From b8a64226871cad22d986d99c8fadeb59613776b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?=
 <14166000+zhangtonghai@user.noreply.gitee.com>
Date: Mon, 25 Nov 2024 17:30:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=AF=B9=E8=B4=A6=20?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CustomerReconciliation/columns.tsx        |  16 +-
 .../CustomerReconciliation/index.vue          | 290 +++++++-----------
 2 files changed, 117 insertions(+), 189 deletions(-)

diff --git a/src/views/operation/CustomerReconciliation/columns.tsx b/src/views/operation/CustomerReconciliation/columns.tsx
index 793d9aae..a0cf5194 100644
--- a/src/views/operation/CustomerReconciliation/columns.tsx
+++ b/src/views/operation/CustomerReconciliation/columns.tsx
@@ -166,14 +166,14 @@ export const columns: BasicColumn[] = [
     //   return RData
     // },
   },
-  { title: '应收RMB', dataIndex: 'rmbdr', align: 'left', width: 100 },
-  { title: '未收RMB', dataIndex: 'balrmbdr', align: 'left', width: 100 },
-  { title: '应收USD', dataIndex: 'usddr', align: 'left', width: 100 },
-  { title: '未收USD', dataIndex: 'balusddr', align: 'left', width: 100 },
-  { title: '应付RMB', dataIndex: 'rmbcr', align: 'left', width: 100 },
-  { title: '未付RMB', dataIndex: 'balrmbcr', align: 'left', width: 100 },
-  { title: '应付USD', dataIndex: 'usdcr', align: 'left', width: 100 },
-  { title: '未付USD', dataIndex: 'balusdcr', align: 'left', width: 100 },
+  { title: '应收RMB', dataIndex: 'rmbdr', align: 'right', width: 100 },
+  { title: '未收RMB', dataIndex: 'balrmbdr', align: 'right', width: 100 },
+  { title: '应收USD', dataIndex: 'usddr', align: 'right', width: 100 },
+  { title: '未收USD', dataIndex: 'balusddr', align: 'right', width: 100 },
+  { title: '应付RMB', dataIndex: 'rmbcr', align: 'right', width: 100 },
+  { title: '未付RMB', dataIndex: 'balrmbcr', align: 'right', width: 100 },
+  { title: '应付USD', dataIndex: 'usdcr', align: 'right', width: 100 },
+  { title: '未付USD', dataIndex: 'balusdcr', align: 'right', width: 100 },
   { title: '对账时间', dataIndex: 'createTime', align: 'left', width: 150 },
   { title: '对账人', dataIndex: 'createByName', align: 'left', width: 100 },
   { title: '备注', dataIndex: 'note', align: 'left', width: 150 },
diff --git a/src/views/operation/CustomerReconciliation/index.vue b/src/views/operation/CustomerReconciliation/index.vue
index 204dde3b..9ad10665 100644
--- a/src/views/operation/CustomerReconciliation/index.vue
+++ b/src/views/operation/CustomerReconciliation/index.vue
@@ -1,129 +1,70 @@
 <template>
-  <div class="topTable">
-    <BasicTable
-      class="ds-table"
-      @register="registerTable"
-      @row-dbClick="
-        (e) => {
-          GoDetailed(true, e)
-        }
-      "
-    >
-      <template #tableTitle>
-        <div class="ds-h-aciton-btns-fee">
-          <a-tooltip placement="top" :mouseEnterDelay="0.5">
-            <template #title>
-              <span>新增</span>
-            </template>
-            <span @click="GoDetailed(false, null)" class="ds-action-svg-btn">
-              <img src="../../../assets/svg/infoclient/xinjian.svg" class="SvgImg" />
+  <div class="ds-sea-export-table p20">
+    <div class="ds-table">
+      <BasicTable
+        @register="registerTable"
+        @row-dbClick="
+          (e) => {
+            GoDetailed(true, e)
+          }
+        "
+      >
+        <template #tableTitle>
+          <TableButton :show="{ add: null, del: null }" @add="GoDetailed(false, null)" @del="FnDel">
+            <span class="iconfont icon-daochu-hei" @click="ExportExcel">导出excel</span>
+            <span class="iconfont icon-tijiaoshenhe-danse" @click="Lock">提交锁定</span>
+            <span class="iconfont icon-chexiaoshenqingshenhe-danse" @click="UnLock">解除锁定</span>
+          </TableButton>
+
+          <div class="buttonGroup">
+            <!-- <a-button v-repeat type="link" @click="generated">
+              <span class="iconfont icon-renwu_ IconColor"></span>
+              生成发票申请
+            </a-button> -->
+          </div>
+        </template>
+        <template v-slot:bodyCell="{ column, record }">
+          <template v-if="column.dataIndex == 'billNo'">
+            <div class="billNo">
+              <span
+                v-if="record.billNo"
+                @click="FnCopy(record.billNo)"
+                class="iconfont icon-fuzhi3"
+              ></span>
+              <span>{{ record.billNo }}</span>
+            </div>
+          </template>
+          <template v-if="column.dataIndex == 'isLocking'">
+            <span v-if="record.isLocking">
+              <i class="iconfont icon-locksuo"></i>
             </span>
-          </a-tooltip>
-          <a-tooltip placement="top" :mouseEnterDelay="0.5">
-            <template #title>
-              <span>删除</span>
-            </template>
-            <a-popconfirm
-              title="确定删除当前选中数据？"
-              @confirm="FnDel"
-              ok-text="是"
-              cancel-text="否"
+            <span v-else> <i class="iconfont icon-a-jiesuo1_jiesuo"></i> </span>
+          </template>
+          <template v-if="column.dataIndex == 'billType'">
+            <span
+              v-for="item in billTypeData"
+              :key="item.value"
+              v-show="item.value == record.billType"
             >
-              <span class="ds-action-svg-btn">
-                <img src="../../../assets/svg/infoclient/shanchu.svg" class="SvgImg" />
-              </span>
-            </a-popconfirm>
-          </a-tooltip>
-          <!-- <a-tooltip placement="top" :mouseEnterDelay="0.5">
-            <template #title>
-              <span>打印</span>
-            </template>
-            <span @click="printFee" class="ds-action-svg-btn">
-              <img src="../../../assets/svg/infoclient/dayin.svg" class="SvgImg" />
+              {{ item.label }}
             </span>
-          </a-tooltip> -->
-          <!-- <a-tooltip placement="top" :mouseEnterDelay="0.5">
-              <template #title>
-                <span>分享</span>
-              </template>
-              <span class="ds-action-svg-btn">
-                <img src="../../../assets/svg/infoclient/tijiao.svg" class="SvgImg" />
-              </span>
-            </a-tooltip> -->
-          <a-tooltip placement="top" :mouseEnterDelay="0.5">
-            <template #title>
-              <span>导出excel</span>
-            </template>
-            <span @click="ExportExcel" class="ds-action-svg-btn" style="padding-top: 4px">
-              <SvgIcon size="16" name="export" />
-            </span>
-          </a-tooltip>
-          <a-tooltip placement="top" :mouseEnterDelay="0.5">
-            <template #title>
-              <span>提交锁定</span>
-            </template>
-            <span @click="Lock" class="ds-action-svg-btn">
-              <img src="../../../assets/icons/lock.svg" class="SvgImg" />
-            </span>
-          </a-tooltip>
+          </template>
+          <template v-if="column.dataIndex == 'isNoTax'">
+            <a-tag color="error" v-if="record.isNoTax == 'true'">是</a-tag>
+            <a-tag color="success" v-else>否</a-tag>
+          </template>
+        </template>
+        <template v-slot:tableAction="{ record }">
           <a-tooltip placement="top" :mouseEnterDelay="0.5">
             <template #title>
-              <span>解除锁定</span>
+              <span>编辑</span>
             </template>
-            <span @click="UnLock" class="ds-action-svg-btn">
-              <img src="../../../assets/icons/openLock.svg" class="SvgImg" />
-            </span>
+            <a-button type="link" @click="GoDetailed(true, record)">
+              <span class="iconfont icon-icon_519"></span>
+            </a-button>
           </a-tooltip>
-        </div>
-        <div class="buttonGroup">
-          <!-- <a-button v-repeat type="link" @click="generated">
-              <span class="iconfont icon-renwu_ IconColor"></span>
-              生成发票申请
-            </a-button> -->
-        </div>
-      </template>
-      <template v-slot:bodyCell="{ column, record }">
-        <template v-if="column.dataIndex == 'billNo'">
-          <div class="billNo">
-            <span
-              v-if="record.billNo"
-              @click="FnCopy(record.billNo)"
-              class="iconfont icon-fuzhi3"
-            ></span>
-            <span>{{ record.billNo }}</span>
-          </div>
         </template>
-        <template v-if="column.dataIndex == 'isLocking'">
-          <span v-if="record.isLocking">
-            <i class="iconfont icon-locksuo"></i>
-          </span>
-          <span v-else> <i class="iconfont icon-a-jiesuo1_jiesuo"></i> </span>
-        </template>
-        <template v-if="column.dataIndex == 'billType'">
-          <span
-            v-for="item in billTypeData"
-            :key="item.value"
-            v-show="item.value == record.billType"
-          >
-            {{ item.label }}
-          </span>
-        </template>
-        <template v-if="column.dataIndex == 'isNoTax'">
-          <a-tag color="error" v-if="record.isNoTax == 'true'">是</a-tag>
-          <a-tag color="success" v-else>否</a-tag>
-        </template>
-      </template>
-      <template v-slot:tableAction="{ record }">
-        <a-tooltip placement="top" :mouseEnterDelay="0.5">
-          <template #title>
-            <span>编辑</span>
-          </template>
-          <a-button type="link" @click="GoDetailed(true, record)">
-            <span class="iconfont icon-icon_519"></span>
-          </a-button>
-        </a-tooltip>
-      </template>
-      <!-- <template v-if="column.key === 'action'">
+        <!-- <template v-if="column.key === 'action'">
           <TableAction
             :actions="[
               {
@@ -136,20 +77,18 @@
             ]"
           />
         </template> -->
-    </BasicTable>
-    <!-- 合计 -->
-    <div class="static-box">
+      </BasicTable>
       <a-table
-        class="ds-table"
+        class="static-box"
         :columns="calcColumns"
         :data-source="calcData"
         :pagination="false"
       ></a-table>
     </div>
-    <!-- <DsPrint ref="dsPrint" name="客户对账"></DsPrint> -->
   </div>
+  <!-- <DsPrint ref="dsPrint" name="客户对账"></DsPrint> -->
 </template>
-<script lang="ts" setup>
+<script lang="ts" setup name="客户对账">
   import { ref } from 'vue'
   import {
     GetCheckBillList,
@@ -159,12 +98,10 @@
   } from './api.js'
   import { BasicTable, useTable, TableAction } from '/@/components/Table'
   import { columns, searchFormSchema, billTypeData } from './columns'
-  import { GetOpenPrintModuleList } from '/@/views/operation/seaexport/api/BookingLedger.js'
   import * as XLSX from 'xlsx'
   import DsPrint from '/@/components/Print/index.vue'
   import { useMessage } from '/@/hooks/web/useMessage'
   const { notification, createMessage } = useMessage()
-  import { SvgIcon } from '/@/components/Icon'
   import { useGo } from '/@/hooks/web/usePage'
   const go = useGo()
   // 引入处理入参方法
@@ -173,53 +110,44 @@
   const appStore = useAppStore()
   const tbHeight = window.innerHeight - 350
   //   表格
-  const [registerTable, { reload, getForm, getPaginationRef, getSelectRows, getRawDataSource }] =
-    useTable({
-      title: '',
-      api: async (p) => {
-        const res: API.DataResult = await GetCheckBillList(p)
-        calcData.value = [res.data?.dataTotal]
-        return new Promise((resolve) => {
-          if (res.data?.list) {
-            const ids = res.data.list.map((item) => {
-              return item.id
-            })
-            appStore.setIds(ids, 'khdz')
-          }
-          resolve({ data: [...res.data.list], total: res.data.totalCount })
-        })
-      },
-      // 请求前的参数格式化
-      beforeFetch: (p) => {
-        return formatParams(p)
-      },
-      columns,
-      formConfig: {
-        labelWidth: 120,
-        schemas: searchFormSchema,
-      },
-      isTreeTable: false,
-      pagination: true,
-      striped: true,
-      useSearchForm: true,
-      showTableSetting: true,
-      bordered: true,
-      showIndexColumn: true,
-      indexColumnProps: {
-        width: 60,
-      },
-      canResize: true,
-      resizeHeightOffset: 90,
-      autoHeight: tbHeight,
-      immediate: true,
-      tableComponent: 'vxe',
-      actionColumn: {
-        width: 60,
-        title: '操作',
-        dataIndex: 'action',
-        fixed: 'right',
-      },
-    })
+  const [registerTable, { reload, getVxeSelectRows, getRawDataSource }] = useTable({
+    title: '',
+    api: async (p) => {
+      const res: API.DataResult = await GetCheckBillList(p)
+      calcData.value = [res.data?.dataTotal]
+      return new Promise((resolve) => {
+        if (res.data?.list) {
+          const ids = res.data.list.map((item) => {
+            return item.id
+          })
+          appStore.setIds(ids, 'khdz')
+        }
+        resolve({ data: [...res.data.list], total: res.data.totalCount })
+      })
+    },
+    // 请求前的参数格式化
+    beforeFetch: (p) => {
+      return formatParams(p)
+    },
+    columns,
+    formConfig: {
+      labelWidth: 120,
+      schemas: searchFormSchema,
+    },
+    isTreeTable: false,
+    pagination: true,
+    striped: true,
+    useSearchForm: true,
+    showTableSetting: true,
+    bordered: true,
+    showIndexColumn: true,
+    canResize: true,
+    immediate: true,
+    resizeHeightOffset: 131,
+    tableComponent: 'vxe',
+    autoHeight: window.innerHeight - 416.5,
+    id: '0',
+  })
   // 复制对账编号
   function FnCopy(data) {
     const el = document.createElement('input')
@@ -240,7 +168,7 @@
   }
   // 删除
   function FnDel() {
-    const select = getSelectRows()
+    const select = getVxeSelectRows()
     let ApiData: any = {
       ids: [],
     }
@@ -265,7 +193,7 @@
     let ApiData: any = {
       ids: [],
     }
-    getSelectRows().forEach((e) => {
+    getVxeSelectRows().forEach((e) => {
       ApiData.ids.push(e.id)
     })
 
@@ -282,7 +210,7 @@
     let ApiData: any = {
       ids: [],
     }
-    getSelectRows().forEach((e) => {
+    getVxeSelectRows().forEach((e) => {
       ApiData.ids.push(e.id)
     })
     CheckBillUnLocking(ApiData).then((res) => {
@@ -466,12 +394,12 @@
     color: #257afa;
     cursor: pointer;
   }
-  .topTable {
-    // height: calc(100vh - 145px);
-    .static-box {
-      position: fixed;
-      bottom: 0;
-      padding-left: 20px;
+  .ds-sea-export-table {
+    height: 100%;
+    .ds-table {
+      .ant-table-body {
+        min-height: calc(100vh - 430px);
+      }
     }
   }
   .ds-h-aciton-btns-fee {