Explorar o código

修改20260206的文档问题

Qukatie hai 1 semana
pai
achega
3c5556b3e8

+ 24 - 14
src/views/iosBasicData/financialManagement/computationCenter/components/pickedData.vue

@@ -11,12 +11,13 @@
       @current-change="currentChange"
       @selection-change="selectionChange"
       @row-dblclick="handleRowDBLClick"
+      @row-click="handleRowClick"
       @resetColumn="resetColumn('crud', 'option', 'optionBack', 491)"
       @saveColumn="saveColumn('crud', 'option', 'optionBack', 491)"
     >
       <template slot="menuLeft">
         <el-tag type="danger" style="margin-right: 2px">人民币合计:{{ amountSubSum || 0 }}</el-tag>
-        <el-tag type="success" style="margin-right: 2px;color:#000000">美元合计:{{ amountSubUsdSum || 0 }}</el-tag>
+        <el-tag type="success" style="margin-right: 2px; color: #000000">美元合计:{{ amountSubUsdSum || 0 }}</el-tag>
       </template>
       <template slot="reconciliationAmount" slot-scope="{ row }">
         <el-popover trigger="click" v-if="Number(row.reconciliationAmount)">
@@ -118,6 +119,7 @@ export default {
         align: "center",
         rowKey: "accBillId",
         selection: true,
+        highlightCurrentRow: true,
         column: [
           {
             label: "核销",
@@ -317,7 +319,7 @@ export default {
         currentPage: 1,
         total: 0,
         pageSize: 50,
-        pageSizes: [20, 50, 100, 200, 500],
+        pageSizes: [20, 50, 100, 200, 500, "ALL"],
       },
       pageData: [],
       selectionList: [],
@@ -347,6 +349,9 @@ export default {
     this.option = await this.getColumnData(this.getColumnName(491), this.optionBack);
   },
   methods: {
+    handleRowClick(row, event, column) {
+      this.$refs.crud.toggleRowSelection(row, true);
+    },
     viewRLA(row, type) {
       this.rlaData = [];
       getListAll({ billId: row.accBillId, srcType: type }).then((res) => {
@@ -359,7 +364,7 @@ export default {
     },
     sizeChange(val) {
       this.page.currentPage = 1;
-      this.page.pageSize = val;
+      this.page.pageSize = val ? val : this.tableData.length;
       this.getList();
     },
     currentChange(val) {
@@ -372,6 +377,11 @@ export default {
       const end = start + this.page.pageSize;
       this.pageData = this.tableData.slice(start, end);
     },
+    refreshData() {
+      this.page.currentPage = 1;
+      this.pageData = [];
+      this.getList();
+    },
     armbChange(row) {
       if (Number(row.amount - row.reconciliationAmount) > 0) {
         if (Number(row.currentStlAmountRMB) < 0) {
@@ -739,7 +749,7 @@ export default {
       }
     },
     selectionChange(list) {
-        this.amountSubSum = 0;
+      this.amountSubSum = 0;
       this.amountDSubSum = 0;
       this.amountCSubSum = 0;
       this.amountSubUsdSum = 0;
@@ -792,16 +802,16 @@ export default {
     },
   },
   watch: {
-    tableData: {
-      // 执行方法
-      handler(oldValue, newValue) {
-        this.page.currentPage = 1;
-        this.pageData = [];
-        this.getList();
-      },
-      deep: true, // 深度监听
-      immediate: true, // 第一次改变就执行
-    },
+    // tableData: {
+    //   // 执行方法
+    //   handler(oldValue, newValue) {
+    //     this.page.currentPage = 1;
+    //     this.pageData = [];
+    //     this.getList();
+    //   },
+    //   deep: true, // 深度监听
+    //   immediate: true, // 第一次改变就执行
+    // },
   },
 };
 </script>

+ 14 - 1
src/views/iosBasicData/financialManagement/computationCenter/detailsPage.vue

@@ -686,7 +686,7 @@ export default {
             prop: "billDate",
             type: "date",
             format: "yyyy-MM-dd",
-            valueFormat: "yyyy-MM-dd 00:00:00",
+            valueFormat: "yyyy-MM-dd HH:mm:ss",
             disabled: false,
           },
           {
@@ -1786,6 +1786,13 @@ export default {
         });
     },
     submit() {
+      this.form.finStlBillsItemsList.forEach((item, index) => {
+        if (item.currentStlCurCode == "CNY") {
+          item.currentStlAmount = item.currentStlAmountRMB;
+        } else {
+          item.currentStlAmount = item.currentStlAmountUSD;
+        }
+      });
       let obj = {
         ...this.form,
         billNoFormat: "STL",
@@ -1843,6 +1850,9 @@ export default {
             }
           });
           this.form = res.data.data;
+          setTimeout(() => {
+            this.$refs.pickedData.refreshData();
+          }, 100);
         })
         .finally(() => {
           loading.close();
@@ -1887,6 +1897,9 @@ export default {
           }
 
           this.form = res.data.data;
+          setTimeout(() => {
+            this.$refs.pickedData.refreshData();
+          }, 100);
         })
         .finally(() => {
           loading.close();

+ 27 - 14
src/views/iosBasicData/financialManagement/finstlbills/components/pickedData.vue

@@ -11,6 +11,7 @@
       @current-change="currentChange"
       @selection-change="selectionChange"
       @row-dblclick="handleRowDBLClick"
+      @row-click="handleRowClick"
       @resetColumn="resetColumn('crud', 'option', 'optionBack', 488)"
       @saveColumn="saveColumn('crud', 'option', 'optionBack', 488)"
     >
@@ -76,8 +77,8 @@
         > -->
         <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>
-        <el-tag type="success" style="margin-right: 2px;color:#000000">应付(USD):{{ amountCSubUsdSum || 0 }}</el-tag>
+        <el-tag type="success" style="margin-right: 2px; color: #000000">应付(CNY):{{ amountCSubSum || 0 }}</el-tag>
+        <el-tag type="success" style="margin-right: 2px; color: #000000">应付(USD):{{ amountCSubUsdSum || 0 }}</el-tag>
       </template>
       <template slot="currentStlAmountRMB" slot-scope="{ row }">
         <el-input-number
@@ -221,6 +222,7 @@ export default {
         align: "center",
         rowKey: "accBillId",
         selection: true,
+        highlightCurrentRow:true,
         column: [
           {
             label: "账单编号",
@@ -457,7 +459,7 @@ export default {
         currentPage: 1,
         total: 0,
         pageSize: 50,
-        pageSizes: [20, 50, 100, 200, 500],
+        pageSizes: [20, 50, 100, 200, 500, "ALL"],
       },
       pageData: [],
       selectionList: [],
@@ -487,6 +489,9 @@ export default {
     this.option = await this.getColumnData(this.getColumnName(488), this.optionBack);
   },
   methods: {
+    handleRowClick(row, event, column) {
+       this.$refs.crud.toggleRowSelection(row,true);
+    },
     viewRLA(row, type) {
       this.rlaData = [];
       getListAll({ billId: row.accBillId, srcType: type }).then((res) => {
@@ -499,7 +504,7 @@ export default {
     },
     sizeChange(val) {
       this.page.currentPage = 1;
-      this.page.pageSize = val;
+      this.page.pageSize = val ? val : this.tableData.length;
       this.getList();
     },
     currentChange(val) {
@@ -512,6 +517,13 @@ export default {
       const end = start + this.page.pageSize;
       this.pageData = this.tableData.slice(start, end);
     },
+    refreshData() {
+      if (this.tableData.length) {
+        this.page.currentPage = 1;
+        this.pageData = [];
+        this.getList();
+      }
+    },
     armbChange(row) {
       if (Number(row.amount - row.reconciliationAmount) > 0) {
         if (Number(row.currentStlAmountRMB) < 0) {
@@ -927,16 +939,17 @@ export default {
     },
   },
   watch: {
-    tableData: {
-      // 执行方法
-      handler(oldValue, newValue) {
-        this.page.currentPage = 1;
-        this.pageData = [];
-        this.getList();
-      },
-      deep: true, // 深度监听
-      immediate: true, // 第一次改变就执行
-    },
+    // tableData: {
+    //   // 执行方法
+    //   handler(oldValue, newValue) {
+    //     if (this.initialState&&oldValue.length) {
+    //       this.initialState=false
+    //       this.refreshData();
+    //     }
+    //   },
+    //   deep: true, // 深度监听
+    //   immediate: true, // 第一次改变就执行
+    // },
   },
 };
 </script>

+ 25 - 14
src/views/iosBasicData/financialManagement/finstlbills/components/queryData.vue

@@ -10,6 +10,7 @@
       @size-change="sizeChange"
       @current-change="currentChange"
       @selection-change="selectionChange"
+      @row-click="handleRowClick"
       @resetColumn="resetColumn('crud', 'option', 'optionBack', 487)"
       @saveColumn="saveColumn('crud', 'option', 'optionBack', 487)"
     >
@@ -17,8 +18,8 @@
         <el-button size="small" type="text" :disabled="disabled" @click="allClick('确认选定行')" style="color: #409eff">确认选定行</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>
-        <el-tag type="success" style="margin-right: 2px;color:#000000">应付(USD):{{ amountCSubUsdSum || 0 }}</el-tag>
+        <el-tag type="success" style="margin-right: 2px; color: #000000">应付(CNY):{{ amountCSubSum || 0 }}</el-tag>
+        <el-tag type="success" style="margin-right: 2px; color: #000000">应付(USD):{{ amountCSubUsdSum || 0 }}</el-tag>
       </template>
       <template slot="currentStlAmountRMB" slot-scope="{ row }">
         <el-input-number
@@ -148,6 +149,7 @@ export default {
         align: "center",
         rowKey: "accBillId",
         selection: true,
+        highlightCurrentRow: true,
         column: [
           {
             label: "账单编号",
@@ -384,7 +386,7 @@ export default {
         currentPage: 1,
         total: 0,
         pageSize: 50,
-        pageSizes: [20, 50, 100, 200, 500],
+        pageSizes: [20, 50, 100, 200, 500, "ALL"],
       },
       pageData: [],
       queryData: [],
@@ -421,6 +423,9 @@ export default {
     this.option = await this.getColumnData(this.getColumnName(487), this.optionBack);
   },
   methods: {
+    handleRowClick(row, event, column) {
+      this.$refs.crud.toggleRowSelection(row, true);
+    },
     viewRLA(row, type) {
       this.rlaData = [];
       getListAll({ billId: row.accBillId, srcType: type }).then((res) => {
@@ -429,13 +434,18 @@ export default {
     },
     sizeChange(val) {
       this.page.currentPage = 1;
-      this.page.pageSize = val;
+      this.page.pageSize = val ? val : this.queryData.length;
       this.getList();
     },
     currentChange(val) {
       this.page.currentPage = val;
       this.getList();
     },
+    refreshData() {
+      this.page.currentPage = 1;
+      this.pageData = [];
+      this.getList();
+    },
     getList() {
       this.page.total = this.queryData.length;
       const start = (this.page.currentPage - 1) * this.page.pageSize;
@@ -583,6 +593,7 @@ export default {
         if (this.queryData.length == 0 && type == "检索") {
           this.$message.warning("当前检索暂无数据!");
         }
+        this.refreshData();
       });
     },
     selectionChange(list) {
@@ -635,16 +646,16 @@ export default {
     },
   },
   watch: {
-    queryData: {
-      // 执行方法
-      handler(oldValue, newValue) {
-        this.page.currentPage = 1;
-        this.pageData = [];
-        this.getList();
-      },
-      deep: true, // 深度监听
-      immediate: true, // 第一次改变就执行
-    },
+    // queryData: {
+    //   // 执行方法
+    //   handler(oldValue, newValue) {
+    //     this.page.currentPage = 1;
+    //     this.pageData = [];
+    //     this.getList();
+    //   },
+    //   deep: true, // 深度监听
+    //   immediate: true, // 第一次改变就执行
+    // },
   },
 };
 </script>

+ 10 - 1
src/views/iosBasicData/financialManagement/finstlbills/detailsPage.vue

@@ -1089,6 +1089,13 @@ export default {
           return this.$message.error("单价不能为非正数");
         }
       }
+      this.form.finStlBillsItemsList.forEach((item, index) => {
+        if (item.currentStlCurCode == "CNY") {
+          item.currentStlAmount = item.currentStlAmountRMB;
+        } else {
+          item.currentStlAmount = item.currentStlAmountUSD;
+        }
+      });
       let obj = {
         ...this.form,
         billNoFormat: "HYDZ",
@@ -1145,7 +1152,6 @@ export default {
               this.$set(item, "stlAmountDrUSD", Number(item.stlTtlAmount ? item.stlTtlAmount : 0));
             }
           });
-
           if (type == "对账") {
             if (res.data.data.finStlBillsItemsList.filter((item) => item.isChecked == 1).length) {
               this.editDisabled = true;
@@ -1163,6 +1169,9 @@ export default {
             //再次查询是为了避免已选定的数据不能再次出现查询结果里面
             this.$refs.queryData.search();
           }
+          setTimeout(() => {
+            this.$refs.pickedData.refreshData();
+          }, 100);
         })
         .finally(() => {
           loading.close();

+ 77 - 67
src/views/iosBasicData/fininvoicesApplyfor/assembly/fininvoicesitems.vue

@@ -12,6 +12,7 @@
       :page.sync="page"
       @size-change="sizeChange"
       @current-change="currentChange"
+      @row-click="handleRowClick"
       @resetColumn="resetColumn('crud', 'option', 'optionBack', 494)"
       @saveColumn="saveColumn('crud', 'option', 'optionBack', 494)"
     >
@@ -26,7 +27,7 @@
           :controls="false"
           placeholder="请输入 本次CNY"
           size="mini"
-          style="width: 100%;"
+          style="width: 100%"
           :disabled="row.curCode != 'CNY' || (row.currentAmountCNY == 0 && row.currentAmountUSD == 0)"
         ></el-input-number>
         <span v-else>{{ row.currentAmountCNY }}</span>
@@ -39,7 +40,7 @@
           :controls="false"
           placeholder="请输入 本次USD"
           size="mini"
-          style="width: 100%;"
+          style="width: 100%"
           :disabled="row.currentCurCode != 'USD' || (row.currentAmountCNY == 0 && row.currentAmountUSD == 0)"
         ></el-input-number>
         <span v-else>{{ row.currentAmountUSD }}</span>
@@ -47,13 +48,13 @@
       <template slot="reconciliationAmount" slot-scope="{ row }">
         <el-popover trigger="click">
           <avue-crud :data="rlaData" :option="rlaOption"></avue-crud>
-          <span style="color: #409EFF;cursor: pointer" slot="reference" @click="viewRLA(row)">{{ row.reconciliationAmount }}</span>
+          <span style="color: #409eff; cursor: pointer" slot="reference" @click="viewRLA(row)">{{ row.reconciliationAmount }}</span>
         </el-popover>
       </template>
       <template slot="reconciliationAmountUsd" slot-scope="{ row }">
         <el-popover trigger="click">
           <avue-crud :data="rlaData" :option="rlaOption"></avue-crud>
-          <span style="color: #409EFF;cursor: pointer" slot="reference" @click="viewRLA(row)">{{ row.reconciliationAmountUsd }}</span>
+          <span style="color: #409eff; cursor: pointer" slot="reference" @click="viewRLA(row)">{{ row.reconciliationAmountUsd }}</span>
         </el-popover>
       </template>
     </avue-crud>
@@ -69,20 +70,20 @@ export default {
   props: {
     queryData: {
       type: Array,
-      default: []
+      default: [],
     },
     handleSelectionData: {
       type: Array,
-      default: []
+      default: [],
     },
     editSave: {
       type: Boolean,
-      default: false
+      default: false,
     },
     form: {
       type: Object,
-      default: {}
-    }
+      default: {},
+    },
   },
   data() {
     return {
@@ -96,33 +97,33 @@ export default {
             label: "来源单号",
             prop: "srcNo",
             width: "200",
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "来源类型",
             prop: "srcType",
             width: "80",
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "签收金额",
             prop: "signedAmount",
             width: "100",
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "签收人",
             prop: "consigneeName",
             width: "100",
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "签收时间",
             prop: "signingTime",
             width: "120",
-            overHidden: true
-          }
-        ]
+            overHidden: true,
+          },
+        ],
       },
       curCodeData: [], // 本次币种
       option: {},
@@ -140,6 +141,7 @@ export default {
         refreshBtn: false,
         index: true,
         selection: true,
+        highlightCurrentRow:true,
         align: "center",
         column: [
           {
@@ -150,159 +152,162 @@ export default {
             dicData: [
               {
                 label: "收",
-                value: "D"
+                value: "D",
               },
               {
                 label: "付",
-                value: "C"
-              }
+                value: "C",
+              },
             ],
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "账单编号",
             prop: "accBillNo",
             width: 120,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "MB/L NO",
             prop: "mblno",
             width: 100,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "业务员",
             prop: "srcCnName",
             width: 80,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "操作人",
             prop: "operatorName",
             width: 80,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "本次CNY",
             prop: "currentAmountCNY",
             width: 100,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "本次USD",
             prop: "currentAmountUSD",
             width: 100,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "已签收CNY",
             prop: "reconciliationAmount",
             width: 100,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "已签收USD",
             prop: "reconciliationAmountUsd",
             width: 100,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "JOB NO",
             prop: "billNo",
             width: 100,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "BOOKINGNO",
             prop: "bookingNo",
             width: 120,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "费用名称",
             prop: "feeCnName",
             width: 80,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "客户名称",
             prop: "corpCnName",
             width: 120,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "账单金额",
             prop: "amount",
             width: 120,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "本次发票币种",
             prop: "currentCurCode",
             width: 100,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "本次发票汇率",
             prop: "currentExrate",
             width: 100,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "付费申请金额",
             prop: "appliedAmount",
             width: 100,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "发票申请金额",
             prop: "appliedInvoiceAmount",
             width: 100,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "已开票金额",
             prop: "uninvoicedAmount",
             width: 100,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "已结算金额",
             prop: "stlTtlAmount",
             width: 100,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "备注",
             prop: "remarks",
             width: 120,
-            overHidden: true
-          }
-        ]
+            overHidden: true,
+          },
+        ],
       },
       page: {
         currentPage: 1,
         total: 0,
         pageSize: 20,
-        pageSizes: [20, 50, 100, 200, 500]
+        pageSizes: [20, 50, 100, 200, 500,'ALL'],
       },
-      pageData: []
+      pageData: [],
     };
   },
   async created() {
     this.option = await this.getColumnData(this.getColumnName(494), this.optionBack);
   },
   methods: {
+    handleRowClick(row, event, column) {
+      this.$refs.crud.toggleRowSelection(row, true);
+    },
     viewRLA(row, type) {
       this.rlaData = [];
-      getListAll({ billId: row.accBillId, srcType: type }).then(res => {
+      getListAll({ billId: row.accBillId, srcType: type }).then((res) => {
         this.rlaData = res.data.data;
       });
     },
     sizeChange(val) {
       this.page.currentPage = 1;
-      this.page.pageSize = val;
+      this.page.pageSize = val?val:this.queryData.length;
       this.getList();
     },
     currentChange(val) {
@@ -315,6 +320,11 @@ export default {
       const end = start + this.page.pageSize;
       this.pageData = this.queryData.slice(start, end);
     },
+    refreshData() {
+      this.page.currentPage = 1;
+      this.pageData = [];
+      this.getList();
+    },
     armbChange(row) {
       if (Number(row.amount - row.reconciliationAmount) > 0) {
         if (Number(row.currentAmountCNY) < 0) {
@@ -379,7 +389,7 @@ export default {
     },
     // 获取币别数据
     getRateListfun(cnName) {
-      getRateList({ current: 1, size: 10, cnName }).then(res => {
+      getRateList({ current: 1, size: 10, cnName }).then((res) => {
         this.curCodeData = res.data.data.records;
       });
     },
@@ -408,7 +418,7 @@ export default {
           refsElTable.toggleRowSelection(this.queryData[index], true);
         }
       } else {
-        let findRow = this.handleSelectionData.find(c => c.rowIndex == row.rowIndex); //找出当前选中行
+        let findRow = this.handleSelectionData.find((c) => c.rowIndex == row.rowIndex); //找出当前选中行
         //如果只有一行且点击的也是这一行则取消选择 否则清空再选中当前点击行
         if (findRow && this.handleSelectionData.length === 1) {
           refsElTable.toggleRowSelection(row, false);
@@ -426,7 +436,7 @@ export default {
         //给每一行添加不可枚举属性rowIndex来标识当前行
         value: rowIndex, // 设置age的值,不设置的话默认为undefined
         writable: true, // 表示属性的值true可以修改,false不可以被修改
-        enumerable: false // 设置为false表示不能通过 for-in 循环返回
+        enumerable: false, // 设置为false表示不能通过 for-in 循环返回
         // configurable: false, // configurable 设置为 false,意味着这个属性不能从对象上删除
       });
     },
@@ -448,22 +458,22 @@ export default {
       if (n > mx) {
         return {
           top: mi,
-          bottom: n
+          bottom: n,
         };
       } else if (n < mx && n > mi) {
         return {
           top: mi,
-          bottom: n
+          bottom: n,
         };
       } else if (n < mi) {
         return {
           top: n,
-          bottom: mx
+          bottom: mx,
         };
       } else if (n == mi || n == mx) {
         return {
           top: mi,
-          bottom: mx
+          bottom: mx,
         };
       }
     },
@@ -471,7 +481,7 @@ export default {
     // 判断方式也是通过判断rowIndex对比
     rowClassName({ row, rowIndex }) {
       let rowName = "",
-        findRow = this.handleSelectionData.find(c => c.rowIndex === row.rowIndex);
+        findRow = this.handleSelectionData.find((c) => c.rowIndex === row.rowIndex);
       if (findRow) {
         rowName = "current-row "; // elementUI 默认高亮行的class类 不用再样式了^-^,也可通过css覆盖改变背景颜色
       }
@@ -504,7 +514,7 @@ export default {
         this.$message.success("重置成功");
         this.$refs[ref].$refs.dialogColumn.columnBox = false;
       }
-    }
+    },
   },
   mounted() {
     // 按住ctrl实现多选 设置监听keydown事件,以及keyup事件,
@@ -517,16 +527,16 @@ export default {
     removeEventListener("keyup", this.keyUp);
   },
   watch: {
-    queryData: {
-      // 执行方法
-      handler(oldValue, newValue) {
-        this.page.currentPage = 1;
-        this.pageData = [];
-        this.getList();
-      },
-      deep: true, // 深度监听
-      immediate: true // 第一次改变就执行
-    }
+    // queryData: {
+    //   // 执行方法
+    //   handler(oldValue, newValue) {
+    //     this.page.currentPage = 1;
+    //     this.pageData = [];
+    //     this.getList();
+    //   },
+    //   deep: true, // 深度监听
+    //   immediate: true, // 第一次改变就执行
+    // },
   },
   computed: {
     //实时得到最上行和最下行
@@ -541,8 +551,8 @@ export default {
       return this.handleSelectionData.reduce((start, end) => {
         return start.rowIndex < end.rowIndex ? start : end;
       });
-    }
-  }
+    },
+  },
 };
 </script>
 

+ 83 - 71
src/views/iosBasicData/fininvoicesApplyfor/assembly/fininvoicesitems2.vue

@@ -12,6 +12,7 @@
       :page.sync="page"
       @size-change="sizeChange"
       @current-change="currentChange"
+      @row-click="handleRowClick"
       @resetColumn="resetColumn('crud', 'option', 'optionBack', 494)"
       @saveColumn="saveColumn('crud', 'option', 'optionBack', 494)"
     >
@@ -26,7 +27,7 @@
           :controls="false"
           placeholder="请输入 本次CNY"
           size="mini"
-          style="width: 100%;"
+          style="width: 100%"
           :disabled="row.curCode != 'CNY' || settlementdistar || !(form.status == '0' || form.status == '4' || form.status == null)"
         ></el-input-number>
         <span v-else>{{ row.currentAmountCNY }}</span>
@@ -34,13 +35,13 @@
       <template slot="reconciliationAmount" slot-scope="{ row }">
         <el-popover trigger="click">
           <avue-crud :data="rlaData" :option="rlaOption"></avue-crud>
-          <span style="color: #409EFF;cursor: pointer" slot="reference" @click="viewRLA(row, '对账')">{{ row.reconciliationAmount }}</span>
+          <span style="color: #409eff; cursor: pointer" slot="reference" @click="viewRLA(row, '对账')">{{ row.reconciliationAmount }}</span>
         </el-popover>
       </template>
       <template slot="reconciliationAmountUsd" slot-scope="{ row }">
         <el-popover trigger="click">
           <avue-crud :data="rlaData" :option="rlaOption"></avue-crud>
-          <span style="color: #409EFF;cursor: pointer" slot="reference" @click="viewRLA(row, '对账')">{{ row.reconciliationAmountUsd }}</span>
+          <span style="color: #409eff; cursor: pointer" slot="reference" @click="viewRLA(row, '对账')">{{ row.reconciliationAmountUsd }}</span>
         </el-popover>
       </template>
       <tempalte slot="currentAmountUSD" slot-scope="{ row }">
@@ -51,7 +52,7 @@
           :controls="false"
           placeholder="请输入 本次USD"
           size="mini"
-          style="width: 100%;"
+          style="width: 100%"
           :disabled="row.currentCurCode != 'USD'"
         ></el-input-number>
         <span v-else>{{ row.currentAmountUSD }}</span>
@@ -69,20 +70,20 @@ export default {
   props: {
     tableData: {
       type: Array,
-      default: []
+      default: [],
     },
     handleSelectionData: {
       type: Array,
-      default: []
+      default: [],
     },
     editSave: {
       type: Boolean,
-      default: false
+      default: false,
     },
     form: {
       type: Object,
-      default: {}
-    }
+      default: {},
+    },
   },
   data() {
     return {
@@ -96,33 +97,33 @@ export default {
             label: "来源单号",
             prop: "srcNo",
             width: "200",
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "来源类型",
             prop: "srcType",
             width: "80",
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "签收金额",
             prop: "signedAmount",
             width: "100",
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "签收人",
             prop: "consigneeName",
             width: "100",
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "签收时间",
             prop: "signingTime",
             width: "120",
-            overHidden: true
-          }
-        ]
+            overHidden: true,
+          },
+        ],
       },
       curCodeData: [], // 本次币种
       option: {},
@@ -140,6 +141,7 @@ export default {
         refreshBtn: false,
         index: true,
         selection: true,
+        highlightCurrentRow:true,
         align: "center",
         column: [
           {
@@ -150,14 +152,14 @@ export default {
             dicData: [
               {
                 label: "未开票",
-                value: 0
+                value: 0,
               },
               {
                 label: "已开票",
-                value: 1
-              }
+                value: 1,
+              },
             ],
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "收/付",
@@ -167,159 +169,162 @@ export default {
             dicData: [
               {
                 label: "收",
-                value: "D"
+                value: "D",
               },
               {
                 label: "付",
-                value: "C"
-              }
+                value: "C",
+              },
             ],
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "账单编号",
             prop: "accBillNo",
             width: 120,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "MB/L NO",
             prop: "mblno",
             width: 100,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "业务员",
             prop: "srcCnName",
             width: 80,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "操作人",
             prop: "operatorName",
             width: 80,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "本次CNY",
             prop: "currentAmountCNY",
             width: 100,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "本次USD",
             prop: "currentAmountUSD",
             width: 100,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "已签收CNY",
             prop: "reconciliationAmount",
             width: 100,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "已签收USD",
             prop: "reconciliationAmountUsd",
             width: 100,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "JOB NO",
             prop: "billNo",
             width: 100,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "BOOKINGNO",
             prop: "bookingNo",
             width: 120,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "费用名称",
             prop: "feeCnName",
             width: 80,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "客户名称",
             prop: "corpCnName",
             width: 120,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "账单金额",
             prop: "amount",
             width: 120,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "本次发票币种",
             prop: "currentCurCode",
             width: 100,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "本次发票汇率",
             prop: "currentExrate",
             width: 100,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "付费申请金额",
             prop: "appliedAmount",
             width: 100,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "发票申请金额",
             prop: "appliedInvoiceAmount",
             width: 100,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "已开票金额",
             prop: "uninvoicedAmount",
             width: 100,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "已结算金额",
             prop: "stlTtlAmount",
             width: 100,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "备注",
             prop: "remarks",
             width: 120,
-            overHidden: true
-          }
-        ]
+            overHidden: true,
+          },
+        ],
       },
       page: {
         currentPage: 1,
         total: 0,
         pageSize: 20,
-        pageSizes: [20, 50, 100, 200, 500]
+        pageSizes: [20, 50, 100, 200, 500,'ALL'],
       },
-      pageData: []
+      pageData: [],
     };
   },
   async created() {
     this.option = await this.getColumnData(this.getColumnName(494), this.optionBack);
   },
   methods: {
+    handleRowClick(row, event, column) {
+      this.$refs.crud.toggleRowSelection(row, true);
+    },
     viewRLA(row, type) {
       this.rlaData = [];
-      getListAll({ billId: row.accBillId, srcType: type }).then(res => {
+      getListAll({ billId: row.accBillId, srcType: type }).then((res) => {
         this.rlaData = res.data.data;
       });
     },
     sizeChange(val) {
       this.page.currentPage = 1;
-      this.page.pageSize = val;
+      this.page.pageSize = val?val:this.tableData.length;
       this.getList();
     },
     currentChange(val) {
@@ -332,6 +337,13 @@ export default {
       const end = start + this.page.pageSize;
       this.pageData = this.tableData.slice(start, end);
     },
+    refreshData() {
+      if (this.tableData.length) {
+        this.page.currentPage = 1;
+        this.pageData = [];
+        this.getList();
+      }
+    },
     armbChange(row) {
       if (Number(row.amount - row.reconciliationAmount) > 0) {
         if (Number(row.currentStlAmountRMB) < 0) {
@@ -400,7 +412,7 @@ export default {
     },
     // 获取币别数据
     getRateListfun(cnName) {
-      getRateList({ current: 1, size: 10, cnName }).then(res => {
+      getRateList({ current: 1, size: 10, cnName }).then((res) => {
         this.curCodeData = res.data.data.records;
       });
     },
@@ -429,7 +441,7 @@ export default {
           refsElTable.toggleRowSelection(this.tableData[index], true);
         }
       } else {
-        let findRow = this.handleSelectionData.find(c => c.rowIndex == row.rowIndex); //找出当前选中行
+        let findRow = this.handleSelectionData.find((c) => c.rowIndex == row.rowIndex); //找出当前选中行
         //如果只有一行且点击的也是这一行则取消选择 否则清空再选中当前点击行
         if (findRow && this.handleSelectionData.length === 1) {
           refsElTable.toggleRowSelection(row, false);
@@ -447,7 +459,7 @@ export default {
         //给每一行添加不可枚举属性rowIndex来标识当前行
         value: rowIndex, // 设置age的值,不设置的话默认为undefined
         writable: true, // 表示属性的值true可以修改,false不可以被修改
-        enumerable: false // 设置为false表示不能通过 for-in 循环返回
+        enumerable: false, // 设置为false表示不能通过 for-in 循环返回
         // configurable: false, // configurable 设置为 false,意味着这个属性不能从对象上删除
       });
     },
@@ -469,22 +481,22 @@ export default {
       if (n > mx) {
         return {
           top: mi,
-          bottom: n
+          bottom: n,
         };
       } else if (n < mx && n > mi) {
         return {
           top: mi,
-          bottom: n
+          bottom: n,
         };
       } else if (n < mi) {
         return {
           top: n,
-          bottom: mx
+          bottom: mx,
         };
       } else if (n == mi || n == mx) {
         return {
           top: mi,
-          bottom: mx
+          bottom: mx,
         };
       }
     },
@@ -492,7 +504,7 @@ export default {
     // 判断方式也是通过判断rowIndex对比
     rowClassName({ row, rowIndex }) {
       let rowName = "",
-        findRow = this.handleSelectionData.find(c => c.rowIndex === row.rowIndex);
+        findRow = this.handleSelectionData.find((c) => c.rowIndex === row.rowIndex);
       if (findRow) {
         rowName = "current-row "; // elementUI 默认高亮行的class类 不用再样式了^-^,也可通过css覆盖改变背景颜色
       }
@@ -525,7 +537,7 @@ export default {
         this.$message.success("重置成功");
         this.$refs[ref].$refs.dialogColumn.columnBox = false;
       }
-    }
+    },
   },
   mounted() {
     // 按住ctrl实现多选 设置监听keydown事件,以及keyup事件,
@@ -538,16 +550,16 @@ export default {
     removeEventListener("keyup", this.keyUp);
   },
   watch: {
-    tableData: {
-      // 执行方法
-      handler(oldValue, newValue) {
-        this.page.currentPage = 1;
-        this.pageData = [];
-        this.getList();
-      },
-      deep: true, // 深度监听
-      immediate: true // 第一次改变就执行
-    }
+    // tableData: {
+    //   // 执行方法
+    //   handler(oldValue, newValue) {
+    //     this.page.currentPage = 1;
+    //     this.pageData = [];
+    //     this.getList();
+    //   },
+    //   deep: true, // 深度监听
+    //   immediate: true, // 第一次改变就执行
+    // },
   },
   computed: {
     //实时得到最上行和最下行
@@ -562,8 +574,8 @@ export default {
       return this.handleSelectionData.reduce((start, end) => {
         return start.rowIndex < end.rowIndex ? start : end;
       });
-    }
-  }
+    },
+  },
 };
 </script>
 

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 149 - 141
src/views/iosBasicData/fininvoicesOutput/fininvoicesDetails.vue


Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio