合计放在监听事件里执行

新加默认排序
默认分页200
新加行编辑

src/enums/column-name.js

@@ -2137,6 +2137,12 @@ const columnName = [{
 },{
   code: 491,
   name: 'JMS-财务管理-凭证数据'
+},{
+  code: 493,
+  name: 'JMS-财务管理-销项发票查询结果'
+},{
+  code: 494,
+  name: 'JMS-财务管理-销项发票选定数据'
 }
 ]
 export const getColumnName = (key) => {

src/views/iosBasicData/financialManagement/computationCenter/components/pickedData.vue

@@ -146,36 +146,42 @@ export default {
                 value: 9,
               },
             ],
+            sortable:true,
             overHidden: true,
           },
           {
             label: "账单编号",
             prop: "accBillNo",
             width: 120,
+            sortable:true,
             overHidden: true,
           },
           {
             label: "业务编号",
             prop: "billNo",
             width: 120,
+            sortable:true,
             overHidden: true,
           },
           {
             label: "费用名称",
             prop: "feeCnName",
             width: 80,
+            sortable:true,
             overHidden: true,
           },
           {
             label: "结算单位",
             prop: "corpCnName",
             width: 140,
+            sortable:true,
             overHidden: true,
           },
           {
             label: "主单号",
             prop: "mblno",
             width: 100,
+            sortable:true,
             overHidden: true,
           },
           {
@@ -326,7 +332,7 @@ export default {
       page: {
         currentPage: 1,
         total: 0,
-        pageSize: 50,
+        pageSize: 200,
         pageSizes: [20, 50, 100, 200, 500, "ALL"],
       },
       pageData: [],
@@ -810,27 +816,27 @@ export default {
       }
     },
     selectionChange(list) {
-      this.amountSubSum = 0;
-      this.amountDSubSum = 0;
-      this.amountCSubSum = 0;
-      this.amountSubUsdSum = 0;
-      this.amountDSubUsdSum = 0;
-      this.amountCSubUsdSum = 0;
-      if (list.length) {
-        list.forEach((e) => {
-          console.log(e.accountDc);
-          if (e.dc == "D") {
-            this.amountDSubSum += Number(e.currentStlAmountRMB ? e.currentStlAmountRMB : 0);
-            this.amountDSubUsdSum += Number(e.currentStlAmountUSD ? e.currentStlAmountUSD : 0);
-          }
-          if (e.dc == "C") {
-            this.amountCSubSum += Number(e.currentStlAmountRMB ? e.currentStlAmountRMB : 0);
-            this.amountCSubUsdSum += Number(e.currentStlAmountUSD ? e.currentStlAmountUSD : 0);
-          }
-        });
-      }
-      this.amountSubSum = Number(this.amountDSubSum - this.amountCSubSum);
-      this.amountSubUsdSum = Number(this.amountDSubUsdSum - this.amountCSubUsdSum);
+      // this.amountSubSum = 0;
+      // this.amountDSubSum = 0;
+      // this.amountCSubSum = 0;
+      // this.amountSubUsdSum = 0;
+      // this.amountDSubUsdSum = 0;
+      // this.amountCSubUsdSum = 0;
+      // if (list.length) {
+      //   list.forEach((e) => {
+      //     console.log(e.accountDc);
+      //     if (e.dc == "D") {
+      //       this.amountDSubSum += Number(e.currentStlAmountRMB ? e.currentStlAmountRMB : 0);
+      //       this.amountDSubUsdSum += Number(e.currentStlAmountUSD ? e.currentStlAmountUSD : 0);
+      //     }
+      //     if (e.dc == "C") {
+      //       this.amountCSubSum += Number(e.currentStlAmountRMB ? e.currentStlAmountRMB : 0);
+      //       this.amountCSubUsdSum += Number(e.currentStlAmountUSD ? e.currentStlAmountUSD : 0);
+      //     }
+      //   });
+      // }
+      // this.amountSubSum = Number(this.amountDSubSum - this.amountCSubSum);
+      // this.amountSubUsdSum = Number(this.amountDSubUsdSum - this.amountCSubUsdSum);
       this.selectionList = list;
     },
     // 收付展示不一样的颜色
@@ -881,6 +887,34 @@ export default {
     //   deep: true, // 深度监听
     //   immediate: true, // 第一次改变就执行
     // },
+    selectionList: {
+      // 执行方法
+      handler(oldValue, newValue) {
+        this.amountSubSum = 0;
+        this.amountDSubSum = 0;
+        this.amountCSubSum = 0;
+        this.amountSubUsdSum = 0;
+        this.amountDSubUsdSum = 0;
+        this.amountCSubUsdSum = 0;
+        if (oldValue.length) {
+          oldValue.forEach((e) => {
+            console.log(e.accountDc);
+            if (e.dc == "D") {
+              this.amountDSubSum += Number(e.currentStlAmountRMB ? e.currentStlAmountRMB : 0);
+              this.amountDSubUsdSum += Number(e.currentStlAmountUSD ? e.currentStlAmountUSD : 0);
+            }
+            if (e.dc == "C") {
+              this.amountCSubSum += Number(e.currentStlAmountRMB ? e.currentStlAmountRMB : 0);
+              this.amountCSubUsdSum += Number(e.currentStlAmountUSD ? e.currentStlAmountUSD : 0);
+            }
+          });
+        }
+        this.amountSubSum = Number(this.amountDSubSum - this.amountCSubSum);
+        this.amountSubUsdSum = Number(this.amountDSubUsdSum - this.amountCSubUsdSum);
+      },
+      deep: true, // 深度监听
+      immediate: true, // 第一次改变就执行
+    },
   },
 };
 </script>

src/views/iosBasicData/financialManagement/finstlbills/components/pickedData.vue

@@ -144,6 +144,11 @@
         </el-popover>
         <span v-else>{{ row.stlAmountDrUSD }}</span>
       </template>
+      <template slot-scope="{ row, index }" slot="menu">
+        <el-button type="text" size="small" @click="rowCell(row, index)" :disabled="disabled || form.operatingStatus == 3 || form.status == 3">
+          {{ row.$cellEdit ? "保存" : "编辑" }}
+        </el-button>
+      </template>
     </avue-crud>
     <fee-info ref="feeInfo"></fee-info>
   </div>
@@ -212,7 +217,7 @@ export default {
         calcHeight: 30,
         menuWidth: 60,
         tip: false,
-        menu: false,
+        menu: true,
         border: true,
         addBtn: false,
         viewBtn: false,
@@ -229,12 +234,14 @@ export default {
             label: "账单编号",
             prop: "accBillNo",
             width: 120,
+            sortable:true,
             overHidden: true,
           },
           {
             label: "业务编号",
             prop: "billNo",
             width: 120,
+            sortable:true,
             overHidden: true,
           },
           {
@@ -247,12 +254,14 @@ export default {
             label: "对账单位",
             prop: "corpCnName",
             width: 140,
+            sortable:true,
             overHidden: true,
           },
           {
             label: "主单号",
             prop: "mblno",
             width: 100,
+            sortable:true,
             overHidden: true,
           },
           {
@@ -465,7 +474,7 @@ export default {
       page: {
         currentPage: 1,
         total: 0,
-        pageSize: 50,
+        pageSize: 200,
         pageSizes: [20, 50, 100, 200, 500, "ALL"],
       },
       pageData: [],
@@ -577,6 +586,13 @@ export default {
       const end = start + this.page.pageSize;
       this.pageData = this.tableData.slice(start, end);
     },
+    rowCell(row, index) {
+      if (row.$cellEdit == true) {
+        this.$set(row, "$cellEdit", false);
+      } else {
+        this.$set(row, "$cellEdit", true);
+      }
+    },
     refreshData() {
       if (this.tableData.length) {
         this.page.currentPage = 1;
@@ -963,22 +979,22 @@ export default {
       }
     },
     selectionChange(list) {
-      this.amountDSubSum = 0;
-      this.amountDSubUsdSum = 0;
-      this.amountCSubSum = 0;
-      this.amountCSubUsdSum = 0;
-      if (list.length) {
-        list.forEach((e) => {
-          if (e.dc == "D") {
-            this.amountDSubSum += Number(e.currentStlAmountRMB ? e.currentStlAmountRMB : 0);
-            this.amountDSubUsdSum += Number(e.currentStlAmountUSD ? e.currentStlAmountUSD : 0);
-          }
-          if (e.dc == "C") {
-            this.amountCSubSum += Number(e.currentStlAmountRMB ? e.currentStlAmountRMB : 0);
-            this.amountCSubUsdSum += Number(e.currentStlAmountUSD ? e.currentStlAmountUSD : 0);
-          }
-        });
-      }
+      // this.amountDSubSum = 0;
+      // this.amountDSubUsdSum = 0;
+      // this.amountCSubSum = 0;
+      // this.amountCSubUsdSum = 0;
+      // if (list.length) {
+      //   list.forEach((e) => {
+      //     if (e.dc == "D") {
+      //       this.amountDSubSum += Number(e.currentStlAmountRMB ? e.currentStlAmountRMB : 0);
+      //       this.amountDSubUsdSum += Number(e.currentStlAmountUSD ? e.currentStlAmountUSD : 0);
+      //     }
+      //     if (e.dc == "C") {
+      //       this.amountCSubSum += Number(e.currentStlAmountRMB ? e.currentStlAmountRMB : 0);
+      //       this.amountCSubUsdSum += Number(e.currentStlAmountUSD ? e.currentStlAmountUSD : 0);
+      //     }
+      //   });
+      // }
       this.selectionList = list;
     },
     // 收付展示不一样的颜色
@@ -1030,6 +1046,29 @@ export default {
     //   deep: true, // 深度监听
     //   immediate: true, // 第一次改变就执行
     // },
+    selectionList: {
+      // 执行方法
+      handler(oldValue, newValue) {
+        this.amountDSubSum = 0;
+        this.amountDSubUsdSum = 0;
+        this.amountCSubSum = 0;
+        this.amountCSubUsdSum = 0;
+        if (oldValue.length) {
+          oldValue.forEach((e) => {
+            if (e.dc == "D") {
+              this.amountDSubSum += Number(e.currentStlAmountRMB ? e.currentStlAmountRMB : 0);
+              this.amountDSubUsdSum += Number(e.currentStlAmountUSD ? e.currentStlAmountUSD : 0);
+            }
+            if (e.dc == "C") {
+              this.amountCSubSum += Number(e.currentStlAmountRMB ? e.currentStlAmountRMB : 0);
+              this.amountCSubUsdSum += Number(e.currentStlAmountUSD ? e.currentStlAmountUSD : 0);
+            }
+          });
+        }
+      },
+      deep: true, // 深度监听
+      immediate: true, // 第一次改变就执行
+    },
   },
 };
 </script>

src/views/iosBasicData/financialManagement/finstlbills/components/queryData.vue

@@ -18,6 +18,7 @@
     >
       <template slot="menuLeft">
         <el-button size="small" type="text" :disabled="disabled" @click="allClick('确认选定行')" style="color: #409eff">确认选定行</el-button>
+        <el-button type="text" size="small" :disabled="pageData.length == 0" style="color: #409eff" @click="allClick('一键编辑')">一键编辑</el-button>
         <el-tag type="danger" style="margin-right: 2px">应收(CNY):{{ amountDSubSum || 0 }}</el-tag>
         <el-tag type="danger" style="margin-right: 2px">应收(USD):{{ amountDSubUsdSum || 0 }}</el-tag>
         <el-tag type="success" style="margin-right: 2px; color: #000000">应付(CNY):{{ amountCSubSum || 0 }}</el-tag>
@@ -25,6 +26,7 @@
       </template>
       <template slot="currentStlAmountRMB" slot-scope="{ row }">
         <el-input-number
+          v-if="row.$cellEdit"
           v-model="row.currentStlAmountRMB"
           @change="armbChange(row)"
           :controls="false"
@@ -33,9 +35,11 @@
           style="width: 100%"
           :disabled="row.currentStlCurCode != 'CNY' || (row.currentStlAmountRMB == 0 && row.currentStlAmountUSD == 0)"
         ></el-input-number>
+        <span v-else>{{ row.currentStlAmountRMB }}</span>
       </template>
       <template slot="currentStlAmountUSD" slot-scope="{ row }">
         <el-input-number
+          v-if="row.$cellEdit"
           v-model="row.currentStlAmountUSD"
           @change="ausdChange(row)"
           :controls="false"
@@ -44,6 +48,7 @@
           style="width: 100%"
           :disabled="row.currentStlCurCode != 'USD' || (row.currentStlAmountRMB == 0 && row.currentStlAmountUSD == 0)"
         ></el-input-number>
+        <span v-else>{{ row.currentStlAmountUSD }}</span>
       </template>
       <template slot="reconciliationAmount" slot-scope="{ row }">
         <el-popover trigger="click" v-if="Number(row.reconciliationAmount)">
@@ -81,6 +86,9 @@
         </el-popover>
         <span v-else>{{ row.stlAmountDrUSD }}</span>
       </template>
+      <template slot-scope="{ row, index }" slot="menu">
+        <el-button type="text" size="small" @click="rowCell(row, index)"> {{ row.$cellEdit ? "保存" : "编辑" }} </el-button>
+      </template>
     </avue-crud>
   </div>
 </template>
@@ -139,7 +147,7 @@ export default {
         calcHeight: 30,
         menuWidth: 60,
         tip: false,
-        menu: false,
+        menu: true,
         border: true,
         addBtn: false,
         viewBtn: false,
@@ -157,12 +165,14 @@ export default {
             label: "账单编号",
             prop: "accBillNo",
             width: 120,
+            sortable:true,
             overHidden: true,
           },
           {
             label: "业务编号",
             prop: "billNo",
             width: 120,
+            sortable:true,
             overHidden: true,
           },
           {
@@ -175,12 +185,14 @@ export default {
             label: "对账单位",
             prop: "corpCnName",
             width: 140,
+            sortable:true,
             overHidden: true,
           },
           {
             label: "主单号",
             prop: "mblno",
             width: 100,
+            sortable:true,
             overHidden: true,
           },
           {
@@ -387,7 +399,7 @@ export default {
       page: {
         currentPage: 1,
         total: 0,
-        pageSize: 50,
+        pageSize: 200,
         pageSizes: [20, 50, 100, 200, 500, "ALL"],
       },
       pageData: [],
@@ -422,7 +434,7 @@ export default {
     this.roleName = localStorage.getItem("roleName").split(",");
     this.option = await this.getColumnData(this.getColumnName(487), this.optionBack);
   },
-   mounted() {
+  mounted() {
     document.addEventListener("keydown", this.handleKeyDown);
     document.addEventListener("keyup", this.handleKeyUp);
   },
@@ -503,6 +515,13 @@ export default {
       const end = start + this.page.pageSize;
       this.pageData = this.queryData.slice(start, end);
     },
+    rowCell(row, index) {
+      if (row.$cellEdit == true) {
+        this.$set(row, "$cellEdit", false);
+      } else {
+        this.$set(row, "$cellEdit", true);
+      }
+    },
     armbChange(row) {
       if (Number(row.amount - row.reconciliationAmount) > 0) {
         if (Number(row.currentStlAmountRMB) < 0) {
@@ -540,6 +559,11 @@ export default {
       }
     },
     allClick(name) {
+      if (name == "一键编辑") {
+        for (let row of this.queryData) {
+          this.$set(row, "$cellEdit", true);
+        }
+      }
       if (name == "确认选定行") {
         if (this.selectionList.length == 0) {
           return this.$message.error("请选择明细");
@@ -654,22 +678,6 @@ export default {
       });
     },
     selectionChange(list) {
-      this.amountDSubSum = 0;
-      this.amountDSubUsdSum = 0;
-      this.amountCSubSum = 0;
-      this.amountCSubUsdSum = 0;
-      if (list.length) {
-        list.forEach((e) => {
-          if (e.dc == "D") {
-            this.amountDSubSum += Number(e.currentStlAmountRMB ? e.currentStlAmountRMB : 0);
-            this.amountDSubUsdSum += Number(e.currentStlAmountUSD ? e.currentStlAmountUSD : 0);
-          }
-          if (e.dc == "C") {
-            this.amountCSubSum += Number(e.currentStlAmountRMB ? e.currentStlAmountRMB : 0);
-            this.amountCSubUsdSum += Number(e.currentStlAmountUSD ? e.currentStlAmountUSD : 0);
-          }
-        });
-      }
       this.selectionList = list;
     },
 
@@ -683,9 +691,9 @@ export default {
       }
       return rowStyle + "padding:0px;fontSize:12px";
     },
-     rowClassName({ row, rowIndex }) {
+    rowClassName({ row, rowIndex }) {
       let rowName = "",
-      findRow = this.selectionList.find((c) => c.$index === rowIndex);
+        findRow = this.selectionList.find((c) => c.$index === rowIndex);
       if (findRow) {
         rowName = "current-row "; // elementUI 默认高亮行的class类 不用再样式了^-^,也可通过css覆盖改变背景颜色
       }
@@ -721,6 +729,29 @@ export default {
     //   deep: true, // 深度监听
     //   immediate: true, // 第一次改变就执行
     // },
+    selectionList: {
+      // 执行方法
+      handler(oldValue, newValue) {
+        this.amountDSubSum = 0;
+        this.amountDSubUsdSum = 0;
+        this.amountCSubSum = 0;
+        this.amountCSubUsdSum = 0;
+        if (oldValue.length) {
+          oldValue.forEach((e) => {
+            if (e.dc == "D") {
+              this.amountDSubSum += Number(e.currentStlAmountRMB ? e.currentStlAmountRMB : 0);
+              this.amountDSubUsdSum += Number(e.currentStlAmountUSD ? e.currentStlAmountUSD : 0);
+            }
+            if (e.dc == "C") {
+              this.amountCSubSum += Number(e.currentStlAmountRMB ? e.currentStlAmountRMB : 0);
+              this.amountCSubUsdSum += Number(e.currentStlAmountUSD ? e.currentStlAmountUSD : 0);
+            }
+          });
+        }
+      },
+      deep: true, // 深度监听
+      immediate: true, // 第一次改变就执行
+    },
   },
 };
 </script>

src/views/iosBasicData/fininvoicesApplyfor/assembly/fininvoicesitems.vue

@@ -13,8 +13,8 @@
       @size-change="sizeChange"
       @current-change="currentChange"
       @row-click="handleRowClick"
-      @resetColumn="resetColumn('crud', 'option', 'optionBack', 494)"
-      @saveColumn="saveColumn('crud', 'option', 'optionBack', 494)"
+      @resetColumn="resetColumn('crud', 'option', 'optionBack', 493)"
+      @saveColumn="saveColumn('crud', 'option', 'optionBack', 493)"
     >
       <template slot="menuLeft">
         <slot name="menuLeft"></slot>
@@ -147,7 +147,7 @@ export default {
           {
             label: "收/付",
             prop: "dc",
-            width: 60,
+            width: 80,
             type: "select",
             dicData: [
               {
@@ -159,18 +159,21 @@ export default {
                 value: "C",
               },
             ],
+            sortable:true,
             overHidden: true,
           },
           {
             label: "账单编号",
             prop: "accBillNo",
             width: 120,
+            sortable:true,
             overHidden: true,
           },
           {
-            label: "MB/L NO",
+            label: "主单号",
             prop: "mblno",
             width: 100,
+            sortable:true,
             overHidden: true,
           },
           {
@@ -286,14 +289,14 @@ export default {
       page: {
         currentPage: 1,
         total: 0,
-        pageSize: 20,
+        pageSize: 200,
         pageSizes: [20, 50, 100, 200, 500,'ALL'],
       },
       pageData: [],
     };
   },
   async created() {
-    this.option = await this.getColumnData(this.getColumnName(494), this.optionBack);
+    this.option = await this.getColumnData(this.getColumnName(493), this.optionBack);
   },
   methods: {
     handleRowClick(row, event, column) {

src/views/iosBasicData/fininvoicesApplyfor/assembly/fininvoicesitems2.vue

@@ -147,7 +147,7 @@ export default {
           {
             label: "开票状态",
             prop: "status",
-            width: 70,
+            width: 100,
             type: "select",
             dicData: [
               {
@@ -159,12 +159,13 @@ export default {
                 value: 1,
               },
             ],
+            sortable:true,
             overHidden: true,
           },
           {
             label: "收/付",
             prop: "dc",
-            width: 60,
+            width: 80,
             type: "select",
             dicData: [
               {
@@ -176,18 +177,21 @@ export default {
                 value: "C",
               },
             ],
+            sortable:true,
             overHidden: true,
           },
           {
             label: "账单编号",
             prop: "accBillNo",
             width: 120,
+            sortable:true,
             overHidden: true,
           },
           {
-            label: "MB/L NO",
+            label: "主单号",
             prop: "mblno",
             width: 100,
+            sortable:true,
             overHidden: true,
           },
           {
@@ -303,7 +307,7 @@ export default {
       page: {
         currentPage: 1,
         total: 0,
-        pageSize: 20,
+        pageSize: 200,
         pageSizes: [20, 50, 100, 200, 500,'ALL'],
       },
       pageData: [],

src/views/iosBasicData/fininvoicesOutput/fininvoicesDetails.vue

@@ -517,7 +517,7 @@
                 </el-row>
                 <el-row v-show="showForm">
                   <el-col :span="16">
-                    <el-form-item label="主单编号" prop="mblno">
+                    <el-form-item label="主单号" prop="mblno">
                       <el-input
                         style="width: 100%"
                         v-model="form.mblno"
@@ -545,7 +545,7 @@
                     </el-form-item>
                   </el-col>
                   <el-col :span="16">
-                    <el-form-item label="分单编号" prop="hblno">
+                    <el-form-item label="分单号" prop="hblno">
                       <el-input
                         style="width: 100%"
                         v-model="form.hblno"
@@ -573,7 +573,7 @@
                     </el-form-item>
                   </el-col>
                   <el-col :span="8">
-                    <el-form-item label="BOOK NO" prop="bookingNo">
+                    <el-form-item label="订舱号" prop="bookingNo">
                       <el-input
                         style="width: 100%"
                         v-model="form.bookingNo"
@@ -581,7 +581,7 @@
                         autocomplete="off"
                         :disabled="editSave || form.srcType == '对账'"
                         clearable
-                        placeholder="请输入BOOK NO"
+                        placeholder="请输入订舱号"
                       >
                       </el-input>
                     </el-form-item>
@@ -1038,14 +1038,66 @@ export default {
   },
   watch: {
     // 监听 状态
-    "form.status": {
-      // 执行方法
+    // "form.status": {
+    //   // 执行方法
+    //   handler(oldValue, newValue) {
+    //     if (oldValue == 3) {
+    //       this.statusType = true;
+    //     } else {
+    //       this.statusType = false;
+    //     }
+    //   },
+    //   deep: true, // 深度监听
+    //   immediate: true, // 第一次改变就执行
+    // },
+    addData: {
       handler(oldValue, newValue) {
-        if (oldValue == 3) {
-          this.statusType = true;
-        } else {
-          this.statusType = false;
+        this.amountSubSum = 0;
+        this.amountDSubSum = 0;
+        this.amountCSubSum = 0;
+        this.amountSubUsdSum = 0;
+        this.amountDSubUsdSum = 0;
+        this.amountCSubUsdSum = 0;
+        if (oldValue.length) {
+          oldValue.forEach((e) => {
+            if (e.dc == "D") {
+              this.amountDSubSum += Number(e.currentAmountCNY ? e.currentAmountCNY : 0);
+              this.amountDSubUsdSum += Number(e.currentAmountUSD ? e.currentAmountUSD : 0);
+            }
+            if (e.dc == "C") {
+              this.amountCSubSum += Number(e.currentAmountCNY ? e.currentAmountCNY : 0);
+              this.amountCSubUsdSum += Number(e.currentAmountUSD ? e.currentAmountUSD : 0);
+            }
+          });
         }
+        this.amountSubSum = Number(this.amountDSubSum - this.amountCSubSum);
+        this.amountSubUsdSum = Number(this.amountDSubUsdSum - this.amountCSubUsdSum);
+      },
+      deep: true, // 深度监听
+      immediate: true, // 第一次改变就执行
+    },
+    handleSelectionData: {
+      handler(oldValue, newValue) {
+        this.amountSubSum = 0;
+        this.amountDSubSum = 0;
+        this.amountCSubSum = 0;
+        this.amountSubUsdSum = 0;
+        this.amountDSubUsdSum = 0;
+        this.amountCSubUsdSum = 0;
+        if (oldValue.length) {
+          oldValue.forEach((e) => {
+            if (e.dc == "D") {
+              this.amountDSubSum += Number(e.currentAmountCNY ? e.currentAmountCNY : 0);
+              this.amountDSubUsdSum += Number(e.currentAmountUSD ? e.currentAmountUSD : 0);
+            }
+            if (e.dc == "C") {
+              this.amountCSubSum += Number(e.currentAmountCNY ? e.currentAmountCNY : 0);
+              this.amountCSubUsdSum += Number(e.currentAmountUSD ? e.currentAmountUSD : 0);
+            }
+          });
+        }
+        this.amountSubSum = Number(this.amountDSubSum - this.amountCSubSum);
+        this.amountSubUsdSum = Number(this.amountDSubUsdSum - this.amountCSubUsdSum);
       },
       deep: true, // 深度监听
       immediate: true, // 第一次改变就执行
@@ -1612,51 +1664,51 @@ export default {
       }
     },
     addSelectionChange(list) {
-      this.amountSubSum = 0;
-      this.amountDSubSum = 0;
-      this.amountCSubSum = 0;
-      this.amountSubUsdSum = 0;
-      this.amountDSubUsdSum = 0;
-      this.amountCSubUsdSum = 0;
-      if (list.length) {
-        list.forEach((e) => {
-          if (e.accountDc == "D") {
-            this.amountDSubSum += Number(e.currentAmountCNY ? e.currentAmountCNY : 0);
-            this.amountDSubUsdSum += Number(e.currentAmountUSD ? e.currentAmountUSD : 0);
-          }
-          if (e.accountDc == "C") {
-            this.amountCSubSum += Number(e.currentAmountCNY ? e.currentAmountCNY : 0);
-            this.amountCSubUsdSum += Number(e.currentAmountUSD ? e.currentAmountUSD : 0);
-          }
-        });
-      }
-      this.amountSubSum = Number(this.amountDSubSum - this.amountCSubSum);
-      this.amountSubUsdSum = Number(this.amountDSubUsdSum - this.amountCSubUsdSum);
+      // this.amountSubSum = 0;
+      // this.amountDSubSum = 0;
+      // this.amountCSubSum = 0;
+      // this.amountSubUsdSum = 0;
+      // this.amountDSubUsdSum = 0;
+      // this.amountCSubUsdSum = 0;
+      // if (list.length) {
+      //   list.forEach((e) => {
+      //     if (e.accountDc == "D") {
+      //       this.amountDSubSum += Number(e.currentAmountCNY ? e.currentAmountCNY : 0);
+      //       this.amountDSubUsdSum += Number(e.currentAmountUSD ? e.currentAmountUSD : 0);
+      //     }
+      //     if (e.accountDc == "C") {
+      //       this.amountCSubSum += Number(e.currentAmountCNY ? e.currentAmountCNY : 0);
+      //       this.amountCSubUsdSum += Number(e.currentAmountUSD ? e.currentAmountUSD : 0);
+      //     }
+      //   });
+      // }
+      // this.amountSubSum = Number(this.amountDSubSum - this.amountCSubSum);
+      // this.amountSubUsdSum = Number(this.amountDSubUsdSum - this.amountCSubUsdSum);
       this.addData = list;
     },
     // 费用明细表格多选
     handleSelectionChange(list) {
-      this.amountSubSum = 0;
-      this.amountDSubSum = 0;
-      this.amountCSubSum = 0;
-      this.amountSubUsdSum = 0;
-      this.amountDSubUsdSum = 0;
-      this.amountCSubUsdSum = 0;
-      if (list.length) {
-        list.forEach((e) => {
-          if (e.dc == "D") {
-            this.amountDSubSum += Number(e.currentAmountCNY ? e.currentAmountCNY : 0);
-            this.amountDSubUsdSum += Number(e.currentAmountUSD ? e.currentAmountUSD : 0);
-          }
-          if (e.dc == "C") {
-            this.amountCSubSum += Number(e.currentAmountCNY ? e.currentAmountCNY : 0);
-            this.amountCSubUsdSum += Number(e.currentAmountUSD ? e.currentAmountUSD : 0);
-          }
-        });
-      }
-      this.amountSubSum = Number(this.amountDSubSum - this.amountCSubSum);
-      this.amountSubUsdSum = Number(this.amountDSubUsdSum - this.amountCSubUsdSum);
-      console.log(111, this.amountSubSum, this.amountSubUsdSum);
+      // this.amountSubSum = 0;
+      // this.amountDSubSum = 0;
+      // this.amountCSubSum = 0;
+      // this.amountSubUsdSum = 0;
+      // this.amountDSubUsdSum = 0;
+      // this.amountCSubUsdSum = 0;
+      // if (list.length) {
+      //   list.forEach((e) => {
+      //     if (e.dc == "D") {
+      //       this.amountDSubSum += Number(e.currentAmountCNY ? e.currentAmountCNY : 0);
+      //       this.amountDSubUsdSum += Number(e.currentAmountUSD ? e.currentAmountUSD : 0);
+      //     }
+      //     if (e.dc == "C") {
+      //       this.amountCSubSum += Number(e.currentAmountCNY ? e.currentAmountCNY : 0);
+      //       this.amountCSubUsdSum += Number(e.currentAmountUSD ? e.currentAmountUSD : 0);
+      //     }
+      //   });
+      // }
+      // this.amountSubSum = Number(this.amountDSubSum - this.amountCSubSum);
+      // this.amountSubUsdSum = Number(this.amountDSubUsdSum - this.amountCSubUsdSum);
+      // console.log(111, this.amountSubSum, this.amountSubUsdSum);
       this.handleSelectionData = list;
     },
     // 开票明细表格多选

src/views/iosBasicData/fininvoicesOutput/index.vue

@@ -384,14 +384,14 @@ export default {
             overHidden: true
           },
           {
-            label: "MB/L NO",
+            label: "主单号",
             prop: "mblno",
             search: true,
             searchOrder: 2,
             overHidden: true
           },
           {
-            label: "HB/L NO",
+            label: "分单号",
             prop: "hblno",
             search: true,
             searchOrder: 4,