修改bug

src/components/bill/billDetailList.vue

@@ -98,6 +98,7 @@
       onLoad(page, params){
         this.loading = true;
         params = {
+          ...params,
           ...this.params
         }
         params.billType = this.billType

src/components/bill/config/application.json

@@ -25,6 +25,18 @@
   "searchIcon": true,
   "searchIndex": 2,
   "dialogClickModal": false,
+  "showSummary": true,
+  "summaryText": "合计",
+  "sumColumnList": [
+    {
+      "name": "amount",
+      "type": "sum"
+    },
+    {
+      "name": "settlementAmount",
+      "type": "sum"
+    }
+  ],
   "column": [
     {
       "label": "合同号",

src/components/bill/config/mainList.json

@@ -24,6 +24,22 @@
   "searchIcon": true,
   "searchIndex": 2,
   "dialogClickModal": false,
+  "showSummary": true,
+  "summaryText": "合计",
+  "sumColumnList": [
+    {
+      "name": "amount",
+      "type": "sum"
+    },
+    {
+      "name": "settlementAmount",
+      "type": "sum"
+    },
+    {
+      "name": "invoiceAmount",
+      "type": "sum"
+    }
+  ],
   "column": [
     {
       "label": "合同号",

src/views/businessManagement/deliveryNotice/detailsPageEdit.vue

@@ -854,6 +854,7 @@ export default {
       this.queryData(id)
     }else if (this.detailData.form){
       this.form = JSON.parse(this.detailData.form);
+      this.$set(this.form, 'orgId', this.form.id);
       delete this.form.createTime
       delete this.form.id
       delete this.form.sysNo

src/views/businessManagement/salesOrder/detailsPageEdit.vue

@@ -572,6 +572,7 @@
                 :option="customerBuyFree"
                 :data="contactsDataBuyFree"
                 @selection-change="selectionChangePolicyTwo"
+                :table-loading="loadingPolicy"
                 ref="crudContactE">
             </avue-crud>
           </basic-container>
@@ -1979,7 +1980,8 @@ export default {
           } else {
             this.$set(item, 'price', '0')
           }
-          this.$set(item, 'amount', (Number(item.price) * Number(item.orderQuantity)).toFixed(2))
+          this.priceChange(item)
+          // this.$set(item, 'amount', (Number(item.price) * Number(item.orderQuantity)).toFixed(2))
         })
         getPurchasePrice({code: item.code}).then(response => {
           if (response.data.data.length > 0) {
@@ -2408,7 +2410,7 @@ export default {
           this.$set(this.goodsListSave[item], 'invoiceWeight', this.goodsListSave[item].cartonWeight)
           this.$set(this.goodsListSave[item], 'shopQuality', 0)
           this.$set(this.goodsListSave[item], 'inputMold', 0) // 判断是商品还是政策 商品 0 特价 1 买赠2
-          this.$set(this.goodsListSave[item], 'priceType', this.goodsListSave[item].policyName)
+          // this.$set(this.goodsListSave[item], 'priceType', this.goodsListSave[item].policyName)
           this.goodsListSave[item].amount = 0
           if (this.goodsActives == "goods") {
             this.$set(this.goodsListSave[item], 'goodType', 0)
@@ -2475,7 +2477,7 @@ export default {
           this.$set(this.tableData[item], 'shopQuality', 0);
           this.$set(this.tableData[item], 'invoiceWeight', this.tableData[item].cartonWeight);
           this.$set(this.tableData[item], 'inputMold', 0);
-          this.$set(this.tableData[item], 'priceType', this.tableData[item].policyName);
+          // this.$set(this.tableData[item], 'priceType', this.tableData[item].policyName);
           this.tableData[item].amount = 0;
           if (this.goodsActives == "goods") {
             this.$set(this.tableData[item], 'goodType', 0)
@@ -2777,7 +2779,7 @@ export default {
       done(row);
     },
     policyOnLoad(params = {}) {
-      // this.policyLoading = true;
+      this.loadingPolicy = true;
       this.policyForm = {};
       detailList(this.treePolicyId).then(res => {
         this.policyForm = res.data.data;
@@ -2793,6 +2795,8 @@ export default {
         } else {
           this.contactsDataBuyFree = []
         }
+      }).finally(() => {
+        this.loadingPolicy = false;
       })
     },
     //