Browse Source

合同 随行就市 去掉合同单价验证

zhongtianhaoyuan 3 years ago
parent
commit
8017f084ac
1 changed files with 10 additions and 5 deletions
  1. 10 5
      src/views/contractManagement/salesContractEdit.vue

+ 10 - 5
src/views/contractManagement/salesContractEdit.vue

@@ -238,7 +238,7 @@
             <span class="unchangeable">*</span>
           </ws-form-item>
           <!-- 最终实际交易量(吨) -->
-          <ws-form-item label="最终实际交易量(吨)" span="1" prop="totalContractPrice">
+          <ws-form-item label="最终实际交易量(吨)" span="1" prop="finalTradingVolume">
             <ws-input v-model="deptBudgetList.finalTradingVolume" maxlength="100" placeholder="请输入最终实际交易量"
               size="small" />
           </ws-form-item>
@@ -940,20 +940,22 @@
           })
           return
         }
-        if (!this.deptBudgetList.unitContractPrice) {
+        if(this.deptBudgetList.priceType == "定价销售"){
+          if (!this.deptBudgetList.unitContractPrice ) {
           this.$message({
             message: '请输入合同单价!',
             type: 'warning',
           })
           return
         }
+        }
         if (
           isNaN(this.deptBudgetList.unitContractPrice) ||
           (String(this.deptBudgetList.unitContractPrice).indexOf('.') != -1 &&
             String(this.deptBudgetList.unitContractPrice).length -
             (String(this.deptBudgetList.unitContractPrice).indexOf('.') + 1) >
             2) ||
-          this.deptBudgetList.unitContractPrice <= 0 ||
+          this.deptBudgetList.unitContractPrice < 0 ||
           this.deptBudgetList.unitContractPrice > 10000
         ) {
           this.$message({
@@ -962,20 +964,23 @@
           })
           return
         }
-        if (!this.deptBudgetList.totalContractPrice) {
+        if(this.deptBudgetList.priceType == "定价销售"){
+             if (!this.deptBudgetList.totalContractPrice) {
           this.$message({
             message: '请输入合同总价!',
             type: 'warning',
           })
           return
         }
+        }
+     
         if (
           isNaN(this.deptBudgetList.totalContractPrice) ||
           (String(this.deptBudgetList.totalContractPrice).indexOf('.') != -1 &&
             String(this.deptBudgetList.totalContractPrice).length -
             (String(this.deptBudgetList.totalContractPrice).indexOf('.') + 1) >
             2) ||
-          this.deptBudgetList.totalContractPrice <= 0 ||
+          this.deptBudgetList.totalContractPrice < 0 ||
           this.deptBudgetList.totalContractPrice > 1000000000
         ) {
           this.$message({