Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/views/contractManagement/acquisitionContractEdit.vue

@@ -58,17 +58,18 @@
           </ws-form-item>
           <!-- 合同单价（元/吨） -->
         <ws-form-item class="readonly" label="合同单价（元/吨）" span="1" prop="unitContractPrice" v-if="deptBudgetList.priceType == '定价收购'">
-          <span v-if="deptBudgetList.unitContractPrice != 'null'">{{
-            deptBudgetList.unitContractPrice
-          }}</span>
+        <ws-input @input="pricechange" v-model="deptBudgetList.unitContractPrice" placeholder="请输入合同单价"
+            maxlength="100" size="small" />
         </ws-form-item>
         <!-- 重量（吨） -->
         <ws-form-item label="重量（吨）" span="1" prop="weight">
-          <ws-input v-model="deptBudgetList.weight" maxlength="100" size="small" placeholder="请输入重量（吨）" />
+          <ws-input v-model="deptBudgetList.weight" @input="weightchange" maxlength="100" size="small" placeholder="请输入重量（吨）" />
         </ws-form-item>
         <!-- 合同总价（元） -->
         <ws-form-item label="合同总价（元）" span="1" prop="totalContractPrice" v-if="deptBudgetList.priceType == '定价收购'">
-          <ws-input v-model="deptBudgetList.totalContractPrice" maxlength="100" placeholder="请输入合同单价" size="small" />
+           <span v-if="deptBudgetList.totalContractPrice != 'null'">{{
+            deptBudgetList.totalContractPrice
+          }}</span>
         </ws-form-item>
         <!-- 溢短装（%） -->
         <ws-form-item label="溢短装（%）" span="1" prop="overShort">
@@ -308,6 +309,17 @@
         this.dialogVisible = true
         this.type = type
       },
+      weightchange(e) {
+        if(this.deptBudgetList.unitContractPrice){
+          this.deptBudgetList.totalContractPrice = e * this.deptBudgetList.unitContractPrice
+        }
+        this.deptBudgetList.finalTradingVolume = e
+      },
+      pricechange(e) {
+        if(this.deptBudgetList.weight){
+          this.deptBudgetList.totalContractPrice = e * this.deptBudgetList.weight
+        }
+      },
       blurMap() {
         this.dialogVisible = false
       },

src/views/contractManagement/purchaseContractEdit.vue

@@ -122,7 +122,7 @@
         </ws-form-item>
         <!-- 重量（吨） -->
         <ws-form-item label="重量（吨）" span="1" prop="weight">
-          <ws-input v-model="deptBudgetList.weight" maxlength="100" size="small" placeholder="请输入重量（吨）" />
+          <ws-input v-model="deptBudgetList.weight" @input="weightchange" maxlength="100" size="small" placeholder="请输入重量（吨）" />
         </ws-form-item>
         <!-- 交货日期（起） -->
         <ws-form-item label="交货日期（起）" span="1" prop="deliveryDateStart">
@@ -144,13 +144,15 @@
           </ws-form-item>
         <!-- 合同单价（元/吨） -->
         <ws-form-item class="readonly" label="合同单价（元/吨）" span="1" prop="unitContractPrice" v-if="deptBudgetList.priceType == '定价采购'">
-          <span v-if="deptBudgetList.unitContractPrice != 'null'">{{
-            deptBudgetList.unitContractPrice
-          }}</span>
+          <ws-input @input="pricechange" v-model="deptBudgetList.unitContractPrice" placeholder="请输入合同单价"
+            maxlength="100" size="small" />
         </ws-form-item>
         <!-- 合同总价（元） -->
         <ws-form-item label="合同总价（元）" span="1" prop="totalContractPrice" v-if="deptBudgetList.priceType == '定价采购'">
-          <ws-input v-model="deptBudgetList.totalContractPrice" maxlength="100" placeholder="请输入合同单价" size="small" />
+          <span v-if="deptBudgetList.totalContractPrice != 'null'">{{
+            deptBudgetList.totalContractPrice
+          }}</span>
+         
         </ws-form-item>
         <!-- 货源所在地区 -->
         <ws-form-item label="货源所在地区" span="1" prop="packingMethod">
@@ -579,6 +581,17 @@
             this.feedbackLeaders.unshift(_obj)
           })
       },
+      weightchange(e) {
+        if(this.deptBudgetList.unitContractPrice){
+          this.deptBudgetList.totalContractPrice = e * this.deptBudgetList.unitContractPrice
+        }
+        this.deptBudgetList.finalTradingVolume = e
+      },
+      pricechange(e) {
+        if(this.deptBudgetList.weight){
+          this.deptBudgetList.totalContractPrice = e * this.deptBudgetList.weight
+        }
+      },
       addClick() {
         this.unitList.push({
           flag: 'add',

src/views/contractManagement/salesContractEdit.vue

@@ -155,7 +155,7 @@
           </ws-form-item>
           <!--重量（吨）-->
           <ws-form-item label="重量（吨）" span="1" prop="contractNo">
-            <ws-input v-model="deptBudgetList.weight" placeholder="请输入重量（吨）" maxlength="100" size="small" />
+            <ws-input v-model="deptBudgetList.weight" @input="weightchange" placeholder="请输入重量（吨）" maxlength="100" size="small" />
           </ws-form-item>
           <!--交货日期（起）-->
           <ws-form-item label="交货日期（起）" span="1" prop="deliveryDateStart">
@@ -179,14 +179,15 @@
           </ws-form-item>
           <!--合同单价（元/吨）-->
           <ws-form-item label="合同单价（元/吨）" span="1" prop="contractNo" v-if="deptBudgetList.priceType == '定价销售'">
-            <div class="unchanged">
-              {{ deptBudgetList.unitContractPrice }}
-            </div>
-            <span class="unchangeable">*</span>
+            <ws-input @input="pricechange" v-model="deptBudgetList.unitContractPrice" placeholder="请输入合同单价"
+              maxlength="100" size="small" />
           </ws-form-item>
           <!--合同总价-->
           <ws-form-item label="合同总价" span="1" prop="totalContractPrice" v-if="deptBudgetList.priceType == '定价销售'">
-            <ws-input v-model="deptBudgetList.totalContractPrice" placeholder="请输入合同总价" maxlength="100" size="small" />
+            <div class="unchanged">
+              {{ deptBudgetList.totalContractPrice }}
+            </div>
+            <span class="unchangeable">*</span>
           </ws-form-item>
           <!--签订日期-->
           <ws-form-item label="签订日期" span="1" prop="signingDate" v-if="deptBudgetList.agreementType=='销售合同'">
@@ -677,6 +678,17 @@
             this.pleaseChoose = ''
           })
       },
+      weightchange(e) {
+        if(this.deptBudgetList.unitContractPrice){
+          this.deptBudgetList.totalContractPrice = e * this.deptBudgetList.unitContractPrice
+        }
+        this.deptBudgetList.finalTradingVolume = e
+      },
+      pricechange(e) {
+        if(this.deptBudgetList.weight){
+          this.deptBudgetList.totalContractPrice = e * this.deptBudgetList.weight
+        }
+      },
       saveClick(item, index) {
         //  console.log(item)