Просмотр исходного кода

修改PC编辑合同时,不应校验收款金额是否填写

mxx 3 лет назад
Родитель
Сommit
8cff311d5b

+ 4 - 1
src/views/contractManagement/futuresPurchaseContractEdit.vue

@@ -1562,7 +1562,8 @@ export default {
         })
         return
       }
-      if (
+      if(this.deptBudgetList.contractProcessInfo.goodsNameKey){
+     if (
         this.deptBudgetList.contractProcessInfo.goodsNameKey > 1000000000 ||
         this.deptBudgetList.contractProcessInfo.goodsNameKey < 0 ||
         (String(this.deptBudgetList.contractProcessInfo.goodsNameKey).indexOf(
@@ -1582,6 +1583,8 @@ export default {
         })
         return
       }
+      }
+ 
       if (
         this.deptBudgetList.contractProcessInfo.waterContent > 10000000 ||
         this.deptBudgetList.contractProcessInfo.waterContent < 0 ||

+ 3 - 0
src/views/contractManagement/futuresSalesContractAdd.vue

@@ -1843,4 +1843,7 @@
    .inline-input {
       width: 100%;
     }
+    .typeselect{
+      width: 100%;
+    }
 </style>

+ 1 - 1
src/views/contractManagement/purchaseContractExamine.vue

@@ -16,7 +16,7 @@
     <ws-form ref="deptBudgetList" :rules="mainReportAdd" :model="deptBudgetList">
       <div class="title-top">
         采购合同<span class="title-number">【编号:{{ deptBudgetList.contractNo }}】</span>
-        <div class="icon">
+        <div class="icon" v-if="deptBudgetList.status">
           <template>
             <el-popover placement="right" :width="285" trigger="click" visible-arrow="false"
               @show="history(deptBudgetList.id)">

+ 3 - 0
src/views/contractManagement/salesContractAdd.vue

@@ -1144,6 +1144,8 @@
           })
           return
         }
+        if(this.deptBudgetList.contractProcessInfo.goodsNameKey ){
+
         if (
           !this.deptBudgetList.contractProcessInfo.goodsNameKey > 1000000000 ||
           this.deptBudgetList.contractProcessInfo.goodsNameKey < 100 ||
@@ -1163,6 +1165,7 @@
           })
           return
         }
+        }
         if (
           this.deptBudgetList.contractProcessInfo.waterContent > 10000000 ||
           this.deptBudgetList.contractProcessInfo.waterContent < 0 ||

+ 3 - 0
src/views/contractManagement/salesContractEdit.vue

@@ -1154,6 +1154,8 @@
           })
           return
         }
+        if(this.deptBudgetList.contractProcessInfo.goodsNameKey){
+
         if (
           (!this.deptBudgetList.contractProcessInfo.goodsNameKey > 1000000000) ||
           (this.deptBudgetList.contractProcessInfo.goodsNameKey < 100) ||
@@ -1173,6 +1175,7 @@
           })
           return
         }
+        }
         if (
           (this.deptBudgetList.contractProcessInfo.waterContent > 10000000) ||
           (this.deptBudgetList.contractProcessInfo.waterContent < 0) ||