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

.hbuilderx/launch.json

@@ -14,6 +14,10 @@
      	{
      		"launchtype" : "remote"
      	},
+     	"mp-weixin" : 
+     	{
+     		"launchtype" : "remote"
+     	},
      	"type" : "uniCloud"
      }
     ]

manifest.json

@@ -2,8 +2,8 @@
     "name" : "易粮易运",
     "appid" : "__UNI__7297DA2",
     "description" : "易粮易运——为天下粮食人服务的App",
-    "versionName" : "1.1.49",
-    "versionCode" : 1149,
+    "versionName" : "1.1.53",
+    "versionCode" : 1153,
     "transformPx" : false,
     /* SDK配置 */
     "quickapp" : {},

pages/erpbusiness/add_quality_testing.vue

@@ -232,7 +232,15 @@
 					buckleMiscellaneous: '',
 					carNumber:'',
 					customerName:'',
-					customerPhone:''
+					customerPhone:'',
+					bulkDensity:"",
+					imperfectGrain:"",
+					waterContent:"",
+					jiaorenli:"",
+					impurity:"",
+					mildewGrain:"",
+					compName:"",
+					
 				},
 				typeList: ['潮粮', '干粮'],
 				managementType: '',
@@ -301,7 +309,7 @@
 			this.gridList.warehouseName = options.warehouseName
 			this.gridList.qualityNo = 'SGRK' + this.getdate() + this.commonWarehouseNo + number
 			this.cangid = options.cangid
-			this.gridList.compName = uni.getStorageSync('pcUserInfo').compName
+			this.gridList.compName = uni.getStorageSync('compName')
 			this.gridList.person= options.personCharge
 			this.gridList.personPhone= options.personPhone
 			this.gridList.qualityInspector= uni.getStorageSync("userInfo").userName
@@ -478,7 +486,12 @@
 								that.gridList.tidalGrainPrice = ''
 							}
 						} else {
-							that.gridList.tidalGrainPrice = res.data.data
+							if(that.gridList.type == '干粮'){
+								that.gridList.dryGrainPrice = res.data.data
+							}
+							else{
+								that.gridList.tidalGrainPrice = res.data.data
+							}
 						}
 					})
 				}
@@ -627,6 +640,7 @@
 																that.$api.msg('提交成功')
 																that.isShowPrint = true
 																that.gridList.warehouseId = that.cangid
+																that.gridList.compId = uni.getStorageSync('pcUserInfo').compId
 																uni.setStorageSync("quality_print",that.gridList)
 																console.log('that.gridList',that.gridList)
 																// uni.navigateBack({})

pages/erpbusiness/sendCommand.vue

@@ -104,6 +104,7 @@
 		},
 		onShow() {
 			this.gridList = uni.getStorageSync("quality_print")
+			this.utils.nullToString(this.gridList)
 			if(!this.gridList.compId){
 				this.gridList.compId = uni.getStorageSync('pcUserInfo').compId
 			}

pages/erpbusiness/sm/sm.vue

@@ -120,8 +120,8 @@
 		},
 		onShow() {
 			// this.compId = "2710b21efc1e4393930c5dc800010dc4"
-			// this.qualityNo = "SGRK202112200080001"
-			// this.cangid = "715d87adeea548cc9a70d03f72952816"
+			// this.qualityNo = "SGRK202201170060001"
+			// this.cangid = "374a8a02ecfe40dc9abdcd902dd564f5"
 			console.log("查看",this.qualityNo,this.compId,this.cangid)
 			if (this.cangid) { //判断是在哪扫码进入的
 				if(this.compId.indexOf(",") != -1){
@@ -188,7 +188,9 @@
 						this.status = this.detailData.qualityInspectionManagement.status
 						this.confirm = this.detailData.qualityInspectionManagement.confirm
 						this.weightStatus = this.detailData.status
-						this.payStatus = this.detailData.paymentManagement.approveStatus
+						if(this.detailData.paymentManagement){
+							this.payStatus = this.detailData.paymentManagement.approveStatus
+						}	
 					})
 					.catch(res => {
 						if (res.message) {