修改对账中心需求

src/api/iosBasicData/finstlbills.js

@@ -332,3 +332,20 @@ export const getFeeList = (current, size, params) => {
     }
   })
 }
+
+// 清除未对账
+export const unclearedUnverified  = (data) => {
+  return request({
+    url: '/api/blade-los/finstlbills/unclearedUnverified',
+    method: 'get',
+    params: data
+  })
+}
+// 获取合并对账明细
+export const getMergeDetail  = (data) => {
+  return request({
+    url: '/api/blade-los/finstlbills/getMergeDetail',
+    method: 'get',
+    params: data
+  })
+}

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

@@ -35,6 +35,14 @@
           >批量删除</el-button
         >
         <el-button
+          type="text"
+          size="small"
+          :disabled="disabled || form.operatingStatus == 3 || form.status == 3"
+          @click="allClick('清除未对账')"
+          style="color: #409eff"
+          >清除未对账</el-button
+        >
+        <el-button
           size="small"
           type="text"
           :disabled="selectionList.length == 0 || form.status == 3 || disabled"
@@ -66,7 +74,13 @@
           style="color: #000"
           >撤销签收
         </el-button>
-        <!-- <el-button type="success" size="small" plain :disabled="selectionList.length == 0 || form.status == 3" @click="allClick('生成开票')"
+        <!--
+          <el-button
+          type="success"
+          size="small"
+          plain
+          :disabled="selectionList.length == 0 || form.status == 3"
+          @click="allClick('生成开票')"
           >生成开票</el-button
         >
         <el-button
@@ -76,11 +90,27 @@
           :disabled="!form.id || selectionList.length == 0 || form.status == 3"
           @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>
-        <el-tag type="success" style="margin-right: 2px; color: #000000">应付(USD):{{ amountCSubUsdSum || 0 }}</el-tag>
+        >
+        -->
+        <el-tag type="danger" style="margin-right: 2px; color: #f56c6c">应收(CNY):{{ amountDSubSum || 0 }}</el-tag>
+        <el-tag type="danger" style="margin-right: 2px; color: #f56c6c">应收(USD):{{ amountDSubUsdSum || 0 }}</el-tag>
+        <el-tag type="danger" style="margin-right: 2px; color: #000000">应付(CNY):{{ amountCSubSum || 0 }}</el-tag>
+        <el-tag type="danger" style="margin-right: 2px; color: #000000">应付(USD):{{ amountCSubUsdSum || 0 }}</el-tag>
+        <el-tag type="success" style="margin-right: 2px; color: #f56c6c">应收(CNY):{{ amountDSubSum2 || 0 }}</el-tag>
+        <el-tag type="success" style="margin-right: 2px; color: #f56c6c">应收(USD):{{ amountDSubUsdSum2 || 0 }}</el-tag>
+        <el-tag type="success" style="margin-right: 2px; color: #000000">应付(CNY):{{ amountCSubSum2 || 0 }}</el-tag>
+        <el-tag type="success" style="margin-right: 2px; color: #000000">应付(USD):{{ amountCSubUsdSum2 || 0 }}</el-tag>
+      </template>
+      <template slot="page">
+        <el-tag style="margin-right: 2px; color: #f56c6c">应收(CNY):{{ form.amountDr || 0 }}</el-tag>
+        <el-tag style="margin-right: 2px; color: #f56c6c">应收(USD):{{ form.amountDrUsd || 0 }}</el-tag>
+        <el-tag style="margin-right: 2px; color: #f56c6c">应收合计(CNY):{{ form.amountDrLoc || 0 }}</el-tag>
+        <el-tag style="margin-right: 2px; color: #000000">应付(CNY):{{ form.amountCr || 0 }}</el-tag>
+        <el-tag style="margin-right: 2px; color: #000000">应付(USD):{{ form.amountCrUsd || 0 }}</el-tag>
+        <el-tag style="margin-right: 2px; color: #000000">应付合计(CNY):{{ form.amountCrLoc || 0 }}</el-tag>
+      </template>
+      <template slot="customSelected" slot-scope="{ row }">
+        <el-checkbox v-model="row.customSelected" @change="customSelection(row)"> </el-checkbox>
       </template>
       <template slot="currentStlAmountRMB" slot-scope="{ row }">
         <el-input-number
@@ -163,6 +193,8 @@ import {
   batchRevokeReconciliation,
   generateFinInvoicesDetail,
   revokeFinInvoicesDetail,
+  unclearedUnverified,
+  getMergeDetail,
 } from "@/api/iosBasicData/finstlbills";
 import { getListAll } from "@/api/iosBasicData/finstlbills";
 import feeInfo from "./feeInfo.vue";
@@ -173,6 +205,10 @@ export default {
       amountDSubUsdSum: 0,
       amountCSubSum: 0,
       amountCSubUsdSum: 0,
+      amountDSubSum2: 0,
+      amountDSubUsdSum2: 0,
+      amountCSubSum2: 0,
+      amountCSubUsdSum2: 0,
       rlaData: [],
       rlaOption: {
         header: false,
@@ -230,19 +266,32 @@ export default {
         rowKey: "accBillId",
         reserveSelection: true, // 翻页时，已选的行不丢失
         selection: true,
+        showSummary: true,
+        sumColumnList: [
+          {
+            name: "currentStlAmountRMB",
+            type: "sum",
+            decimals: 2,
+          },
+          {
+            name: "currentStlAmountUSD",
+            type: "sum",
+            decimals: 2,
+          },
+        ],
         column: [
           {
             label: "账单编号",
             prop: "accBillNo",
             width: 120,
-            sortable:true,
+            sortable: true,
             overHidden: true,
           },
           {
             label: "业务编号",
             prop: "billNo",
             width: 120,
-            sortable:true,
+            sortable: true,
             overHidden: true,
           },
           {
@@ -255,14 +304,20 @@ export default {
             label: "对账单位",
             prop: "corpCnName",
             width: 140,
-            sortable:true,
+            sortable: true,
+            overHidden: true,
+          },
+          {
+            label: "选择",
+            prop: "customSelected",
+            width: 60,
             overHidden: true,
           },
           {
             label: "主单号",
             prop: "mblno",
             width: 100,
-            sortable:true,
+            sortable: true,
             overHidden: true,
           },
           {
@@ -480,8 +535,10 @@ export default {
       },
       pageData: [],
       selectionList: [],
+      customselectList: [],
       isShiftPressed: false, // 键盘状态
       lastSelectedRowIndex: null,
+      lastCustomSelectedRowIndex: null,
     };
   },
   components: { feeInfo },
@@ -527,23 +584,43 @@ export default {
       }
     },
     handleRowClick(row, event, column) {
+      // const currentIndex = this.pageData.indexOf(row); // 获取当前行索引
+      // if (this.isShiftPressed && this.lastSelectedRowIndex != null) {
+      //   const start = Math.min(this.lastSelectedRowIndex, currentIndex);
+      //   const end = Math.max(this.lastSelectedRowIndex, currentIndex);
+      //   this.$refs.crud.selectClear(); // 清空历史选中
+      //   setTimeout(() => {
+      //     for (let i = start; i <= end; i++) {
+      //       this.$refs.crud.toggleRowSelection(this.pageData[i], true);
+      //     }
+      //   }, 10);
+      //   this.lastSelectedRowIndex = currentIndex; // 更新起始行索引
+      // } else {
+      //   // 普通点击：清空选中并设置起始行
+      //   // this.$refs.crud.selectClear(); // 清空历史选中
+      //   this.$refs.crud.toggleRowSelection(row, true); // 选中当前行
+      //   this.lastSelectedRowIndex = currentIndex; // 更新起始行索引
+      // }
+    },
+    customSelection(row) {
+      //  lastCustomSelectedRowIndex
       const currentIndex = this.pageData.indexOf(row); // 获取当前行索引
-      if (this.isShiftPressed && this.lastSelectedRowIndex != null) {
-        const start = Math.min(this.lastSelectedRowIndex, currentIndex);
-        const end = Math.max(this.lastSelectedRowIndex, currentIndex);
-        this.$refs.crud.selectClear(); // 清空历史选中
+      if (this.isShiftPressed && this.lastCustomSelectedRowIndex != null) {
+        const start = Math.min(this.lastCustomSelectedRowIndex, currentIndex);
+        const end = Math.max(this.lastCustomSelectedRowIndex, currentIndex);
+        this.pageData.forEach((item) => {
+          item.customSelected = false;
+        });
         setTimeout(() => {
           for (let i = start; i <= end; i++) {
-            this.$refs.crud.toggleRowSelection(this.pageData[i], true);
+            this.$set(this.pageData[i], "customSelected", true);
           }
+          this.customselectList = this.pageData.filter((item) => item.customSelected == true);
         }, 10);
-
-        this.lastSelectedRowIndex = currentIndex; // 更新起始行索引
+        this.lastCustomSelectedRowIndex = currentIndex; // 更新起始行索引
       } else {
-        // 普通点击：清空选中并设置起始行
-        // this.$refs.crud.selectClear(); // 清空历史选中
-        this.$refs.crud.toggleRowSelection(row, true); // 选中当前行
-        this.lastSelectedRowIndex = currentIndex; // 更新起始行索引
+        this.lastCustomSelectedRowIndex = currentIndex; // 更新起始行索引
+        this.customselectList = this.pageData.filter((item) => item.customSelected == true);
       }
     },
     select(list, row) {
@@ -595,11 +672,27 @@ export default {
       }
     },
     refreshData() {
-      if (this.tableData.length) {
-        this.page.currentPage = 1;
-        this.pageData = [];
-        this.getList();
+      this.page.currentPage = 1;
+      this.pageData = [];
+      this.getList();
+    },
+    search() {
+      if (!this.form.id) {
+        return this.$message.error("请保存数据再进行查询");
       }
+      let obj = {
+        billId: this.form.id,
+        billNo: this.form.duizhangNo,
+      };
+      getMergeDetail(obj).then((res) => {
+        if (res.data.data.finStlBillsItemsList.length == 0) {
+          this.$message.success("当前检索暂无数据！");
+        } else {
+          this.$message.success("操作成功");
+          this.$refs.crud.selectClear(); // 清空历史选中
+          this.$emit("update", this.form.id);
+        }
+      });
     },
     armbChange(row) {
       if (Number(row.amount - row.reconciliationAmount) > 0) {
@@ -640,7 +733,7 @@ export default {
     allClick(name) {
       if (name == "一键编辑") {
         for (let row of this.tableData) {
-          if (row.isChecked == 0 && row.status == 0) {
+          if (row.isSignfor != 1 && row.status == 0) {
             this.$set(row, "$cellEdit", true);
           }
         }
@@ -701,6 +794,32 @@ export default {
           }
         });
       }
+      if (name == "清除未对账") {
+        this.$confirm("是否继续操作?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        }).then(() => {
+          let obj = {
+            billId: this.form.id,
+          };
+          const loading = this.$loading({
+            lock: true,
+            text: "加载中",
+            spinner: "el-icon-loading",
+            background: "rgba(255,255,255,0.7)",
+          });
+          unclearedUnverified(obj)
+            .then((res) => {
+              this.$message.success("操作成功");
+              this.$refs.crud.selectClear(); // 清空历史选中
+              this.$emit("update", this.form.id);
+            })
+            .finally(() => {
+              loading.close();
+            });
+        });
+      }
       if (name == "批量对账") {
         if (this.selectionList.length === 0) {
           this.$message.error("请选择至少一条数据");
@@ -735,6 +854,7 @@ export default {
           batchConfirmReconciliation(obj)
             .then((res) => {
               this.$message.success("操作成功");
+              this.$refs.crud.selectClear(); // 清空历史选中
               this.$emit("update", this.form.id, "对账");
             })
             .finally(() => {
@@ -779,6 +899,7 @@ export default {
           batchRevokeReconciliation(obj)
             .then((res) => {
               this.$message.success("操作成功");
+              this.$refs.crud.selectClear(); // 清空历史选中
               this.$emit("update", this.form.id, "对账");
             })
             .finally(() => {
@@ -823,6 +944,7 @@ export default {
           finstlbillsConfirmSignFor(obj)
             .then((res) => {
               this.$message.success("操作成功");
+              this.$refs.crud.selectClear(); // 清空历史选中
               this.$emit("update", this.form.id);
             })
             .finally(() => {
@@ -864,6 +986,7 @@ export default {
           finstlbillsRevokeSignFor(obj)
             .then((res) => {
               this.$message.success("操作成功");
+              this.$refs.crud.selectClear(); // 清空历史选中
               this.$emit("update", this.form.id);
             })
             .finally(() => {
@@ -1012,7 +1135,7 @@ export default {
       let rowName = "",
         findRow = this.selectionList.find((c) => c.$index === rowIndex);
       if (findRow) {
-        rowName = "current-row"; // elementUI 默认高亮行的class类 不用再样式了^-^,也可通过css覆盖改变背景颜色
+        rowName = "selected-row";
       }
       return rowName; //也可以再加上其他类名 如果有需求的话
     },
@@ -1070,6 +1193,29 @@ export default {
       deep: true, // 深度监听
       immediate: true, // 第一次改变就执行
     },
+    customselectList: {
+      // 执行方法
+      handler(oldValue, newValue) {
+        this.amountDSubSum2 = 0;
+        this.amountDSubUsdSum2 = 0;
+        this.amountCSubSum2 = 0;
+        this.amountCSubUsdSum2 = 0;
+        if (oldValue.length) {
+          oldValue.forEach((e) => {
+            if (e.dc == "D") {
+              this.amountDSubSum2 += Number(e.currentStlAmountRMB ? e.currentStlAmountRMB : 0);
+              this.amountDSubUsdSum2 += Number(e.currentStlAmountUSD ? e.currentStlAmountUSD : 0);
+            }
+            if (e.dc == "C") {
+              this.amountCSubSum2 += Number(e.currentStlAmountRMB ? e.currentStlAmountRMB : 0);
+              this.amountCSubUsdSum2 += Number(e.currentStlAmountUSD ? e.currentStlAmountUSD : 0);
+            }
+          });
+        }
+      },
+      deep: true, // 深度监听
+      immediate: true, // 第一次改变就执行
+    },
   },
 };
 </script>
@@ -1078,7 +1224,7 @@ export default {
 .el-button--text.is-disabled {
   color: #c0c4cc !important;
 }
-.current-row {
-  background: #a0cfff !important;
+::v-deep .el-table .selected-row td {
+  background-color: #e1f3d8 !important;
 }
 </style>

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

@@ -19,10 +19,17 @@
       <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>
-        <el-tag type="success" style="margin-right: 2px; color: #000000">应付(USD):{{ amountCSubUsdSum || 0 }}</el-tag>
+        <el-tag type="danger" style="margin-right: 2px; color: #f56c6c">应收(CNY):{{ amountDSubSum || 0 }}</el-tag>
+        <el-tag type="danger" style="margin-right: 2px; color: #f56c6c">应收(USD):{{ amountDSubUsdSum || 0 }}</el-tag>
+        <el-tag type="danger" style="margin-right: 2px; color: #000000">应付(CNY):{{ amountCSubSum || 0 }}</el-tag>
+        <el-tag type="danger" style="margin-right: 2px; color: #000000">应付(USD):{{ amountCSubUsdSum || 0 }}</el-tag>
+        <el-tag type="success" style="margin-right: 2px; color: #f56c6c">应收(CNY):{{ amountDSubSum2 || 0 }}</el-tag>
+        <el-tag type="success" style="margin-right: 2px; color: #f56c6c">应收(USD):{{ amountDSubUsdSum2 || 0 }}</el-tag>
+        <el-tag type="success" style="margin-right: 2px; color: #000000">应付(CNY):{{ amountCSubSum2 || 0 }}</el-tag>
+        <el-tag type="success" style="margin-right: 2px; color: #000000">应付(USD):{{ amountCSubUsdSum2 || 0 }}</el-tag>
+      </template>
+      <template slot="customSelected" slot-scope="{ row }">
+        <el-checkbox v-model="row.customSelected" @change="customSelection(row)"> </el-checkbox>
       </template>
       <template slot="currentStlAmountRMB" slot-scope="{ row }">
         <el-input-number
@@ -103,6 +110,10 @@ export default {
       amountDSubUsdSum: 0,
       amountCSubSum: 0,
       amountCSubUsdSum: 0,
+      amountDSubSum2: 0,
+      amountDSubUsdSum2: 0,
+      amountCSubSum2: 0,
+      amountCSubUsdSum2: 0,
       rlaData: [],
       rlaOption: {
         header: false,
@@ -166,14 +177,14 @@ export default {
             label: "账单编号",
             prop: "accBillNo",
             width: 120,
-            sortable:true,
+            sortable: true,
             overHidden: true,
           },
           {
             label: "业务编号",
             prop: "billNo",
             width: 120,
-            sortable:true,
+            sortable: true,
             overHidden: true,
           },
           {
@@ -186,14 +197,20 @@ export default {
             label: "对账单位",
             prop: "corpCnName",
             width: 140,
-            sortable:true,
+            sortable: true,
+            overHidden: true,
+          },
+          {
+            label: "选择",
+            prop: "customSelected",
+            width: 60,
             overHidden: true,
           },
           {
             label: "主单号",
             prop: "mblno",
             width: 100,
-            sortable:true,
+            sortable: true,
             overHidden: true,
           },
           {
@@ -409,8 +426,10 @@ export default {
       lastSelectedRow: null,
       lastSelectionRange: null, // {startIndex, endIndex}
       selectionList: [],
+      customselectList:[],
       isShiftPressed: false, // 键盘状态
       lastSelectedRowIndex: null,
+      lastCustomSelectedRowIndex: null,
     };
   },
   props: {
@@ -455,23 +474,43 @@ export default {
       }
     },
     handleRowClick(row, event, column) {
+      // const currentIndex = this.pageData.indexOf(row); // 获取当前行索引
+      // if (this.isShiftPressed && this.lastSelectedRowIndex != null) {
+      //   const start = Math.min(this.lastSelectedRowIndex, currentIndex);
+      //   const end = Math.max(this.lastSelectedRowIndex, currentIndex);
+      //   this.$refs.crud.selectClear(); // 清空历史选中
+      //   setTimeout(() => {
+      //     for (let i = start; i <= end; i++) {
+      //       this.$refs.crud.toggleRowSelection(this.pageData[i], true);
+      //     }
+      //   }, 10);
+      //   this.lastSelectedRowIndex = currentIndex; // 更新起始行索引
+      // } else {
+      //   // 普通点击：清空选中并设置起始行
+      //   // this.$refs.crud.selectClear(); // 清空历史选中
+      //   this.$refs.crud.toggleRowSelection(row, true); // 选中当前行
+      //   this.lastSelectedRowIndex = currentIndex; // 更新起始行索引
+      // }
+    },
+    customSelection(row) {
+      //  lastCustomSelectedRowIndex
       const currentIndex = this.pageData.indexOf(row); // 获取当前行索引
-      if (this.isShiftPressed && this.lastSelectedRowIndex != null) {
-        const start = Math.min(this.lastSelectedRowIndex, currentIndex);
-        const end = Math.max(this.lastSelectedRowIndex, currentIndex);
-        this.$refs.crud.selectClear(); // 清空历史选中
+      if (this.isShiftPressed && this.lastCustomSelectedRowIndex != null) {
+        const start = Math.min(this.lastCustomSelectedRowIndex, currentIndex);
+        const end = Math.max(this.lastCustomSelectedRowIndex, currentIndex);
+        this.pageData.forEach((item) => {
+          item.customSelected = false;
+        });
         setTimeout(() => {
           for (let i = start; i <= end; i++) {
-            this.$refs.crud.toggleRowSelection(this.pageData[i], true);
+            this.$set(this.pageData[i], "customSelected", true);
           }
+          this.customselectList = this.pageData.filter((item) => item.customSelected == true);
         }, 10);
-
-        this.lastSelectedRowIndex = currentIndex; // 更新起始行索引
+        this.lastCustomSelectedRowIndex = currentIndex; // 更新起始行索引
       } else {
-        // 普通点击：清空选中并设置起始行
-        // this.$refs.crud.selectClear(); // 清空历史选中
-        this.$refs.crud.toggleRowSelection(row, true); // 选中当前行
-        this.lastSelectedRowIndex = currentIndex; // 更新起始行索引
+        this.lastCustomSelectedRowIndex = currentIndex; // 更新起始行索引
+        this.customselectList = this.pageData.filter((item) => item.customSelected == true);
       }
     },
     select(list, row) {
@@ -599,7 +638,7 @@ export default {
         });
         finstlbillsSubmit(obj)
           .then((res) => {
-            this.$refs.crud.toggleSelection()
+            this.$refs.crud.toggleSelection();
             this.$message.success("操作成功");
             this.$emit("update", res.data.data.id, "query");
           })
@@ -697,7 +736,7 @@ export default {
       let rowName = "",
         findRow = this.selectionList.find((c) => c.$index === rowIndex);
       if (findRow) {
-        rowName = "current-row "; // elementUI 默认高亮行的class类 不用再样式了^-^,也可通过css覆盖改变背景颜色
+        rowName = "selected-row"; // elementUI 默认高亮行的class类 不用再样式了^-^,也可通过css覆盖改变背景颜色
       }
       return rowName; //也可以再加上其他类名 如果有需求的话
     },
@@ -754,6 +793,29 @@ export default {
       deep: true, // 深度监听
       immediate: true, // 第一次改变就执行
     },
+    customselectList: {
+      // 执行方法
+      handler(oldValue, newValue) {
+        this.amountDSubSum2 = 0;
+        this.amountDSubUsdSum2 = 0;
+        this.amountCSubSum2 = 0;
+        this.amountCSubUsdSum2 = 0;
+        if (oldValue.length) {
+          oldValue.forEach((e) => {
+            if (e.dc == "D") {
+              this.amountDSubSum2 += Number(e.currentStlAmountRMB ? e.currentStlAmountRMB : 0);
+              this.amountDSubUsdSum2 += Number(e.currentStlAmountUSD ? e.currentStlAmountUSD : 0);
+            }
+            if (e.dc == "C") {
+              this.amountCSubSum2 += Number(e.currentStlAmountRMB ? e.currentStlAmountRMB : 0);
+              this.amountCSubUsdSum2 += Number(e.currentStlAmountUSD ? e.currentStlAmountUSD : 0);
+            }
+          });
+        }
+      },
+      deep: true, // 深度监听
+      immediate: true, // 第一次改变就执行
+    },
   },
 };
 </script>
@@ -762,7 +824,7 @@ export default {
 .el-button--text.is-disabled {
   color: #c0c4cc !important;
 }
-.current-row {
-  background: #a0cfff !important;
+::v-deep .el-table .selected-row td {
+  background-color: #E1F3D8 !important;
 }
 </style>

src/views/iosBasicData/financialManagement/finstlbills/detailsPage.vue

@@ -80,9 +80,9 @@
               <el-option v-for="item in dcOptions" :key="item.value" :label="item.label" :value="item.value"> </el-option>
             </el-select>
           </tempalte>
-          <tempalte slot="updateUserName">
+          <tempalte slot="operatorName">
             <dic-select
-              v-model="form.updateUserName"
+              v-model="form.operatorName"
               placeholder="操作员"
               label="name"
               res="records"
@@ -90,7 +90,7 @@
               :filterable="true"
               :remote="true"
               dataName="account"
-              @selectChange="dicChange('updateUserName', $event)"
+              @selectChange="dicChange('operatorName', $event)"
               :disabled="editDisabled"
             ></dic-select>
           </tempalte>
@@ -254,34 +254,24 @@ export default {
             disabled: false,
           },
           {
-            label: "审核",
-            prop: "isApproved",
-            type: "select",
-            clearable: false,
-            dicData: [
-              {
-                label: "全部",
-                value: 2,
-              },
-              {
-                label: "是",
-                value: 1,
-              },
-              {
-                label: "否",
-                value: 0,
-              },
-            ],
-            disabled: false,
-            value: 2,
-            span: 4,
-          },
-          {
             label: "对账单位",
             prop: "corpCnName",
             disabled: false,
           },
           {
+            label: "简称/编码",
+            prop: "corpShortName",
+            disabled: true,
+            span: 3,
+          },
+          {
+            label: "",
+            labelWidth: 0,
+            prop: "corpCode",
+            disabled: true,
+            span: 2,
+          },
+          {
             label: "账期备注",
             prop: "corpAccRemarks",
             disabled: true,
@@ -296,27 +286,6 @@ export default {
             label: "预收账款",
             prop: "advanceFromCustomers",
             disabled: true,
-          },
-          {
-            label: "签收",
-            prop: "isSignfor",
-            type: "select",
-            clearable: false,
-            dicData: [
-              {
-                label: "全部",
-                value: 2,
-              },
-              {
-                label: "是",
-                value: 1,
-              },
-              {
-                label: "否",
-                value: 0,
-              },
-            ],
-            disabled: false,
             span: 4,
           },
         ],
@@ -359,14 +328,22 @@ export default {
             span: 2,
           },
           {
-            label: "操作员",
-            prop: "updateUserName",
+            label: "操作/业务",
+            prop: "operatorName",
             disabled: false,
+            span: 3,
           },
           {
-            label: "业务员",
+            label: "",
+            labelWidth: 0,
             prop: "srcCnName",
             disabled: false,
+            span: 2,
+          },
+          {
+            label: "对账号",
+            prop: "duizhangNo",
+            disabled: false,
           },
           {
             label: "业务类型",
@@ -389,8 +366,33 @@ export default {
             disabled: false,
           },
           {
-            label: "对账",
-            prop: "isChecked",
+            label: "审核",
+            prop: "isApproved",
+            labelWidth: 40,
+            type: "select",
+            clearable: false,
+            dicData: [
+              {
+                label: "全部",
+                value: 2,
+              },
+              {
+                label: "是",
+                value: 1,
+              },
+              {
+                label: "否",
+                value: 0,
+              },
+            ],
+            disabled: false,
+            value: 2,
+            span: 2,
+          },
+          {
+            label: "发票",
+            prop: "isInvoice",
+            labelWidth: 40,
             clearable: false,
             type: "select",
             dicData: [
@@ -408,8 +410,9 @@ export default {
               },
             ],
             disabled: false,
-            span: 4,
+            span: 2,
           },
+
           {
             label: "业务编号",
             prop: "businessNo",
@@ -431,8 +434,9 @@ export default {
             disabled: false,
           },
           {
-            label: "销账",
-            prop: "isCleared",
+            label: "对账",
+            prop: "isChecked",
+            labelWidth: 40,
             clearable: false,
             type: "select",
             dicData: [
@@ -450,7 +454,30 @@ export default {
               },
             ],
             disabled: false,
-            span: 4,
+            span: 2,
+          },
+          {
+            label: "签收",
+            prop: "isSignfor",
+            labelWidth: 40,
+            type: "select",
+            clearable: false,
+            dicData: [
+              {
+                label: "全部",
+                value: 2,
+              },
+              {
+                label: "是",
+                value: 1,
+              },
+              {
+                label: "否",
+                value: 0,
+              },
+            ],
+            disabled: false,
+            span: 2,
           },
           {
             label: "ETD期间",
@@ -467,6 +494,7 @@ export default {
             prop: "signForDate", //signForDate只是插槽值 字段为 signForDateStart signForDateEnd
             disabled: false,
           },
+
           {
             label: "费用名称",
             prop: "feeCnName",
@@ -483,8 +511,9 @@ export default {
             disabled: false,
           },
           {
-            label: "发票",
-            prop: "isInvoice",
+            label: "销账",
+            prop: "isCleared",
+            labelWidth: 40,
             clearable: false,
             type: "select",
             dicData: [
@@ -502,7 +531,7 @@ export default {
               },
             ],
             disabled: false,
-            span: 4,
+            span: 2,
           },
           {
             label: "船名",
@@ -631,8 +660,8 @@ export default {
     inEdit() {
       this.editButton = false;
       //管理员 允许修改他人业务 本人单据可以编辑
-      if (this.roleName.includes("admin") || this.roleName.includes("允许修改他人业务") || this.saberUserInfo.user_id == this.form.createUser) {
-        if (this.form.finStlBillsItemsList.filter((item) => item.isChecked == 1).length == 0) {
+      if (this.form.status != 3 && this.form.operatingStatus != 3) {
+        if (this.roleName.includes("admin") || this.roleName.includes("允许修改他人业务") || this.saberUserInfo.user_id == this.form.createUser) {
           this.editDisabled = false;
           this.optionForm.disabled = false;
           this.optionForm2.disabled = false;
@@ -660,6 +689,9 @@ export default {
         pageLabel: "对账中心(J)",
       };
       if (name == "付费申请") {
+        if (this.form.finStlBillsItemsList.filter((item) => item.dc == "C").length == 0) {
+          return this.$message.error("费用明细没有付费数据");
+        }
         this.$refs.cashier.openDialog(this.form, this.form.finStlBillsItemsList, "auto");
         // const loading = this.$loading({
         //   lock: true,
@@ -734,6 +766,8 @@ export default {
         if (row) {
           this.form.corpId = row.id;
           this.form.corpEnName = row.enName;
+          this.form.corpCode = row.code;
+          this.form.corpShortName = row.shortName;
           this.form.corpArgreementNo = row.enName;
           this.form.limitedAmount = null;
           this.form.corpAccRemarks = null;
@@ -759,6 +793,8 @@ export default {
           });
         } else {
           this.form.corpId = null;
+          this.form.corpCode = null;
+          this.form.corpShortName = null;
           this.form.corpEnName = null;
           this.form.corpCnName = null;
           this.form.corpArgreementNo = null;
@@ -769,12 +805,12 @@ export default {
           this.form.isSignedPersonName = null;
         }
       }
-      if (name == "updateUserName") {
+      if (name == "operatorName") {
         if (row) {
-          this.form.updateUser = row.id;
+          this.form.operatorId = row.id;
         } else {
-          this.form.updateUser = null;
-          this.form.updateUserName = null;
+          this.form.operatorId = null;
+          this.form.operatorName = null;
         }
       }
       if (name == "srcCnName") {
@@ -793,9 +829,15 @@ export default {
         this.$refs.advance.openDialog(this.form);
       }
       if (name == "检索") {
-        this.activeName = "1";
-        //直接检索
-        this.$refs.queryData.search(name);
+        if (this.form.duizhangNo) {
+          this.activeName = "2";
+          //查对账号
+          this.$refs.pickedData.search(name);
+        } else {
+          this.activeName = "1";
+          //直接检索
+          this.$refs.queryData.search(name);
+        }
       }
       if (name == "重置条件") {
         await this.$refs.avueForm.resetForm();
@@ -866,6 +908,7 @@ export default {
           finstlbillsRevokeReconciliation(obj)
             .then((res) => {
               this.$message.success("操作成功");
+              this.editButton = true;
               this.getDetail(this.form.id);
             })
             .finally(() => {
@@ -895,6 +938,7 @@ export default {
             revokeSettlementApprove(obj)
               .then((res) => {
                 this.$message.success("操作成功");
+                this.editButton = true;
                 this.getDetail(this.form.id);
               })
               .finally(() => {
@@ -961,7 +1005,7 @@ export default {
         curCode: this.form.curCode, // 币别
         srcId: this.form.srcId, // 业务员id
         isCleared: this.form.isCleared, // 是否销账（0 未销账 3 部分销账 9 销账）
-        accBillNo: this.form.accountNo, // 账单编号  ACCT NO
+        // accBillNo: this.form.accountNo, // 账单编号  ACCT NO
         billNo: this.form.businessNo, // 单据编号  JOB NO
         mblno: this.form.mblno, // 主单号
         hblno: this.form.hblno, // 分单号
@@ -1033,7 +1077,6 @@ export default {
       });
       finstlbillsConfirmReconciliation(obj)
         .then((res) => {
-          this.$message.success("操作成功");
           this.getDetail(this.form.id);
         })
         .finally(() => {
@@ -1072,9 +1115,9 @@ export default {
         });
     },
     submit() {
-      if (!this.form.corpId) {
-        return this.$message.error("请选择对账单位");
-      }
+      // if (!this.form.corpId) {
+      //   return this.$message.error("请选择对账单位");
+      // }
       for (let item of this.form.finInvoiceItemDetailList) {
         if (!item.invoiceCompanyId) {
           return this.$message.error("发票抬头不能为空");
@@ -1134,6 +1177,7 @@ export default {
       finstlbillsDetail(id)
         .then((res) => {
           res.data.data.finStlBillsItemsList.forEach((item) => {
+            item.customSelected = false;
             if (item.curCode == "CNY") {
               this.$set(item, "amountRMB", item.amount);
               this.$set(item, "currentInvoiceAmountRMB", Number(item.currentInvoiceAmount ? item.currentInvoiceAmount : 0));
@@ -1152,17 +1196,10 @@ 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;
-              this.optionForm.disabled = true;
-              this.optionForm2.disabled = true;
-            }
-            if (res.data.data.finStlBillsItemsList.length && res.data.data.finStlBillsItemsList.filter((item) => item.isChecked == 1).length == 0) {
-              this.editDisabled = false;
-              this.optionForm.disabled = false;
-              this.optionForm2.disabled = false;
-            }
+          if (res.data.data.status == 3 || res.data.data.operatingStatus == 3) {
+            this.editDisabled = true;
+            this.optionForm.disabled = true;
+            this.optionForm2.disabled = true;
           }
           this.form = res.data.data;
           if (type == "query") {