gjy 3 years ago
parent
commit
a79338aa13

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

@@ -1228,6 +1228,9 @@
           .then(() => {
             this.$refs.deptBudgetList.validate((valid) => {
               if (valid) {
+                if(this.deptBudgetList.personPhone){
+                  this.deptBudgetList.personPhone=this.deptBudgetList.personPhone.toString()
+                }
                 this.deptBudgetList.compId = this.compId
                 this.deptBudgetList.contractType = 1
                 editInfo(this.deptBudgetList)

+ 9 - 9
src/views/contractManagement/storageContractAdd.vue

@@ -161,7 +161,7 @@
             <ws-input v-model="deptBudgetList.placeDelivery" placeholder="请输入交货详细地址" maxlength="20" size="small" />
           </ws-form-item>
           <ws-form-item label="代储费(元/吨·天)" span="1" prop="storageFee">
-            <ws-input v-model="deptBudgetList.storageFee" placeholder="请输入仓储费" maxlength="20" size="small" />
+            <ws-input v-model="deptBudgetList.storageFeeNew" placeholder="请输入仓储费" maxlength="20" size="small" />
           </ws-form-item>
           <!--合同单价(元/吨)-->
         <ws-form-item class="readonly" label="合同单价(元/吨)" span="1" prop="unitContractPrice">
@@ -868,7 +868,7 @@
           })
           return
         }
-        if (!this.deptBudgetList.storageFee) {
+        if (!this.deptBudgetList.storageFeeNew) {
           this.$message({
             message: '代储费不能为空!',
             type: 'warning',
@@ -883,13 +883,13 @@
           return
         }
         if (
-          isNaN(this.deptBudgetList.storageFee) ||
-          (String(this.deptBudgetList.storageFee).indexOf('.') != -1 &&
-            String(this.deptBudgetList.storageFee).length -
-            (String(this.deptBudgetList.storageFee).indexOf('.') + 1) >
+          isNaN(this.deptBudgetList.storageFeeNew) ||
+          (String(this.deptBudgetList.storageFeeNew).indexOf('.') != -1 &&
+            String(this.deptBudgetList.storageFeeNew).length -
+            (String(this.deptBudgetList.storageFeeNew).indexOf('.') + 1) >
             2) ||
-          this.deptBudgetList.storageFee < 0 ||
-          this.deptBudgetList.storageFee > 1000
+          this.deptBudgetList.storageFeeNew < 0 ||
+          this.deptBudgetList.storageFeeNew > 1000
         ) {
           this.$message({
             message: '代储费填写错误!',
@@ -1333,7 +1333,7 @@
               this.deptBudgetList.personPhone=this.deptBudgetList.personPhone.toString()
             }
             this.deptBudgetList.compId = this.compId
-            this.deptBudgetList.contractType = 4
+            this.deptBudgetList.contractType = 1
             this.deptBudgetList.goodsType = 1
             addList(this.deptBudgetList)
               .toPromise()

+ 1 - 0
src/views/contractManagement/storageContractEdit.vue

@@ -1414,6 +1414,7 @@
           .then(() => {
             this.$refs.deptBudgetList.validate((valid) => {
               if (valid) {
+                
                 this.deptBudgetList.compId = this.compId
                 this.deptBudgetList.contractType = 1
                 editInfo(this.deptBudgetList)