优化对账

src/views/iosBasicData/ComputationCenter/index.vue

@@ -38,9 +38,9 @@
           <el-button v-if="tabsValue == 'CHK'" type="primary" size="small" plain @click="chooseSettlement()">选择结算 </el-button>
           <!-- <el-button v-if="tabsValue == '业务单据'" type="primary" size="small" plain @click="addfun()">添加单据 </el-button> -->
           <el-button v-if="tabsValue == '业务单据'" type="danger" size="small" plain @click="handleDelete()">一键删除 </el-button>
-          <span style="font-size: 24px;font-weight: 600;">
-            <span style="color: #67C23A;margin-right: 10px;"> CNY:￥{{ amountSubSum.toFixed(2) }}元 </span>
-            <span style="color: #E6A23C;"> USD:${{ amountSubUsdSum.toFixed(2) }}元 </span>
+          <span style="font-size: 24px; font-weight: 600">
+            <span style="color: #67c23a; margin-right: 10px"> CNY:￥{{ amountSubSum.toFixed(2) }}元 </span>
+            <span style="color: #e6a23c"> USD:${{ amountSubUsdSum.toFixed(2) }}元 </span>
           </span>
         </template>
         <tempalte slot="feeCnNameSearch">
@@ -153,7 +153,7 @@ export default {
       page: {
         pageSize: 100,
         currentPage: 1,
-        total: 0
+        total: 0,
       },
       query: {}, // 检索条件
       data: [], // 数据
@@ -180,10 +180,18 @@ export default {
         menuWidth: "100",
         column: [
           {
+            label: "单据编号",
+            prop: "billNo",
+            width: 120,
+            search: true,
+            overHidden: true,
+          },
+          
+          {
             label: "单据类型",
             prop: "operatingType",
             width: 100,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "往来单位",
@@ -199,9 +207,9 @@ export default {
             props: {
               label: "cnName",
               value: "cnName",
-              res: "data.records"
+              res: "data.records",
             },
-            width: 140
+            width: 140,
           },
           {
             label: "MB/L NO",
@@ -209,7 +217,7 @@ export default {
             width: 120,
             search: true,
             searchOrder: 2,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "JOB NO",
@@ -217,7 +225,7 @@ export default {
             width: 120,
             search: true,
             searchOrder: 3,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "HB/L NO",
@@ -225,7 +233,7 @@ export default {
             width: 120,
             search: true,
             searchOrder: 4,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "ACCT NO",
@@ -233,46 +241,26 @@ export default {
             width: 120,
             search: true,
             searchOrder: 5,
-            overHidden: true
-          },
-          {
-            label: "来源类型",
-            prop: "srcType",
-            width: 100,
-            overHidden: true
-          },
-          {
-            label: "单据编号",
-            prop: "billNo",
-            width: 120,
-            search: true,
-            overHidden: true
-          },
-          {
-            label: "来源单号",
-            prop: "requestNo",
-            width: 120,
-            search: true,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "费用名称",
             prop: "feeCnName",
             width: 100,
             search: true,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "申请人",
             prop: "createUserName",
             width: 100,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "结算日期",
             prop: "billDate",
             width: 140,
-            overHidden: true
+            overHidden: true,
           },
 
           {
@@ -284,7 +272,7 @@ export default {
             searchLabelWidth: "100",
             type: "date",
             format: "yyyy-MM-dd",
-            valueFormat: "yyyy-MM-dd HH:mm:ss"
+            valueFormat: "yyyy-MM-dd HH:mm:ss",
           },
           {
             label: "结算日期止",
@@ -295,7 +283,7 @@ export default {
             searchLabelWidth: "100",
             type: "date",
             format: "yyyy-MM-dd",
-            valueFormat: "yyyy-MM-dd HH:mm:ss"
+            valueFormat: "yyyy-MM-dd HH:mm:ss",
           },
           {
             label: "单据开始日期",
@@ -306,7 +294,7 @@ export default {
             searchLabelWidth: "100",
             type: "date",
             format: "yyyy-MM-dd",
-            valueFormat: "yyyy-MM-dd HH:mm:ss"
+            valueFormat: "yyyy-MM-dd HH:mm:ss",
           },
           {
             label: "单据结束日期",
@@ -317,31 +305,7 @@ export default {
             searchLabelWidth: "100",
             type: "date",
             format: "yyyy-MM-dd",
-            valueFormat: "yyyy-MM-dd HH:mm:ss"
-          },
-          // {
-          //     label: "单据日期",
-          //     prop: "billDate",
-          //     search:true,
-          //     overHidden:true,
-          //     searchProp: 'billDateList',
-          //     type: "daterange",
-          //     searchRange: true,
-          //     searchDefaultTime: ["00:00:00", "23:59:59"],
-          //     format: "yyyy-MM-dd",
-          //     valueFormat: "yyyy-MM-dd HH:mm:ss"
-          // },
-          {
-            label: "提交日期",
-            prop: "auditDateFrom",
-            width: 140,
-            overHidden: true
-          },
-          {
-            label: "审核日期",
-            prop: "auditDateTo",
-            width: 140,
-            overHidden: true
+            valueFormat: "yyyy-MM-dd HH:mm:ss",
           },
           {
             label: "收/付",
@@ -352,59 +316,46 @@ export default {
             dicData: [
               {
                 id: "C",
-                name: "付款"
+                name: "付款",
               },
               {
                 id: "D",
-                name: "收款"
-              }
+                name: "收款",
+              },
             ],
             props: {
               label: "name",
-              value: "id"
+              value: "id",
             },
-            overHidden: true
-          },
-          {
-            label: "对账单号",
-            prop: "checkNo",
-            search: true,
-            width: 100,
-            searchOrder: 6,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "船名",
             prop: "vesselCnName",
             search: true,
             searchOrder: 7,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "航次",
             prop: "voyageNo",
             search: true,
             searchOrder: 8,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "CNY",
             prop: "amountSub",
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "USD",
             prop: "amountSubUsd",
-            overHidden: true
+            overHidden: true,
           },
-          {
-            label: "事由",
-            prop: "remarks",
-            overHidden: true
-          }
-        ]
+        ],
       },
-      saberUserInfo: {} // 当前登录人个人信息
+      saberUserInfo: {}, // 当前登录人个人信息
     };
   },
   async created() {
@@ -433,13 +384,13 @@ export default {
   methods: {
     // 获取业务类型
     bbusinesstypeListfun() {
-      bbusinesstypeList(1, 50).then(res => {
+      bbusinesstypeList(1, 50).then((res) => {
         this.findObject(this.option.column, "businessType").dicData = res.data.data.records;
       });
     },
     // 获取往来单位数据
     getBcorpslistByTypefun() {
-      getBcorpslistByType(1, 10).then(res => {
+      getBcorpslistByType(1, 10).then((res) => {
         this.findObject(this.option.column, "corpCnName").dicData = res.data.data.records;
       });
     },
@@ -452,9 +403,9 @@ export default {
       this.$confirm("确定将选择数据结算?", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning"
+        type: "warning",
       }).then(() => {
-        let arrId = this.selectionList.map(item => {
+        let arrId = this.selectionList.map((item) => {
           return item.id;
         });
         this.isShow = false;
@@ -471,13 +422,13 @@ export default {
       this.$confirm("是否撤销对抵?", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning"
+        type: "warning",
       }).then(() => {
         let obj = {
           ...row,
-          billDate: row.billDate ? row.billDate.slice(0, 10) + " 00:00:00" : null
+          billDate: row.billDate ? row.billDate.slice(0, 10) + " 00:00:00" : null,
         };
-        revokeOffset(obj).then(res => {
+        revokeOffset(obj).then((res) => {
           this.$message.success("操作成功");
           this.onLoad(this.page, this.search);
         });
@@ -489,9 +440,7 @@ export default {
       // this.editSave = true
       this.$nextTick(() => {
         this.$refs.settlementDetailsRef.generateFinStlBillsfun(
-          row.id,
-          this.tabsValue == "CHK" || this.tabsValue == "XXFP" || this.tabsValue == "GZXZ" ? "D" : "C",
-          this.tabsValue
+          row.id,row.dc,row.operatingType
         );
       });
     },
@@ -513,8 +462,8 @@ export default {
           this.$router.push({
             path: `/iosBasicData/PaymentApplication/index`,
             query: {
-              id: row.id
-            }
+              id: row.id,
+            },
           });
         }
       } else if (this.tabsValue == "CHK" || this.tabsValue == "CHK-C") {
@@ -522,8 +471,8 @@ export default {
           this.$router.push({
             path: `/iosBasicData/finstlbills/index`,
             query: {
-              id: row.id
-            }
+              id: row.id,
+            },
           });
         }
       } else if (this.tabsValue == "DCDD") {
@@ -531,8 +480,8 @@ export default {
           this.$router.push({
             path: `/iosBasicData/dcOffset/index`,
             query: {
-              id: row.id
-            }
+              id: row.id,
+            },
           });
         }
       } else if (this.tabsValue == "XXFP") {
@@ -540,8 +489,8 @@ export default {
           this.$router.push({
             path: `/iosBasicData/fininvoicesOutput/index`,
             query: {
-              id: row.id
-            }
+              id: row.id,
+            },
           });
         }
       } else if (this.tabsValue == "GZXZ") {
@@ -549,13 +498,13 @@ export default {
           this.$router.push({
             path: `/iosBasicData/writeOff/index`,
             query: {
-              id: row.id
-            }
+              id: row.id,
+            },
           });
         }
       } else {
         this.pageIds = [];
-        this.data.forEach(item => {
+        this.data.forEach((item) => {
           this.pageIds.push(item.id);
         });
         this.isShow = false;
@@ -572,14 +521,14 @@ export default {
           this.$alert("付费申请页面已存在,请关闭付费申请再进行操作", "温馨提示", {
             confirmButtonText: "确定",
             type: "warning",
-            callback: action => {}
+            callback: (action) => {},
           });
         } else {
           this.$router.push({
             path: `/iosBasicData/PaymentApplication/index`,
             query: {
-              id: row.id
-            }
+              id: row.id,
+            },
           });
         }
       } else {
@@ -587,14 +536,14 @@ export default {
           this.$alert("销项发票页面已存在,请关闭销项发票再进行操作", "温馨提示", {
             confirmButtonText: "确定",
             type: "warning",
-            callback: action => {}
+            callback: (action) => {},
           });
         } else {
           this.$router.push({
             path: `/iosBasicData/fininvoicesOutput/index`,
             query: {
-              id: row.id
-            }
+              id: row.id,
+            },
           });
         }
       }
@@ -606,7 +555,7 @@ export default {
       if (JSON.stringify(this.$route.query) != "{}") {
         this.$router.$avueRouter.closeTag();
         this.$router.push({
-          path: "/iosBasicData/ComputationCenter/index"
+          path: "/iosBasicData/ComputationCenter/index",
         });
       }
       this.isShow = true;
@@ -644,7 +593,7 @@ export default {
       this.amountSubSum = 0;
       this.amountSubUsdSum = 0;
       if (list.length) {
-        list.forEach(e => {
+        list.forEach((e) => {
           this.amountSubSum += Number(e.amountSub);
           this.amountSubUsdSum += Number(e.amountSubUsd);
         });
@@ -676,16 +625,16 @@ export default {
       this.$confirm("确定将选择数据删除?", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning"
+        type: "warning",
       }).then(() => {
-        let arrId = this.selectionList.map(item => {
+        let arrId = this.selectionList.map((item) => {
           return item.id;
         });
-        finstlbillsRemove(arrId.join(",")).then(res => {
+        finstlbillsRemove(arrId.join(",")).then((res) => {
           this.onLoad(this.page);
           this.$message({
             type: "success",
-            message: "操作成功!"
+            message: "操作成功!",
           });
         });
       });
@@ -696,13 +645,13 @@ export default {
       this.$confirm("确定将选择数据删除?", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning"
+        type: "warning",
       }).then(() => {
-        finstlbillsRemove(row.id).then(res => {
+        finstlbillsRemove(row.id).then((res) => {
           this.onLoad(this.page);
           this.$message({
             type: "success",
-            message: "操作成功!"
+            message: "操作成功!",
           });
         });
       });
@@ -724,8 +673,8 @@ export default {
           message: h("div", sumArr),
           confirmButtonText: "确定",
           cancelButtonText: "取消",
-          type: "warning"
-        }).catch(err => {});
+          type: "warning",
+        }).catch((err) => {});
         return true;
       }
     },
@@ -755,21 +704,21 @@ export default {
           businessType: "CHK",
           cashierStatus: 2,
           status: 3,
-          billStatus: 0
+          billStatus: 0,
         });
       } else if (this.tabsValue == "业务单据") {
         // 应收应付 业务数据
         res = await finstlbillsList(page.currentPage, page.pageSize, {
           ...Object.assign(params, this.query),
           businessType: "STL",
-          status: 0
+          status: 0,
         });
       } else {
         // 应收应付 业务数据 已完成
         res = await finstlbillsList(page.currentPage, page.pageSize, {
           ...Object.assign(params, this.query),
           businessType: "STL",
-          status: 3
+          status: 3,
         });
       }
       const data = res.data.data;
@@ -817,8 +766,8 @@ export default {
         }
       }
       return back;
-    }
-  }
+    },
+  },
 };
 </script>
 

src/views/iosBasicData/ComputationCenter/settlementDetails.vue

@@ -116,20 +116,6 @@
                 </el-form-item>
               </el-col>
               <el-col :span="5">
-                <el-form-item label="事由" prop="remarks">
-                  <el-input
-                    style="width: 100%"
-                    v-model="form.remarks"
-                    size="small"
-                    autocomplete="off"
-                    :disabled="editSave"
-                    clearable
-                    placeholder="请输入事由"
-                  >
-                  </el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="5">
                 <el-form-item label="费用名称" prop="feeCnName">
                   <dic-select
                     v-model="form.feeCnName"
@@ -2596,32 +2582,13 @@ export default {
     // 结算按钮
     generateFinStlBillsfun(id, dc, type) {
       this.activeName = "2";
-      let typeName = null;
       this.generateStatus = true;
       this.pageLoading = true;
       this.settlementType = dc;
-      if (type == "CHK-D") {
-        typeName = "收费结算";
-      }
-      if (type == "CHK-C") {
-        typeName = "对账付款";
-      }
-      if (type == "FFSQ") {
-        typeName = "付费结算";
-      }
-      if (type == "DCDD") {
-        typeName = "收付相抵";
-      }
-      if (type == "XXFP") {
-        typeName = "销项发票";
-      }
-      if (type == "GZXZ") {
-        typeName = "其他结算";
-      }
       generateFinStlBills({
         billId: id,
         dc: dc,
-        type: typeName,
+        type: type,
       })
         .then((res) => {
           res.data.data.finStlBillsItemsList = res.data.data.finStlBillsItemsList ? res.data.data.finStlBillsItemsList : [];

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

@@ -20,7 +20,7 @@
           size="small"
           :disabled="disabled || form.operatingStatus == 3 || form.status == 3"
           @click="allClick('一键编辑')"
-          style="color:#409EFF"
+          style="color: #409eff"
           >一键编辑</el-button
         >
         <el-button
@@ -28,7 +28,7 @@
           size="small"
           :disabled="disabled || form.status == 3 || selectionList.length == 0 || form.operatingStatus == 3"
           @click="allClick('批量删除')"
-          style="color:#000"
+          style="color: #000"
           >批量删除</el-button
         >
         <el-button
@@ -36,7 +36,7 @@
           type="text"
           :disabled="selectionList.length == 0 || form.status == 3 || disabled"
           @click="allClick('批量对账')"
-          style="color:#409EFF"
+          style="color: #409eff"
           >批量对账
         </el-button>
         <el-button
@@ -44,7 +44,7 @@
           type="text"
           :disabled="selectionList.length == 0 || form.status == 3 || disabled"
           @click="allClick('撤销对账')"
-          style="color:#000"
+          style="color: #000"
           >撤销对账
         </el-button>
         <el-button
@@ -52,7 +52,7 @@
           type="text"
           :disabled="selectionList.length == 0 || form.status == 3 || disabled"
           @click="allClick('批量签收')"
-          style="color:#409EFF"
+          style="color: #409eff"
           >批量签收
         </el-button>
         <el-button
@@ -60,7 +60,7 @@
           type="text"
           :disabled="selectionList.length == 0 || form.status == 3 || disabled"
           @click="allClick('撤销签收')"
-          style="color:#000"
+          style="color: #000"
           >撤销签收
         </el-button>
         <!-- <el-button type="success" size="small" plain :disabled="selectionList.length == 0 || form.status == 3" @click="allClick('生成开票')"
@@ -74,10 +74,10 @@
           @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;">应付(CNY):{{ amountCSubSum || 0 }}</el-tag>
-        <el-tag type="success" style="margin-right: 2px;">应付(USD):{{ amountCSubUsdSum || 0 }}</el-tag>
+        <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">应付(CNY):{{ amountCSubSum || 0 }}</el-tag>
+        <el-tag type="success" style="margin-right: 2px">应付(USD):{{ amountCSubUsdSum || 0 }}</el-tag>
       </template>
       <template slot="currentStlAmountRMB" slot-scope="{ row }">
         <el-input-number
@@ -87,7 +87,7 @@
           :controls="false"
           placeholder="请输入 本次CNY"
           size="mini"
-          style="width: 100%;"
+          style="width: 100%"
           :disabled="row.currentStlCurCode != 'CNY' || (row.currentStlAmountRMB == 0 && row.currentStlAmountUSD == 0)"
         ></el-input-number>
         <span v-else>{{ row.currentStlAmountRMB }}</span>
@@ -100,7 +100,7 @@
           :controls="false"
           placeholder="请输入 本次USD"
           size="mini"
-          style="width: 100%;"
+          style="width: 100%"
           :disabled="row.currentStlCurCode != 'USD' || (row.currentStlAmountRMB == 0 && row.currentStlAmountUSD == 0)"
         ></el-input-number>
         <span v-else>{{ row.currentStlAmountUSD }}</span>
@@ -108,7 +108,7 @@
       <template slot="reconciliationAmount" slot-scope="{ row }">
         <el-popover trigger="click" v-if="Number(row.reconciliationAmount)">
           <avue-crud :data="rlaData" :option="rlaOption"></avue-crud>
-          <span style="color: #409EFF;cursor: pointer" slot="reference" @click="viewRLA(row,'对账')">
+          <span style="color: #409eff; cursor: pointer" slot="reference" @click="viewRLA(row, '对账')">
             {{ row.reconciliationAmount }}
           </span>
         </el-popover>
@@ -117,20 +117,29 @@
       <template slot="reconciliationAmountUsd" slot-scope="{ row }">
         <el-popover trigger="click" v-if="Number(row.reconciliationAmountUsd)">
           <avue-crud :data="rlaData" :option="rlaOption"></avue-crud>
-          <span style="color: #409EFF;cursor: pointer" slot="reference" @click="viewRLA(row,'对账')">
+          <span style="color: #409eff; cursor: pointer" slot="reference" @click="viewRLA(row, '对账')">
             {{ row.reconciliationAmountUsd }}
           </span>
         </el-popover>
         <span v-else>{{ row.reconciliationAmountUsd }}</span>
       </template>
-      <template slot="stlAmount" slot-scope="{ row }">
-        <el-popover trigger="click" v-if="Number(row.stlAmount)">
+      <template slot="stlAmountDr" slot-scope="{ row }">
+        <el-popover trigger="click" v-if="Number(row.stlAmountDr)">
           <avue-crud :data="rlaData" :option="rlaOption"></avue-crud>
-          <span style="color: #409EFF;cursor: pointer" slot="reference" @click="viewRLA(row,'结算中心')">
-            {{ row.stlAmount }}
+          <span style="color: #409eff; cursor: pointer" slot="reference" @click="viewRLA(row, '结算中心')">
+            {{ row.stlAmountDr }}
           </span>
         </el-popover>
-        <span v-else>{{ row.stlAmount }}</span>
+        <span v-else>{{ row.stlAmountDr }}</span>
+      </template>
+      <template slot="stlAmountDrUSD" slot-scope="{ row }">
+        <el-popover trigger="click" v-if="Number(row.stlAmountDrUSD)">
+          <avue-crud :data="rlaData" :option="rlaOption"></avue-crud>
+          <span style="color: #409eff; cursor: pointer" slot="reference" @click="viewRLA(row, '结算中心')">
+            {{ row.stlAmountDrUSD }}
+          </span>
+        </el-popover>
+        <span v-else>{{ row.stlAmountDrUSD }}</span>
       </template>
     </avue-crud>
     <fee-info ref="feeInfo"></fee-info>
@@ -145,7 +154,7 @@ import {
   batchConfirmReconciliation,
   batchRevokeReconciliation,
   generateFinInvoicesDetail,
-  revokeFinInvoicesDetail
+  revokeFinInvoicesDetail,
 } from "@/api/iosBasicData/finstlbills";
 import { getListAll } from "@/api/iosBasicData/finstlbills";
 import feeInfo from "./feeInfo.vue";
@@ -166,33 +175,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,
+          },
+        ],
       },
       option: {},
       optionBack: {
@@ -217,43 +226,43 @@ export default {
             label: "原业务编号",
             prop: "billNo",
             width: 120,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "发票号",
             prop: "invoiceNo",
             width: 80,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "对账单位",
             prop: "corpCnName",
             width: 140,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "主单号",
             prop: "mblno",
             width: 100,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "本次CNY",
             prop: "currentStlAmountRMB",
             width: 100,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "本次USD",
             prop: "currentStlAmountUSD",
             width: 100,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "汇率",
             prop: "currentStlExrate",
             width: 60,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "对账",
@@ -264,13 +273,13 @@ export default {
             dicData: [
               {
                 label: "否",
-                value: 0
+                value: 0,
               },
               {
                 label: "是",
-                value: 1
-              }
-            ]
+                value: 1,
+              },
+            ],
           },
           {
             label: "签收",
@@ -281,13 +290,13 @@ export default {
             dicData: [
               {
                 label: "否",
-                value: 0
+                value: 0,
               },
               {
                 label: "是",
-                value: 1
-              }
-            ]
+                value: 1,
+              },
+            ],
           },
           {
             label: "签收日期",
@@ -295,31 +304,31 @@ export default {
             type: "date",
             format: "yyyy-MM-dd",
             width: 80,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "已签收CNY",
             prop: "reconciliationAmount",
             width: 80,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "已签收USD",
             prop: "reconciliationAmountUsd",
             width: 80,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "结算单号",
             prop: "stlNo",
             width: 80,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "结算单金额",
             prop: "stlAmount",
             width: 80,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "销账日期",
@@ -327,67 +336,67 @@ export default {
             type: "date",
             format: "yyyy-MM-dd",
             width: 80,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "操作员",
             prop: "operatorName",
             width: 80,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "BOOKINGNO",
             prop: "bookingNo",
             width: 80,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "分单号",
             prop: "hblno",
             width: 80,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "船名",
             prop: "vesselCnName",
             width: 80,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "航次",
             prop: "voyageNo",
             width: 80,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "发票CNY",
             prop: "currentInvoiceAmountRMB",
             width: 80,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "发票USD",
             prop: "currentInvoiceAmountUSD",
             width: 80,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "箱型箱量",
             prop: "quantityCntrTypesDescr",
             width: 80,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "起运港",
             prop: "polCnName",
             width: 80,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "卸货港",
             prop: "podCnName",
             width: 80,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "ETD",
@@ -395,7 +404,7 @@ export default {
             type: "date",
             format: "yyyy-MM-dd",
             width: 80,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "ETA",
@@ -403,69 +412,69 @@ export default {
             type: "date",
             format: "yyyy-MM-dd",
             width: 80,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "应结算CNY",
             prop: "amountRMB",
             width: 80,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "应结算USD",
             prop: "amountUSD",
             width: 80,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "已结算CNY",
             prop: "stlAmountDr",
             width: 80,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "已结算USD",
             prop: "stlAmountDrUSD",
             width: 80,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "备注",
             prop: "remarkss",
             width: 100,
             cell: true,
-            overHidden: true
-          }
-        ]
+            overHidden: true,
+          },
+        ],
       },
       page: {
         currentPage: 1,
         total: 0,
         pageSize: 20,
-        pageSizes: [20, 50, 100, 200, 500]
+        pageSizes: [20, 50, 100, 200, 500],
       },
       pageData: [],
-      selectionList: []
+      selectionList: [],
     };
   },
   components: { feeInfo },
   props: {
     form: {
       type: Object,
-      default: function() {
+      default: function () {
         return {};
-      }
+      },
     },
     tableData: {
       type: Array,
-      default: function() {
+      default: function () {
         return [];
-      }
+      },
     },
     disabled: {
       type: Boolean,
-      default: false
-    }
+      default: false,
+    },
   },
   async created() {
     this.roleName = localStorage.getItem("roleName").split(",");
@@ -474,7 +483,7 @@ export default {
   methods: {
     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;
       });
     },
@@ -564,15 +573,15 @@ export default {
         this.$confirm("确定将选择数据删除?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
-          type: "warning"
+          type: "warning",
         }).then(() => {
           multiList = this.selectionList;
           arr = this.pageData;
           // 获取有id 的数据
-          const itemsWithId = multiList.filter(item => item.id != null);
-          let arrIds = itemsWithId.map(item => item.id); // 获取id 数据
+          const itemsWithId = multiList.filter((item) => item.id != null);
+          let arrIds = itemsWithId.map((item) => item.id); // 获取id 数据
           // 把选中的删除掉
-          multiList.forEach(item => {
+          multiList.forEach((item) => {
             for (let index in arr) {
               if (JSON.stringify(item) == JSON.stringify(arr[index])) {
                 arr.splice(Number(index), 1);
@@ -584,10 +593,10 @@ export default {
               lock: true,
               text: "加载中",
               spinner: "el-icon-loading",
-              background: "rgba(255,255,255,0.7)"
+              background: "rgba(255,255,255,0.7)",
             });
             finstlbillsitemsRemove(arrIds.join(","))
-              .then(res => {
+              .then((res) => {
                 this.$message.success("删除成功");
                 this.$emit("update", this.form.id);
               })
@@ -612,21 +621,21 @@ export default {
           billNoFormat: "HYDZ",
           businessTypeCode: "HYDZ",
           businessType: "CHK",
-          finStlBillsItemsList: this.selectionList
+          finStlBillsItemsList: this.selectionList,
         };
         this.$confirm("是否确认对账?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
-          type: "warning"
+          type: "warning",
         }).then(() => {
           const loading = this.$loading({
             lock: true,
             text: "加载中",
             spinner: "el-icon-loading",
-            background: "rgba(255,255,255,0.7)"
+            background: "rgba(255,255,255,0.7)",
           });
           batchConfirmReconciliation(obj)
-            .then(res => {
+            .then((res) => {
               this.$message.success("操作成功");
               this.$emit("update", this.form.id, "对账");
             })
@@ -653,21 +662,21 @@ export default {
           billNoFormat: "HYDZ",
           businessTypeCode: "HYDZ",
           businessType: "CHK",
-          finStlBillsItemsList: this.selectionList
+          finStlBillsItemsList: this.selectionList,
         };
         this.$confirm("是否撤销对账?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
-          type: "warning"
+          type: "warning",
         }).then(() => {
           const loading = this.$loading({
             lock: true,
             text: "加载中",
             spinner: "el-icon-loading",
-            background: "rgba(255,255,255,0.7)"
+            background: "rgba(255,255,255,0.7)",
           });
           batchRevokeReconciliation(obj)
-            .then(res => {
+            .then((res) => {
               this.$message.success("操作成功");
               this.$emit("update", this.form.id, "对账");
             })
@@ -694,21 +703,21 @@ export default {
           billNoFormat: "HYDZ",
           businessTypeCode: "HYDZ",
           businessType: "CHK",
-          finStlBillsItemsList: this.selectionList
+          finStlBillsItemsList: this.selectionList,
         };
         this.$confirm("是否确认签收?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
-          type: "warning"
+          type: "warning",
         }).then(() => {
           const loading = this.$loading({
             lock: true,
             text: "加载中",
             spinner: "el-icon-loading",
-            background: "rgba(255,255,255,0.7)"
+            background: "rgba(255,255,255,0.7)",
           });
           finstlbillsConfirmSignFor(obj)
-            .then(res => {
+            .then((res) => {
               this.$message.success("操作成功");
               this.$emit("update", this.form.id);
             })
@@ -732,21 +741,21 @@ export default {
           billNoFormat: "HYDZ",
           businessTypeCode: "HYDZ",
           businessType: "CHK",
-          finStlBillsItemsList: this.selectionList
+          finStlBillsItemsList: this.selectionList,
         };
         this.$confirm("是否撤销签收?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
-          type: "warning"
+          type: "warning",
         }).then(() => {
           const loading = this.$loading({
             lock: true,
             text: "加载中",
             spinner: "el-icon-loading",
-            background: "rgba(255,255,255,0.7)"
+            background: "rgba(255,255,255,0.7)",
           });
           finstlbillsRevokeSignFor(obj)
-            .then(res => {
+            .then((res) => {
               this.$message.success("操作成功");
               this.$emit("update", this.form.id);
             })
@@ -787,23 +796,23 @@ export default {
                 dicUrl: "/api/blade-system/dict-biz/dictionary?code=Invoice_information_los",
                 props: {
                   label: "dictValue",
-                  value: "dictValue"
+                  value: "dictValue",
                 },
                 rules: [
                   {
                     required: true,
                     message: "请选择 开票项目",
-                    trigger: "blur"
-                  }
+                    trigger: "blur",
+                  },
                 ],
-                span: 24
-              }
-            ]
+                span: 24,
+              },
+            ],
           },
-          beforeClose: done => {
+          beforeClose: (done) => {
             done();
           },
-          callback: res => {
+          callback: (res) => {
             res.done();
             let obj = {
               ...this.form,
@@ -811,16 +820,16 @@ export default {
               businessTypeCode: "HYDZ",
               businessType: "CHK",
               serverName: res.data.serverName,
-              finStlBillsItemsList: this.selectionList
+              finStlBillsItemsList: this.selectionList,
             };
             const loading = this.$loading({
               lock: true,
               text: "加载中",
               spinner: "el-icon-loading",
-              background: "rgba(255,255,255,0.7)"
+              background: "rgba(255,255,255,0.7)",
             });
             generateFinInvoicesDetail(obj)
-              .then(res => {
+              .then((res) => {
                 this.$message.success("操作成功");
                 this.$emit("update", this.form.id, "finstlbills");
               })
@@ -828,7 +837,7 @@ export default {
                 loading.close();
               });
             res.close();
-          }
+          },
         });
       }
       if (name == "撤销开票") {
@@ -845,16 +854,16 @@ export default {
           billNoFormat: "HYDZ",
           businessTypeCode: "HYDZ",
           businessType: "CHK",
-          finStlBillsItemsList: this.selectionList
+          finStlBillsItemsList: this.selectionList,
         };
         const loading = this.$loading({
           lock: true,
           text: "加载中",
           spinner: "el-icon-loading",
-          background: "rgba(255,255,255,0.7)"
+          background: "rgba(255,255,255,0.7)",
         });
         revokeFinInvoicesDetail(obj)
-          .then(res => {
+          .then((res) => {
             this.$message.success("操作成功");
             this.$emit("update", this.form.id);
           })
@@ -869,7 +878,7 @@ export default {
       this.amountCSubSum = 0;
       this.amountCSubUsdSum = 0;
       if (list.length) {
-        list.forEach(e => {
+        list.forEach((e) => {
           if (e.dc == "D") {
             this.amountDSubSum += Number(e.currentStlAmountRMB ? e.currentStlAmountRMB : 0);
             this.amountDSubUsdSum += Number(e.currentStlAmountUSD ? e.currentStlAmountUSD : 0);
@@ -909,7 +918,7 @@ export default {
         this.$message.success("重置成功");
         this.$refs[ref].$refs.dialogColumn.columnBox = false;
       }
-    }
+    },
   },
   watch: {
     tableData: {
@@ -920,9 +929,9 @@ export default {
         this.getList();
       },
       deep: true, // 深度监听
-      immediate: true // 第一次改变就执行
-    }
-  }
+      immediate: true, // 第一次改变就执行
+    },
+  },
 };
 </script>
 

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

@@ -14,11 +14,11 @@
       @saveColumn="saveColumn('crud', 'option', 'optionBack', 487)"
     >
       <template slot="menuLeft">
-        <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;">应付(CNY):{{ amountCSubSum || 0 }}</el-tag>
-        <el-tag type="success" style="margin-right: 2px;">应付(USD):{{ amountCSubUsdSum || 0 }}</el-tag>
+        <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">应付(CNY):{{ amountCSubSum || 0 }}</el-tag>
+        <el-tag type="success" style="margin-right: 2px">应付(USD):{{ amountCSubUsdSum || 0 }}</el-tag>
       </template>
       <template slot="currentStlAmountRMB" slot-scope="{ row }">
         <el-input-number
@@ -27,7 +27,7 @@
           :controls="false"
           placeholder="请输入 本次CNY"
           size="mini"
-          style="width: 100%;"
+          style="width: 100%"
           :disabled="row.currentStlCurCode != 'CNY' || (row.currentStlAmountRMB == 0 && row.currentStlAmountUSD == 0)"
         ></el-input-number>
       </template>
@@ -38,14 +38,14 @@
           :controls="false"
           placeholder="请输入 本次USD"
           size="mini"
-          style="width: 100%;"
+          style="width: 100%"
           :disabled="row.currentStlCurCode != 'USD' || (row.currentStlAmountRMB == 0 && row.currentStlAmountUSD == 0)"
         ></el-input-number>
       </template>
       <template slot="reconciliationAmount" slot-scope="{ row }">
         <el-popover trigger="click" v-if="Number(row.reconciliationAmount)">
           <avue-crud :data="rlaData" :option="rlaOption"></avue-crud>
-          <span style="color: #409EFF;cursor: pointer" slot="reference" @click="viewRLA(row, '对账')">
+          <span style="color: #409eff; cursor: pointer" slot="reference" @click="viewRLA(row, '对账')">
             {{ row.reconciliationAmount }}
           </span>
         </el-popover>
@@ -54,20 +54,29 @@
       <template slot="reconciliationAmountUsd" slot-scope="{ row }">
         <el-popover trigger="click" v-if="Number(row.reconciliationAmountUsd)">
           <avue-crud :data="rlaData" :option="rlaOption"></avue-crud>
-          <span style="color: #409EFF;cursor: pointer" slot="reference" @click="viewRLA(row, '对账')">
+          <span style="color: #409eff; cursor: pointer" slot="reference" @click="viewRLA(row, '对账')">
             {{ row.reconciliationAmountUsd }}
           </span>
         </el-popover>
         <span v-else>{{ row.reconciliationAmountUsd }}</span>
       </template>
-      <template slot="stlAmount" slot-scope="{ row }">
-        <el-popover trigger="click" v-if="Number(row.stlAmount)">
+      <template slot="stlAmountDr" slot-scope="{ row }">
+        <el-popover trigger="click" v-if="Number(row.stlAmountDr)">
           <avue-crud :data="rlaData" :option="rlaOption"></avue-crud>
-          <span style="color: #409EFF;cursor: pointer" slot="reference" @click="viewRLA(row, '结算中心')">
-            {{ row.stlAmount }}
+          <span style="color: #409eff; cursor: pointer" slot="reference" @click="viewRLA(row, '结算中心')">
+            {{ row.stlAmountDr }}
           </span>
         </el-popover>
-        <span v-else>{{ row.stlAmount }}</span>
+        <span v-else>{{ row.stlAmountDr }}</span>
+      </template>
+      <template slot="stlAmountDrUSD" slot-scope="{ row }">
+        <el-popover trigger="click" v-if="Number(row.stlAmountDrUSD)">
+          <avue-crud :data="rlaData" :option="rlaOption"></avue-crud>
+          <span style="color: #409eff; cursor: pointer" slot="reference" @click="viewRLA(row, '结算中心')">
+            {{ row.stlAmountDrUSD }}
+          </span>
+        </el-popover>
+        <span v-else>{{ row.stlAmountDrUSD }}</span>
       </template>
     </avue-crud>
   </div>
@@ -93,33 +102,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,
+          },
+        ],
       },
       option: {},
       optionBack: {
@@ -144,43 +153,43 @@ export default {
             label: "原业务编号",
             prop: "billNo",
             width: 120,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "发票号",
             prop: "invoiceNo",
             width: 80,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "对账单位",
             prop: "corpCnName",
             width: 140,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "主单号",
             prop: "mblno",
             width: 100,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "本次CNY",
             prop: "currentStlAmountRMB",
             width: 100,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "本次USD",
             prop: "currentStlAmountUSD",
             width: 100,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "汇率",
             prop: "currentStlExrate",
             width: 60,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "对账",
@@ -191,13 +200,13 @@ export default {
             dicData: [
               {
                 label: "否",
-                value: 0
+                value: 0,
               },
               {
                 label: "是",
-                value: 1
-              }
-            ]
+                value: 1,
+              },
+            ],
           },
           {
             label: "签收",
@@ -208,13 +217,13 @@ export default {
             dicData: [
               {
                 label: "否",
-                value: 0
+                value: 0,
               },
               {
                 label: "是",
-                value: 1
-              }
-            ]
+                value: 1,
+              },
+            ],
           },
           {
             label: "签收日期",
@@ -222,31 +231,31 @@ export default {
             type: "date",
             format: "yyyy-MM-dd",
             width: 80,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "已签收CNY",
             prop: "reconciliationAmount",
             width: 80,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "已签收USD",
             prop: "reconciliationAmountUsd",
             width: 80,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "结算单号",
             prop: "stlNo",
             width: 80,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "结算单金额",
             prop: "stlAmount",
             width: 80,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "销账日期",
@@ -254,67 +263,67 @@ export default {
             type: "date",
             format: "yyyy-MM-dd",
             width: 80,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "操作员",
             prop: "operatorName",
             width: 80,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "BOOKINGNO",
             prop: "bookingNo",
             width: 80,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "分单号",
             prop: "hblno",
             width: 80,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "船名",
             prop: "vesselCnName",
             width: 80,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "航次",
             prop: "voyageNo",
             width: 80,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "发票CNY",
             prop: "currentInvoiceAmountRMB",
             width: 80,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "发票USD",
             prop: "currentInvoiceAmountUSD",
             width: 80,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "箱型箱量",
             prop: "quantityCntrTypesDescr",
             width: 80,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "起运港",
             prop: "polCnName",
             width: 80,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "卸货港",
             prop: "podCnName",
             width: 80,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "ETD",
@@ -322,7 +331,7 @@ export default {
             type: "date",
             format: "yyyy-MM-dd",
             width: 80,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "ETA",
@@ -330,46 +339,46 @@ export default {
             type: "date",
             format: "yyyy-MM-dd",
             width: 80,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "应结算CNY",
             prop: "amountRMB",
             width: 80,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "应结算USD",
             prop: "amountUSD",
             width: 80,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "已结算CNY",
             prop: "stlAmountDr",
             width: 80,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "已结算USD",
             prop: "stlAmountDrUSD",
             width: 80,
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "备注",
             prop: "remarkss",
             width: 100,
             cell: true,
-            overHidden: true
-          }
-        ]
+            overHidden: true,
+          },
+        ],
       },
       page: {
         currentPage: 1,
         total: 0,
         pageSize: 20,
-        pageSizes: [20, 50, 100, 200, 500]
+        pageSizes: [20, 50, 100, 200, 500],
       },
       pageData: [],
       queryData: [],
@@ -380,26 +389,26 @@ export default {
       // 选择相关
       lastSelectedRow: null,
       lastSelectionRange: null, // {startIndex, endIndex}
-      selectionList: []
+      selectionList: [],
     };
   },
   props: {
     form: {
       type: Object,
-      default: function() {
+      default: function () {
         return {};
-      }
+      },
     },
     tableData: {
       type: Array,
-      default: function() {
+      default: function () {
         return [];
-      }
+      },
     },
     disabled: {
       type: Boolean,
-      default: false
-    }
+      default: false,
+    },
   },
   async created() {
     this.roleName = localStorage.getItem("roleName").split(",");
@@ -408,7 +417,7 @@ export default {
   methods: {
     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;
       });
     },
@@ -488,16 +497,16 @@ export default {
           billNoFormat: "HYDZ",
           businessTypeCode: "HYDZ",
           businessType: "CHK",
-          finStlBillsItemsList: this.selectionList
+          finStlBillsItemsList: this.selectionList,
         };
         const loading = this.$loading({
           lock: true,
           text: "加载中",
           spinner: "el-icon-loading",
-          background: "rgba(255,255,255,0.7)"
+          background: "rgba(255,255,255,0.7)",
         });
         finstlbillsSubmit(obj)
-          .then(res => {
+          .then((res) => {
             this.$message.success("操作成功");
             this.$emit("update", res.data.data.id, "query");
           })
@@ -533,9 +542,9 @@ export default {
         businessDateEnd: this.form.businessDateEnd, // 业务结束日期
         approveTimeStart: this.form.auditDateFrom, // 审核开始日期
         approveTimeEnd: this.form.auditDateTo, // 审核结束日期
-        feeCnName: this.form.feeCnName
+        feeCnName: this.form.feeCnName,
       };
-      finstlbillslistAccBillV1(obj).then(res => {
+      finstlbillslistAccBillV1(obj).then((res) => {
         res.data.data.forEach((item, index) => {
           item.accBillId = item.id;
           delete item.id;
@@ -561,7 +570,7 @@ export default {
         });
         this.queryData = [];
         for (let item of res.data.data) {
-          if (this.tableData.filter(row => row.accBillNo == item.accBillNo).length == 0) {
+          if (this.tableData.filter((row) => row.accBillNo == item.accBillNo).length == 0) {
             this.queryData.push(item);
           }
         }
@@ -576,7 +585,7 @@ export default {
       this.amountCSubSum = 0;
       this.amountCSubUsdSum = 0;
       if (list.length) {
-        list.forEach(e => {
+        list.forEach((e) => {
           if (e.dc == "D") {
             this.amountDSubSum += Number(e.currentStlAmountRMB ? e.currentStlAmountRMB : 0);
             this.amountDSubUsdSum += Number(e.currentStlAmountUSD ? e.currentStlAmountUSD : 0);
@@ -617,7 +626,7 @@ export default {
         this.$message.success("重置成功");
         this.$refs[ref].$refs.dialogColumn.columnBox = false;
       }
-    }
+    },
   },
   watch: {
     queryData: {
@@ -628,9 +637,9 @@ export default {
         this.getList();
       },
       deep: true, // 深度监听
-      immediate: true // 第一次改变就执行
-    }
-  }
+      immediate: true, // 第一次改变就执行
+    },
+  },
 };
 </script>
 

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

@@ -2,10 +2,11 @@
   <div>
     <div class="customer-head">
       <div class="customer-back">
-        <el-button type="danger" style="border: none;background: none;color: red" icon="el-icon-arrow-left" @click="goBack()">返回列表 </el-button>
+        <el-button type="danger" style="border: none; background: none; color: red" icon="el-icon-arrow-left" @click="goBack()">返回列表 </el-button>
         <el-button v-if="form.id && pageIds.length" type="text" @click="lastPage">上一票</el-button>
         <el-button v-if="form.id && pageIds.length" type="text" @click="nextPage">下一票</el-button>
       </div>
+      <div class="customer-title">{{ form.operatingType }}</div>
       <div class="add-customer-btn">
         <el-button v-if="form.operatingType == '付费申请'" size="small" type="success" @click="allClick('查看指示')">查看指示</el-button>
         <el-button type="success" size="small" v-if="form.operatingType == '销账'" @click="allClick('预付款')">预付款</el-button>
@@ -29,7 +30,7 @@
           >撤销操作
         </el-button>
         <el-dropdown v-if="form.operatingStatus == 0" trigger="click" @command="moreClick">
-          <el-button type="success" size="small" style="margin:0 8px;" :disabled="editButton"
+          <el-button type="success" size="small" style="margin: 0 8px" :disabled="editButton"
             >更多操作<i class="el-icon-arrow-down el-icon--right"></i>
           </el-button>
           <el-dropdown-menu slot="dropdown">
@@ -47,7 +48,7 @@
     </div>
     <div style="margin-top: 50px">
       <el-card class="box-card">
-        <avue-form :option="optionForm" v-model="form" ref="form">
+        <avue-form :option="optionForm" v-model="form" ref="avueForm">
           <tempalte slot="corpCnName">
             <dic-select
               v-model="form.corpCnName"
@@ -65,7 +66,7 @@
             ></dic-select>
           </tempalte>
           <tempalte slot="corpIsSigned">
-            <div style="display: flex;">
+            <div style="display: flex">
               <el-checkbox :true-label="1" :false-label="0" size="small" v-model="form.corpIsSigned" disabled>已签约 </el-checkbox>
               <el-input v-model="form.isSignedPersonName" placeholder="请输入 签约人" size="small" disabled></el-input>
             </div>
@@ -129,13 +130,13 @@
               :disabled="editDisabled"
             ></date-range>
           </tempalte>
-          <tempalte slot="Btn" style="display: flex;justify-content: flex-end;">
+          <tempalte slot="Btn" style="display: flex; justify-content: flex-end">
             <el-button type="primary" size="mini" icon="el-icon-search" @click="allClick('检索')" :disabled="editDisabled">检索</el-button>
             <el-button size="mini" @click="allClick('重置条件')" :disabled="editDisabled || form.finStlBillsItemsList.length">重置条件</el-button>
           </tempalte>
         </avue-form>
       </el-card>
-      <el-tabs style="margin-top: 2px;" class="box-tabs" type="border-card" v-model="activeName" @tab-click="handleClick">
+      <el-tabs style="margin-top: 2px" class="box-tabs" type="border-card" v-model="activeName" @tab-click="handleClick">
         <el-tab-pane label="查询结果" name="1">
           <query-data ref="queryData" :form="form" :tableData="form.finStlBillsItemsList" @update="update" :disabled="editDisabled"></query-data>
         </el-tab-pane>
@@ -143,7 +144,7 @@
           <picked-data ref="pickedData" :form="form" :tableData="form.finStlBillsItemsList" @update="update" :disabled="editButton"></picked-data>
         </el-tab-pane>
         <el-tab-pane label="开票明细" name="3">
-          <fininvoiceitemdetail :form="form" :data="form.finInvoiceItemDetailList" @update="update" :disabled="form.operatingStatus!=0">
+          <fininvoiceitemdetail :form="form" :data="form.finInvoiceItemDetailList" @update="update" :disabled="form.operatingStatus != 0">
           </fininvoiceitemdetail
         ></el-tab-pane>
       </el-tabs>
@@ -184,7 +185,7 @@ import {
   finInvoicesApprove,
   revokeFinInvoicesApprove,
   agreementListAll,
-  finstlbillslistAccBillByCorp
+  finstlbillslistAccBillByCorp,
 } from "@/api/iosBasicData/finstlbills";
 import { confirmWriteOff, revokeWriteOff } from "@/api/iosBasicData/writeOff.js";
 import { getListAllDetail } from "@/api/iosBasicData/cashier.js";
@@ -205,7 +206,7 @@ export default {
         isInvoice: 2,
         finStlBillsItemsList: [],
         finInvoiceItemDetailList: [],
-        advancePaymentRecordList: []
+        advancePaymentRecordList: [],
       },
       optionForm: {
         menuBtn: false,
@@ -215,8 +216,8 @@ export default {
         column: [
           {
             label: "对账单号",
-            prop: "checkNo",
-            disabled: true
+            prop: "billNo",
+            disabled: true,
           },
           {
             label: "对账日期",
@@ -224,17 +225,17 @@ export default {
             type: "date",
             format: "yyyy-MM-dd",
             valueFormat: "yyyy-MM-dd 00:00:00",
-            disabled: false
+            disabled: false,
           },
           {
             label: "限定金额",
             prop: "limitedAmount",
-            disabled: true
+            disabled: true,
           },
           {
             label: "备注",
             prop: "remarks",
-            disabled: false
+            disabled: false,
           },
           {
             label: "审核",
@@ -243,40 +244,41 @@ export default {
             dicData: [
               {
                 label: "全部",
-                value: 2
+                value: 2,
               },
               {
                 label: "是",
-                value: 1
+                value: 1,
               },
               {
                 label: "否",
-                value: 0
-              }
+                value: 0,
+              },
             ],
             disabled: false,
-            span: 4
+            value: 2,
+            span: 4,
           },
           {
             label: "对账单位",
             prop: "corpCnName",
-            disabled: false
+            disabled: false,
           },
           {
             label: "账期备注",
             prop: "corpAccRemarks",
-            disabled: true
+            disabled: true,
           },
           {
             label: "",
             labelWidth: 0,
             prop: "corpIsSigned",
-            disabled: true
+            disabled: true,
           },
           {
             label: "预收账款",
             prop: "advanceFromCustomers",
-            disabled: true
+            disabled: true,
           },
           {
             label: "签收",
@@ -285,21 +287,21 @@ export default {
             dicData: [
               {
                 label: "全部",
-                value: 2
+                value: 2,
               },
               {
                 label: "是",
-                value: 1
+                value: 1,
               },
               {
                 label: "否",
-                value: 0
-              }
+                value: 0,
+              },
             ],
             disabled: false,
-            span: 4
-          }
-        ]
+            span: 4,
+          },
+        ],
       },
       optionForm2: {
         menuBtn: false,
@@ -314,15 +316,15 @@ export default {
             dicData: [
               {
                 label: "收",
-                value: "D"
+                value: "D",
               },
               {
                 label: "付",
-                value: "C"
-              }
+                value: "C",
+              },
             ],
             disabled: false,
-            span: 3
+            span: 3,
           },
           {
             label: "币别",
@@ -333,20 +335,20 @@ export default {
             props: {
               label: "code",
               value: "code",
-              res: "data.records"
+              res: "data.records",
             },
             disabled: false,
-            span: 2
+            span: 2,
           },
           {
             label: "操作员",
             prop: "updateUserName",
-            disabled: false
+            disabled: false,
           },
           {
             label: "业务员",
             prop: "srcCnName",
-            disabled: false
+            disabled: false,
           },
           {
             label: "业务类型",
@@ -355,18 +357,18 @@ export default {
             dicData: [
               {
                 label: "海运出口",
-                value: "SE"
+                value: "SE",
               },
               {
                 label: "海运进口",
-                value: "SI"
-              }
+                value: "SI",
+              },
             ],
             filterable: true,
             multiple: true,
             dataType: "string",
             tags: true,
-            disabled: false
+            disabled: false,
           },
           {
             label: "对账",
@@ -375,39 +377,39 @@ export default {
             dicData: [
               {
                 label: "全部",
-                value: 2
+                value: 2,
               },
               {
                 label: "是",
-                value: 1
+                value: 1,
               },
               {
                 label: "否",
-                value: 0
-              }
+                value: 0,
+              },
             ],
             disabled: false,
-            span: 4
+            span: 4,
           },
           {
             label: "业务编号",
             prop: "businessNo",
-            disabled: false
+            disabled: false,
           },
           {
             label: "主单号",
             prop: "mblno",
-            disabled: false
+            disabled: false,
           },
           {
             label: "分单号",
             prop: "hblno",
-            disabled: false
+            disabled: false,
           },
           {
             label: "订舱号",
             prop: "bookingNumber",
-            disabled: false
+            disabled: false,
           },
           {
             label: "销账",
@@ -416,34 +418,34 @@ export default {
             dicData: [
               {
                 label: "全部",
-                value: 2
+                value: 2,
               },
               {
                 label: "是",
-                value: 1
+                value: 1,
               },
               {
                 label: "否",
-                value: 0
-              }
+                value: 0,
+              },
             ],
             disabled: false,
-            span: 4
+            span: 4,
           },
           {
             label: "ETD期间",
             prop: "businessDate", // businessDate只是插槽值 字段为 businessDateStart businessDateEnd
-            disabled: false
+            disabled: false,
           },
           {
             label: "审核日期",
             prop: "auditDate", //auditDate只是插槽值 字段为 auditDateFrom auditDateTo
-            disabled: false
+            disabled: false,
           },
           {
             label: "签收日期",
             prop: "signForDate", //signForDate只是插槽值 字段为 signForDateStart signForDateEnd
-            disabled: false
+            disabled: false,
           },
           {
             label: "费用名称",
@@ -452,13 +454,13 @@ export default {
             dicUrl: "/api/blade-los/bfees/listAll",
             props: {
               label: "cnName",
-              value: "cnName"
+              value: "cnName",
             },
             filterable: true,
             multiple: true,
             dataType: "string",
             tags: true,
-            disabled: false
+            disabled: false,
           },
           {
             label: "发票",
@@ -467,57 +469,57 @@ export default {
             dicData: [
               {
                 label: "全部",
-                value: 2
+                value: 2,
               },
               {
                 label: "是",
-                value: 1
+                value: 1,
               },
               {
                 label: "否",
-                value: 0
-              }
+                value: 0,
+              },
             ],
             disabled: false,
-            span: 4
+            span: 4,
           },
           {
             label: "船名",
             prop: "vesselCnName",
-            disabled: false
+            disabled: false,
           },
           {
             label: "航次",
             prop: "voyageNo",
-            disabled: false
+            disabled: false,
           },
           {
             label: "发票号",
             prop: "invoiceNo",
-            disabled: false
+            disabled: false,
           },
           {
             label: "查询金额",
             prop: "checkBalance",
-            disabled: false
+            disabled: false,
           },
           {
             label: "",
             prop: "Btn",
             labelWidth: 0,
-            span: 4
-          }
-        ]
+            span: 4,
+          },
+        ],
       },
       dcOptions: [
         {
           label: "收",
-          value: "D"
+          value: "D",
         },
         {
           label: "付",
-          value: "C"
-        }
+          value: "C",
+        },
       ],
       retrievePopupsType: false, // 弹窗开启关闭
       retrievePopupsData: [], // 选择弹窗数据
@@ -538,17 +540,17 @@ export default {
           {
             label: "客户中文名",
             prop: "cnName",
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "客户英文文名",
             prop: "cnEame",
-            overHidden: true
-          }
-        ]
+            overHidden: true,
+          },
+        ],
       },
       roleName: localStorage.getItem("roleName").split(","),
-      saberUserInfo: JSON.parse(localStorage.getItem("saber-userInfo")).content // 当前登录人个人信息
+      saberUserInfo: JSON.parse(localStorage.getItem("saber-userInfo")).content, // 当前登录人个人信息
     };
   },
   components: {
@@ -558,14 +560,14 @@ export default {
     dateRange,
     cashierItem,
     fininvoiceitemdetail,
-    advancePayment
+    advancePayment,
   },
   props: {
     detailData: Object,
     pageIds: {
       type: Array, // 指定 prop 的类型为 Array
-      default: () => [] // 提供一个默认值，这里使用函数形式返回一个空数组
-    }
+      default: () => [], // 提供一个默认值，这里使用函数形式返回一个空数组
+    },
   },
   async created() {
     if (this.detailData && this.detailData.id) {
@@ -601,7 +603,7 @@ export default {
       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.finStlBillsItemsList.filter((item) => item.isChecked == 1).length == 0) {
           this.editDisabled = false;
           this.optionForm.disabled = false;
           this.optionForm2.disabled = false;
@@ -626,7 +628,7 @@ export default {
         businessTypeCode: "HYDZ",
         businessType: "CHK",
         url: "/iosBasicData/financialManagement/finstlbills/index",
-        pageLabel: "对账中心(J)"
+        pageLabel: "对账中心(J)",
       };
       if (name == "付费申请") {
         this.$refs.cashier.openDialog(this.form, this.form.finStlBillsItemsList, "auto");
@@ -650,10 +652,10 @@ export default {
           lock: true,
           text: "加载中",
           spinner: "el-icon-loading",
-          background: "rgba(255,255,255,0.7)"
+          background: "rgba(255,255,255,0.7)",
         });
         confirmOffset(obj)
-          .then(res => {
+          .then((res) => {
             this.$message.success("操作成功");
             this.getDetail(this.form.id);
           })
@@ -686,10 +688,10 @@ export default {
           lock: true,
           text: "加载中",
           spinner: "el-icon-loading",
-          background: "rgba(255,255,255,0.7)"
+          background: "rgba(255,255,255,0.7)",
         });
         finInvoicesApprove(obj)
-          .then(res => {
+          .then((res) => {
             this.$message.success("操作成功");
             this.getDetail(this.form.id);
           })
@@ -711,9 +713,9 @@ export default {
           this.form.isSignedPersonName = null;
           let obj = {
             corpId: row.id,
-            validDate: dateFormat(new Date(), "yyyy-MM-dd")
+            validDate: dateFormat(new Date(), "yyyy-MM-dd"),
           };
-          agreementListAll(obj).then(res => {
+          agreementListAll(obj).then((res) => {
             if (res.data.data.length) {
               let obj = res.data.data[0];
               let USDTEXT = obj.amountUsd ? "USD:" + Number(obj.amountUsd) : "";
@@ -757,7 +759,21 @@ export default {
         }
       }
     },
-    allClick(name) {
+    // 重置数据
+    reloadData() {
+      this.form = {
+        billDate: dateFormat(new Date(), "yyyy-MM-dd") + " 00:00:00", // 对账日期 默认 当天
+        isApproved: 2,
+        isSignfor: 0,
+        isChecked: 2,
+        isCleared: 2,
+        isInvoice: 2,
+        finStlBillsItemsList: [],
+        finInvoiceItemDetailList: [],
+        advancePaymentRecordList: [],
+      };
+    },
+    async allClick(name) {
       if (name == "预付款") {
         this.$refs.advance.openDialog(this.form);
       }
@@ -775,8 +791,8 @@ export default {
         }
       }
       if (name == "重置条件") {
-        this.$refs.form.resetForm();
-        this.form = this.$options.data().form;
+       await this.$refs.avueForm.resetForm()
+       this.form = this.$options.data().form;
       }
       if (name == "查看指示") {
         this.$refs.cashier.openDialog(this.form, this.form.finStlBillsItemsList, "view");
@@ -785,51 +801,62 @@ export default {
         if (this.form.finStlBillsItemsList.length == 0) {
           return this.$message.error("选定数据不能为空");
         }
-        getListAllDetail({ srcId: this.form.id }).then(res => {
-          if (
-            Number(this.form.amountDr) != Number(this.form.actualAmountDr) ||
-            Number(this.form.amountCr) != Number(this.form.actualAmountCr) ||
-            Number(this.form.amountDrUsd) != Number(this.form.actualAmountDrUsd) ||
-            Number(this.form.amountCrUsd) != Number(this.form.actualAmountCrUsd)
-          ) {
-            this.$confirm("对账金额与实际支付金额不相等，是否确认对账?", {
-              confirmButtonText: "确定",
-              cancelButtonText: "取消",
-              type: "warning"
-            }).then(() => {
-              this.confirm();
-            });
-          } else {
-            this.$confirm("确定进行确认完成操作?", {
-              confirmButtonText: "确定",
-              cancelButtonText: "取消",
-              type: "warning"
-            }).then(() => {
-              this.confirm();
-            });
-          }
-        });
+        if (this.form.dc == "C") {
+          getListAllDetail({ srcId: this.form.id }).then((res) => {
+            if (
+              Number(this.form.amountDr) != Number(this.form.actualAmountDr) ||
+              Number(this.form.amountCr) != Number(this.form.actualAmountCr) ||
+              Number(this.form.amountDrUsd) != Number(this.form.actualAmountDrUsd) ||
+              Number(this.form.amountCrUsd) != Number(this.form.actualAmountCrUsd)
+            ) {
+              this.$confirm("对账金额与实际支付金额不相等，是否确认对账?", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+              }).then(() => {
+                this.confirm();
+              });
+            } else {
+              this.$confirm("确定进行确认完成操作?", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+              }).then(() => {
+                this.confirm();
+              });
+            }
+          });
+        }
+        if (this.form.dc == "D") {
+          this.$confirm("确定进行确认完成操作?", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          }).then(() => {
+            this.confirm();
+          });
+        }
       }
       if (name == "撤销完成") {
         this.$confirm("确定进行撤销对账操作?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
-          type: "warning"
+          type: "warning",
         }).then(() => {
           let obj = {
             ...this.form,
             billNoFormat: "HYDZ",
             businessTypeCode: "HYDZ",
-            businessType: "CHK"
+            businessType: "CHK",
           };
           const loading = this.$loading({
             lock: true,
             text: "加载中",
             spinner: "el-icon-loading",
-            background: "rgba(255,255,255,0.7)"
+            background: "rgba(255,255,255,0.7)",
           });
           finstlbillsRevokeReconciliation(obj)
-            .then(res => {
+            .then((res) => {
               this.$message.success("操作成功");
               this.getDetail(this.form.id);
             })
@@ -842,23 +869,23 @@ export default {
         this.$confirm("确定进行撤销申请操作?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
-          type: "warning"
+          type: "warning",
         }).then(() => {
           let obj = {
             ...this.form,
             billNoFormat: "HYDZ",
             businessTypeCode: "HYDZ",
-            businessType: "CHK"
+            businessType: "CHK",
           };
           if (this.form.operatingType == "付费申请") {
             const loading = this.$loading({
               lock: true,
               text: "加载中",
               spinner: "el-icon-loading",
-              background: "rgba(255,255,255,0.7)"
+              background: "rgba(255,255,255,0.7)",
             });
             revokeSettlementApprove(obj)
-              .then(res => {
+              .then((res) => {
                 this.$message.success("操作成功");
                 this.getDetail(this.form.id);
               })
@@ -871,10 +898,10 @@ export default {
               lock: true,
               text: "加载中",
               spinner: "el-icon-loading",
-              background: "rgba(255,255,255,0.7)"
+              background: "rgba(255,255,255,0.7)",
             });
             revokeOffset(obj)
-              .then(res => {
+              .then((res) => {
                 this.$message.success("操作成功");
                 this.getDetail(this.form.id);
               })
@@ -887,10 +914,10 @@ export default {
               lock: true,
               text: "加载中",
               spinner: "el-icon-loading",
-              background: "rgba(255,255,255,0.7)"
+              background: "rgba(255,255,255,0.7)",
             });
             revokeWriteOff(obj)
-              .then(res => {
+              .then((res) => {
                 this.$message.success("操作成功");
                 this.getDetail(this.form.id);
               })
@@ -903,10 +930,10 @@ export default {
               lock: true,
               text: "加载中",
               spinner: "el-icon-loading",
-              background: "rgba(255,255,255,0.7)"
+              background: "rgba(255,255,255,0.7)",
             });
             revokeFinInvoicesApprove(obj)
-              .then(res => {
+              .then((res) => {
                 this.$message.success("操作成功");
                 this.getDetail(this.form.id);
               })
@@ -943,9 +970,9 @@ export default {
         businessDateEnd: this.form.businessDateEnd, // 业务结束日期
         approveTimeStart: this.form.auditDateFrom, // 审核开始日期
         approveTimeEnd: this.form.auditDateTo, // 审核结束日期
-        feeCnName: this.form.feeCnName
+        feeCnName: this.form.feeCnName,
       };
-      finstlbillslistAccBillByCorp(obj).then(res => {
+      finstlbillslistAccBillByCorp(obj).then((res) => {
         this.retrievePopupsType = true;
         this.retrievePopupsData = res.data.data;
       });
@@ -962,9 +989,9 @@ export default {
       this.form.isSignedPersonName = null;
       let obj = {
         corpId: row.id,
-        validDate: dateFormat(new Date(), "yyyy-MM-dd")
+        validDate: dateFormat(new Date(), "yyyy-MM-dd"),
       };
-      agreementListAll(obj).then(res => {
+      agreementListAll(obj).then((res) => {
         if (res.data.data.length) {
           let obj = res.data.data[0];
           let USDTEXT = obj.amountUsd ? "USD:" + Number(obj.amountUsd) : "";
@@ -988,16 +1015,16 @@ export default {
         businessTypeCode: "HYDZ",
         businessType: "CHK",
         url: "/iosBasicData/financialManagement/finstlbills/index",
-        pageLabel: "对账中心(J)"
+        pageLabel: "对账中心(J)",
       };
       const loading = this.$loading({
         lock: true,
         text: "加载中",
         spinner: "el-icon-loading",
-        background: "rgba(255,255,255,0.7)"
+        background: "rgba(255,255,255,0.7)",
       });
       finstlbillsConfirmReconciliation(obj)
-        .then(res => {
+        .then((res) => {
           this.$message.success("操作成功");
           this.getDetail(this.form.id);
         })
@@ -1019,16 +1046,16 @@ export default {
         businessTypeCode: "HYDZ",
         businessType: "CHK",
         url: "/iosBasicData/financialManagement/finstlbills/index",
-        pageLabel: "对账中心(J)"
+        pageLabel: "对账中心(J)",
       };
       const loading = this.$loading({
         lock: true,
         text: "加载中",
         spinner: "el-icon-loading",
-        background: "rgba(255,255,255,0.7)"
+        background: "rgba(255,255,255,0.7)",
       });
       confirmWriteOff(obj)
-        .then(res => {
+        .then((res) => {
           this.$message.success("操作成功");
           this.getDetail(this.form.id);
         })
@@ -1058,16 +1085,16 @@ export default {
         ...this.form,
         billNoFormat: "HYDZ",
         businessTypeCode: "HYDZ",
-        businessType: "CHK"
+        businessType: "CHK",
       };
       const loading = this.$loading({
         lock: true,
         text: "加载中",
         spinner: "el-icon-loading",
-        background: "rgba(255,255,255,0.7)"
+        background: "rgba(255,255,255,0.7)",
       });
       finstlbillsSubmit(obj)
-        .then(res => {
+        .then((res) => {
           this.$message.success("操作成功");
           this.getDetail(res.data.data.id);
         })
@@ -1087,33 +1114,37 @@ export default {
         lock: true,
         text: "加载中",
         spinner: "el-icon-loading",
-        background: "rgba(255,255,255,0.7)"
+        background: "rgba(255,255,255,0.7)",
       });
       finstlbillsDetail(id)
-        .then(res => {
-          res.data.data.finStlBillsItemsList.forEach(item => {
+        .then((res) => {
+          res.data.data.finStlBillsItemsList.forEach((item) => {
             if (item.curCode == "CNY") {
               this.$set(item, "amountRMB", item.amount);
               this.$set(item, "currentInvoiceAmountRMB", Number(item.currentInvoiceAmount ? item.currentInvoiceAmount : 0));
               this.$set(item, "unsettledAmountRMB", Number(item.amount ? item.amount : 0));
               this.$set(item, "currentStlAmountRMB", Number(item.currentStlAmount ? item.currentStlAmount : 0));
               this.$set(item, "currentStlAmountUSD", Number(0));
+              this.$set(item, "stlAmountDr", Number(item.stlTtlAmount ? item.stlTtlAmount : 0));
+              this.$set(item, "stlAmountDrUSD", Number(0));
             } else {
               this.$set(item, "amountUSD", item.amount);
               this.$set(item, "currentInvoiceAmountUSD", item.currentInvoiceAmount);
               this.$set(item, "unsettledAmountUSD", Number(item.amount ? item.amount : 0));
               this.$set(item, "currentStlAmountUSD", Number(item.currentStlAmount ? item.currentStlAmount : 0));
               this.$set(item, "currentStlAmountRMB", Number(0));
+              this.$set(item, "stlAmountDr", Number(0));
+              this.$set(item, "stlAmountDrUSD", Number(item.stlTtlAmount ? item.stlTtlAmount : 0));
             }
           });
 
           if (type == "对账") {
-            if (res.data.data.finStlBillsItemsList.filter(item => item.isChecked == 1).length) {
+            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) {
+            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;
@@ -1144,9 +1175,9 @@ export default {
     },
     goBack(type) {
       this.$emit("goBack");
-    }
+    },
   },
-  watch: {}
+  watch: {},
 };
 </script>
 
@@ -1221,4 +1252,11 @@ export default {
   font-size: 16px;
   color: #54bcbd;
 }
+.customer-title {
+  position: absolute;
+  top: 12px;
+  z-index: 1000;
+  left: calc(50% - 175px);
+  color: #67c23a;
+}
 </style>

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

@@ -121,12 +121,6 @@ export default {
             overHidden: true
           },
           {
-            label: "单据编号",
-            prop: "billNo",
-            search: true,
-            overHidden: true
-          },
-          {
             label: "对账日期",
             prop: "billDate",
             overHidden: true,
@@ -156,7 +150,7 @@ export default {
           },
           {
             label: "对账单号",
-            prop: "checkNo",
+            prop: "billNo",
             search: true,
             width: "100",
             searchOrder: 6,