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

# Conflicts:
#	config/index.js

config/index.js

@@ -7,6 +7,7 @@ const dev = {
 	// baseUrlNew: 'http://192.168.110.138:8090/',
 	baseUrlNew: 'http://192.168.110.67:9888/',
 	// baseUrlNew: 'http://192.168.110.138:8090/',
+	// baseUrlNew: 'http://192.168.110.9:9888/',
 	// baseUrlNew: 'http://192.168.110.82:8090/',
 	// baseUrlNew: 'http://192.168.110.82:8090/',
 	// baseUrlNew: 'http://192.168.110.202:8090/',

pages/erpbusiness/add_quality_testing.vue

@@ -196,6 +196,14 @@
 					</view>
 				</view>
 			</view>
+			<view v-show='typevalue==3&&utils.getCurrectRoles("acquisitionQuality.qview")' class="c-row ">
+				<view class="title">交易量</view>
+				<view class="con-list">
+					<view :style="redstatus?'color:red;':''">
+						{{gridList.volumeofbusiness?gridList.volumeofbusiness:'自动获取，不可编辑'}}
+					</view>
+				</view>
+			</view>
 			<view v-show='typevalue==3&&utils.getCurrectRoles("acquisitionQuality.qview")' class="c-row ">
 				<view class="title">车牌号</view>
 				<view class="con-list" v-show='gridList.inOutType!="移库入库" ||gridList.outType!="汽运"'>
@@ -471,6 +479,7 @@
 		},
 		data() {
 			return {
+				redstatus:false,
 				isShowPrint: false,
 				isShowAlert: false,
 				disabled1: false,
@@ -892,7 +901,6 @@
 				// this.taskNolist=res.data.data
 			})
 			if (uni.getStorageSync('checkcustomer')) {
-
 				let _customerInfo = uni.getStorageSync('checkcustomer')
 				if (_customerInfo.shipperName) {
 					this.gridList.identityId = _customerInfo.id
@@ -907,6 +915,37 @@
 				}
 
 				this.gridList.customerNumberCard = _customerInfo.customerNumberCard
+				var that = this
+				setTimeout(()=>{console.log(this.gridList.goodsName)
+					if(this.gridList.goodsName){
+						uni.showLoading({
+						title: '加载中',
+						mask: true
+					})
+						this.$api.doRequest('get', '/qualityInspectionManagement/getQualityInspectionManagementMap', {
+							goodsName: this.gridList.goodsName,
+							compId: uni.getStorageSync('pcUserInfo').compId,
+							customerNumberCard: this.gridList.customerNumberCard,
+							warehouseName: this.gridList.warehouseName
+						}).then(res => {
+							uni.hideLoading();
+							if(res.data.data.A+res.data.data.B+res.data.data.C*50>res.data.data.D-50){
+								that.redstatus=true
+							}else{
+								that.redstatus=false
+							}
+							var a=res.data.data.A>0?res.data.data.A+'吨':''
+							var b=res.data.data.B>0?res.data.data.B+'吨':''
+							var c=res.data.data.C>0?res.data.data.C+'车':''
+									  
+							that.gridList.volumeofbusiness=a+b+c
+							console.log(that.gridList.volumeofbusiness)
+							that.$forceUpdate()
+						})
+					}
+				},1000)
+				
+				
 			}
 		},
 		methods: {
@@ -1373,6 +1412,31 @@
 						this.tranCarInfoList = []
 					}
 					this.fleetNameList = this.contractNolist.tranCarInfoList1
+					if(this.gridList.goodsName&&this.gridList.customerNumberCard){
+						uni.showLoading({
+						title: '加载中',
+						mask: true
+					})
+					this.$api.doRequest('get', '/qualityInspectionManagement/getQualityInspectionManagementMap', {
+							goodsName: this.gridList.goodsName,
+							compId: uni.getStorageSync('pcUserInfo').compId,
+							customerNumberCard: this.gridList.customerNumberCard
+						}).then(res => {
+							uni.hideLoading(); 
+							if(res.data.data.A+res.data.data.B+res.data.data.C*50>res.data.data.D-50){
+								that.redstatus=true
+							}else{
+								that.redstatus=false
+							}
+							var a=res.data.data.A>0?res.data.data.A+'吨':''
+							var b=res.data.data.B>0?res.data.data.B+'吨':''
+							var c=res.data.data.C>0?res.data.data.C+'车':''
+									  
+							that.gridList.volumeofbusiness=a+b+c
+							console.log(that.gridList.volumeofbusiness)
+							that.$forceUpdate()
+						})
+					}
 				})
 				this.$forceUpdate()
 				console.log(this.gridList)