前端

src/lang/zh.js

@@ -483,12 +483,17 @@ export default {
     contractManagement: '合同管理',
     purchaseContract: '现货采购合同',
     collectionContract: '代收合同',
+    storageContract:'代储合同',
     purchaseContractAdd: '现货采购合同  /  添加',
     collectionContractAdd: '代收合同  /  添加',
+    storageContractAdd:'代储合同  /  添加',
     purchaseContractEdit: '现货采购合同  /  编辑',
     collectionContractEdit: '代收合同  /  编辑',
     collectionContractExamine:'代收合同  /  查看',
     collectionContractRecord:'代收合同  /  记录',
+    storageContractEdit: '代储合同  /  编辑',
+    storageContractExamine:'代储合同  /  查看',
+    storageContractRecord:'代储合同  /  记录',
     purchaseContractExamine: '现货采购合同  /  查看',
     salesContract: '现货销售合同',
     salesContractEdit: '现货销售合同  /  编辑',
@@ -4815,7 +4820,12 @@ export default {
     collectionContractAdd: '代收合同添加',
     collectionContractEdit: '代收合同编辑',
     collectionContractExamine: '代收合同查看',
-    collectionContractRecord:'代收合同记录'
+    collectionContractRecord:'代收合同记录',
+    storageContract:'代储合同',
+    storageContractAdd:'代储合同添加',
+    storageContractEdit: '代储合同编辑',
+    storageContractExamine:'代储合同查看',
+    storageContractRecord:'代储合同记录',
 
   },
   purchase: {

src/views/contractManagement/collectionContractRecord.vue

@@ -690,6 +690,7 @@
       rowEdit(row) {
         this.viewLock = false
         this.getCustomerNumberCard(row)
+        this.getList()
       },
       imgshow() {
         this.deleteshow = false
@@ -826,14 +827,14 @@
         if (this.modification.length == 0) {
           this.$message.warning('请选择一条要开票的条目')
         } else {
-          for (let i = 0; i < this.modification.length; i++) {
-            if (
-              this.modification[i].status != '全部付款'
-            ) {
-              this.$message.error('请选择全部付款条目！')
-              return
-            }
-          }
+          // for (let i = 0; i < this.modification.length; i++) {
+          //   if (
+          //     this.modification[i].status != '全部付款'
+          //   ) {
+          //     this.$message.error('请选择全部付款条目！')
+          //     return
+          //   }
+          // }
 
           this.$confirm(
               '确定修改所选条目的发票状态？',
@@ -977,6 +978,7 @@
         } = param
         const sums = []
         var _number = [6, 8, 9, 12, 13]
+        console.log(data)
         columns.forEach((column, index) => {
           if (index === 0) {
             sums[index] = '合计'
@@ -1137,7 +1139,7 @@
       },
       // 付款
       payment() {
-        this.imageUrl = ''
+        this.imageUrl = []
         if (this.modification.length == 0) {
           this.$message.warning('请选择要付款的条目')
         } else {

src/views/contractManagement/storageContractAdd.vue

@@ -868,7 +868,7 @@
           })
           return
         }
-        if (!this.deptBudgetList.storageFeeNew) {
+        if (!this.deptBudgetList.storageFee) {
           this.$message({
             message: '代储费不能为空！',
             type: 'warning',
@@ -883,13 +883,13 @@
           return
         }
         if (
-          isNaN(this.deptBudgetList.storageFeeNew) ||
-          (String(this.deptBudgetList.storageFeeNew).indexOf('.') != -1 &&
-            String(this.deptBudgetList.storageFeeNew).length -
-            (String(this.deptBudgetList.storageFeeNew).indexOf('.') + 1) >
+          isNaN(this.deptBudgetList.storageFee) ||
+          (String(this.deptBudgetList.storageFee).indexOf('.') != -1 &&
+            String(this.deptBudgetList.storageFee).length -
+            (String(this.deptBudgetList.storageFee).indexOf('.') + 1) >
             2) ||
-          this.deptBudgetList.storageFeeNew < 0 ||
-          this.deptBudgetList.storageFeeNew > 1000
+          this.deptBudgetList.storageFee < 0 ||
+          this.deptBudgetList.storageFee > 1000
         ) {
           this.$message({
             message: '代储费填写错误！',