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

config/index.js

@@ -10,7 +10,7 @@ const dev = {
 	// baseUrlNew: 'http://192.168.110.202:8090/',
 	// baseUrlNew: 'http://192.168.110.138:8090/',
 	// 上传图片的
-	baseUrlNew: 'https://api2.eliangeyun.com/',
+	// baseUrlNew: 'https://api2.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }

pages/erpbusiness/add_quality_testing.vue

@@ -238,7 +238,7 @@
 				</view>
 			</view>
 			<view v-show='utils.getCurrectRoles("acquisitionQuality.initial")' class="c-row ">
-				<view class="title">囤位号</view>
+				<view class="title">囤位号（选填）</view>
 				<view class="con-list">
 					<input type="digit" v-model='gridList.storageTagNo' placeholder="请输入囤位号" name="input"></input>
 				</view>
@@ -276,82 +276,7 @@
 					<input v-model='gridList.titleNoOther' placeholder="请输入封号" name="input" type="digit"></input>
 				</view>
 			</view>
-			<view v-show="gridList.type == '潮粮'&&utils.getCurrectRoles('acquisitionQuality.initial')&&typevalue==3"
-				class="c-row">
-				<view class="title">净重单价（元/公斤）</view>
-				<view class="con-list">
-					<input v-model='gridList.tidalGrainPrice' :disabled='pricedisabled' @blur='inputprice'
-						placeholder="自动获取，不可编辑" name="input" type="digit"></input>
-				</view>
-				<button class='cu-btn bg-green shadow' @click="changeprice">{{pricetext}}</button>
-			</view>
-			<view v-show="gridList.type == '干粮'&&utils.getCurrectRoles('acquisitionQuality.initial')&&typevalue==3"
-				class="c-row">
-				<view class="title">干粮单价（元/公斤）</view>
-				<view class="con-list">
-					<input v-model='gridList.dryGrainPrice' :disabled='pricedisabled' @blur='inputprice'
-						placeholder="请输入干粮单价" name="input" type="digit"></input>
-				</view>
-				<button class='cu-btn bg-green shadow' @click="changeprice">{{pricetext}}</button>
-			</view>
-			<!-- <view v-show="gridList.type == '潮粮'&&utils.getCurrectRoles('acquisitionQuality.initial')&&typevalue==1"
-				class="c-row">
-				<view class="title">水分增价（元/公斤）</view>
-				<view class="con-list">
-					<input v-model='gridList.waterPriceIncrease' :disabled='disabled1' @input='deductionchange'
-						placeholder="自动获取，不可编辑" name="input" type="digit"></input>
-				</view>
-			</view>
-			<view v-show="gridList.type == '潮粮'&&utils.getCurrectRoles('acquisitionQuality.initial')&&typevalue==1"
-				class="c-row">
-				<view class="title">水分扣价（元/公斤）</view>
-				<view class="con-list">
-					<input v-model='gridList.waterPriceDeduction' :disabled='disabled1' @input='deductionchange'
-						placeholder="自动获取，不可编辑" name="input" type="digit"></input>
-				</view>
-			</view>
-			<view v-show="gridList.type == '潮粮'&&utils.getCurrectRoles('acquisitionQuality.initial')&&typevalue==1"
-				class="c-row">
-				<view class="title">质量增价（元/公斤）</view>
-				<view class="con-list">
-					<input v-model='gridList.qualityPriceIncrease' :disabled='disabled1' @input='deductionchange'
-						placeholder="自动获取，不可编辑" name="input" type="digit"></input>
-				</view>
-			</view>
 			
-			<view v-show="gridList.type == '潮粮'&&utils.getCurrectRoles('acquisitionQuality.initial')&&typevalue==1"
-				class="c-row">
-				<view class="title">质量扣价（元/公斤）</view>
-				<view class="con-list">
-					<input v-model='gridList.qualityPriceDeduction' :disabled='disabled1' @input='deductionchange'
-						placeholder="自动获取，不可编辑" name="input" type="digit"></input>
-				</view>
-			</view>
-			 -->
-			<view v-show="gridList.type == '潮粮'&&utils.getCurrectRoles('acquisitionQuality.initial')&&typevalue==1"
-				class="c-row">
-				<view class="title">净重单价（元/公斤）</view>
-				<view class="con-list">
-					<input v-model='gridList.tidalGrainPrice' :disabled='disabled1' @blur='inputprice'
-						placeholder="自动获取，不可编辑" name="input" type="digit"></input>
-				</view>
-			</view>
-			<view v-show="gridList.type == '潮粮'&&utils.getCurrectRoles('acquisitionQuality.initial')&&typevalue==1"
-				class="c-row">
-				<view class="title">净重单价（元/公斤）</view>
-				<view class="con-list">
-					<input v-model='gridList.tidalGrainPrice' :disabled='disabled1' @blur='inputprice'
-						placeholder="自动获取，不可编辑" name="input" type="digit"></input>
-				</view>
-			</view>
-			<view v-show="gridList.type == '干粮'&&utils.getCurrectRoles('acquisitionQuality.initial')&&typevalue==1"
-				class="c-row">
-				<view class="title">干粮单价（元/公斤）</view>
-				<view class="con-list">
-					<input v-model='gridList.dryGrainPrice' :disabled='disabled1' @blur='inputprice'
-						placeholder="请输入干粮单价" name="input" type="digit"></input>
-				</view>
-			</view>
 			
 		</view>
 		<view v-show="utils.getCurrectRoles('acquisitionQuality.initial')" style='padding-bottom:300rpx;'>
@@ -411,6 +336,82 @@
 						<input v-model='gridList.jiaorenli' placeholder="请输入热损伤占比" name="input" type="digit"></input>
 					</view>
 				</view>
+				<view v-show="gridList.type == '潮粮'&&utils.getCurrectRoles('acquisitionQuality.initial')&&typevalue==3"
+					class="c-row">
+					<view class="title">净重单价（元/公斤）</view>
+					<view class="con-list">
+						<input v-model='gridList.tidalGrainPrice' :disabled='pricedisabled' @blur='inputprice'
+							placeholder="自动获取，不可编辑" name="input" type="digit"></input>
+					</view>
+					<button class='cu-btn bg-green shadow' @click="changeprice">{{pricetext}}</button>
+				</view>
+				<view v-show="gridList.type == '干粮'&&utils.getCurrectRoles('acquisitionQuality.initial')&&typevalue==3"
+					class="c-row">
+					<view class="title">干粮单价（元/公斤）</view>
+					<view class="con-list">
+						<input v-model='gridList.dryGrainPrice' :disabled='pricedisabled'  @blur='inputprice'
+							placeholder="请输入干粮单价" name="input" type="digit"></input>
+					</view>
+					<button class='cu-btn bg-green shadow' @click="changeprice">{{pricetext}}</button>
+				</view>
+				<view v-show="utils.getCurrectRoles('acquisitionQuality.initial')&&typevalue==3"
+					class="c-row">
+					<view class="title">水分增价（元/吨）</view>
+					<view class="con-list">
+						<input v-model='gridList.waterPriceIncrease' @focus="pricefocus($event,1)" @input='deductionchange'
+							placeholder="请输入水分增价" name="input" type="digit"></input>
+					</view>
+				</view>
+				<view v-show="utils.getCurrectRoles('acquisitionQuality.initial')&&typevalue==3"
+					class="c-row">
+					<view class="title">水分扣价（元/吨）</view>
+					<view class="con-list">
+						<input v-model='gridList.waterPriceDeduction'  @focus="pricefocus($event,2)" @input='deductionchange'
+							placeholder="请输入水分扣价" name="input" type="digit"></input>
+					</view>
+				</view>
+				<view v-show="utils.getCurrectRoles('acquisitionQuality.initial')&&typevalue==3"
+					class="c-row">
+					<view class="title">质量增价（元/吨）</view>
+					<view class="con-list">
+						<input v-model='gridList.qualityPriceIncrease'  @focus="pricefocus($event,3)" @input='deductionchange'
+							placeholder="请输入质量增价" name="input" type="digit"></input>
+					</view>
+				</view>
+				
+				<view v-show="utils.getCurrectRoles('acquisitionQuality.initial')&&typevalue==3"
+					class="c-row">
+					<view class="title">质量扣价（元/吨）</view>
+					<view class="con-list">
+						<input v-model='gridList.qualityPriceDeduction'  @focus="pricefocus($event,4)" @input='deductionchange'
+							placeholder="请输入质量扣价" name="input" type="digit"></input>
+					</view>
+				</view>
+				
+				<view v-show="gridList.type == '潮粮'&&utils.getCurrectRoles('acquisitionQuality.initial')&&typevalue==1"
+					class="c-row">
+					<view class="title">净重单价（元/公斤）</view>
+					<view class="con-list">
+						<input v-model='gridList.tidalGrainPrice' :disabled='disabled1' @blur='inputprice'
+							placeholder="自动获取，不可编辑" name="input" type="digit"></input>
+					</view>
+				</view>
+<!-- 				<view v-show="gridList.type == '潮粮'&&utils.getCurrectRoles('acquisitionQuality.initial')&&typevalue==1"
+					class="c-row">
+					<view class="title">净重单价（元/公斤）</view>
+					<view class="con-list">
+						<input v-model='gridList.tidalGrainPrice' :disabled='disabled1' @blur='inputprice'
+							placeholder="自动获取，不可编辑" name="input" type="digit"></input>
+					</view>
+				</view> -->
+				<view v-show="gridList.type == '干粮'&&utils.getCurrectRoles('acquisitionQuality.initial')&&typevalue==1"
+					class="c-row">
+					<view class="title">干粮单价（元/公斤）</view>
+					<view class="con-list">
+						<input v-model='gridList.dryGrainPrice' :disabled='disabled1' @blur='inputprice'
+							placeholder="请输入干粮单价" name="input" type="digit"></input>
+					</view>
+				</view>
 			</view>
 		</view>
 
@@ -457,6 +458,8 @@
 					month: true,
 					day: true,
 				},
+				dryGrainPrice:0,
+				tidalGrainPrice:0,
 				modalName: '',
 				pricetext: '锁定',
 				pricedisabled: false,
@@ -870,10 +873,48 @@
 			}
 		},
 		methods: {
+			pricefocus(e,status){
+				console.log(e)
+				if(status==1){
+					if(e.detail.value==0){
+						this.gridList.waterPriceIncrease=''
+						
+					}
+				}else if(status==2){
+					if(e.detail.value==0){
+						this.gridList.waterPriceDeduction=''
+						
+					}
+					
+				}else if(status==3){
+					if(e.detail.value==0){
+						this.gridList.qualityPriceIncrease=''
+						
+					}
+					
+				}else if(status==4){
+					if(e.detail.value==0){
+						this.gridList.qualityPriceDeduction=''
+						
+					}
+					
+				}
+				
+			},
 			deductionchange(){
-			    if(this.gridList.tidalGrainPrice&&this.gridList.waterPriceIncreas&&this.gridList.waterPriceDeduction&&this.gridList.qualityPriceIncrease&&this.gridList.qualityPriceDeduction){
-			        this.gridList.tidalGrainPrice=this.gridList.tidalGrainPrice-this.gridList.waterPriceIncrease-this.gridList.waterPriceDeduction-this.gridList.qualityPriceIncrease-this.gridList.qualityPriceDeduction
-			    }
+				if(this.gridList.type=='干粮'){
+					if(this.dryGrainPrice!=''){
+						console.log(Number(this.dryGrainPrice+(this.gridList.waterPriceIncrease/1000)-(this.gridList.waterPriceDeduction/1000)+(this.gridList.qualityPriceIncrease/1000)-(this.gridList.qualityPriceDeduction/1000)),Number(this.dryGrainPrice+(this.gridList.waterPriceIncrease/1000)-(this.gridList.waterPriceDeduction/1000)+(this.gridList.qualityPriceIncrease/1000)-(this.gridList.qualityPriceDeduction/1000)).toFixed(2))
+						this.gridList.dryGrainPrice=Number(this.dryGrainPrice+(this.gridList.waterPriceIncrease/1000)-(this.gridList.waterPriceDeduction/1000)+(this.gridList.qualityPriceIncrease/1000)-(this.gridList.qualityPriceDeduction/1000)).toFixed(3)
+					}
+					
+				}else if(this.gridList.type=='潮粮'){
+					if(this.tidalGrainPrice!=''){
+						this.gridList.tidalGrainPrice=Number(this.tidalGrainPrice+(this.gridList.waterPriceIncrease/1000)-(this.gridList.waterPriceDeduction/1000)+(this.gridList.qualityPriceIncrease/1000)-(this.gridList.qualityPriceDeduction/1000)).toFixed(3)
+					}
+					
+				}
+				this.$forceUpdate()
 			},
 			carNopicker(e){
 				this.gridList.carNumber=this.tranCarInfoList[e[0]].carNo
@@ -907,6 +948,11 @@
 						}).then(res => {
 							if(res.data.data != 0){
 								this.gridList.dryGrainPrice = res.data.data
+								this.dryGrainPrice=res.data.data
+								this.gridList.waterPriceIncrease=0
+								this.gridList.waterPriceDeduction=0
+								this.gridList.qualityPriceIncrease=0
+								this.gridList.qualityPriceDeduction=0
 							}
 						})
 					// }
@@ -927,6 +973,13 @@
 
 					this.pricetext = '解锁'
 				}
+				console.log(this.gridList.dryGrainPrice,this.gridList.tidalGrainPrice)
+				if(this.gridList.type=='干粮'){
+					this.dryGrainPrice = this.gridList.dryGrainPrice
+				}
+				if(this.gridList.type=='潮粮'){
+					this.tidalGrainPrice = this.gridList.tidalGrainPrice
+				}
 			},
 			groupChange(e) {
 				console.log(e,this.gridListInit)
@@ -1076,6 +1129,7 @@
 								this.edit = true
 								if (this.contractNolist.priceType != '随行就市') {
 									this.gridList.tidalGrainPrice = this.contractNolist.contractPrice
+									this.tidalGrainPrice = this.contractNolist.contractPrice
 								}
 
 							} else {
@@ -1239,6 +1293,8 @@
 							goodsName: this.gridList.goodsName
 						}).then(res => {
 							that.gridList.dryGrainPrice = res.data.data
+							that.dryGrainPrice = res.data.data
+							
 						})
 					}
 
@@ -1257,10 +1313,17 @@
 						waterContent: this.gridList.waterContent,
 						grade: this.gridList.grade,
 					}).then(res => {
+						that.gridList.waterPriceIncrease=0
+						that.gridList.waterPriceDeduction=0
+						that.gridList.qualityPriceIncrease=0
+						that.gridList.qualityPriceDeduction=0
 						if (that.gridList.paramType == '1') {
 							that.gridList.tidalGrainPrice = parseFloat(parseFloat(res.data.data) - parseFloat(that
 								.gridList.buckleMiscellaneous) / 100 * parseFloat(that.gridList
 								.dryGrainPrice)).toFixed(4)
+								that.tidalGrainPrice = parseFloat(parseFloat(res.data.data) - parseFloat(that
+									.gridList.buckleMiscellaneous) / 100 * parseFloat(that.gridList
+									.dryGrainPrice)).toFixed(4)
 							if (!that.gridList.tidalGrainPrice) {
 								that.gridList.tidalGrainPrice = ''
 							}
@@ -1269,6 +1332,7 @@
 								that.gridList.dryGrainPrice = res.data.data
 							} else {
 								that.gridList.tidalGrainPrice = res.data.data
+								that.tidalGrainPrice = res.data.data
 							}
 						}
 					})

pages/erpbusiness/edit_quality_testing.vue

@@ -146,7 +146,7 @@
 					<!-- <view v-if="flag != '0'">
 						{{gridList.goodsName}}
 					</view> -->
-					<view v-if='flag==4||flag==0' @click='goodsName = true'>{{gridList.goodsName}}</view>
+					<view v-if='flag==4||flag==0'>{{gridList.goodsName}}</view>
 					<view v-else>{{gridList.goodsName}}</view>
 					<u-picker :range="goodsList" range-key="goodsName" @confirm='goodsPicker($event)'
 						v-model="goodsName" mode="selector">
@@ -237,21 +237,7 @@
 					<input :disabled='flag!=4&&flag!=0' v-model='gridList.titleNoOther' placeholder="请输入封号" name="input" type="digit"></input>
 				</view>
 			</view>
-			<view v-if="gridList.type == '潮粮'&&gridList.serviceManagementType==3&&flag!=3" class="c-row">
-				<view class="title">净重单价（元/公斤）</view>
-				<view class="con-list">
-					<input :disabled='flag==1&&pricedisabled' v-model='gridList.tidalGrainPrice'  @blur='inputprice' placeholder="自动获取,不可编辑"
-						name="input"></input>
-				</view>
-				<button class='cu-btn bg-green shadow' @click="changeprice">{{pricetext}}</button>
-			</view>
-			<view v-if="gridList.type == '干粮'&&gridList.serviceManagementType==3&&flag!=3" class="c-row">
-				<view class="title">干粮单价（元/公斤）</view>
-				<view class="con-list">
-					<input v-model='gridList.dryGrainPrice' :disabled='pricedisabled' type="digit"  @blur='inputprice' placeholder="请输入干粮单价" name="input"></input>
-				</view>
-				<button class='cu-btn bg-green shadow' @click="changeprice">{{pricetext}}</button>
-			</view>
+			
 			<view class="c-row-fj" v-if="flag==2||flag==1">
 				<view style="margin: 0px 0px 30rpx 10rpx;">复检备注</view>
 				<textarea class='textarea-style' v-model='gridList.reMemo' placeholder="请输入复检备注"
@@ -267,12 +253,7 @@
 				</view>
 
 			</view>
-			<view v-if="gridList.type == '干粮'&&gridList.serviceManagementType==1&&flag!=3" class="c-row">
-				<view class="title">干粮单价（元/公斤）</view>
-				<view class="con-list">
-					{{gridList.dryGrainPrice}}
-				</view>
-			</view>
+			
 		</view>
 		<view v-if='flag!=3' style='padding-bottom:300rpx;'>
 			<view class='wrap'>
@@ -353,6 +334,60 @@
 						<!-- <input v-model='gridList.jiaorenli' @click.stop="handleShowKeyboard1":disabled="true" placeholder="请输入热损伤占比" name="input"></input> -->
 					</view>
 				</view>
+				<view v-show="utils.getCurrectRoles('acquisitionQuality.initial')"
+					class="c-row">
+					<view class="title">水分增价（元/吨）</view>
+					<view class="con-list">
+						<input  v-model='gridList.waterPriceIncrease' @focus="pricefocus($event,1)" @blur="priceblur($event,1)" @input='deductionchange'
+							placeholder="请输入水分增价" name="input" type="digit"></input>
+					</view>
+				</view>
+				<view v-show="utils.getCurrectRoles('acquisitionQuality.initial')"
+					class="c-row">
+					<view class="title">水分扣价（元/吨）</view>
+					<view class="con-list">
+						<input  v-model='gridList.waterPriceDeduction' @focus="pricefocus($event,2)" @blur="priceblur($event,2)" @input='deductionchange'
+							placeholder="请输入水分扣价" name="input" type="digit"></input>
+					</view>
+				</view>
+				<view v-show="utils.getCurrectRoles('acquisitionQuality.initial')"
+					class="c-row">
+					<view class="title">质量增价（元/吨）</view>
+					<view class="con-list">
+						<input v-model='gridList.qualityPriceIncrease' @focus="pricefocus($event,3)" @blur="priceblur($event,3)" @input='deductionchange'
+							placeholder="请输入质量增价" name="input" type="digit"></input>
+					</view>
+				</view>
+				
+				<view v-show="utils.getCurrectRoles('acquisitionQuality.initial')"
+					class="c-row">
+					<view class="title">质量扣价（元/吨）</view>
+					<view class="con-list">
+						<input v-model='gridList.qualityPriceDeduction' @focus="pricefocus($event,4)"  @blur="priceblur($event,4)" @input='deductionchange'
+							placeholder="请输入质量扣价" name="input" type="digit"></input>
+					</view>
+				</view>
+				<view v-if="gridList.type == '潮粮'&&gridList.serviceManagementType==3&&flag!=3" class="c-row">
+					<view class="title">净重单价（元/公斤）</view>
+					<view class="con-list">
+						<input :disabled='flag==1&&pricedisabled' v-model='gridList.tidalGrainPrice'  @blur='inputprice' placeholder="自动获取,不可编辑"
+							name="input"></input>
+					</view>
+					<button class='cu-btn bg-green shadow' @click="changeprice">{{pricetext}}</button>
+				</view>
+				<view v-if="gridList.type == '干粮'&&gridList.serviceManagementType==3&&flag!=3" class="c-row">
+					<view class="title">干粮单价（元/公斤）</view>
+					<view class="con-list">
+						<input v-model='gridList.dryGrainPrice' :disabled='pricedisabled' type="digit"  @blur='inputprice' placeholder="请输入干粮单价" name="input"></input>
+					</view>
+					<button class='cu-btn bg-green shadow' @click="changeprice">{{pricetext}}</button>
+				</view>
+				<view v-if="gridList.type == '干粮'&&gridList.serviceManagementType==1&&flag!=3" class="c-row">
+					<view class="title">干粮单价（元/公斤）</view>
+					<view class="con-list">
+						{{gridList.dryGrainPrice}}
+					</view>
+				</view>
 			</view>
 		</view>
 
@@ -491,6 +526,8 @@
 				cangid: '',
 				goodsList: [],
 				taskNolist:[],
+				dryGrainPrice:0,
+				tidalGrainPrice:0,
 				isShowAlert: false,
 				content: '确认初检信息后，初检员不需要再次确认质检信息，是否确定提交?',
 			}
@@ -545,6 +582,13 @@
 						that.value = false
 					}
 					that.gridList = data
+					if(that.gridList.dryGrainPrice){
+						that.dryGrainPrice=that.gridList.dryGrainPrice
+					}
+					if(that.gridList.tidalGrainPrice){
+						that.tidalGrainPrice=that.gridList.tidalGrainPrice
+					}
+					
 					if(!that.gridList.reGrade){
 						that.gridList.reGrade=that.gridList.grade
 					}
@@ -647,6 +691,77 @@
 			}
 		},
 		methods: {
+			pricefocus(e,status){
+				console.log(e)
+				if(status==1){
+					if(e.detail.value==0){
+						this.gridList.waterPriceIncrease=''
+						
+					}
+				}else if(status==2){
+					if(e.detail.value==0){
+						this.gridList.waterPriceDeduction=''
+						
+					}
+					
+				}else if(status==3){
+					if(e.detail.value==0){
+						this.gridList.qualityPriceIncrease=''
+						
+					}
+					
+				}else if(status==4){
+					if(e.detail.value==0){
+						this.gridList.qualityPriceDeduction=''
+						
+					}
+					
+				}
+				
+			},
+			priceblur(e,status){
+				console.log(e)
+				if(status==1){
+					if(e.detail.value==''){
+						this.gridList.waterPriceIncrease=0
+						
+					}
+				}else if(status==2){
+					if(e.detail.value==''){
+						this.gridList.waterPriceDeduction=0
+						
+					}
+					
+				}else if(status==3){
+					if(e.detail.value==''){
+						this.gridList.qualityPriceIncrease=0
+						
+					}
+					
+				}else if(status==4){
+					if(e.detail.value==''){
+						this.gridList.qualityPriceDeduction=0
+						
+					}
+					
+				}
+				
+			},
+			deductionchange(){
+				if(this.gridList.type=='干粮'){
+					if(this.dryGrainPrice!=''){
+						console.log(Number(this.dryGrainPrice+(this.gridList.waterPriceIncrease/1000)-(this.gridList.waterPriceDeduction/1000)+(this.gridList.qualityPriceIncrease/1000)-(this.gridList.qualityPriceDeduction/1000)),Number(this.dryGrainPrice+(this.gridList.waterPriceIncrease/1000)-(this.gridList.waterPriceDeduction/1000)+(this.gridList.qualityPriceIncrease/1000)-(this.gridList.qualityPriceDeduction/1000)).toFixed(2))
+						this.gridList.dryGrainPrice=Number(this.dryGrainPrice+(this.gridList.waterPriceIncrease/1000)-(this.gridList.waterPriceDeduction/1000)+(this.gridList.qualityPriceIncrease/1000)-(this.gridList.qualityPriceDeduction/1000)).toFixed(3)
+					}
+					
+				}else if(this.gridList.type=='潮粮'){
+					if(this.tidalGrainPrice!=''){
+						this.gridList.tidalGrainPrice=Number(this.tidalGrainPrice+(this.gridList.waterPriceIncrease/1000)-(this.gridList.waterPriceDeduction/1000)+(this.gridList.qualityPriceIncrease/1000)-(this.gridList.qualityPriceDeduction/1000)).toFixed(3)
+					}
+					
+				}
+				this.$forceUpdate()
+			},
 			obtainPrice(){//根据容重获取价格
 				if (this.gridList.goodsName && this.cangid && this.gridList.bulkDensity) {
 					// if (!this.gridList.dryGrainPrice || this.gridList.dryGrainPrice == 0) {
@@ -657,6 +772,11 @@
 						}).then(res => {
 							if(res.data.data != 0){
 								this.gridList.dryGrainPrice = res.data.data
+								this.dryGrainPrice = res.data.data
+								this.gridList.waterPriceIncrease=0
+								this.gridList.waterPriceDeduction=0
+								this.gridList.qualityPriceIncrease=0
+								this.gridList.qualityPriceDeduction=0
 							}
 						})
 					// }
@@ -825,6 +945,8 @@
 							goodsName: this.gridList.goodsName
 						}).then(res => {
 							that.gridList.dryGrainPrice = res.data.data
+							that.dryGrainPrice = res.data.data
+							
 						})
 					}
 				}
@@ -842,6 +964,10 @@
 						waterContent: this.gridList.waterContent,
 						grade: this.gridList.grade,
 					}).then(res => {
+						that.gridList.waterPriceIncrease=0
+						that.gridList.waterPriceDeduction=0
+						that.gridList.qualityPriceIncrease=0
+						that.gridList.qualityPriceDeduction=0
 						if (that.gridList.paramType == '1') {
 							that.gridList.tidalGrainPrice = parseFloat(parseFloat(res.data.data) - parseFloat(that
 								.gridList.buckleMiscellaneous) / 100 * parseFloat(that.gridList
@@ -1077,6 +1203,7 @@
 				// this.$set(this.gradeList,'grade',this.gradeList[e[0]].value)
 				this.gridList.reGrade = this.gradeList[e[0]].value
 				this.gridList.reGradeKey = this.gradeList[e[0]].key
+
 			},
 			binNumberpicker(e) {
 				this.gridList.binNumber = this.warehouseList[e[0]].binNumber

pages/task/audit/acquisitioncontract.vue

@@ -30,10 +30,10 @@
 			<u-form-item label-width='260' label="收购方电话" :borderBottom="false">
 				<u-input v-model="list.buyerPhone" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="合营方" :borderBottom="false" v-if="list.seller">
+			<u-form-item label-width='260' label="合营方" :borderBottom="false" v-show="list.jointVentureParties">
 				<u-input v-model="list.jointVentureParties" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="合营方电话" :borderBottom="false" v-if="list.sellerPhone">
+			<u-form-item label-width='260' label="合营方电话" :borderBottom="false" v-show="list.jointPhone">
 				<u-input v-model="list.jointPhone" input-align="right" placeholder="--" disabled />
 			</u-form-item>
 			<u-form-item label-width='260' label="交货日期（起 - 止）" :borderBottom="false">
@@ -47,36 +47,36 @@
 			<!-- <u-form-item label-width='260' label="交货日期（止）" :borderBottom="false">
 				<u-input v-model="list.deliveryDateEnd" input-align="right" placeholder="--" disabled />
 			</u-form-item> -->
-			<u-form-item label-width='260' label="合同单价（元/吨）" :borderBottom="false" v-if="list.unitContractPrice">
+			<u-form-item label-width='260' label="合同单价（元/吨）" :borderBottom="false" v-show="list.unitContractPrice">
 				<u-input v-model="list.unitContractPrice" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="合同总价（元）" :borderBottom="false" v-if="list.totalContractPrice">
+			<u-form-item label-width='260' label="合同总价（元）" :borderBottom="false" v-show="list.totalContractPrice">
 				<u-input v-model="list.totalContractPrice" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='300' label="最终实际交易量（吨）" :borderBottom="false" v-if="list.finalTradingVolume">
+			<u-form-item label-width='300' label="最终实际交易量（吨）" :borderBottom="false" v-show="list.finalTradingVolume">
 				<u-input v-model="list.finalTradingVolume" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='300' label="结算单价（元/吨）" :borderBottom="false" v-if="list.settlementPrice">
+			<u-form-item label-width='300' label="结算单价（元/吨）" :borderBottom="false" v-show="list.settlementPrice">
 				<u-input v-model="list.settlementPrice" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="合同收入（元）" :borderBottom="false" v-if="list.contractProcessInfo.goodsNameKey">
+			<u-form-item label-width='260' label="合同收入（元）" :borderBottom="false" v-show="list.contractProcessInfo.goodsNameKey">
 				<u-input v-model="list.contractProcessInfo.goodsNameKey" input-align="right" placeholder="--"
 					disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="已开发票（元）" :borderBottom="false" v-if="list.contractProcessInfo.goodsName">
+			<u-form-item label-width='260' label="已开发票（元）" :borderBottom="false" v-show="list.contractProcessInfo.goodsName">
 				<u-input v-model="list.contractProcessInfo.goodsName" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="费用支出（元）" :borderBottom="false" v-if="list.contractProcessInfo.waterContent">
+			<u-form-item label-width='260' label="费用支出（元）" :borderBottom="false" v-show="list.contractProcessInfo.waterContent">
 				<u-input v-model="list.contractProcessInfo.waterContent" input-align="right" placeholder="--"
 					disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="未开发票（元）" :borderBottom="false" v-if="list.contractProcessInfo.impurity">
+			<u-form-item label-width='260' label="未开发票（元）" :borderBottom="false" v-show="list.contractProcessInfo.impurity">
 				<u-input v-model="list.contractProcessInfo.impurity" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="未回款（元）" :borderBottom="false" v-if="list.contractProcessInfo.mildewGrain">
+			<u-form-item label-width='260' label="未回款（元）" :borderBottom="false" v-show="list.contractProcessInfo.mildewGrain">
 				<u-input v-model="list.contractProcessInfo.mildewGrain" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="双章原件回收情况" :borderBottom="false" v-if="list.contractProcessInfo.grade">
+			<u-form-item label-width='260' label="双章原件回收情况" :borderBottom="false" v-show="list.contractProcessInfo.grade">
 				<u-input v-model="list.contractProcessInfo.grade" input-align="right" placeholder="--" disabled />
 			</u-form-item>
 			<u-form-item label-width='260' label="备注信息" :borderBottom="false">

pages/task/audit/warehouse_details.vue

@@ -26,23 +26,35 @@
 				<view class="left">货名</view>
 				<view class="right">{{list.goodsName}}</view>
 			</view>
-			<view class='row'>
+			<view class='row' v-if="list.bulkDensityStandard !=1">
 				<view class="left">基准水分（%）</view>
 				<view class="right">{{list.waterBase}}</view>
 			</view>
-			<view class='row'>
+			<view class='row' v-if="list.bulkDensityStandard !=1">
 				<view class="left">干粮水分（%）</view>
 				<view class="right">{{list.waterMin}}</view>
 			</view>
-			<view class='row'>
+			<view class='row' v-if="list.bulkDensityStandard !=1">
 				<view class="left">水分上限（%）</view>
 				<view class="right">{{list.waterMax}}</view>
 			</view>
-			<view v-if="list.paramType == '2'" class='row'>
+			<view v-if="list.paramType == '2' && list.bulkDensityStandard !=1" class='row'>
 				<view class="left">扣重比</view>
 				<view class="right">{{list.deductWeight}}</view>
 			</view>
-			<view class='row'>
+			<view class="form_view" style="background: #F9F9FA;" v-if="list.bulkDensityStandard ==1">
+				<table border="1" width="100%" style="border-collapse: collapse;" cellspacing="0" cellpadding="0" class="table_css">
+				<tr>
+					<td>容重(g/L)</td>
+					<td>价格(元/公斤)</td>
+				</tr>
+				<tr v-for="(item,index) in list.detailPrints">
+					<td>{{item.bulkDensityMax }} ~ {{ item.bulkDensityMin}}</td>
+					<td>{{item.bulkDensityPrice}}</td>
+				</tr>
+				</table>
+			</view>
+			<view class='row' v-if="list.bulkDensityStandard !=1">
 				<view class="left">干粮收购价格（元/公斤）</view>
 				<view class="right">{{list.dryGrainPrice}}</view>
 			</view>
@@ -51,7 +63,7 @@
 				<view class="right">{{list.saleLimit}}</view>
 			</view>
 		</view>
-		<view class="content2">
+		<view class="content2" v-if="list.bulkDensityStandard !=1">
 			<view class="title">粮价设置</view>
 			<view v-for="(item,index) in list.details" :key="index">
 				<view class="row">
@@ -518,4 +530,18 @@
 			margin-top: 20rpx;
 		}
 	}
+	.form_view{
+		margin: 20rpx 0;
+		border-radius: 20rpx;
+		background: #F9F9FA;
+		padding: 30rpx 20rpx;
+		.table_css td{
+			text-align: center;
+			border: 1rpx solid #DBD9CE;
+			padding: 14rpx 0;
+		}
+		.table_css{
+			border: 1rpx solid #DBD9CE;
+		}
+	}
 </style>