ccj 2 years ago
parent
commit
5f0b3e16d6
2 changed files with 34 additions and 18 deletions
  1. 22 16
      pages/erpbusiness/add_quality_testing.vue
  2. 12 2
      pages/erpbusiness/edit_quality_testing.vue

+ 22 - 16
pages/erpbusiness/add_quality_testing.vue

@@ -345,15 +345,7 @@
 					</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>
@@ -387,7 +379,15 @@
 							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.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>
@@ -1317,24 +1317,30 @@
 					}).then(res => {
 						
 						if (that.gridList.paramType == '1') {
+							// console.log(that.gridList)
 							if(that.gridList.buckleMiscellaneous){
 								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)
+								.gridList.buckleMiscellaneous) / 100 * parseFloat(that.gridList
+								.dryGrainPrice)).toFixed(4)
 							}
-							
 							if (!that.gridList.tidalGrainPrice) {
 								that.gridList.tidalGrainPrice = ''
 							}
+							if(that.gridList.type == '干粮'){
+								that.gridList.dryGrainPrice = res.data.data
+								that.dryGrainPrice = that.gridList.dryGrainPrice 
+							}
 						} else {
-							if (that.gridList.type == '干粮') {
+							that.gridList.tidalGrainPrice = res.data.data
+							if(that.gridList.type == '干粮'){
 								that.gridList.dryGrainPrice = res.data.data
-							} else {
+								that.dryGrainPrice = that.gridList.dryGrainPrice 
+							}else{
 								that.gridList.tidalGrainPrice = res.data.data
-								that.tidalGrainPrice = res.data.data
+								that.tidalGrainPrice = that.gridList.tidalGrainPrice 
 							}
 						}
 					})

+ 12 - 2
pages/erpbusiness/edit_quality_testing.vue

@@ -1034,11 +1034,21 @@
 								if (!that.gridList.tidalGrainPrice) {
 									that.gridList.tidalGrainPrice = ''
 								}
+								if(that.gridList.type == '干粮'){
+									that.gridList.dryGrainPrice = res.data.data
+									that.dryGrainPrice = that.gridList.dryGrainPrice 
+								}
 							} else {
 								that.gridList.tidalGrainPrice = res.data.data
-								
+								if(that.gridList.type == '干粮'){
+									that.gridList.dryGrainPrice = res.data.data
+									that.dryGrainPrice = that.gridList.dryGrainPrice 
+								}else{
+									that.gridList.tidalGrainPrice = res.data.data
+									that.tidalGrainPrice = that.gridList.tidalGrainPrice 
+								}
 							}
-							that.tidalGrainPrice = that.gridList.tidalGrainPrice
+							// that.tidalGrainPrice = that.gridList.tidalGrainPrice
 						})
 					}