配资合同页面修改

src/views/allocationContract/configuration/customerContact.json

@@ -140,6 +140,71 @@
         }
       ]
     },
+      {
+          "label": "订货数量",
+          "prop": "orderQuantity",
+          "index": 7,
+          "width": 100,
+          "cell": false,
+          "slot": true,
+          "overHidden": true,
+          "rules": [
+              {
+                  "required": false,
+                  "message": "请输入订货数量",
+                  "trigger": "blur"
+              }
+          ]
+      },
+      {
+          "label": "采购价格",
+          "prop": "purchaseAmount",
+          "index": 12,
+          "width": 100,
+          "cell": false,
+          "slot": true,
+          "overHidden": true,
+          "rules": [
+              {
+                  "required": false,
+                  "message": "请输入采购价格",
+                  "trigger": "blur"
+              }
+          ]
+      },
+      {
+          "label": "采购价格(含利息)",
+          "prop": "interestPrice",
+          "index": 13,
+          "width": 130,
+          "cell": false,
+          "slot": false,
+          "overHidden": true
+      },
+      {
+          "label": "采购金额(含利息)",
+          "prop": "interestAmount",
+          "index": 13,
+          "width": 130,
+          "cell": false,
+          "slot": false,
+          "overHidden": true
+      },
+      {
+          "label": "金额",
+          "prop": "amount",
+          "index": 14,
+          "width": 100,
+          "cell": false,
+          "overHidden": true,
+          "rules": [
+              {
+                  "required": false,
+                  "message": "请输入金额",
+                  "trigger": "blur"
+              }
+          ]
+      },
     {
       "label": "库区",
       "prop": "storageId",
@@ -169,22 +234,6 @@
       ]
     },
     {
-      "label": "订货数量",
-      "prop": "orderQuantity",
-      "index": 7,
-      "width": 100,
-      "cell": false,
-      "slot": true,
-      "overHidden": true,
-      "rules": [
-        {
-          "required": false,
-          "message": "请输入订货数量",
-          "trigger": "blur"
-        }
-      ]
-    },
-    {
       "label": "发货数量",
       "prop": "actualQuantity",
       "index": 8,
@@ -249,63 +298,23 @@
       "slot": true,
       "overHidden": true
     },
-    {
-      "label": "采购价格",
-      "prop": "purchaseAmount",
-      "index": 12,
-      "width": 100,
-      "cell": false,
-      "slot": true,
-      "overHidden": true,
-      "rules": [
-        {
-          "required": false,
-          "message": "请输入采购价格",
-          "trigger": "blur"
-        }
-      ]
-    },
-    {
-      "label": "最新单价",
-      "prop": "price",
-      "index": 13,
-      "width": 100,
-      "cell": false,
-      "slot": false,
-      "overHidden": true,
-      "rules": [
-        {
-          "required": false,
-          "message": "请输入最新单价",
-          "trigger": "blur"
-        }
-      ]
-    },
       {
-          "label": "采购价格(含利息)",
-          "prop": "interestAmount",
+          "label": "最新单价",
+          "prop": "price",
           "index": 13,
-          "width": 130,
+          "width": 100,
           "cell": false,
           "slot": false,
-          "overHidden": true
+          "overHidden": true,
+          "rules": [
+              {
+                  "required": false,
+                  "message": "请输入最新单价",
+                  "trigger": "blur"
+              }
+          ]
       },
     {
-      "label": "金额",
-      "prop": "amount",
-      "index": 14,
-      "width": 100,
-      "cell": false,
-      "overHidden": true,
-      "rules": [
-        {
-          "required": false,
-          "message": "请输入金额",
-          "trigger": "blur"
-        }
-      ]
-    },
-    {
       "label": "积分倍数",
       "prop": "integralMultiples",
       "index": 15,

src/views/allocationContract/detailsPageEdit.vue

@@ -1901,7 +1901,10 @@ export default {
             item.property == "actualQuantity" ||
             item.property == "integral" ||
             item.property == "cartonWeight" ||
-            item.property == "cntrVolumn"
+            item.property == "cntrVolumn" ||
+            item.property == "purchaseAmount" ||
+            item.property == "interestPrice" ||
+            item.property == "interestAmount"
           ) {
             let amountSum = 0;
             let orderQuantitySum = 0;
@@ -1909,6 +1912,7 @@ export default {
             let integralSum = 0;
             let cartonWeight = 0;
             let cntrVolumn = 0;
+            let interestAmountSum = 0;
             if (this.selection.length > 0) {
               this.selection.forEach(e => {
                 amountSum = _.add(amountSum, Number(e.amount));
@@ -1917,6 +1921,7 @@ export default {
                 integralSum = _.add(integralSum, Number(e.integral));
                 cartonWeight = _.add(cartonWeight, Number(e.cartonWeight));
                 cntrVolumn = _.add(cntrVolumn, Number(e.cntrVolumn));
+                  interestAmountSum = _.add(interestAmountSum, Number(e.interestAmount));
               });
             } else {
               {
@@ -1927,6 +1932,7 @@ export default {
                   integralSum = _.add(integralSum, Number(e.integral));
                   cartonWeight = _.add(cartonWeight, Number(e.cartonWeight));
                   cntrVolumn = _.add(cntrVolumn, Number(e.cntrVolumn));
+                    interestAmountSum = _.add(interestAmountSum, Number(e.interestAmount));
                 });
               }
             }
@@ -1954,6 +1960,10 @@ export default {
             if (item.property == "cntrVolumn") {
               sums[index] = cntrVolumn ? cntrVolumn.toFixed(5) : "0.00000";
             }
+
+              if (item.property === "interestAmount") {
+                  sums[index] = interestAmountSum ? interestAmountSum.toFixed(2) : "0.00000";
+              }
           }
         });
       }

src/views/basicData/customerManagement/companyMaterial/detailsPageEdit.vue

@@ -592,6 +592,7 @@ export default {
         this.form = res.data.data;
         this.contactsData = this.form.corpsAttnList;
         this.bankOfDepositData = this.form.corpsBankList;
+        this.addressData = this.form.corpsAddrList;
         this.advantageProjectData = this.form.corpsItems;
         if (this.form.belongtoarea) {
           this.form.belongtoarea = this.form.belongtoarea
@@ -734,6 +735,7 @@ export default {
     editCustomer() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          this.form.corpsAddrList = this.addressData;
           this.form.corpsAttnList = this.contactsData;
           this.form.corpsBankList = this.bankOfDepositData;
           this.form.corpsItems = this.advantageProjectData;