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

manifest.json

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

pages/erp/exWarehousing/exWarehousing.vue

@@ -579,7 +579,9 @@
 				this.weightbills.goodsName = this.inOutNoList[e[0]].goodsName
 				if (this.detailData.inOutType == '销售出库') {
 					this.weightbills.buyer = this.inOutNoList[e[0]].buyer
-					this.weightbills.seller = uni.getStorageSync('compName1')
+					if(uni.getStorageSync('compName1')){
+						this.weightbills.seller = uni.getStorageSync('compName1').company
+					}
 					if (this.detailData.tips = '买方' + this.contractNoList[e[0]].buyer) {
 						this.detailData.tips = '买方' + this.contractNoList[e[0]].buyer +
 							'（ ' +
@@ -590,7 +592,9 @@
 					}
 				} else if (this.detailData.inOutType == '移库出库') {
 					this.weightbills.buyer = this.inOutNoList[e[0]].receiveWarehouse
-					this.weightbills.seller = uni.getStorageSync('compName1')
+					if(uni.getStorageSync('compName1')){
+						this.weightbills.seller = uni.getStorageSync('compName1').company
+					}
 					this.detailData.tips = '入货库' + this.inOutNoList[e[0]].receiveWarehouse
 				}
 			},

pages/erpbusiness/add_quality_testing.vue

@@ -796,7 +796,9 @@
 				console.log(res)
 				this.warehouseList = res.data.data.warehousePositionInfoList
 			})
-			this.gridList.compName = uni.getStorageSync('compName1')
+			if(uni.getStorageSync('compName1')){
+				this.gridList.compName = uni.getStorageSync('compName1').company
+			}
 			this.gridList.person = options.personCharge
 			this.gridList.personPhone = options.personPhone
 			this.gridList.qualityInspector = uni.getStorageSync("userInfo").userName