Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-app

# Conflicts:
#	config/index.js

config/index.js

@@ -1,8 +1,7 @@
 const dev = {
 	baseUrl: 'https://www.zthymaoyi.com',
-	// baseUrlNew: 'http://192.168.1.117:8090/',
-	// baseUrlNew: 'http://192.168.1.119:9100/',
-	baseUrlNew: 'http://api1.eliangeyun.com/',
+	baseUrlNew: 'http://192.168.1.119:9100/',
+	// baseUrlNew: 'http://api1.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }

pages/erp/exWarehousing/exWarehousing.vue

@@ -424,8 +424,20 @@
 						this.detailData.contractNo = this.inOutNoList[0].moveTaskNo
 					}
 					this.detailData.goodsName = this.inOutNoList[0].goodsName
+					this.detailData.goodsNameKey = this.inOutNoList[0].goodsNameKey
 					this.detailData.grade = this.inOutNoList[0].grade
 					this.detailData.inOutType = this.inOutNoList[0].inOutType
+					if (this.detailData.inOutType == '销售出库') {
+						this.detailData.inOutTypeKey = 1
+					} else if (this.detailData.inOutType == '移库出库') {
+						this.detailData.inOutTypeKey = 3
+					} else if (this.detailData.inOutType == '暂存出库') {
+						this.detailData.inOutTypeKey = 4
+					} else if (this.detailData.inOutType == '贸易服务出库') {
+						this.detailData.inOutTypeKey = 5
+					} else if (this.detailData.inOutType == '采购出库') {
+						this.detailData.inOutTypeKey = 6
+					}
 					//查询所有的合同  进行获取车牌号
 					this.$api.doRequest('get', '/warehouseBaseInfo/selectContractNoList', {
 						flag: 5,
@@ -470,6 +482,7 @@
 					this.detailData.contractNo = this.inOutNoList[e[0]].moveTaskNo
 				}
 				this.detailData.goodsName = this.inOutNoList[e[0]].goodsName
+				this.detailData.goodsNameKey = this.inOutNoList[e[0]].goodsNameKey
 				this.detailData.grade = this.inOutNoList[e[0]].grade
 				this.detailData.inOutType = this.inOutNoList[e[0]].inOutType
 				this.weightbills.goodsName = this.inOutNoList[e[0]].goodsName

pages/erp/warehousing/warehousing.vue

@@ -345,17 +345,6 @@
 			this.detailData.contractNo = _data.contractNo;
 			this.detailData.goodsNameKey = _data.goodsNameKey;
 			this.detailData.inOutType = _data.inOutType;
-			if (this.detailData.inOutType == '采购入库') {
-				this.detailData.inOutTypeKey = 1
-			} else if (this.detailData.inOutType == '移库入库') {
-				this.detailData.inOutTypeKey = 3
-			} else if (this.detailData.inOutType == '暂存入库') {
-				this.detailData.inOutTypeKey = 4
-			} else if (this.detailData.inOutType == '贸易服务入库') {
-				this.detailData.inOutTypeKey = 5
-			} else if (this.detailData.inOutType == '退库') {
-				this.detailData.inOutTypeKey = 6
-			}
 			if (_data.unitContractPrice) {
 				this.detailData.cost = _data.unitContractPrice
 			}
@@ -428,6 +417,7 @@
 		},
 		methods: {
 			inOutNo() {
+				let  that  = this
 				this.$api.doRequest('get', '/inOutWarehouseTask/selectInOutWarehouseNo', {
 					flag: 2,
 					warehouseName:this.warehouseName,
@@ -443,8 +433,20 @@
 						this.detailData.contractNo = this.inOutNoList[0].moveTaskNo
 					}
 					this.detailData.goodsName = this.inOutNoList[0].goodsName
+					this.detailData.goodsNameKey = this.inOutNoList[0].goodsNameKey;
 					this.detailData.grade = this.inOutNoList[0].grade
 					this.detailData.inOutType = this.inOutNoList[0].inOutType
+					if (this.detailData.inOutType == '采购入库') {
+						this.detailData.inOutTypeKey = 1
+					} else if (this.detailData.inOutType == '移库入库') {
+						this.detailData.inOutTypeKey = 3
+					} else if (this.detailData.inOutType == '暂存入库') {
+						this.detailData.inOutTypeKey = 4
+					} else if (this.detailData.inOutType == '贸易服务入库') {
+						this.detailData.inOutTypeKey = 5
+					} else if (this.detailData.inOutType == '退库') {
+						this.detailData.inOutTypeKey = 6
+					}
 					//查询所有的合同  进行获取车牌号
 					this.$api.doRequest('get', '/warehouseBaseInfo/selectContractNoList', {
 						flag: 7,
@@ -500,6 +502,7 @@
 					this.detailData.contractNo = this.inOutNoList[e[0]].moveTaskNo
 				}
 				this.detailData.goodsName = this.inOutNoList[e[0]].goodsName
+				this.detailData.goodsNameKey = this.inOutNoList[e[0]].goodsNameKey;
 				this.detailData.grade = this.inOutNoList[e[0]].grade
 				this.detailData.inOutType = this.inOutNoList[e[0]].inOutType
 				for (var i = 0; i < this.contractNoList.length; i++) {

pages/erpbusiness/acquisitionInspection/grossWeightDetail.vue

@@ -84,13 +84,15 @@
 		},
 		methods: {
 			submit() {
+			
 				let that = this
 				uni.showModal({
 					content: "确定提交检斤信息?",
 					success: function(res) {
 						if (res.confirm) {
 							that.$api.doRequest('get', '/paymentManagement/cumulant', {
-								compId: JSON.parse(localStorage.getItem('pcUserInfo')).data.compId,
+								// compId: JSON.parse(localStorage.getItem('pcUserInfo')).data.compId,
+								compId: uni.getStorageSync('pcUserInfo').compId,
 								customerNumberCard: that.detailData.customerNumberCard,
 								goodsName: that.detailData.goodsName,
 							}).then(res => {
@@ -100,6 +102,7 @@
 											that.detailData.goodsName == that.purchasePriceList[i]
 											.goodsName
 										) {
+											
 											let count = (that.purchasePriceList[i].saleLimit -
 												res.data.data / 1000).toFixed(2)
 											if (Number(count) - that.detailData.grossWeight / 1000 <= 0) {

pages/erpbusiness/acquisitionInspection/tareDetail.vue

@@ -89,7 +89,6 @@
 		},
 		onLoad(options) {
 			this.detailData = JSON.parse(options.detailData)
-			console.log(this.detailData)
 			if (!this.detailData.buckleMiscellaneous) {
 				this.detailData.buckleMiscellaneous = 0
 			}
@@ -105,7 +104,8 @@
 					content: "确定提交检斤信息?",
 					success() {
 						that.$api.doRequest('get', '/paymentManagement/cumulant', {
-							compId: JSON.parse(localStorage.getItem('pcUserInfo')).data.compId,
+							// compId: JSON.parse(localStorage.getItem('pcUserInfo')).data.compId,
+							compId: uni.getStorageSync('pcUserInfo').compId,
 							customerNumberCard: that.detailData.customerNumberCard,
 							goodsName: that.detailData.goodsName,
 						}).then(res => {

pages/erpbusiness/add_quality_testing.vue

@@ -632,7 +632,7 @@
 				this.waterContentChange()
 			},
 			setGoodName(e) {
-				uni.showLoading({title: '加载中',mask:true})
+				// 
 				// [e[0]] = 0
 				// this.$set(this.gradeList,'grade',this.gradeList[e[0]].value)
 				if (this.goodsList[e[0]].goodsName == '玉米') {
@@ -647,24 +647,25 @@
 				}
 				var that = this
 				this.gridList.goodsName = this.goodsList[e[0]].goodsName
-				this.$api.doRequest('get', '/identityAuthenticationInfo/identityAuthenticationInfoCustomer', {
-					warehouseId: this.cangid,
-					goodsName: this.gridList.goodsName
-				}).then(res => {
-					if (res.data.data) {
-						uni.hideLoading()
-						// let data = res.data.data
-						// that.gridList =data
-					}
-				})
+				// this.$api.doRequest('get', '/identityAuthenticationInfo/identityAuthenticationInfoCustomer', {
+				// 	warehouseId: this.cangid,
+				// 	goodsName: this.gridList.goodsName
+				// }).then(res => {
+				// 	if (res.data.data) {
+				// 		uni.hideLoading()
+				// 		// let data = res.data.data
+				// 		// that.gridList =data
+				// 	}
+				// })
 				uni.setStorageSync('goodsName', this.gridList.goodsName)
 				if (this.gridList.type == "干粮" && this.gridList.goodsName) {
+					uni.showLoading({title: '加载中',mask:true})
 					this.$api.doRequest('get', '/purchasePrice/dryGrainPrice', {
 						warehouseId: this.cangid,
 						goodsName: this.gridList.goodsName
 					}).then(res => {
 						this.gridList.dryGrainPrice = res.data.data
-						
+						uni.hideLoading()
 					})
 				}
 				this.waterContentChange()

pages/erpbusiness/bleConnect.vue

@@ -33,17 +33,11 @@
 		},
 		computed: mapState(['sysinfo', 'Bluetooth']),
 		onLoad() {
-			
-			
-			
-		},
-		onShow() {
-			// if(this.Bluetooth){
-			// 	uni.navigateTo({
-			// 		url: '/pages/erpbusiness/sendCommand'
-			// 	})
-			// }
-		console.log(this.Bluetooth)
+			console.log("····················")
+			console.log("this.Bluetooth",this.Bluetooth)
+			if(this.Bluetooth.BLEInformation.deviceId){
+				this.openControl()
+			}
 		},
 		onUnload() {
 			//停止搜索蓝牙设备
@@ -162,9 +156,9 @@
 			//校验权限
 			checkPemission() {
 				let that = this
-				let 
+				let {
 					BLEInformation
-				 = that.Bluetooth;
+				} = that.Bluetooth;
 				let platform = BLEInformation.platform;
 				that.getBluetoothDevices();
 			},
@@ -224,9 +218,9 @@
 				let {
 					title
 				} = e.currentTarget.dataset;
-				let 
+				let {
 					BLEInformation
-				 = that.Bluetooth;
+				} = that.Bluetooth;
 				this.stopSearch();
 				
 				that.serviceId = 0;
@@ -244,7 +238,6 @@
 						console.log('createBLEConnection success:', res)
 						BLEInformation.deviceId = title;
 						that.$store.commit('BLEInformationSet', BLEInformation);
-						// console.log(this.Bluetooth,)
 						uni.hideLoading()
 						that.getSeviceId()
 					},
@@ -257,9 +250,9 @@
 			//获取蓝牙设备所有服务(service)。
 			getSeviceId() {
 				let that = this;
-				let 
+				let {
 					BLEInformation
-				 = that.Bluetooth;
+				} = that.Bluetooth;
 				console.log('BLEInformation.deviceId:',BLEInformation.deviceId)
 				// uni.getBLEDeviceServices
 				let t=setTimeout(()=>{
@@ -287,9 +280,9 @@
 					readCharacter: read,
 					notifyCharacter: notify
 				} = that;
-				let 
+				let {
 					BLEInformation
-				 = that.Bluetooth;
+				} = that.Bluetooth;
 				// uni.getBLEDeviceCharacteristics
 				plus.bluetooth.getBLEDeviceCharacteristics({
 					deviceId: BLEInformation.deviceId,
@@ -339,7 +332,6 @@
 								that.getCharacteristics()
 							}
 						} else {
-							that.$store.commit('BLEInformationSet', BLEInformation);
 							that.openControl()
 						}
 					},

pages/erpbusiness/edit_quality_testing.vue

@@ -23,7 +23,7 @@
 			<view class="c-row ">
 				<view class="title">车牌号</view>
 				<view class="con-list">
-					<input v-model='gridList.carNumber' @click.stop="handleShowKeyboard":disabled="true" placeholder="请输入车牌号" name="input"></input>
+					<input v-model='gridList.carNumber' @click.stop="handleShowKeyboard" placeholder="请输入车牌号" name="input"></input>
 					<master-keyboard ref="keyboard" keyboardtype="car" :randomNumber="true" :newCar="false" :defaultValue="gridList.carNumber" @keyboardClick="handleClick"></master-keyboard>
 					<!-- <input :disabled='flag==1' v-model='gridList.carNumber' placeholder="请输入车牌号" name="input"></input> -->
 				</view>

pages/erpbusiness/exbleConnect.vue

@@ -34,7 +34,11 @@
 		computed: mapState(['sysinfo', 'Bluetooth']),
 		onLoad() {
 			// console.log(this.Bluetooth)
-			
+			console.log("~~~~~~~~~~~~~~~~~~~~~~~~~~~")
+			console.log("this.Bluetooth",this.Bluetooth)
+			if(this.Bluetooth.BLEInformation.deviceId){
+				this.openControl()
+			}
 		},
 		onUnload() {
 			//停止搜索蓝牙设备

pages/erpbusiness/jjbleConnect.vue

@@ -34,7 +34,11 @@
 		computed: mapState(['sysinfo', 'Bluetooth']),
 		onLoad() {
 			// console.log(this.Bluetooth)
-			
+			console.log("····················")
+			console.log("this.Bluetooth",this.Bluetooth)
+			if(this.Bluetooth.BLEInformation.deviceId){
+				this.openControl()
+			}
 		},
 		onUnload() {
 			//停止搜索蓝牙设备

pages/erpbusiness/jjsendCommand.vue

@@ -103,7 +103,6 @@
 		},
 		onShow() {
 			this.gridList = uni.getStorageSync("acquisitionInspection_print")
-			console.log(this.gridList)
 			let that = this;
 			let width;
 			let height;

pages/erpbusiness/sendCommand.vue

@@ -103,6 +103,7 @@
 		},
 		onShow() {
 			this.gridList = uni.getStorageSync("quality_print")
+			this.gridList.compId = uni.getStorageSync('pcUserInfo').compId
 			console.log(this.gridList)
 			let that = this;
 			let width;

pages/erpbusiness/sm/sm.vue

@@ -44,12 +44,12 @@
 					去初检
 				</view>
 				<view class="but_css" @click="skip(2)"
-					v-if="getRoles('acquisitionQuality.again') && (status == '已初检'|| status == '已复检')">去复检</view>
+					v-if="getRoles('acquisitionQuality.again') && !payStatus && confirm != '1' && (status == '已初检'|| status == '已复检')">去复检</view>
 				<view class="but_css" @click="skip(3)"
 					v-if="getRoles('acquisitionWeight.mao') && weightStatus != '已称皮重' && (weightStatus == '已质检'|| weightStatus == '已称毛重')">
 					去称毛重</view>
 				<view class="but_css" @click="skip(4)"
-					v-if="getRoles('acquisitionWeight.weight') && (weightStatus == '已称毛重' || weightStatus == '已称皮重')">
+					v-if="getRoles('acquisitionWeight.weight') && !payStatus && (weightStatus == '已称毛重' || weightStatus == '已称皮重')">
 					去称皮重
 				</view>
 				<view class="but_css" @click="skip(5)"
@@ -91,6 +91,7 @@
 				weightStatus: "", //检斤状态
 				qualityNo: "",
 				confirm: "", //确认初检确认状态
+				payStatus:"",//结算状态
 				detailData: {},
 				userName: "", //仓库负责人
 				companyId: "",
@@ -112,17 +113,20 @@
 			//#ifdef APP-PLUS
 			this.user.title = options.data.split(',')[2]
 			this.user.companyId = options.data.split(',')[1]
-			this.compId = options.data.split(",")[1]
+			this.compId = options.data
 			this.qualityNo = _list[1]
 			this.cangid = _list[2]
 			//#endif
 		},
 		onShow() {
 			// this.compId = "2710b21efc1e4393930c5dc800010dc4"
-			// this.qualityNo = "SGRK202112040001"
-			// this.cangid = "1c9949fa0dc04c5e84f9bea9c809856c"
+			// this.qualityNo = "SGRK202112200080001"
+			// this.cangid = "715d87adeea548cc9a70d03f72952816"
 			console.log("查看",this.qualityNo,this.compId,this.cangid)
 			if (this.cangid) { //判断是在哪扫码进入的
+				if(this.compId.indexOf(",") != -1){
+					this.compId = this.compId.split(",")[1]
+				}
 				this.show = false
 				this.show1 = true
 				this.companyId = uni.getStorageSync('pcUserInfo').compId
@@ -149,6 +153,8 @@
 							})
 						}
 					}).catch(res => {});
+				}else{
+				    this.$api.msg('当前身份不可操作！')
 				}
 			} else {//邀请客户
 				this.show = true
@@ -156,10 +162,13 @@
 				this.getList()
 			}
 			// this.getShow()
+			// debugger
+			// this.getRoles("acquisitionWeight.mao")
 		},
 		methods: {
 			//查看权限
 			getRoles: function(role) {
+				// debugger
 				let _roles = uni.getStorageSync('rolesList')
 				for (let i = 0; i < _roles.length; i++) {
 					if (_roles[i] == role) {
@@ -179,6 +188,7 @@
 						this.status = this.detailData.qualityInspectionManagement.status
 						this.confirm = this.detailData.qualityInspectionManagement.confirm
 						this.weightStatus = this.detailData.status
+						this.payStatus = this.detailData.paymentManagement.approveStatus
 					})
 					.catch(res => {
 						if (res.message) {

pages/task/audit/freight_setting_approval.vue

@@ -46,19 +46,10 @@
 				</u-form-item>
 			</u-form>
 		</view>
-		<!-- 审核意见弹窗 -->
-		<!-- <u-popup v-model="show1" mode="center">
-			<view style="width: 300px;padding: 30rpx 10rpx;border-radius: 20rpx;">
-				<view class="rejectText">审核意见</view>
-				<u-input v-model="rejectInfo" type="textarea" :border="border" :height="height" :auto-height="autoHeight"  class="rejectInfoCss"
-					placeholder="请输入审核意见" />
-				<view class="flex">
-					<u-button @click="show1 = false" type="error" hover-class='none'>取消</u-button>
-					<u-button @click="passSubmit()" type="success">确定</u-button>
-				</view>
-			</view>
-		</u-popup> -->
-		<u-button type="primary" class="submit" @click="passSubmit()" v-if="list.priceStatus == '审核中'||isSHowBtn">通过
+		<u-modal v-model="show" :title-style="{fontSize: '18px',fontWeight:'500'}"
+			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
+			showCancelButton='false' :content="content" @confirm="passSubmit" @cancel="show = false"></u-modal>
+		<u-button type="primary" class="submit" @click="show = true" v-if="list.priceStatus == '审核中'||isSHowBtn">通过
 		</u-button>
 	</view>
 </template>
@@ -79,18 +70,16 @@
 				id: "",
 				show: false,
 				rejectInfo: "", //审核意见
-				//弹窗属性
-				// height:200,
-				// autoHeight: true,
-				// border: false,
+				title: "提示",
+				content: '是否通过该设置?'
 			}
 		},
 		onBackPress(e) {
-			if(this.everyCheck){
-			uni.navigateTo({
-				url: "/pages/task/my_task"
-			})
-			return true;
+			if (this.everyCheck) {
+				uni.navigateTo({
+					url: "/pages/task/my_task"
+				})
+				return true;
 			}
 		},
 		onLoad(options) {
@@ -116,45 +105,30 @@
 					this.$api.msg('运费单价不能为空')
 					return
 				}
-				// if (!this.rejectInfo1) {
-				// 	this.$api.msg('审核意见不能为空！')
-				// }else{
-
-				// }
-				uni.showModal({
-					content: "是否通过该设置?",
-					showCancel: true,
-					confirmText: '确定',
-					success: function(res) {
-						uni.showLoading({
-							title: "审核中"
-						})
-						if (res.confirm) {
-							var tranProcessInfo = {}
-							tranProcessInfo.id = that.list.id
-							tranProcessInfo.flag = "2"
-							tranProcessInfo.tranPriceIng = that.list.tranPriceIng
-							tranProcessInfo.reviewer = that.userInfo.userName
-							tranProcessInfo.tranTypeKey = that.list.tranTypeKey
-							that.$api.doRequest('post', '/tranProcessInfo/api/setUpTranPrice', tranProcessInfo)
-								.then(res => {
-									if (res.data.code == 200) {
-										that.$api.msg('审核通过成功!')
-										setTimeout(function() {
-											if (that.everyCheck) {
-												helper.setAudit(that.list)
-											} else {
-												uni.navigateBack()
-											}
-											uni.hideLoading()
-										}, 1000);
-									}
-								})
-						} else {
-							uni.hideLoading()
-						}
-					}
+				uni.showLoading({
+					title: "审核中"
 				})
+				var tranProcessInfo = {}
+				tranProcessInfo.id = that.list.id
+				tranProcessInfo.flag = "2"
+				tranProcessInfo.tranPriceIng = that.list.tranPriceIng
+				tranProcessInfo.reviewer = that.userInfo.userName
+				tranProcessInfo.tranTypeKey = that.list.tranTypeKey
+				that.$api.doRequest('post', '/tranProcessInfo/api/setUpTranPrice', tranProcessInfo)
+					.then(res => {
+						if (res.data.code == 200) {
+							that.$api.msg('审核通过成功!')
+							setTimeout(function() {
+								if (that.everyCheck) {
+									helper.setAudit(that.list)
+								} else {
+									uni.navigateBack()
+								}
+								uni.hideLoading()
+							}, 1000);
+						}
+					})
+
 			}
 		}
 	}
@@ -244,4 +218,4 @@
 		width: 100%;
 		justify-content: flex-end;
 	}
-</style>
+</style>

store/bluetooth/index.js

@@ -2,10 +2,21 @@ let sysinfo = uni.getSystemInfoSync();
 const Bluetooth = {
 	state: {
 		//蓝牙信息
-		
+		BLEInformation: {
+			platform: sysinfo.platform || "",
+			deviceId: "",
+			writeCharaterId: "",
+			writeServiceId: "",
+			notifyCharaterId: "",
+			notifyServiceId: "",
+			readCharaterId: "",
+			readServiceId: "",
+		}
 	},
 	mutations:{
-		
+		BLEInformationSet(state, info){
+			state.BLEInformation = info;
+		}
 	}
 }
 

store/index.js

@@ -1,6 +1,8 @@
 import Vue from 'vue'
 import Vuex from 'vuex'
 Vue.use(Vuex)
+//蓝牙设置
+import Bluetooth from '@/store/bluetooth/index.js'
 let lifeData = {};
 
 try {
@@ -39,15 +41,16 @@ const saveLifeData = function(key, value) {
 		uni.setStorageSync('lifeData', tmp);
 	}
 }
-let sysinfo = uni.getSystemInfoSync();
 
 
 const store = new Vuex.Store({
+	modules: {
+		Bluetooth
+	},
 	state: {
 		sysinfo: uni.getSystemInfoSync(),//系统信息
 		enter:{},
 		hasLogin: false,
-		BLEInformation: {},
 		// 如果上面从本地获取的lifeData对象下有对应的属性，就赋值给state中对应的变量
 		pushRes:lifeData.pushRes?lifeData.pushRes: {},
 		//期货数据获取
@@ -90,18 +93,7 @@ const store = new Vuex.Store({
 		clientId: lifeData.clientId?lifeData.clientId: "",
 		// 确定收货
 		isConfigfreightTransport:true,
-		choice:"",
-		//蓝牙信息
-		BLEInformation: {
-			platform: sysinfo.platform || "",
-			deviceId: "",
-			writeCharaterId: "",
-			writeServiceId: "",
-			notifyCharaterId: "",
-			notifyServiceId: "",
-			readCharaterId: "",
-			readServiceId: "",
-		}
+		choice:""
 	},
 	mutations: {
 		$uStore(state, payload) {
@@ -129,10 +121,7 @@ const store = new Vuex.Store({
 			state.userInfo = provider;
 			uni.setStorageSync('userInfo', provider)
 		},
-		BLEInformationSet(state, info){
-			console.log(info)
-			state.BLEInformation = info;
-		},
+		
 		logout(state) {
 			state.hasLogin = false;
 			state.userInfo = {};
@@ -151,9 +140,8 @@ const store = new Vuex.Store({
 		state.enter = provider
 		console.log(state)
 		},
-		BLEInformationSet(state, info){
-			state.BLEInformation = info;
-		}
+		
+		
 	},
 	actions: {