From 64b48c1c3d6b1b3a23c032d76193ebd4e595c5b1 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: Wed, 9 Oct 2024 17:51:12 +0800
Subject: [PATCH] 10/09

---
 .../BuyCtn/TenantAuditStepModal.vue           |   2 +-
 .../CtnScrap/TenantAuditStepModal.vue         |   2 +-
 .../ContainerManagement/CtnScrap/columns.tsx  |   2 +-
 .../CurrentState/columns.tsx                  |   6 +-
 .../CustFeeDui/TenantAuditStepModal.vue       |   2 +-
 .../RentIn/TenantAuditStepModal.vue           |   6 +-
 .../ContainerManagement/RentIn/columns.tsx    |   2 +-
 .../RentOneWay/TenantAuditStepModal.vue       |   2 +-
 .../RentOneWay/columns.tsx                    |   2 +-
 .../RentOneWayIn/TenantAuditStepModal.vue     |   2 +-
 .../RentOut/TenantAuditStepModal.vue          |   8 +-
 .../ContainerManagement/RentOut/columns.tsx   |   2 +-
 .../SellCtn/TenantAuditStepModal.vue          |   2 +-
 .../ContainerManagement/SellCtn/columns.tsx   |   2 +-
 .../StateChange/columns.tsx                   |   2 +-
 .../ContainerManagement/dsxxcl/columns.tsx    |   2 +-
 .../ContainerManagement/qbxdtbdrz/columns.tsx |   2 +-
 .../TaskMail/TenantAuditStepModal.vue         |   6 +-
 src/views/baseinfo/TaskMail/api.ts            |  11 +-
 src/views/baseinfo/TaskMail/columns.tsx       |  86 +++++++-
 .../infoclient/FeeCustTemplate/columns.tsx    |  38 +++-
 .../infoclient/FeeCustTemplate/feeField.vue   |  40 ++--
 src/views/baseinfo/port/columns.tsx           |  38 ++--
 src/views/baseinfo/shipping/columns.tsx       |  79 ++++----
 .../FeeCustTemplate/TenantAuditStepModal.vue  |  26 ++-
 src/views/fee/FeeCustTemplate/columns.tsx     |  96 +++++++--
 src/views/fee/FeeCustTemplate/feeField.vue    |  40 ++--
 src/views/fee/template/components/Modal.vue   |  44 ++--
 src/views/fee/template/index.vue              |  56 +++++-
 .../operation/CustomerReconciliation/api.js   |   8 +
 .../CustomerReconciliation/index.vue          | 188 ++++++++++--------
 31 files changed, 572 insertions(+), 232 deletions(-)

diff --git a/src/views/ContainerManagement/BuyCtn/TenantAuditStepModal.vue b/src/views/ContainerManagement/BuyCtn/TenantAuditStepModal.vue
index 32a43f44..08448889 100644
--- a/src/views/ContainerManagement/BuyCtn/TenantAuditStepModal.vue
+++ b/src/views/ContainerManagement/BuyCtn/TenantAuditStepModal.vue
@@ -581,7 +581,7 @@
       },
     },
     {
-      title: '放箱单号',
+      title: '合同号',
       width: 120,
       data: 'ctnReleaseNo',
     },
diff --git a/src/views/ContainerManagement/CtnScrap/TenantAuditStepModal.vue b/src/views/ContainerManagement/CtnScrap/TenantAuditStepModal.vue
index eb546839..18f0bc8d 100644
--- a/src/views/ContainerManagement/CtnScrap/TenantAuditStepModal.vue
+++ b/src/views/ContainerManagement/CtnScrap/TenantAuditStepModal.vue
@@ -602,7 +602,7 @@
       },
     },
     {
-      title: '放箱单号',
+      title: '合同号',
       width: 120,
       data: 'ctnReleaseNo',
     },
diff --git a/src/views/ContainerManagement/CtnScrap/columns.tsx b/src/views/ContainerManagement/CtnScrap/columns.tsx
index 91965453..016478a1 100644
--- a/src/views/ContainerManagement/CtnScrap/columns.tsx
+++ b/src/views/ContainerManagement/CtnScrap/columns.tsx
@@ -202,7 +202,7 @@ export const formSearchBoxSchema: FormSchema[] = [
   },
   {
     field: 'ctnreleaseno',
-    label: '放箱单号',
+    label: '合同号',
     component: 'Input',
     colProps: { span: 6 },
   },
diff --git a/src/views/ContainerManagement/CurrentState/columns.tsx b/src/views/ContainerManagement/CurrentState/columns.tsx
index 3d8e0c64..fe093ee2 100644
--- a/src/views/ContainerManagement/CurrentState/columns.tsx
+++ b/src/views/ContainerManagement/CurrentState/columns.tsx
@@ -73,7 +73,7 @@ export const columns: BasicColumn[] = [
     width: 200,
   },
   {
-    title: '关联放箱单号',
+    title: '关联合同号',
     dataIndex: 'ctnReleaseNo',
     sorter: true,
     width: 200,
@@ -312,7 +312,7 @@ export const searchFormSchema: FormSchema[] = [
   },
   {
     field: 'ctnReleaseNo',
-    label: '关联放箱单号',
+    label: '关联合同号',
     component: 'Input',
     colProps: { span: 4 },
   },
@@ -498,7 +498,7 @@ export const formSchema: FormSchema[] = [
   },
   {
     field: 'ctnReleaseNo',
-    label: '关联放箱单号',
+    label: '关联合同号',
     component: 'Input',
     colProps: { span: 6 },
     // required: true,
diff --git a/src/views/ContainerManagement/CustFeeDui/TenantAuditStepModal.vue b/src/views/ContainerManagement/CustFeeDui/TenantAuditStepModal.vue
index 74288824..8c5ea509 100644
--- a/src/views/ContainerManagement/CustFeeDui/TenantAuditStepModal.vue
+++ b/src/views/ContainerManagement/CustFeeDui/TenantAuditStepModal.vue
@@ -781,7 +781,7 @@
       data: 'rentType',
     },
     {
-      title: '放箱单号',
+      title: '合同号',
       width: 120,
       data: 'ctnReleaseNo',
     },
diff --git a/src/views/ContainerManagement/RentIn/TenantAuditStepModal.vue b/src/views/ContainerManagement/RentIn/TenantAuditStepModal.vue
index 186b28fe..bcce9ffe 100644
--- a/src/views/ContainerManagement/RentIn/TenantAuditStepModal.vue
+++ b/src/views/ContainerManagement/RentIn/TenantAuditStepModal.vue
@@ -623,7 +623,7 @@
     //   data: 'billState',
     // },
     {
-      title: '关联放箱单号',
+      title: '关联合同号',
       width: 120,
       data: 'ctnReleaseNo',
     },
@@ -734,7 +734,7 @@
       data: 'vesselVoyno',
     },
     {
-      title: '放箱单号',
+      title: '合同号',
       width: 120,
       data: 'ctnreleaseno',
     },
@@ -930,7 +930,7 @@
     //   data: 'billState',
     // },
     {
-      title: '关联放箱单号',
+      title: '关联合同号',
       width: 120,
       data: 'ctnReleaseNo',
     },
diff --git a/src/views/ContainerManagement/RentIn/columns.tsx b/src/views/ContainerManagement/RentIn/columns.tsx
index bcfcf5c4..674af413 100644
--- a/src/views/ContainerManagement/RentIn/columns.tsx
+++ b/src/views/ContainerManagement/RentIn/columns.tsx
@@ -547,7 +547,7 @@ export const formSearchBoxSchema: FormSchema[] = [
   },
   {
     field: 'ctnreleaseno',
-    label: '放箱单号',
+    label: '合同号',
     component: 'Input',
     colProps: { span: 6 },
   },
diff --git a/src/views/ContainerManagement/RentOneWay/TenantAuditStepModal.vue b/src/views/ContainerManagement/RentOneWay/TenantAuditStepModal.vue
index 54b09815..a35ffebc 100644
--- a/src/views/ContainerManagement/RentOneWay/TenantAuditStepModal.vue
+++ b/src/views/ContainerManagement/RentOneWay/TenantAuditStepModal.vue
@@ -641,7 +641,7 @@
       },
     },
     {
-      title: '放箱单号',
+      title: '合同号',
       width: 120,
       data: 'ctnReleaseNo',
     },
diff --git a/src/views/ContainerManagement/RentOneWay/columns.tsx b/src/views/ContainerManagement/RentOneWay/columns.tsx
index 419a96ca..2e02628d 100644
--- a/src/views/ContainerManagement/RentOneWay/columns.tsx
+++ b/src/views/ContainerManagement/RentOneWay/columns.tsx
@@ -544,7 +544,7 @@ export const formSearchBoxSchema: FormSchema[] = [
   },
   {
     field: 'ctnreleaseno',
-    label: '放箱单号',
+    label: '合同号',
     component: 'Input',
     colProps: { span: 6 },
   },
diff --git a/src/views/ContainerManagement/RentOneWayIn/TenantAuditStepModal.vue b/src/views/ContainerManagement/RentOneWayIn/TenantAuditStepModal.vue
index b305ff38..5e3312e1 100644
--- a/src/views/ContainerManagement/RentOneWayIn/TenantAuditStepModal.vue
+++ b/src/views/ContainerManagement/RentOneWayIn/TenantAuditStepModal.vue
@@ -589,7 +589,7 @@
       },
     },
     {
-      title: '放箱单号',
+      title: '合同号',
       width: 120,
       data: 'ctnReleaseNo',
     },
diff --git a/src/views/ContainerManagement/RentOut/TenantAuditStepModal.vue b/src/views/ContainerManagement/RentOut/TenantAuditStepModal.vue
index 693a561b..eeb64f34 100644
--- a/src/views/ContainerManagement/RentOut/TenantAuditStepModal.vue
+++ b/src/views/ContainerManagement/RentOut/TenantAuditStepModal.vue
@@ -643,7 +643,7 @@
     //   data: 'billState',
     // },
     {
-      title: '放箱单号',
+      title: '合同号',
       width: 120,
       data: 'ctnReleaseNo',
     },
@@ -975,7 +975,7 @@
     //   data: 'billState',
     // },
     {
-      title: '放箱单号',
+      title: '合同号',
       width: 120,
       data: 'ctnReleaseNo',
     },
@@ -1374,7 +1374,7 @@
       data: 'stateTime',
     },
     {
-      title: '放箱单号',
+      title: '合同号',
       width: 120,
       data: 'ctnReleaseNo',
     },
@@ -1552,7 +1552,7 @@
       data: 'vesselVoyno',
     },
     {
-      title: '放箱单号',
+      title: '合同号',
       width: 120,
       data: 'ctnReleaseNo',
     },
diff --git a/src/views/ContainerManagement/RentOut/columns.tsx b/src/views/ContainerManagement/RentOut/columns.tsx
index 15cd9cfa..d5089a5f 100644
--- a/src/views/ContainerManagement/RentOut/columns.tsx
+++ b/src/views/ContainerManagement/RentOut/columns.tsx
@@ -574,7 +574,7 @@ export const formSearchBoxSchema: FormSchema[] = [
   },
   {
     field: 'ctnreleaseno',
-    label: '放箱单号',
+    label: '合同号',
     component: 'Input',
     colProps: { span: 6 },
   },
diff --git a/src/views/ContainerManagement/SellCtn/TenantAuditStepModal.vue b/src/views/ContainerManagement/SellCtn/TenantAuditStepModal.vue
index 447a40b3..a4058a48 100644
--- a/src/views/ContainerManagement/SellCtn/TenantAuditStepModal.vue
+++ b/src/views/ContainerManagement/SellCtn/TenantAuditStepModal.vue
@@ -682,7 +682,7 @@
     //   },
     // },
     {
-      title: '放箱单号',
+      title: '合同号',
       width: 120,
       data: 'ctnReleaseNo',
     },
diff --git a/src/views/ContainerManagement/SellCtn/columns.tsx b/src/views/ContainerManagement/SellCtn/columns.tsx
index 6f45997e..9ca334ed 100644
--- a/src/views/ContainerManagement/SellCtn/columns.tsx
+++ b/src/views/ContainerManagement/SellCtn/columns.tsx
@@ -290,7 +290,7 @@ export const formSearchBoxSchema: FormSchema[] = [
   },
   {
     field: 'ctnreleaseno',
-    label: '放箱单号',
+    label: '合同号',
     component: 'Input',
     colProps: { span: 6 },
   },
diff --git a/src/views/ContainerManagement/StateChange/columns.tsx b/src/views/ContainerManagement/StateChange/columns.tsx
index 5fe5c82f..1ef08af3 100644
--- a/src/views/ContainerManagement/StateChange/columns.tsx
+++ b/src/views/ContainerManagement/StateChange/columns.tsx
@@ -365,7 +365,7 @@ export const formSchema: FormSchema[] = [
   },
   {
     field: 'ctnReleaseNo',
-    label: '关联放箱单号',
+    label: '关联合同号',
     component: 'Input',
     colProps: { span: 6 },
     // required: true,
diff --git a/src/views/ContainerManagement/dsxxcl/columns.tsx b/src/views/ContainerManagement/dsxxcl/columns.tsx
index 2c214e73..5c265406 100644
--- a/src/views/ContainerManagement/dsxxcl/columns.tsx
+++ b/src/views/ContainerManagement/dsxxcl/columns.tsx
@@ -52,7 +52,7 @@ export const columns: BasicColumn[] = [
     width: 200,
   },
   {
-    title: '关联放箱单号',
+    title: '关联合同号',
     dataIndex: 'ctnReleaseNo',
     sorter: true,
     width: 200,
diff --git a/src/views/ContainerManagement/qbxdtbdrz/columns.tsx b/src/views/ContainerManagement/qbxdtbdrz/columns.tsx
index 62d47e76..495952e0 100644
--- a/src/views/ContainerManagement/qbxdtbdrz/columns.tsx
+++ b/src/views/ContainerManagement/qbxdtbdrz/columns.tsx
@@ -312,7 +312,7 @@ export const formSchema: FormSchema[] = [
   },
   {
     field: 'ctnReleaseNo',
-    label: '关联放箱单号',
+    label: '关联合同号',
     component: 'Input',
     colProps: { span: 6 },
     // required: true,
diff --git a/src/views/baseinfo/TaskMail/TenantAuditStepModal.vue b/src/views/baseinfo/TaskMail/TenantAuditStepModal.vue
index 39d5f663..933b8008 100644
--- a/src/views/baseinfo/TaskMail/TenantAuditStepModal.vue
+++ b/src/views/baseinfo/TaskMail/TenantAuditStepModal.vue
@@ -73,7 +73,7 @@
   })
   const DiyFieldIdS = ref<any>([])
   function linkageForm(data) {
-    console.log(data)
+    console.log(data, 11111111)
 
     // 清楚所有添加的Schema
     if (DiyFieldIdS.value.length) {
@@ -251,12 +251,8 @@
           sortConditions: [],
         },
       })
-      console.log(DiyFieldIdS.value)
-
       arrRes.data.forEach((item) => {
         values.attachments.forEach((e) => {
-          console.log(item.id, e)
-
           if (item.id == e) {
             attachments.push({
               taskMailId: values.id,
diff --git a/src/views/baseinfo/TaskMail/api.ts b/src/views/baseinfo/TaskMail/api.ts
index 1f64cf5e..fab96a16 100644
--- a/src/views/baseinfo/TaskMail/api.ts
+++ b/src/views/baseinfo/TaskMail/api.ts
@@ -6,6 +6,7 @@ enum Api {
   edit = '/opApi/TaskMail/Edit',
   info = '/opApi/TaskMail/Edit',
   del = '/opApi/TaskMail/Delete',
+  delfile = '/opApi/TaskMail/DeleteAttachments',
 
   PrintTemplateList = '/mainApi/Print/GetOpenPrintTemplateList',
 }
@@ -41,6 +42,14 @@ export function ApiDel(data: PageRequest) {
     data,
   })
 }
+// 删除附件 (Auth)
+export function ApiDelFile(data: PageRequest) {
+  return request<DataResult>({
+    url: Api.delfile,
+    method: 'post',
+    data,
+  })
+}
 // 印模块列表 (Auth)
 export function GetPrintTemplateList(data: PageRequest) {
   return request<DataResult>({
@@ -48,4 +57,4 @@ export function GetPrintTemplateList(data: PageRequest) {
     method: 'post',
     data,
   })
-}
\ No newline at end of file
+}
diff --git a/src/views/baseinfo/TaskMail/columns.tsx b/src/views/baseinfo/TaskMail/columns.tsx
index a247167b..112243c3 100644
--- a/src/views/baseinfo/TaskMail/columns.tsx
+++ b/src/views/baseinfo/TaskMail/columns.tsx
@@ -1,8 +1,9 @@
 import { BasicColumn, FormSchema } from '/@/components/Table'
 // 字典
 import { getDictOption } from '/@/utils/dictUtil'
-import { GetPrintTemplateList } from './api.ts'
+import { GetPrintTemplateList, ApiDelFile } from './api.ts'
 let documentTypeList = []
+let attachmentsData = []
 export const columns: BasicColumn[] = [
   {
     title: '名称',
@@ -29,6 +30,10 @@ export const columns: BasicColumn[] = [
       return RText
     },
   },
+  {
+    title: '备注',
+    dataIndex: 'note',
+  },
 ]
 
 export const searchFormSchema: FormSchema[] = [
@@ -141,12 +146,44 @@ export const formSchema: FormSchema[] = [
       unCheckedChildren: '否',
     },
   },
+  // {
+  //   label: '附件',
+  //   field: 'attachmentsO',
+  //   component: 'ApiSelect',
+  //   show: false,
+  //   componentProps: ({ formActionType }) => {
+  //     return {
+  //       api: () => {
+  //         return new Promise((resolve) => {
+  //           GetPrintTemplateList({
+  //             queryCondition: `[]`,
+  //             pageCondition: {
+  //               pageIndex: 1,
+  //               pageSize: 999,
+  //               sortConditions: [],
+  //             },
+  //           }).then((res) => {
+  //             attachmentsData = res.data
+  //             resolve(res)
+  //           })
+  //         })
+  //       },
+  //       labelField: 'templateName',
+  //       valueField: 'id',
+  //       resultField: 'data',
+  //       allowClear: true,
+  //       immediate: true,
+  //       mode: 'multiple',
+  //       class: 'NoLimitHeight',
+  //     }
+  //   },
+  // },
   {
     label: '附件',
     field: 'attachments',
     component: 'ApiSelect',
     colProps: { span: 12 },
-    componentProps: ({ formActionType }) => {
+    componentProps: ({ formActionType, formModel }) => {
       return {
         api: () => {
           return new Promise((resolve) => {
@@ -158,6 +195,7 @@ export const formSchema: FormSchema[] = [
                 sortConditions: [],
               },
             }).then((res) => {
+              attachmentsData = res.data
               resolve(res)
             })
           })
@@ -170,11 +208,55 @@ export const formSchema: FormSchema[] = [
         mode: 'multiple',
         class: 'NoLimitHeight',
         onChange: (e, obj) => {
+          if (formModel && formModel.id) {
+            console.log(formModel.id)
+
+            let DelData: any = []
+            if (formModel.attachments.length) {
+              formModel.attachments.forEach((item) => {
+                let type = false
+                obj.forEach((item2) => {})
+                if (!type) {
+                  DelData.push(item)
+                }
+              })
+            }
+            let ApiData: any = []
+            attachmentsData.forEach((item: any) => {
+              console.log(item)
+              DelData.forEach((item2) => {
+                if (item.id == item2) {
+                  ApiData.push({
+                    taskMailId: formModel.id,
+                    templateId: item.id,
+                    fileName: formModel[item.id] ? formModel[item.id] : item.templateName,
+                    fileType: formModel[`${item.id}-fileType`],
+                  })
+                }
+              })
+            })
+            if (ApiData.length) {
+              ApiDelFile(ApiData).then((res) => {
+                console.log(res, 11111)
+              })
+            }
+            console.log(formModel)
+          }
+
           formActionType ? formActionType.linkageForm(obj) : null
         },
       }
     },
   },
+  {
+    field: 'note',
+    label: '备注',
+    component: 'InputTextArea',
+    colProps: { span: 24 },
+    componentProps: {
+      rows: 2,
+    },
+  },
   {
     field: 'title',
     label: '主题模板',
diff --git a/src/views/baseinfo/infoclient/FeeCustTemplate/columns.tsx b/src/views/baseinfo/infoclient/FeeCustTemplate/columns.tsx
index 1fa0dec3..cab2d1c1 100644
--- a/src/views/baseinfo/infoclient/FeeCustTemplate/columns.tsx
+++ b/src/views/baseinfo/infoclient/FeeCustTemplate/columns.tsx
@@ -31,7 +31,7 @@ export const columns: BasicColumn[] = [
     width: 120,
   },
   {
-    title: '结算对象',
+    title: '费用对象',
     dataIndex: 'customerName',
     width: 200,
   },
@@ -223,7 +223,7 @@ export const formSchema: FormSchema[] = [
   // },
   {
     field: 'customerId',
-    label: '结算对象',
+    label: '费用对象',
     defaultValue: '',
     component: 'Input',
     show: false,
@@ -231,12 +231,44 @@ export const formSchema: FormSchema[] = [
   },
   {
     field: 'customerName',
-    label: '结算对象',
+    label: '费用对象',
     component: 'Input',
     defaultValue: '',
     dynamicDisabled: true,
     colProps: { span: 6 },
   },
+  {
+    field: 'customerType',
+    label: '费用对象类别',
+    defaultValue: '',
+    component: 'ApiSelect',
+    colProps: { span: 6 },
+    componentProps: ({ formModel }) => {
+      return {
+        api: () => {
+          return new Promise((resolve) => {
+            getDictOption('djy_cust_prop').then((res) => {
+              resolve(res)
+            })
+          })
+        },
+        labelField: 'label',
+        valueField: 'value',
+        resultField: 'data',
+        filterOption: (input: string, option: any) => {
+          return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+        },
+      }
+    },
+    dynamicRules: ({ values }) => {
+      return [
+        {
+          required: values.customerId ? false : true,
+          message: '未选择费用对象时,此项必填！',
+        },
+      ]
+    },
+  },
   // {
   //   label: '',
   //   field: 'customerId',
diff --git a/src/views/baseinfo/infoclient/FeeCustTemplate/feeField.vue b/src/views/baseinfo/infoclient/FeeCustTemplate/feeField.vue
index 71b82fae..d1d35d57 100644
--- a/src/views/baseinfo/infoclient/FeeCustTemplate/feeField.vue
+++ b/src/views/baseinfo/infoclient/FeeCustTemplate/feeField.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="fee-field">
     <div class="flex">
-      <span class="title">费用字段</span>
+      <span class="title">费用明细</span>
       <div>
         <a-button type="link" @click="OpenSetCondition">
           <span class="iconfont icon-jichupeizhi"></span>
@@ -61,7 +61,7 @@
   // 引入计费标准字典
   import { feeUnitDict } from '/@/hooks/dict/index'
   // 引入字典数据
-  // import { getDictOption } from '/@/utils/dictUtil'
+  import { getDictOption } from '/@/utils/dictUtil'
   import AdvancedSearch from '/@/components/Form/src/components/AdvancedSearch.vue'
   import { useMessage } from '/@/hooks/web/useMessage'
   import { HotTable, HotColumn } from '@handsontable/vue3'
@@ -263,6 +263,20 @@
         process(dict)
       },
     },
+    {
+      title: '客户类别',
+      width: 130,
+      data: 'customerTypeText',
+      type: 'dropdown',
+      source: async (query, process) => {
+        const results = await getDictOption('djy_cust_prop')
+        console.log(results)
+        const dict = results.map((item) => {
+          return item.value + '-' + item.name
+        })
+        process(dict)
+      },
+    },
     {
       title: '单位标准',
       width: 130,
@@ -656,17 +670,17 @@
         // if (changes[0][1] === 'feeEnName') {
         // }
 
-        // // 修改客户类别
-        // if (changes[0][1] === 'customerTypeText') {
-        //   getDictOption('djy_cust_prop').then((res) => {
-        //     const item = res.filter((item) => {
-        //       return changes[0][3].includes(item.name)
-        //     })
-        //     if (item) dict = item[0]
-        //     list.value[changes[0][0]]['customerType'] = dict?.value
-        //     list.value[changes[0][0]]['customerTypeText'] = changes[0][3].split('-')[1]
-        //   })
-        // }
+        // 修改客户类别
+        if (changes[0][1] === 'customerTypeText') {
+          getDictOption('djy_cust_prop').then((res) => {
+            const item = res.filter((item) => {
+              return changes[0][3].includes(item.name)
+            })
+            if (item) dict = item[0]
+            list.value[changes[0][0]]['customerType'] = dict?.value
+            list.value[changes[0][0]]['customerTypeText'] = changes[0][3].split('-')[1]
+          })
+        }
 
         // // 当前操作的行
         // const index = changes[0][0]
diff --git a/src/views/baseinfo/port/columns.tsx b/src/views/baseinfo/port/columns.tsx
index 74f3b459..2045ea96 100644
--- a/src/views/baseinfo/port/columns.tsx
+++ b/src/views/baseinfo/port/columns.tsx
@@ -138,17 +138,15 @@ export const columns: BasicColumn[] = [
 
 export const searchFormSchema: FormSchema[] = [
   {
-    field: 'CnName',
-    label: '港口中文名称',
+    field: 'CnName:portName:ediCode',
+    label: '港口名称',
     component: 'Input',
     colProps: { span: 4 },
+    componentProps: {
+      placeholder: '港口中文名字/港口英文名字/EDI代码',
+    },
   },
-  {
-    field: 'portName',
-    label: '港口英文名称',
-    component: 'Input',
-    colProps: { span: 4 }
-  },
+
   {
     field: 'countryId',
     label: '国家',
@@ -167,10 +165,20 @@ export const searchFormSchema: FormSchema[] = [
     },
   },
   {
-    field: 'ediCode',
-    label: 'EDI代码',
-    component: 'Input',
+    field: 'laneId',
+    label: '航线',
+    component: 'Select',
     colProps: { span: 4 },
+    componentProps: () => {
+      return {
+        options: LanesSelectList,
+        allowClear: false,
+        showSearch: true,
+        filterOption: (input: string, option: any) => {
+          return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+        },
+      }
+    },
   },
 ]
 export const formSchema: FormSchema[] = [
@@ -267,21 +275,21 @@ export const formSchema: FormSchema[] = [
             formModel.lane = obj.label
             formModel.laneCode = obj.code
           }
-        }
+        },
       }
-    }
+    },
   },
   {
     field: 'lane',
     label: '',
     component: 'Input',
-    show: false
+    show: false,
   },
   {
     field: 'laneCode',
     label: '',
     component: 'Input',
-    show: false
+    show: false,
   },
   {
     field: 'ediCode',
diff --git a/src/views/baseinfo/shipping/columns.tsx b/src/views/baseinfo/shipping/columns.tsx
index 8bffee0a..76c47150 100644
--- a/src/views/baseinfo/shipping/columns.tsx
+++ b/src/views/baseinfo/shipping/columns.tsx
@@ -5,11 +5,9 @@
  */
 import { BasicColumn, FormSchema } from '/@/components/Table'
 import { Tag } from 'ant-design-vue'
-import {
-  getClientCountrySelectList
-} from '../infoclient/api'
+import { getClientCountrySelectList } from '../infoclient/api'
 let ClientCountryList = []
-getClientCountrySelectList().then(res => {
+getClientCountrySelectList().then((res) => {
   res.data.forEach((e) => {
     ClientCountryList.push({ label: e.countryName, value: e.id })
   })
@@ -39,28 +37,37 @@ export const columns: BasicColumn[] = [
     title: '备注',
     dataIndex: 'note',
     width: 200,
-  }
+  },
 ]
 
 export const searchFormSchema: FormSchema[] = [
   {
-    field: 'cnName',
-    label: '中文名称',
-    colProps: { span: 4},
-    component: 'Input'
-  },
-  {
-    field: 'enName',
-    label: '英文名称',
-    colProps: { span: 4},
-    component: 'Input'
-  },
-  {
-    field: 'ediCode',
-    label: 'EDI代码',
+    field: 'cnName:enName:ediCode',
+    label: '船公司名称',
+    component: 'Input',
     colProps: { span: 4 },
-    component: 'Input'
-  }
+    componentProps: {
+      placeholder: '中文名称/英文名称/EDI代码',
+    },
+  },
+  // {
+  //   field: 'cnName',
+  //   label: '中文名称',
+  //   colProps: { span: 4},
+  //   component: 'Input'
+  // },
+  // {
+  //   field: 'enName',
+  //   label: '英文名称',
+  //   colProps: { span: 4},
+  //   component: 'Input'
+  // },
+  // {
+  //   field: 'ediCode',
+  //   label: 'EDI代码',
+  //   colProps: { span: 4 },
+  //   component: 'Input'
+  // }
 ]
 export const formSchema: FormSchema[] = [
   {
@@ -75,35 +82,35 @@ export const formSchema: FormSchema[] = [
     label: '中文名称',
     required: true,
     colProps: { span: 12 },
-    component: 'Input'
+    component: 'Input',
   },
   {
     field: 'cnShortName',
     label: '中文简称',
     colProps: { span: 12 },
     required: true,
-    component: 'Input'
+    component: 'Input',
   },
   {
     field: 'enName',
     label: '英文名称',
     colProps: { span: 12 },
     required: true,
-    component: 'Input'
+    component: 'Input',
   },
   {
     field: 'code',
     label: '英文简称',
     colProps: { span: 12 },
     required: true,
-    component: 'Input'
+    component: 'Input',
   },
   {
     field: 'otherCode',
     label: '船公司代码别名',
     colProps: { span: 12 },
     required: true,
-    component: 'Input'
+    component: 'Input',
   },
   {
     field: 'countryId',
@@ -125,15 +132,15 @@ export const formSchema: FormSchema[] = [
           if (v && obj) {
             formModel.countryName = obj.label
           }
-        }
+        },
       }
-    }
+    },
   },
   {
     field: 'countryName',
     label: '国家名称',
     show: false,
-    component: 'Input'
+    component: 'Input',
   },
   {
     field: 'ediCode',
@@ -159,9 +166,9 @@ export const formSchema: FormSchema[] = [
     colProps: { span: 24 },
     componentProps: {
       autoSize: {
-        minRows: 3
-      }
-    }
+        minRows: 3,
+      },
+    },
   },
   {
     field: 'note',
@@ -170,8 +177,8 @@ export const formSchema: FormSchema[] = [
     colProps: { span: 24 },
     componentProps: {
       autoSize: {
-        minRows: 3
-      }
-    }
-  }
+        minRows: 3,
+      },
+    },
+  },
 ]
diff --git a/src/views/fee/FeeCustTemplate/TenantAuditStepModal.vue b/src/views/fee/FeeCustTemplate/TenantAuditStepModal.vue
index fae1512e..43314d6e 100644
--- a/src/views/fee/FeeCustTemplate/TenantAuditStepModal.vue
+++ b/src/views/fee/FeeCustTemplate/TenantAuditStepModal.vue
@@ -65,6 +65,7 @@
   const emit = defineEmits(['success', 'register'])
   const isUpdate = ref(true)
   const isCopy = ref(false)
+  const isSave = ref(false)
   const detailId = ref()
   // 按钮loading
   const loading = ref(false)
@@ -82,6 +83,7 @@
       setModalProps({ confirmLoading: false, loading: true })
       isUpdate.value = !!data?.isUpdate
       isCopy.value = !!data?.isCopy
+      isSave.value = !!data?.isSave
       if (unref(isUpdate)) {
         setModalProps({ confirmLoading: true })
         rowId.value = data.record.id
@@ -95,7 +97,29 @@
           detailId.value = res.data.id
         }
       } else {
-        if (isCopy.value) {
+        if (unref(isSave)) {
+          console.log(data.record, 1111111111111)
+          setModalProps({ confirmLoading: true })
+          // const res: API.DataResult = await ApiInfo({ id: unref(data.record.id) })
+          // if (res.succeeded) {
+          setFieldsValue({
+            name: data.record.templateName,
+            businessType: Number(data.record.opType),
+            feeType: data.record.feeType,
+            description: data.record.description,
+            note: data.record.note,
+
+            // ...data.record,
+            // id: '',
+          })
+          // // res.data.details.forEach((item) => {
+          // //   delete item.id
+          // // })
+          feeField.value.SetData(data.record.details)
+          feeField.value.condition = ''
+          // // detailId.value = res.data.id
+          // // }
+        } else if (isCopy.value) {
           setModalProps({ confirmLoading: true })
           const res: API.DataResult = await ApiInfo({ id: unref(data.record.id) })
           if (res.succeeded) {
diff --git a/src/views/fee/FeeCustTemplate/columns.tsx b/src/views/fee/FeeCustTemplate/columns.tsx
index 1fa0dec3..66500292 100644
--- a/src/views/fee/FeeCustTemplate/columns.tsx
+++ b/src/views/fee/FeeCustTemplate/columns.tsx
@@ -4,7 +4,12 @@ import { Tag } from 'ant-design-vue'
 // 引入字典数据
 import { getDictOption } from '/@/utils/dictUtil'
 
-import { getOrgList, GetClientPortSelectList, GetCarrierSelectList } from '/@/api/common'
+import {
+  getOrgList,
+  GetClientPortSelectList,
+  GetCarrierSelectList,
+  GetClientListByCode,
+} from '/@/api/common'
 import {
   GetClientLanesSelectList,
   GetAgentCnClientList,
@@ -31,7 +36,7 @@ export const columns: BasicColumn[] = [
     width: 120,
   },
   {
-    title: '结算对象',
+    title: '费用对象',
     dataIndex: 'customerName',
     width: 200,
   },
@@ -176,12 +181,27 @@ export const formSchema: FormSchema[] = [
   {
     field: 'businessType',
     label: '业务类型',
-    component: 'Select',
-    required: true,
+    component: 'ApiSelect',
     colProps: { span: 6 },
-    componentProps: () => {
+    required: true,
+    componentProps: ({ formModel }) => {
       return {
-        options: businessType,
+        api: () => {
+          return new Promise((resolve) => {
+            getDictOption('business_type').then((res) => {
+              res.forEach((item) => {
+                item.value = Number(item.value)
+              })
+              resolve(res)
+            })
+          })
+        },
+        labelField: 'label',
+        valueField: 'value',
+        resultField: 'data',
+        filterOption: (input: string, option: any) => {
+          return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+        },
       }
     },
   },
@@ -222,20 +242,72 @@ export const formSchema: FormSchema[] = [
   //   },
   // },
   {
-    field: 'customerId',
-    label: '结算对象',
+    field: 'customerName',
+    label: '费用对象',
     defaultValue: '',
     component: 'Input',
     show: false,
     colProps: { span: 6 },
   },
   {
-    field: 'customerName',
-    label: '结算对象',
-    component: 'Input',
+    field: 'customerId',
+    label: '费用对象',
+    component: 'ApiSelect',
+    required: false,
+    dynamicDisabled: false,
+    colProps: { span: 6 },
+    componentProps: ({ formModel }) => {
+      return {
+        api: GetClientListByCode,
+        labelField: 'pinYinCode',
+        valueField: 'id',
+        showName: 'shortName',
+        resultField: 'data',
+        immediate: false,
+        onChange: (e, obj) => {
+          if (e && obj) {
+            formModel.customerName = obj.label
+            formModel.customerId = obj.value
+          }
+          if (!e && !obj) {
+            formModel.customerName = ''
+            formModel.customerId = ''
+          }
+        },
+      }
+    },
+  },
+  {
+    field: 'customerType',
+    label: '费用对象类别',
     defaultValue: '',
-    dynamicDisabled: true,
+    component: 'ApiSelect',
     colProps: { span: 6 },
+    componentProps: ({ formModel }) => {
+      return {
+        api: () => {
+          return new Promise((resolve) => {
+            getDictOption('djy_cust_prop').then((res) => {
+              resolve(res)
+            })
+          })
+        },
+        labelField: 'label',
+        valueField: 'value',
+        resultField: 'data',
+        filterOption: (input: string, option: any) => {
+          return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+        },
+      }
+    },
+    dynamicRules: ({ values }) => {
+      return [
+        {
+          required: values.customerId ? false : true,
+          message: '未选择费用对象时,此项必填！',
+        },
+      ]
+    },
   },
   // {
   //   label: '',
diff --git a/src/views/fee/FeeCustTemplate/feeField.vue b/src/views/fee/FeeCustTemplate/feeField.vue
index f0e0a3c2..5a77a296 100644
--- a/src/views/fee/FeeCustTemplate/feeField.vue
+++ b/src/views/fee/FeeCustTemplate/feeField.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="fee-field">
     <div class="flex">
-      <span class="title">费用字段</span>
+      <span class="title">费用明细</span>
       <div>
         <a-button type="link" @click="OpenSetCondition">
           <span class="iconfont icon-jichupeizhi"></span>
@@ -61,7 +61,7 @@
   // 引入计费标准字典
   import { feeUnitDict } from '/@/hooks/dict/index'
   // 引入字典数据
-  // import { getDictOption } from '/@/utils/dictUtil'
+  import { getDictOption } from '/@/utils/dictUtil'
   import AdvancedSearch from '/@/components/Form/src/components/AdvancedSearch.vue'
   import { useMessage } from '/@/hooks/web/useMessage'
   import { HotTable, HotColumn } from '@handsontable/vue3'
@@ -263,6 +263,20 @@
         process(dict)
       },
     },
+    {
+      title: '客户类别',
+      width: 130,
+      data: 'customerTypeText',
+      type: 'dropdown',
+      source: async (query, process) => {
+        const results = await getDictOption('djy_cust_prop')
+        console.log(results)
+        const dict = results.map((item) => {
+          return item.value + '-' + item.name
+        })
+        process(dict)
+      },
+    },
     {
       title: '单位标准',
       width: 130,
@@ -656,17 +670,17 @@
         // if (changes[0][1] === 'feeEnName') {
         // }
 
-        // // 修改客户类别
-        // if (changes[0][1] === 'customerTypeText') {
-        //   getDictOption('djy_cust_prop').then((res) => {
-        //     const item = res.filter((item) => {
-        //       return changes[0][3].includes(item.name)
-        //     })
-        //     if (item) dict = item[0]
-        //     list.value[changes[0][0]]['customerType'] = dict?.value
-        //     list.value[changes[0][0]]['customerTypeText'] = changes[0][3].split('-')[1]
-        //   })
-        // }
+        // 修改客户类别
+        if (changes[0][1] === 'customerTypeText') {
+          getDictOption('djy_cust_prop').then((res) => {
+            const item = res.filter((item) => {
+              return changes[0][3].includes(item.name)
+            })
+            if (item) dict = item[0]
+            list.value[changes[0][0]]['customerType'] = dict?.value
+            list.value[changes[0][0]]['customerTypeText'] = changes[0][3].split('-')[1]
+          })
+        }
 
         // // 当前操作的行
         // const index = changes[0][0]
diff --git a/src/views/fee/template/components/Modal.vue b/src/views/fee/template/components/Modal.vue
index a18bf144..fe99a828 100644
--- a/src/views/fee/template/components/Modal.vue
+++ b/src/views/fee/template/components/Modal.vue
@@ -69,28 +69,30 @@
       labelWidth: 100,
       schemas: formSchema,
       showActionButtonGroup: false,
-    }) 
-  const [registerModal, { setModalProps, closeModal, updateFormField }] = useModalInner(async (data) => {
-    resetFields()
-    setModalProps({ confirmLoading: false, loading: true })
-    isUpdate.value = !!data?.isUpdate
-    if (unref(isUpdate)) {
-      setModalProps({ confirmLoading: true });
-      updateFormField(updateSchema)
-      rowId.value = data.record.id
-      const res: API.DataResult = await GetFeeTemplateInfo({ id: unref(rowId) })
-      if (res.succeeded) {
-        setFieldsValue({
-          ...res.data,
-        })
-        detailId.value = res.data.id
+    })
+  const [registerModal, { setModalProps, closeModal, updateFormField }] = useModalInner(
+    async (data) => {
+      resetFields()
+      setModalProps({ confirmLoading: false, loading: true })
+      isUpdate.value = !!data?.isUpdate
+      if (unref(isUpdate)) {
+        setModalProps({ confirmLoading: true })
+        updateFormField(updateSchema)
+        rowId.value = data.record.id
+        const res: API.DataResult = await GetFeeTemplateInfo({ id: unref(rowId) })
+        if (res.succeeded) {
+          setFieldsValue({
+            ...res.data,
+          })
+          detailId.value = res.data.id
+        }
+      } else {
+        detailId.value = ''
+        setFieldsValue({ permissionIdentity: unref(2) })
       }
-    } else {
-      detailId.value = ''
-      setFieldsValue({ permissionIdentity: unref(2) })
-    }
-    setModalProps({ loading: false })
-  })
+      setModalProps({ loading: false })
+    },
+  )
   const getTitle = computed(() => (!unref(isUpdate) ? '新增' : '编辑'))
   // 费用表格
   const feeField = ref()
diff --git a/src/views/fee/template/index.vue b/src/views/fee/template/index.vue
index f9a7f27a..ed89ad69 100644
--- a/src/views/fee/template/index.vue
+++ b/src/views/fee/template/index.vue
@@ -1,8 +1,26 @@
 <template>
   <div>
     <BasicTable @register="registerTable">
-      <template #toolbar>
+      <!-- <template #toolbar>
         <a-button type="primary" @click="handleCreate"> 新建 </a-button>
+      </template> -->
+      <template #tableTitle>
+        <span class="title">费用模版</span>
+        <a-button type="link" @click="handleCreate">
+          <span class="iconfont icon-new_document"></span>
+          添加
+        </a-button>
+        <a-popconfirm
+          title="确定保存为自动费用模板？"
+          ok-text="是"
+          cancel-text="否"
+          @confirm="handleSave"
+        >
+          <a-button type="link">
+            <span class="iconfont icon-tijiao1"></span>
+            保存为自动费用模板
+          </a-button>
+        </a-popconfirm>
       </template>
       <template #bodyCell="{ column, record }">
         <template v-if="column.key === 'action'">
@@ -19,19 +37,24 @@
       </template>
     </BasicTable>
     <Modal @register="registerModal" @success="handleSuccess" />
+    <TenantAuditStepModal @register="AutoRegisterModal" @success="handleSuccess" />
   </div>
 </template>
 <script lang="ts" setup>
   import { onMounted } from 'vue'
   import { BasicTable, useTable, TableAction } from '/@/components/Table'
-  import { GetFeeTemplateList } from './api'
+  import { GetFeeTemplateList, GetFeeTemplateDetailList } from './api'
+  // import { ApiEdit } from '/@/views/fee/FeeCustTemplate/api'
+  import TenantAuditStepModal from '/@/views/fee/FeeCustTemplate/TenantAuditStepModal.vue'
   import { useModal } from '/@/components/Modal'
   import Modal from './components/Modal.vue'
   import { columns, searchFormSchema } from './columns'
   // 引入字典数据
   import { getDictOption } from '/@/utils/dictUtil'
+  import { useMessage } from '/@/hooks/web/useMessage'
+  const { notification } = useMessage()
   const [registerModal, { openModal }] = useModal()
-  const [registerTable, { reload, getForm, getPaginationRef }] = useTable({
+  const [registerTable, { reload, getForm, getPaginationRef, getSelectRows }] = useTable({
     title: '费用模版',
     // api: getSysDictTypeList,
     api: async (p) => {
@@ -107,7 +130,32 @@
       isUpdate: false,
     })
   }
-
+  const [AutoRegisterModal, { openModal: AutOpenModal }] = useModal()
+  async function handleSave() {
+    const select = getSelectRows()
+    if (select.length !== 1) {
+      notification.warning({ message: '请选择一条数据', duration: 3 })
+      return false
+    } else {
+      const ApiData = {
+        pageCondition: {
+          pageIndex: 1,
+          pageSize: 1000,
+          sortConditions: [],
+        },
+        queryCondition: JSON.stringify([
+          { FieldName: 'TemplateId', FieldValue: select[0].id, ConditionalType: 1 },
+        ]),
+      }
+      const res = await GetFeeTemplateDetailList(ApiData)
+      select[0].details = res.data
+      AutOpenModal(true, {
+        record: select[0],
+        isUpdate: false,
+        isSave: true,
+      })
+    }
+  }
   function handleEdit(record: Recordable) {
     openModal(true, {
       record,
diff --git a/src/views/operation/CustomerReconciliation/api.js b/src/views/operation/CustomerReconciliation/api.js
index c4d2f191..b4a48c26 100644
--- a/src/views/operation/CustomerReconciliation/api.js
+++ b/src/views/operation/CustomerReconciliation/api.js
@@ -105,6 +105,14 @@ export function CheckBillUnLocking(parameter) {
     data: parameter,
   })
 }
+// 对账列表批量删除 (Auth)
+export function BatchDelCheckBill(parameter) {
+  return request({
+    url: '/checkApi/CheckBill/BatchDelCheckBill',
+    method: 'post',
+    data: parameter,
+  })
+}
 
 // ---------------------------------------------------------
 // 获取费用代码下拉列表 (Auth)
diff --git a/src/views/operation/CustomerReconciliation/index.vue b/src/views/operation/CustomerReconciliation/index.vue
index 6ea9e4e3..78de5444 100644
--- a/src/views/operation/CustomerReconciliation/index.vue
+++ b/src/views/operation/CustomerReconciliation/index.vue
@@ -130,7 +130,12 @@
 </template>
 <script lang="ts" setup>
   import { ref } from 'vue'
-  import { GetCheckBillList, CheckBillLocking, CheckBillUnLocking } from './api.js'
+  import {
+    GetCheckBillList,
+    CheckBillLocking,
+    CheckBillUnLocking,
+    BatchDelCheckBill,
+  } 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'
@@ -146,86 +151,87 @@
   import { useAppStore } from '/@/store/modules/app'
   const appStore = useAppStore()
   //   表格
-  const [registerTable, { 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.count })
-      })
-    },
-    // 请求前的参数格式化
-    beforeFetch: (p) => {
-      return formatParams(p)
-    },
-    // beforeFetch: () => {
-    //   var currentPageInfo: any = getPaginationRef()
-    //   var data = getForm().getFieldsValue()
-    //   const postParam: API.PageRequest = {
-    //     queryCondition: '',
-    //     pageCondition: {
-    //       pageIndex: currentPageInfo.current,
-    //       pageSize: currentPageInfo.pageSize,
-    //       sortConditions: [],
-    //     },
-    //   }
-    //   postParam.pageCondition.sortConditions.push({
-    //     sortField: 'createTime',
-    //     listSortDirection: 1,
-    //   })
-    //   let condition: API.ConditionItem[] = []
-    //   if (!!data.billNo) {
-    //     condition.push({
-    //       FieldName: 'billNo',
-    //       FieldValue: data.billNo,
-    //       ConditionalType: 1,
-    //     })
-    //   }
-    //   if (!!data.customerName) {
-    //     condition.push({
-    //       FieldName: 'customerName',
-    //       FieldValue: data.customerName,
-    //       ConditionalType: 1,
-    //     })
-    //   }
-    //   postParam.queryCondition = JSON.stringify(condition)
-    //   return postParam
-    // },
-    columns,
-    formConfig: {
-      labelWidth: 120,
-      // 表格表单需要的过滤字段集合
-      schemas: searchFormSchema,
-      // 是否显示高级查询(默认否)
-      useAdvancedSearch: true,
-    },
-    isTreeTable: false,
-    pagination: true,
-    striped: true,
-    useSearchForm: true,
-    showTableSetting: true,
-    bordered: true,
-    showIndexColumn: true,
-    indexColumnProps: {
-      width: 60,
-    },
-    canResize: true,
-    resizeHeightOffset: 90,
-    immediate: true,
-    actionColumn: {
-      width: 80,
-      title: '操作',
-      dataIndex: 'action',
-      fixed: 'right',
-    },
-  })
+  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.count })
+        })
+      },
+      // 请求前的参数格式化
+      beforeFetch: (p) => {
+        return formatParams(p)
+      },
+      // beforeFetch: () => {
+      //   var currentPageInfo: any = getPaginationRef()
+      //   var data = getForm().getFieldsValue()
+      //   const postParam: API.PageRequest = {
+      //     queryCondition: '',
+      //     pageCondition: {
+      //       pageIndex: currentPageInfo.current,
+      //       pageSize: currentPageInfo.pageSize,
+      //       sortConditions: [],
+      //     },
+      //   }
+      //   postParam.pageCondition.sortConditions.push({
+      //     sortField: 'createTime',
+      //     listSortDirection: 1,
+      //   })
+      //   let condition: API.ConditionItem[] = []
+      //   if (!!data.billNo) {
+      //     condition.push({
+      //       FieldName: 'billNo',
+      //       FieldValue: data.billNo,
+      //       ConditionalType: 1,
+      //     })
+      //   }
+      //   if (!!data.customerName) {
+      //     condition.push({
+      //       FieldName: 'customerName',
+      //       FieldValue: data.customerName,
+      //       ConditionalType: 1,
+      //     })
+      //   }
+      //   postParam.queryCondition = JSON.stringify(condition)
+      //   return postParam
+      // },
+      columns,
+      formConfig: {
+        labelWidth: 120,
+        // 表格表单需要的过滤字段集合
+        schemas: searchFormSchema,
+        // 是否显示高级查询(默认否)
+        useAdvancedSearch: true,
+      },
+      isTreeTable: false,
+      pagination: true,
+      striped: true,
+      useSearchForm: true,
+      showTableSetting: true,
+      bordered: true,
+      showIndexColumn: true,
+      indexColumnProps: {
+        width: 60,
+      },
+      canResize: true,
+      resizeHeightOffset: 90,
+      immediate: true,
+      actionColumn: {
+        width: 80,
+        title: '操作',
+        dataIndex: 'action',
+        fixed: 'right',
+      },
+    })
   // 复制对账编号
   function FnCopy(data) {
     const el = document.createElement('input')
@@ -246,7 +252,25 @@
   }
   // 删除
   function FnDel() {
-    notification.warning({ message: '待开发', duration: 3 })
+    const select = getSelectRows()
+    let ApiData: any = {
+      ids: [],
+    }
+    if (select.length === 0) {
+      notification.warning({ message: '请至少选择一条数据', duration: 3 })
+      return false
+    } else {
+      ApiData.ids = select.map((item) => {
+        return item.id
+      })
+    }
+
+    BatchDelCheckBill(ApiData).then((res) => {
+      notification.success({ message: res.message, duration: 3 })
+      reload()
+    })
+
+    // notification.warning({ message: '待开发', duration: 3 })
   }
   // 锁定
   function Lock() {