From f14d250ca7495605b71f3d07517c4b09f9896a16 Mon Sep 17 00:00:00 2001
From: lijingjia <lijj_xl@163.com>
Date: Fri, 19 Jul 2024 13:52:04 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=A7=94=E6=89=98=E5=8D=95=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ActionBar/index.vue            |   8 +-
 src/design/iconfont.less                      |   9 +-
 src/hooks/web/common.ts                       |   3 +-
 src/views/baseinfo/orderContact/api.ts        |   1 -
 .../operation/seaexport/api/BookingLedger.js  |  15 +-
 .../detail/components/ladingInfo.tsx          |   1 +
 .../seaexport/detail/modules/PersonModal.vue  |  36 +++-
 .../seaexport/detail/modules/baseInfo.tsx     | 101 ++++++++--
 .../seaexport/detail/modules/basicInfo.vue    |  55 +++--
 .../seaexport/detail/modules/rightContent.vue |   6 +-
 src/views/operation/seaexport/index.vue       |  27 +++
 src/views/system/print/api.ts                 |  56 ++++++
 src/views/system/print/columns.tsx            | 190 ++++++++++++++++++
 src/views/system/print/components/Modal.vue   | 110 ++++++++++
 src/views/system/print/index.vue              | 115 +++++++++++
 15 files changed, 677 insertions(+), 56 deletions(-)
 create mode 100644 src/views/system/print/api.ts
 create mode 100644 src/views/system/print/columns.tsx
 create mode 100644 src/views/system/print/components/Modal.vue
 create mode 100644 src/views/system/print/index.vue

diff --git a/src/components/ActionBar/index.vue b/src/components/ActionBar/index.vue
index 835ccaa0..c1e9a514 100644
--- a/src/components/ActionBar/index.vue
+++ b/src/components/ActionBar/index.vue
@@ -126,13 +126,7 @@
             }
             id = ids[index + 1]
           }
-          closePage()
-          go({
-            path: route.path,
-            query: {
-              id
-            }
-          })
+          closePage(route.path + '?id=' + id)
         } else {
           createMessage.warning('列表页面数据丢失，请回退列表页面后重试！')
         }
diff --git a/src/design/iconfont.less b/src/design/iconfont.less
index 7eb6960b..83a7239e 100644
--- a/src/design/iconfont.less
+++ b/src/design/iconfont.less
@@ -1,6 +1,9 @@
-.icon-locksuo {
+.icon-locksuo, .icon-duihao1 {
   color: #17a6a3;
 }
-.icon-lock-openkaisuo {
-  color: #7a8798;
+.icon-lock-openkaisuo, .icon-chahao {
+  color: @msg-color;
 }
+.icon-bingtu3 {
+  color: #257afa;
+}
\ No newline at end of file
diff --git a/src/hooks/web/common.ts b/src/hooks/web/common.ts
index 05e99357..42c95635 100644
--- a/src/hooks/web/common.ts
+++ b/src/hooks/web/common.ts
@@ -19,8 +19,7 @@ export function formatTableData(v) {
 */
 export function closePage(topath) {
   const tabStore = useMultipleTabStore()
-  // 当前路由
-  const fullPath = router?.currentRoute?._value?.fullPath
+  tabStore.closeTab(router.currentRoute._value, router)
   // 有目标路径则跳转
   if (topath) {
     router.push(topath)
diff --git a/src/views/baseinfo/orderContact/api.ts b/src/views/baseinfo/orderContact/api.ts
index 5b52d2fe..09215188 100644
--- a/src/views/baseinfo/orderContact/api.ts
+++ b/src/views/baseinfo/orderContact/api.ts
@@ -5,7 +5,6 @@ enum Api {
   list = '/mainApi/OrderContact/GetOrderContactList',
   edit = '/mainApi/OrderContact/EditOrderContact',
   info = '/mainApi/OrderContact/GetOrderContactInfo',
-
   OrderContact = '/mainApi/OrderContact/GetOrderContactListByClientId',
   Del = '/mainApi/OrderContact/BatchDelOrderContact',
 
diff --git a/src/views/operation/seaexport/api/BookingLedger.js b/src/views/operation/seaexport/api/BookingLedger.js
index bcd56d31..b565967f 100644
--- a/src/views/operation/seaexport/api/BookingLedger.js
+++ b/src/views/operation/seaexport/api/BookingLedger.js
@@ -1999,10 +1999,19 @@ export function EditBusinessOrderContact(params) {
 }
 
 // 委托单位联系人详情
-export function GetBusinessOrderContactInfo(data) {
+export function GetBusinessOrderContactInfo(params) {
   return request({
     url: '/opApi/BusinessOrderContact/GetBusinessOrderContactInfo',
-    method: 'post',
-    data
+    method: 'get',
+    params
+  })
+}
+
+// 联系人下拉
+export function GetOrderContactListByClientId(params) {
+  return request({
+    url: '/mainApi/OrderContact/GetOrderContactListByClientId',
+    method: 'get',
+    params
   })
 }
\ No newline at end of file
diff --git a/src/views/operation/seaexport/detail/components/ladingInfo.tsx b/src/views/operation/seaexport/detail/components/ladingInfo.tsx
index 65e30b1f..4f636e82 100644
--- a/src/views/operation/seaexport/detail/components/ladingInfo.tsx
+++ b/src/views/operation/seaexport/detail/components/ladingInfo.tsx
@@ -221,6 +221,7 @@ export const formSchema2: FormSchema[] = [
           })
         },
         labelField: 'ediCode',
+        showName: 'portName',
         valueField: 'id',
         resultField: 'data',
         filterOption: (input: string, option: any) => {
diff --git a/src/views/operation/seaexport/detail/modules/PersonModal.vue b/src/views/operation/seaexport/detail/modules/PersonModal.vue
index 007ec7c2..b64c7920 100644
--- a/src/views/operation/seaexport/detail/modules/PersonModal.vue
+++ b/src/views/operation/seaexport/detail/modules/PersonModal.vue
@@ -3,13 +3,24 @@
     v-bind="$attrs"
     :use-wrapper="true"
     :title="getTitle"
-    :form-schema="formSchema"
+    :form-schema="personFormSchema"
     width="50%"
     @register="registerModal"
     @ok="handleSave"
   >
     <!-- 包装表单 -->
-    <BasicForm @register="registerForm" />
+    <BasicForm @register="registerForm">
+      <template #service="item">
+        <a-select show-search v-model:value="item.opid"
+          :default-active-first-option="false" :show-arrow="false" allowClear
+          :filter-option="false" :not-found-content="null"
+        >
+          <a-select-option v-for="item in personList" :key="item.id" :value="item.id">
+              {{ item.userName }}
+          </a-select-option>
+        </a-select>
+      </template>
+    </BasicForm>
     <!--右下角按钮-->
     <template #footer>
       <a-button
@@ -47,10 +58,11 @@
   // 弹窗组件
   import { BasicModal, useModalInner } from '/@/components/Modal'
   import { BasicForm, useForm } from '/@/components/Form/index'
+  import { getDictOption } from '/@/utils/dictUtil'
   // 表单字段数据
   import { personFormSchema } from './baseInfo'
   // 相关接口
-  import { EditBusinessOrderContact, GetBusinessOrderContactInfo } from '/@/views/operation/seaexport/api/BookingLedger'
+  import { EditBusinessOrderContact, GetBusinessOrderContactInfo, GetOrderContactListByClientId } from '/@/views/operation/seaexport/api/BookingLedger'
   // 提示消息混入
   import { useMessage } from '/@/hooks/web/useMessage'
   // 声明Emits
@@ -59,6 +71,8 @@
   // 按钮loading
   const loading = ref(false)
   const rowId = ref('')
+  // 联系人下拉
+  const personList = ref([])
   const { createMessage } = useMessage()
   const [registerForm, { resetFields, setFieldsValue, validate, updateSchema }] =
     useForm({
@@ -68,6 +82,10 @@
     })
 
   const [registerModal, { setModalProps, closeModal, updateFormField }] = useModalInner(async (data) => {
+    // 设置关系人下拉
+    GetOrderContactListByClientId({ id: data.companyId }).then(res => {
+      personList.value = res.data
+    })
     resetFields()
     setModalProps({ confirmLoading: false, loading: true })
     isUpdate.value = !!data?.isUpdate
@@ -82,7 +100,17 @@
         })
       }
     } else {
-      setFieldsValue({ permissionIdentity: unref(2) })
+      // 新建设置默认值
+      const arr = await getDictOption('djy_cust_prop')
+      console.log(arr)
+      if (data.companyType) {
+        const res = arr.filter(item => {
+          return item.label == data.companyType
+        })
+        if (res && res.length) {
+          setFieldsValue({ customerType: res[0].value })
+        }
+      }
     }
     setModalProps({ loading: false })
   })
diff --git a/src/views/operation/seaexport/detail/modules/baseInfo.tsx b/src/views/operation/seaexport/detail/modules/baseInfo.tsx
index dbfdebff..ccd52b45 100644
--- a/src/views/operation/seaexport/detail/modules/baseInfo.tsx
+++ b/src/views/operation/seaexport/detail/modules/baseInfo.tsx
@@ -10,6 +10,7 @@ import {
   GetDeptList,
   GetPackageSelectList,
 } from '/@/views/operation/seaexport/api/BookingLedger'
+
 import { useOptionsStore } from '/@/store/modules/options'
 const optionsStore = useOptionsStore()
 const LockType = [
@@ -414,7 +415,7 @@ export const basicInfoFormSchema: FormSchema[] = [
     dynamicDisabled: false,
     // defaultValue: '',
     colProps: { span: 3 },
-    componentProps: () => {
+    componentProps: ({ formModel }) => {
       return {
         api: () => {
           return new Promise((resolve) => {
@@ -434,9 +435,22 @@ export const basicInfoFormSchema: FormSchema[] = [
         filterOption: (input: string, option: any) => {
           return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
         },
+        onChange: (e, obj) => {
+          if (obj) {
+            formModel.operatorName = obj.label
+          } else {
+            formModel.operatorName = ''
+          }
+        }
       }
     },
   },
+  {
+    field: 'operatorName',
+    label: '',
+    component: 'Input',
+    show: false
+  },
   {
     label: '客服员',
     field: 'customerService',
@@ -445,7 +459,7 @@ export const basicInfoFormSchema: FormSchema[] = [
     dynamicDisabled: false,
     // defaultValue: '',
     colProps: { span: 3 },
-    componentProps: () => {
+    componentProps: ({ formModel }) => {
       return {
         api: () => {
           return new Promise((resolve) => {
@@ -464,9 +478,22 @@ export const basicInfoFormSchema: FormSchema[] = [
         filterOption: (input: string, option: any) => {
           return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
         },
+        onChange: (e, obj) => {
+          if (obj) {
+            formModel.customerServiceName = obj.label
+          } else {
+            formModel.customerServiceName = ''
+          }
+        }
       }
     },
   },
+  {
+    field: 'customerServiceName',
+    label: '',
+    component: 'Input',
+    show: false
+  },
   {
     label: '单证',
     field: 'doc',
@@ -475,7 +502,7 @@ export const basicInfoFormSchema: FormSchema[] = [
     dynamicDisabled: false,
     // defaultValue: '',
     colProps: { span: 3 },
-    componentProps: () => {
+    componentProps: ({ formModel }) => {
       return {
         api: () => {
           return new Promise((resolve) => {
@@ -492,9 +519,22 @@ export const basicInfoFormSchema: FormSchema[] = [
         filterOption: (input: string, option: any) => {
           return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
         },
+        onChange: (e, obj) => {
+          if (obj) {
+            formModel.docName = obj.label
+          } else {
+            formModel.docName = ''
+          }
+        }
       }
     },
   },
+  {
+    field: 'docName',
+    label: '',
+    component: 'Input',
+    show: false
+  },
   {
     label: '海外客服',
     field: 'foreignCustomerService',
@@ -503,7 +543,7 @@ export const basicInfoFormSchema: FormSchema[] = [
     dynamicDisabled: false,
     // defaultValue: '',
     colProps: { span: 3 },
-    componentProps: () => {
+    componentProps: ({ formModel }) => {
       return {
         option: optionsStore.getOptionsByCode('GetSaleList'),
         allowClear: true,
@@ -513,9 +553,22 @@ export const basicInfoFormSchema: FormSchema[] = [
         filterOption: (input: string, option: any) => {
           return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
         },
+        onChange: (e, obj) => {
+          if (obj) {
+            formModel.foreignCustomerServiceName = obj.label
+          } else {
+            formModel.foreignCustomerServiceName = ''
+          }
+        }
       }
     },
   },
+  {
+    field: 'foreignCustomerServiceName',
+    label: '',
+    component: 'Input',
+    show: false
+  },
   {
     field: 'saleDeptId',
     label: '所属部门',
@@ -532,9 +585,9 @@ export const basicInfoFormSchema: FormSchema[] = [
         valueField: 'id',
         filterOption: (input: string, option: any) => {
           return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
-        },
+        }
       }
-    },
+    }
   },
   {
     label: '所属分部',
@@ -593,6 +646,7 @@ export const basicInfoFormSchema: FormSchema[] = [
   {
     field: 'truckerId',
     label: '车队',
+    labelSlot: 'truckerId',
     component: 'ApiSelect',
     required: false,
     dynamicDisabled: false,
@@ -631,6 +685,7 @@ export const basicInfoFormSchema: FormSchema[] = [
   {
     label: '船公司',
     field: 'carrierId',
+    labelSlot: 'carrierId',
     component: 'ApiSelect',
     required: false,
     dynamicDisabled: false,
@@ -670,6 +725,7 @@ export const basicInfoFormSchema: FormSchema[] = [
   {
     label: '订舱代理',
     field: 'forwarderId',
+    labelSlot: 'forwarder',
     component: 'ApiSelect',
     required: false,
     dynamicDisabled: false,
@@ -711,6 +767,7 @@ export const basicInfoFormSchema: FormSchema[] = [
     label: '船代',
     field: 'shipAgencyId',
     component: 'ApiSelect',
+    labelSlot: 'shipAgencyId',
     required: false,
     dynamicDisabled: false,
     // defaultValue: '',
@@ -753,6 +810,7 @@ export const basicInfoFormSchema: FormSchema[] = [
     label: '场站',
     component: 'ApiSelect',
     required: false,
+    labelSlot: 'yardId',
     dynamicDisabled: false,
     // defaultValue: '',
     colProps: { span: 3 },
@@ -790,6 +848,7 @@ export const basicInfoFormSchema: FormSchema[] = [
     field: 'customserId',
     label: '报关行',
     component: 'ApiSelect',
+    labelSlot: 'customserId',
     required: false,
     dynamicDisabled: false,
     // defaultValue: '',
@@ -2619,20 +2678,26 @@ export const personFormSchema: FormSchema[] = [
     component: 'ApiSelect',
     required: false,
     dynamicDisabled: false,
+    slot: 'service',
     // defaultValue: '',
     colProps: { span: 12 },
-    componentProps: () => {
-      return {
-        option: optionsStore.getOptionsByCode('GetServiceSelectList'),
-        allowClear: true,
-        showSearch: true,
-        labelField: 'enName',
-        valueField: 'id',
-        filterOption: (input: string, option: any) => {
-          return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
-        },
-      }
-    }
+    // componentProps: () => {
+    //   return {
+    //     api: GetOrderContact,
+    //     params: {
+    //       id: '' 
+    //     },
+    //     allowClear: true,
+    //     showSearch: true,
+    //     labelField: 'enName',
+    //     resultField: 'data',
+    //     valueField: 'id',
+    //     immediate: false,
+    //     filterOption: (input: string, option: any) => {
+    //       return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+    //     },
+    //   }
+    // }
   },
   {
     label: '邮箱',
diff --git a/src/views/operation/seaexport/detail/modules/basicInfo.vue b/src/views/operation/seaexport/detail/modules/basicInfo.vue
index 065e4eb6..0cd0fb1a 100644
--- a/src/views/operation/seaexport/detail/modules/basicInfo.vue
+++ b/src/views/operation/seaexport/detail/modules/basicInfo.vue
@@ -22,8 +22,26 @@
     <BasicForm @register="registerForm">
       <!-- label插槽 -->
       <template #customerId="item">
-        <span class="iconfont icon-tuandui" @click="openPersonModal(item)"></span>
+        <span class="iconfont icon-tuandui" @click="openPersonModal(item, '委托单位', 'customerId')"></span>
       </template>
+      <!-- <template #truckerId>
+        <span class="iconfont icon-tuandui" @click="openPersonModal"></span>
+      </template>
+      <template #carrierId>
+        <span class="iconfont icon-tuandui" @click="openPersonModal"></span>
+      </template>
+      <template #forwarder>
+        <span class="iconfont icon-tuandui" @click="openPersonModal"></span>
+      </template>
+      <template #shipAgencyId>
+        <span class="iconfont icon-tuandui" @click="openPersonModal"></span>
+      </template>
+      <template #yardId>
+        <span class="iconfont icon-tuandui" @click="openPersonModal"></span>
+      </template> -->
+      <!-- <template #customserId>
+        <span class="iconfont icon-tuandui" @click="openPersonModal"></span>
+      </template> -->
       <template #isBusinessLocking="item">
         <a-input disabled :value="item.isBusinessLocking ? '已锁定' : '未锁定'"></a-input>
         <span v-if="item.isBusinessLocking" class="iconfont icon-chenggong"></span>
@@ -35,8 +53,9 @@
     </BasicForm>
     <a-modal 
       v-model:visible="visible"
-      title="费用模版"
+      title="关系人"
       width="80%"
+      v-if="visible"
     >
       <BasicTable
         @register="registerTable"
@@ -94,8 +113,8 @@
     size: 'small',
   })
   const visible = ref(false)
-  // 当前选中的委托单位id
-  let customerId = ''
+  // 当前选中的单位id
+  let companyId = ''
   // 关系人表格
   const [registerTable, { reload, getForm, getPaginationRef }] = useTable({
     api: async (p) => {
@@ -116,8 +135,8 @@
       }
       let condition: API.ConditionItem[] = []
       condition.push({
-        FieldName: 'customerId',
-        FieldValue: customerId,
+        FieldName: 'businessId',
+        FieldValue: props.details.id,
         ConditionalType: 1,
       })
       postParam.queryCondition = JSON.stringify(condition)
@@ -131,10 +150,12 @@
     showTableSetting: false,
     bordered: true,
     showIndexColumn: true,
+    rowSelection: {
+      type: 'checkbox'
+    },
     canResize: false,
-    immediate: false,
     actionColumn: {
-      width: 80,
+      width: 50,
       title: '操作',
       dataIndex: 'action',
       fixed: 'right'
@@ -153,22 +174,24 @@
     })
     RefChilrenRef.value.FnaddFormToSet(Arr)
   }
+  // 存储当前选择的往来单位类型
+  let companyType = '' 
   // 打开关系人弹窗
-  const openPersonModal = (item) => {
-    console.log(item.values)
-    if (item?.values?.customerId) {
-      customerId = item.values.customerId
+  const openPersonModal = (item, type, field) => {
+    if (item?.values[field]) {
+      companyId = item.values[field]
     } else {
-      return createMessage.warning('请选择委托单位！')
+      return createMessage.warning(`请选择${type}！`)
     }
+    companyType = type
     visible.value = true
-    reload()
   }
   // 新增联系人
   const create = () => {
     openModal(true, {
-      isParent: false,
       isUpdate: false,
+      companyType,
+      companyId
     })
   }
   function handleSuccess() {
@@ -179,6 +202,8 @@
     openModal(true, {
       record,
       isUpdate: true,
+      companyType,
+      companyId
     })
   }
   // 删除联系人
diff --git a/src/views/operation/seaexport/detail/modules/rightContent.vue b/src/views/operation/seaexport/detail/modules/rightContent.vue
index f45a6097..5dd3024f 100644
--- a/src/views/operation/seaexport/detail/modules/rightContent.vue
+++ b/src/views/operation/seaexport/detail/modules/rightContent.vue
@@ -660,9 +660,10 @@
   )
 
   function init() {
+    // 初始化备注组件数据
     Getremark()
-
     if (route.query.id && !route.query.isCopy) {
+      // 初始化服务项目
       getServiceItemList(1, null)
       getStatusServiceList(1, null)
     } else {
@@ -735,14 +736,13 @@
       GetServiceProjectList(data).then((res) => {
         if (res.success) {
           bookingServiceItem.value = res.data.ext
-
           // this.$bus.$emit('bookingServiceItem', res.data.ext)
           emit('bookingServiceItem', res.data.ext)
         } else {
           createMessage.error(res.data.msg)
         }
         seriveLoading.value = false
-      })
+      }).chath
     } else {
       spinning.value = true
       getStatusServiceList(1, null)
diff --git a/src/views/operation/seaexport/index.vue b/src/views/operation/seaexport/index.vue
index c648e2c8..ee855ab0 100644
--- a/src/views/operation/seaexport/index.vue
+++ b/src/views/operation/seaexport/index.vue
@@ -52,6 +52,33 @@
             <Icon icon="ant-design:copy-outlined" @click="FnCopy(record.mblno)" />
           </div>
         </template>
+        <!-- 应收开票 -->
+        <template v-if="column.dataIndex == 'arInvoiceStatus'">
+          <a-tooltip>
+            <template #title>{{ record.arInvoiceStatusName }}</template>
+            <i v-if="record.arInvoiceStatus == 2" class="iconfont icon-bingtu3"></i>
+            <i v-else-if="record.arInvoiceStatus == 1" class="iconfont icon-duihao1"></i>
+            <i v-else class="iconfont icon-chahao"></i>
+          </a-tooltip>
+        </template>
+        <!-- 应付开票 -->
+        <template v-if="column.dataIndex == 'apInvoiceStatus'">
+          <a-tooltip>
+            <template #title>{{ record.apInvoiceStatusName }}</template>
+            <i v-if="record.apInvoiceStatus == 2" class="iconfont icon-bingtu3"></i>
+            <i v-else-if="record.apInvoiceStatus == 1" class="iconfont icon-duihao1"></i>
+            <i v-else class="iconfont icon-chahao"></i>
+          </a-tooltip>
+        </template>
+        <!-- 应收对账 -->
+        <template v-if="column.dataIndex == 'arCheckStatus'">
+          <a-tooltip>
+            <template #title>{{ record.arCheckStatusName }}</template>
+            <i v-if="record.arCheckStatus == 2" class="iconfont icon-bingtu3"></i>
+            <i v-else-if="record.arCheckStatus == 1" class="iconfont icon-duihao1"></i>
+            <i v-else class="iconfont icon-chahao"></i>
+          </a-tooltip>
+        </template>
         <!-- 业务锁定 -->
         <template v-if="column.dataIndex == 'isBusinessLocking'">
           <span v-if="record.isBusinessLocking">
diff --git a/src/views/system/print/api.ts b/src/views/system/print/api.ts
new file mode 100644
index 00000000..f076ded1
--- /dev/null
+++ b/src/views/system/print/api.ts
@@ -0,0 +1,56 @@
+/*
+ * @Description: 
+ * @Author: lijj
+ * @Date: 2024-04-25 15:48:33
+ */
+
+import { request } from '/@/utils/request'
+import { DataResult, PageRequest } from '/@/api/model/baseModel'
+enum Api {
+  list = '/mainApi/ClientParam/GetClientParamList',
+  edit = '/mainApi/ClientParam//EditClientParam',
+  info = '/mainApi/ClientParam/GetClientParamInfo',
+  delete = '/mainApi/ClientParam/BatchDelClientParam',
+  GetTenantParamDataSelectList = '/mainApi/ClientParam/GetTenantParamDataSelectList'
+}
+// 列表 (Auth)
+export function GetClientParamList(data: PageRequest) {
+  return request<DataResult>({
+    url: Api.list,
+    method: 'post',
+    data
+  })
+}
+// 编辑 (Auth)
+export function EditClientParam(data: PageRequest) {
+  return request<DataResult>({
+    url: Api.edit,
+    method: 'post',
+    data
+  })
+}
+// 详情 (Auth)
+export function GetClientParamInfo(query) {
+  return request<DataResult>({
+    url: Api.info,
+    method: 'get',
+    params: query
+  })
+}
+
+// 删除 (Auth)
+export function BatchDelClientParam(data: PageRequest) {
+  return request<DataResult>({
+    url: Api.delete,
+    method: 'post',
+    data
+  })
+}
+
+export function GetTenantParamDataSelectList(query) {
+  return request<DataResult>({
+    url: Api.GetTenantParamDataSelectList,
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file
diff --git a/src/views/system/print/columns.tsx b/src/views/system/print/columns.tsx
new file mode 100644
index 00000000..ee44550b
--- /dev/null
+++ b/src/views/system/print/columns.tsx
@@ -0,0 +1,190 @@
+/*
+ * @Description: 
+ * @Author: lijj
+ * @Date: 2024-04-25 15:48:33
+ */
+import { ref } from 'vue'
+import { BasicColumn, FormSchema } from '/@/components/Table'
+// 引入字典数据
+import { getDictOption } from '/@/utils/dictUtil'
+// 下拉数据
+import { getOptions } from '/@/hooks/dict'
+import { useOptionsStore } from '/@/store/modules/options'
+import { GetTenantParamDataSelectList } from './api'
+const optionsStore = useOptionsStore()
+const itemNameOption = ref([])
+// 模块字典
+const modulesDict = await getDictOption('modules')
+export const columns: BasicColumn[] = [
+  {
+    title: '客户名称',
+    dataIndex: 'customerName',
+    width: 150
+  },
+  {
+    title: '客户参数类型',
+    dataIndex: 'paramType',
+    width: 150
+  },
+  {
+    title: '客户参数名称',
+    dataIndex: 'paramName',
+    width: 200
+  },
+  {
+    title: '备注',
+    dataIndex: 'note',
+    width: 200
+  }
+]
+
+export const searchFormSchema: FormSchema[] = [
+  {
+    field: 'paramName',
+    label: '客户参数名称',
+    colProps: { span: 6 },
+    component: 'Input'
+  },
+]
+export const formSchema: FormSchema[] = [
+  {
+    label: '',
+    field: 'id',
+    component: 'Input',
+    defaultValue: '',
+    show: false
+  },
+  {
+    field: 'paramCode',
+    label: '客户参数类别',
+    required: true,
+    component: 'ApiSelect',
+    colProps: { span: 12 },
+    componentProps: ({ formModel }) => {
+      return {
+        option: optionsStore.getOptionsByCode('GetTenantParamSelectList'),
+        labelField: 'paramName',
+        valueField: 'paramCode',
+        filterOption: (input: string, option: any) => {
+          return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+        },
+        onChange: (e, obj) => {
+          GetTenantParamDataSelectList({ code: e }).then(res => {
+            itemNameOption.value = res.data
+          })
+          if (obj) {
+            formModel.paramName = obj.label
+            formModel.paramId = obj.id
+            formModel.paramType = obj.type
+          } else {
+            formModel.paramName = ''
+            formModel.paramId = ''
+            formModel.paramType = ''
+          }
+        }
+      }
+    }
+  },
+  {
+    field: 'itemCode',
+    label: '客户参数名称',
+    required: true,
+    component: 'ApiSelect',
+    colProps: { span: 12 },
+    componentProps: ({ formModel }) => {
+      return {
+        option: itemNameOption.value,
+        labelField: 'itemName',
+        valueField: 'itemCode',
+        filterOption: (input: string, option: any) => {
+          return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+        },
+        onChange: (e, obj) => {
+          if (obj) {
+            formModel.itemName = obj.label
+          } else {
+            formModel.itemName = ''
+          }
+        }
+      }
+    }
+  },
+  {
+    label: '',
+    field: 'itemName',
+    component: 'Input',
+    defaultValue: '',
+    show: false
+  },
+  {
+    label: '',
+    field: 'customerName',
+    component: 'Input',
+    defaultValue: '',
+    show: false
+  },
+  {
+    label: '',
+    field: 'paramId',
+    component: 'Input',
+    defaultValue: '',
+    show: false
+  },
+  {
+    label: '',
+    field: 'paramName',
+    component: 'Input',
+    defaultValue: '',
+    show: false
+  },
+  {
+    label: '',
+    field: 'paramType',
+    component: 'Input',
+    defaultValue: '',
+    show: false
+  },
+  {
+    field: 'customerId',
+    label: '客户名称',
+    required: true,
+    component: 'ApiSelect',
+    colProps: { span: 12 },
+    componentProps: ({ formModel }) => {
+      return {
+        api: () => {
+          return new Promise((resolve) => {
+            const arr = getOptions('custom')
+            resolve(arr)
+          })
+        },
+        labelField: 'shortName',
+        valueField: 'codeName',
+        resultField: 'data',
+        filterOption: (input: string, option: any) => {
+          return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+        },
+        onChange: (e, obj) => {
+          if (obj) {
+            formModel.customerName = obj.label
+          } else {
+            formModel.customerName = ''
+          }
+        }
+      }
+    }
+  },
+  {
+    field: 'orderNo',
+    label: '排序',
+    required: true,
+    component: 'Input',
+    colProps: { span: 12 }
+  },
+  {
+    field: 'note',
+    label: '备注',
+    component: 'InputTextArea',
+    colProps: { span: 24 }
+  }
+]
diff --git a/src/views/system/print/components/Modal.vue b/src/views/system/print/components/Modal.vue
new file mode 100644
index 00000000..0f306422
--- /dev/null
+++ b/src/views/system/print/components/Modal.vue
@@ -0,0 +1,110 @@
+<template>
+  <BasicModal
+    v-bind="$attrs"
+    :use-wrapper="true"
+    :title="getTitle"
+    :form-schema="formSchema"
+    width="50%"
+    @register="registerModal"
+    @ok="handleSave"
+  >
+    <!-- 包装表单 -->
+    <BasicForm @register="registerForm" />
+    <!--右下角按钮-->
+    <template #footer>
+      <a-button
+        pre-icon="ant-design:close-outlined"
+        type="warning"
+        :loading="loading"
+        ghost
+        style="margin-right: 0.8rem"
+        @click="closeModal"
+      >
+        取消
+      </a-button>
+      <a-button
+        type="success"
+        :loading="loading"
+        pre-icon="ant-design:check-outlined"
+        style="margin-right: 0.8rem"
+        @click="handleSave(false)"
+      >
+        仅保存
+      </a-button>
+      <a-button
+        pre-icon="ant-design:check-circle-outlined"
+        type="primary"
+        :loading="loading"
+        @click="handleSave(true)"
+      >
+        保存并关闭
+      </a-button>
+    </template>
+  </BasicModal>
+</template>
+<script lang="ts" setup>
+  import { ref, computed, unref } from 'vue'
+  // 弹窗组件
+  import { BasicModal, useModalInner } from '/@/components/Modal'
+  import { BasicForm, useForm } from '/@/components/Form/index'
+  // 表单字段数据
+  import { formSchema } from '../columns'
+  // 相关接口
+  import { EditClientParam, GetClientParamInfo } from '../api'
+  // 提示消息混入
+  import { useMessage } from '/@/hooks/web/useMessage'
+  // 声明Emits
+  const emit = defineEmits(['success', 'register'])
+  const isUpdate = ref(true)
+  // 按钮loading
+  const loading = ref(false)
+  const rowId = ref('')
+  const { createMessage } = useMessage()
+  const [registerForm, { resetFields, setFieldsValue, validate, updateSchema }] =
+    useForm({
+      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 GetClientParamInfo({ id: unref(rowId) })
+      if (res.succeeded) {
+        setFieldsValue({
+          ...res.data,
+        })
+      }
+    } else {
+      setFieldsValue({ permissionIdentity: unref(2) })
+    }
+    setModalProps({ loading: false })
+  })
+
+  const getTitle = computed(() => (!unref(isUpdate) ? '新增' : '编辑'))
+
+  async function handleSave(exit) {
+    try {
+      const values = await validate()
+      loading.value = true
+      setModalProps({ confirmLoading: true, loading: true })
+      const res: API.DataResult = await EditClientParam(values)
+      loading.value = false
+      if (res.succeeded) {
+        createMessage.success(res.message)
+        emit('success')
+      } else {
+        createMessage.error(res.message)
+      }
+      exit && closeModal()
+    } finally {
+      setModalProps({ confirmLoading: false, loading: false })
+    }
+  }
+</script>
diff --git a/src/views/system/print/index.vue b/src/views/system/print/index.vue
new file mode 100644
index 00000000..ac43e887
--- /dev/null
+++ b/src/views/system/print/index.vue
@@ -0,0 +1,115 @@
+<template>
+  <div>
+    <BasicTable
+      class="ds-table"
+      @register="registerTable"
+    >
+      <template #toolbar>
+        <a-button type="link" @click="handleCreate">
+          <span class="iconfont icon-tianjia"></span>
+          新建
+        </a-button>
+      </template>
+      <template #bodyCell="{ column, record }">
+        <template v-if="column.key === 'action'">
+          <TableAction
+            :actions="[
+              {
+                icon: 'clarity:note-edit-line',
+                tooltip: '编辑',
+                onClick: handleEdit.bind(null, record),
+              },
+              {
+                icon: 'ant-design:delete-outlined',
+                tooltip: '删除',
+                color: 'error',
+                popConfirm: {
+                  title: '是否要删除此条数据？',
+                  okText: '是',
+                  cancelText: '否',
+                  confirm: handleDelete.bind(null, record)
+                }
+              }
+            ]"
+          />
+        </template>
+      </template>
+    </BasicTable>
+    <Modal @register="registerModal" @success="handleSuccess" />
+  </div>
+</template>
+<script lang="ts" setup>
+  import { onMounted } from 'vue'
+  import { BasicTable, useTable, TableAction } from '/@/components/Table'
+  import { formatParams } from '/@/hooks/web/common'
+  import { GetClientParamList, BatchDelClientParam } from './api'
+  import { useModal } from '/@/components/Modal'
+  import Modal from './components/Modal.vue'
+  import { columns, searchFormSchema } from './columns'
+  import { useMessage } from '/@/hooks/web/useMessage'
+  const { notification } = useMessage()
+  const [registerModal, { openModal }] = useModal()
+  const [registerTable, { reload, getForm, getPaginationRef }] = useTable({
+    api: async (p) => {
+      const res: API.DataResult = await GetClientParamList(p)
+      return new Promise((resolve) => {
+        resolve({ data: [...res.data], total: res.count })
+      })
+    },
+    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: false,
+    actionColumn: {
+      width: 80,
+      title: '操作',
+      dataIndex: 'action',
+      fixed: 'right',
+    },
+  })
+
+  function handleCreate() {
+    openModal(true, {
+      isParent: false,
+      isUpdate: false,
+    })
+  }
+
+  function handleEdit(record: Recordable) {
+    openModal(true, {
+      record,
+      isUpdate: true,
+    })
+  }
+  // 删除
+  async function handleDelete(record: Recordable) {
+    const res: API.DataResult = await BatchDelClientParam({
+      id: '',
+      ids: [record.id],
+    })
+    if (res.succeeded) {
+      notification.success({ message: res.message, duration: 3 })
+      reload()
+    } else {
+      notification.error({ message: res.message, duration: 3 })
+    }
+  }
+  onMounted(() => {
+    //初始化字典选项
+  })
+  function handleSuccess() {
+    reload()
+  }
+</script>

From 299ac1025041a4d1d69089d6ae1655dc7b51c0eb Mon Sep 17 00:00:00 2001
From: lijingjia <lijj_xl@163.com>
Date: Mon, 22 Jul 2024 08:32:13 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=A7=94=E6=89=98=E5=8D=95=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CostEntry/actionBar.vue        |   3 +-
 src/components/CostEntry/feeTable.vue         |  10 +-
 .../operation/seaexport/api/BookingLedger.js  |   2 +-
 .../detail/components/ladingInfo.vue          |  12 +-
 .../seaexport/detail/modules/rightContent.vue |   8 +-
 src/views/system/print/api.ts                 |  48 +++-
 src/views/system/print/columns.tsx            | 224 +++++++++---------
 src/views/system/print/components/Modal.vue   |   6 +-
 .../system/print/components/temModal.vue      | 110 +++++++++
 src/views/system/print/index.vue              | 190 +++++++++++----
 10 files changed, 439 insertions(+), 174 deletions(-)
 create mode 100644 src/views/system/print/components/temModal.vue

diff --git a/src/components/CostEntry/actionBar.vue b/src/components/CostEntry/actionBar.vue
index 94fa11a9..a4281b3d 100644
--- a/src/components/CostEntry/actionBar.vue
+++ b/src/components/CostEntry/actionBar.vue
@@ -173,7 +173,7 @@
   import DsPrint from '/@/components/Print/index.vue'
   const [registerModal, { openModal }] = useModal()
   const { createMessage } = useMessage()
-  const emits = defineEmits(['revoke', 'save', 'delete', 'cancel', 'refresh', 'history', 'selectInsert', 'submit']) 
+  const emits = defineEmits(['revoke', 'save', 'delete', 'cancel', 'refresh', 'history', 'selectInsert', 'submit', 'add']) 
   const props = defineProps({
     // 数据
     data: {
@@ -213,6 +213,7 @@
       
     }
     props.data.push(deepCopyRow)
+    emits('add')
   }
   // 复制选中行
   const copyRow = () => {
diff --git a/src/components/CostEntry/feeTable.vue b/src/components/CostEntry/feeTable.vue
index 2458eda2..ef6b0f42 100644
--- a/src/components/CostEntry/feeTable.vue
+++ b/src/components/CostEntry/feeTable.vue
@@ -21,6 +21,7 @@
           @selectInsert="selectInsert"
           @revoke="revoke"
           @submit="submit"
+          @add="add"
         ></ActionBar>
       </div>
       <div>
@@ -826,6 +827,13 @@
         loading.value = false
       })
   }
+  // 增加行
+  const add = () => {
+    const hot = hotTb.value.hotInstance
+    nextTick(() => {
+      hot.selectCell(list.value.length - 1, 4)
+    })
+  }
   onMounted(() => {
     const hot = hotTb.value.hotInstance
     hot.addHook('afterOnCellMouseDown', function (event, coords, TD) {})
@@ -836,7 +844,7 @@
         if (hot.getSelected()[0][0] == list.value.length - 1 && !hot.getActiveEditor()?._opened) {
           list.value.push(JSON.parse(JSON.stringify(row)))
           nextTick(() => {
-            hot.selectCell(list.value.length - 1, 3)
+            hot.selectCell(list.value.length - 1, 4)
           })
           return false
         }
diff --git a/src/views/operation/seaexport/api/BookingLedger.js b/src/views/operation/seaexport/api/BookingLedger.js
index b565967f..78f56a76 100644
--- a/src/views/operation/seaexport/api/BookingLedger.js
+++ b/src/views/operation/seaexport/api/BookingLedger.js
@@ -2010,7 +2010,7 @@ export function GetBusinessOrderContactInfo(params) {
 // 联系人下拉
 export function GetOrderContactListByClientId(params) {
   return request({
-    url: '/mainApi/OrderContact/GetOrderContactListByClientId',
+    url: '/opApi/BusinessOrderContact/GetOrderContactListByClientId',
     method: 'get',
     params
   })
diff --git a/src/views/operation/seaexport/detail/components/ladingInfo.vue b/src/views/operation/seaexport/detail/components/ladingInfo.vue
index 8bf95615..6384b5fd 100644
--- a/src/views/operation/seaexport/detail/components/ladingInfo.vue
+++ b/src/views/operation/seaexport/detail/components/ladingInfo.vue
@@ -33,6 +33,10 @@
             EDI报文导出
             <span class="iconfont icon-30jiantouxiangxiafill"></span>
           </a-button>
+          <a-button type="link" @click="msg">
+            <span class="iconfont icon-xiaopiaodayin"></span>
+            打印
+          </a-button>
         </div>
         <div>
           <a-button type="link" @click="create">
@@ -215,12 +219,14 @@
       resetFields2()
       resetFields3()
       resetFields4()
-      resetFields5()
       formData.agentId = ''
       formData.agentContent = ''
       formData.cntrSealNo = ''
       formData.description = ''
       formData.marks = ''
+      setFieldsValue5({
+        ...props.details
+      })
     }
     setFormValue()
   }
@@ -674,12 +680,14 @@
     resetFields2()
     resetFields3()
     resetFields4()
-    resetFields5()
     formData.agentId = ''
     formData.agentContent = ''
     formData.cntrSealNo = ''
     formData.description = ''
     formData.marks = ''
+    setFieldsValue5({
+      ...props.details
+    })
     createMessage.success('表单已置为新建状态！')
   }
   // 调入主单信息
diff --git a/src/views/operation/seaexport/detail/modules/rightContent.vue b/src/views/operation/seaexport/detail/modules/rightContent.vue
index 5dd3024f..eb90339a 100644
--- a/src/views/operation/seaexport/detail/modules/rightContent.vue
+++ b/src/views/operation/seaexport/detail/modules/rightContent.vue
@@ -47,7 +47,7 @@
           <span
             v-for="(serive, sindex) in bookingServiceItem"
             class="items"
-            :class="{'item-active': serive.projectCode == projectCode}"
+            :class="{'item-active': serive.isYield}"
             :key="sindex"
             @click="saveService(serive)"
           >
@@ -748,14 +748,10 @@
       getStatusServiceList(1, null)
     }
   }
-  const projectCode = ref()
   // 点击 服务项目
   function saveService(data) {
-    projectCode.value = data.projectCode
-    var date = new Date()
-    console.log(date.valueOf())
     if (!props.id) {
-      createMessage.error('请先保存主单')
+      createMessage.warning('请先保存主单')
       return false
     }
     const obj = {
diff --git a/src/views/system/print/api.ts b/src/views/system/print/api.ts
index f076ded1..febd71cf 100644
--- a/src/views/system/print/api.ts
+++ b/src/views/system/print/api.ts
@@ -7,30 +7,40 @@
 import { request } from '/@/utils/request'
 import { DataResult, PageRequest } from '/@/api/model/baseModel'
 enum Api {
-  list = '/mainApi/ClientParam/GetClientParamList',
-  edit = '/mainApi/ClientParam//EditClientParam',
-  info = '/mainApi/ClientParam/GetClientParamInfo',
+  list = '/mainApi/Print/GetOpenPrintTemplateList',
+  modalList = '/mainApi/Print/GetOpenPrintModuleList',
+  edit = '/mainApi/PrintTemplate//EditSysPrintModule',
+  temEidt = '/mainApi/PrintTemplate/EditSysPrintTemplate',
+  temInfo = '/mainApi/PrintTemplate/GetSysPrintTemplateInfo',
+  info = '/mainApi/PrintTemplate/GetSysPrintModuleInfo',
   delete = '/mainApi/ClientParam/BatchDelClientParam',
   GetTenantParamDataSelectList = '/mainApi/ClientParam/GetTenantParamDataSelectList'
 }
 // 列表 (Auth)
-export function GetClientParamList(data: PageRequest) {
+export function GetSysPrintTemplateList() {
   return request<DataResult>({
     url: Api.list,
-    method: 'post',
-    data
+    method: 'get'
   })
 }
-// 编辑 (Auth)
-export function EditClientParam(data: PageRequest) {
+// 模块列表
+export function GetPrintModuleList(params) {
+  return request<DataResult>({
+    url: Api.modalList,
+    method: 'get',
+    params
+  })
+}
+// 模块编辑 (Auth)
+export function EditSysPrintModule(data: PageRequest) {
   return request<DataResult>({
     url: Api.edit,
     method: 'post',
     data
   })
 }
-// 详情 (Auth)
-export function GetClientParamInfo(query) {
+// 模块详情 (Auth)
+export function GetSysPrintModuleInfo(query) {
   return request<DataResult>({
     url: Api.info,
     method: 'get',
@@ -38,6 +48,24 @@ export function GetClientParamInfo(query) {
   })
 }
 
+// 模版编辑
+export function EditSysPrintTemplate(data: PageRequest) {
+  return request<DataResult>({
+    url: Api.temEidt,
+    method: 'post',
+    data
+  })
+}
+
+// 模版详情
+export function GetSysPrintTemplateInfo(data: PageRequest) {
+  return request<DataResult>({
+    url: Api.temInfo,
+    method: 'post',
+    data
+  })
+}
+
 // 删除 (Auth)
 export function BatchDelClientParam(data: PageRequest) {
   return request<DataResult>({
diff --git a/src/views/system/print/columns.tsx b/src/views/system/print/columns.tsx
index ee44550b..7c788683 100644
--- a/src/views/system/print/columns.tsx
+++ b/src/views/system/print/columns.tsx
@@ -5,29 +5,29 @@
  */
 import { ref } from 'vue'
 import { BasicColumn, FormSchema } from '/@/components/Table'
-// 引入字典数据
-import { getDictOption } from '/@/utils/dictUtil'
-// 下拉数据
-import { getOptions } from '/@/hooks/dict'
 import { useOptionsStore } from '/@/store/modules/options'
-import { GetTenantParamDataSelectList } from './api'
+import { GetPrintModuleList } from './api'
 const optionsStore = useOptionsStore()
 const itemNameOption = ref([])
-// 模块字典
-const modulesDict = await getDictOption('modules')
+
 export const columns: BasicColumn[] = [
   {
-    title: '客户名称',
-    dataIndex: 'customerName',
-    width: 150
+    title: '模版名称',
+    dataIndex: 'templateName',
+    width: 200
+  },
+  {
+    title: '打印类型',
+    dataIndex: 'printType',
+    width: 120
   },
   {
-    title: '客户参数类型',
-    dataIndex: 'paramType',
-    width: 150
+    title: '入口参数',
+    dataIndex: 'inParamColumn',
+    width: 200
   },
   {
-    title: '客户参数名称',
+    title: '创建时间',
     dataIndex: 'paramName',
     width: 200
   },
@@ -40,8 +40,8 @@ export const columns: BasicColumn[] = [
 
 export const searchFormSchema: FormSchema[] = [
   {
-    field: 'paramName',
-    label: '客户参数名称',
+    field: 'templateName',
+    label: '模版名称',
     colProps: { span: 6 },
     component: 'Input'
   },
@@ -55,136 +55,146 @@ export const formSchema: FormSchema[] = [
     show: false
   },
   {
-    field: 'paramCode',
-    label: '客户参数类别',
+    field: 'moduleName',
+    label: '模块名称',
     required: true,
-    component: 'ApiSelect',
-    colProps: { span: 12 },
-    componentProps: ({ formModel }) => {
-      return {
-        option: optionsStore.getOptionsByCode('GetTenantParamSelectList'),
-        labelField: 'paramName',
-        valueField: 'paramCode',
-        filterOption: (input: string, option: any) => {
-          return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
-        },
-        onChange: (e, obj) => {
-          GetTenantParamDataSelectList({ code: e }).then(res => {
-            itemNameOption.value = res.data
-          })
-          if (obj) {
-            formModel.paramName = obj.label
-            formModel.paramId = obj.id
-            formModel.paramType = obj.type
-          } else {
-            formModel.paramName = ''
-            formModel.paramId = ''
-            formModel.paramType = ''
-          }
-        }
-      }
-    }
+    component: 'Input',
+    colProps: { span: 12 }
   },
   {
-    field: 'itemCode',
-    label: '客户参数名称',
+    field: 'moduleCode',
+    label: '模块编码',
     required: true,
-    component: 'ApiSelect',
-    colProps: { span: 12 },
-    componentProps: ({ formModel }) => {
-      return {
-        option: itemNameOption.value,
-        labelField: 'itemName',
-        valueField: 'itemCode',
-        filterOption: (input: string, option: any) => {
-          return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
-        },
-        onChange: (e, obj) => {
-          if (obj) {
-            formModel.itemName = obj.label
-          } else {
-            formModel.itemName = ''
-          }
-        }
-      }
-    }
-  },
-  {
-    label: '',
-    field: 'itemName',
     component: 'Input',
-    defaultValue: '',
-    show: false
+    colProps: { span: 12 }
   },
   {
-    label: '',
-    field: 'customerName',
+    field: 'sortNo',
+    label: '排序',
     component: 'Input',
-    defaultValue: '',
-    show: false
+    colProps: { span: 12 }
   },
   {
-    label: '',
-    field: 'paramId',
-    component: 'Input',
-    defaultValue: '',
-    show: false
+    field: 'disable',
+    label: '是否可用',
+    defaultValue: 0,
+    component: 'RadioButtonGroup',
+    colProps: { span: 12 },
+    componentProps: {
+      options: [
+        { label: '禁用', value: 1 },
+        { label: '启用', value: 0 }
+      ]
+    }
   },
+  {
+    field: 'note',
+    label: '备注',
+    component: 'InputTextArea',
+    colProps: { span: 24 }
+  }
+]
+
+
+export const temFormSchema: FormSchema[] = [
   {
     label: '',
-    field: 'paramName',
+    field: 'id',
     component: 'Input',
     defaultValue: '',
     show: false
   },
   {
-    label: '',
-    field: 'paramType',
+    field: 'moduleName',
+    label: '模版名称',
+    required: true,
     component: 'Input',
-    defaultValue: '',
-    show: false
+    colProps: { span: 12 }
   },
   {
-    field: 'customerId',
-    label: '客户名称',
+    field: 'printType',
+    label: '打印类型',
     required: true,
+    component: 'Select',
+    colProps: { span: 12 },
+    componentProps: () => {
+      return {
+        options: [
+          { label: 'PDF', value: 'PDF' },
+          { label: 'EXCEL', value: 'EXCEL' },
+          { label: 'WORD', value: 'WORD' },
+        ],
+        allowClear: true,
+        showSearch: true,
+        filterOption: (input: string, option: any) => {
+          return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+        },
+      }
+    },
+  },
+  {
+    label: '所属模块',
+    field: 'templateCode',
     component: 'ApiSelect',
+    required: false,
+    dynamicDisabled: false,
+    // defaultValue: '',
     colProps: { span: 12 },
     componentProps: ({ formModel }) => {
       return {
-        api: () => {
-          return new Promise((resolve) => {
-            const arr = getOptions('custom')
-            resolve(arr)
-          })
-        },
-        labelField: 'shortName',
-        valueField: 'codeName',
+        api: GetPrintModuleList,
+        allowClear: true,
+        showSearch: true,
+        labelField: 'moduleName',
+        valueField: 'moduleCode',
         resultField: 'data',
         filterOption: (input: string, option: any) => {
           return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
         },
         onChange: (e, obj) => {
           if (obj) {
-            formModel.customerName = obj.label
+            formModel.templateName = obj.label
+            formModel.moduleId = obj.id
           } else {
-            formModel.customerName = ''
+            formModel.templateName = ''
+            formModel.moduleId = ''
           }
-        }
+        },
       }
-    }
+    },
   },
   {
-    field: 'orderNo',
-    label: '排序',
-    required: true,
+    field: 'templateName',
+    label: '',
     component: 'Input',
-    colProps: { span: 12 }
+    show: false
   },
   {
-    field: 'note',
-    label: '备注',
+    field: 'moduleId',
+    label: '',
+    component: 'Input',
+    show: false
+  },
+  {
+    field: 'isUseDataSource',
+    label: '是否使用数据源',
+    defaultValue: 0,
+    component: 'RadioButtonGroup',
+    colProps: { span: 12 },
+    componentProps: {
+      options: [
+        { label: '是', value: 1 },
+        { label: '否', value: 0 }
+      ]
+    }
+  },
+  {
+    field: 'printJsonContent',
+    label: '打印设计内容',
     component: 'InputTextArea',
-    colProps: { span: 24 }
+    colProps: { span: 24 },
+    componentProps: {
+      autoSize: { minRows: 3, maxRows: 20 }
+    }
   }
-]
+]
\ No newline at end of file
diff --git a/src/views/system/print/components/Modal.vue b/src/views/system/print/components/Modal.vue
index 0f306422..0b525a20 100644
--- a/src/views/system/print/components/Modal.vue
+++ b/src/views/system/print/components/Modal.vue
@@ -50,7 +50,7 @@
   // 表单字段数据
   import { formSchema } from '../columns'
   // 相关接口
-  import { EditClientParam, GetClientParamInfo } from '../api'
+  import { EditSysPrintModule, GetSysPrintModuleInfo } from '../api'
   // 提示消息混入
   import { useMessage } from '/@/hooks/web/useMessage'
   // 声明Emits
@@ -75,7 +75,7 @@
       setModalProps({ confirmLoading: true });
       updateFormField(updateSchema)
       rowId.value = data.record.id
-      const res: API.DataResult = await GetClientParamInfo({ id: unref(rowId) })
+      const res: API.DataResult = await GetSysPrintModuleInfo({ id: unref(rowId) })
       if (res.succeeded) {
         setFieldsValue({
           ...res.data,
@@ -94,7 +94,7 @@
       const values = await validate()
       loading.value = true
       setModalProps({ confirmLoading: true, loading: true })
-      const res: API.DataResult = await EditClientParam(values)
+      const res: API.DataResult = await EditSysPrintModule(values)
       loading.value = false
       if (res.succeeded) {
         createMessage.success(res.message)
diff --git a/src/views/system/print/components/temModal.vue b/src/views/system/print/components/temModal.vue
new file mode 100644
index 00000000..91e933d2
--- /dev/null
+++ b/src/views/system/print/components/temModal.vue
@@ -0,0 +1,110 @@
+<template>
+  <BasicModal
+    v-bind="$attrs"
+    :use-wrapper="true"
+    :title="getTitle"
+    :form-schema="formSchema"
+    width="50%"
+    @register="registerModal"
+    @ok="handleSave"
+  >
+    <!-- 包装表单 -->
+    <BasicForm @register="registerForm" />
+    <!--右下角按钮-->
+    <template #footer>
+      <a-button
+        pre-icon="ant-design:close-outlined"
+        type="warning"
+        :loading="loading"
+        ghost
+        style="margin-right: 0.8rem"
+        @click="closeModal"
+      >
+        取消
+      </a-button>
+      <a-button
+        type="success"
+        :loading="loading"
+        pre-icon="ant-design:check-outlined"
+        style="margin-right: 0.8rem"
+        @click="handleSave(false)"
+      >
+        仅保存
+      </a-button>
+      <a-button
+        pre-icon="ant-design:check-circle-outlined"
+        type="primary"
+        :loading="loading"
+        @click="handleSave(true)"
+      >
+        保存并关闭
+      </a-button>
+    </template>
+  </BasicModal>
+</template>
+<script lang="ts" setup>
+  import { ref, computed, unref } from 'vue'
+  // 弹窗组件
+  import { BasicModal, useModalInner } from '/@/components/Modal'
+  import { BasicForm, useForm } from '/@/components/Form/index'
+  // 表单字段数据
+  import { temFormSchema } from '../columns'
+  // 相关接口
+  import { EditSysPrintTemplate, GetSysPrintTemplateInfo } from '../api'
+  // 提示消息混入
+  import { useMessage } from '/@/hooks/web/useMessage'
+  // 声明Emits
+  const emit = defineEmits(['success', 'register'])
+  const isUpdate = ref(true)
+  // 按钮loading
+  const loading = ref(false)
+  const rowId = ref('')
+  const { createMessage } = useMessage()
+  const [registerForm, { resetFields, setFieldsValue, validate, updateSchema }] =
+    useForm({
+      labelWidth: 100,
+      schemas: temFormSchema,
+      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 GetSysPrintTemplateInfo({ id: unref(rowId) })
+      if (res.succeeded) {
+        setFieldsValue({
+          ...res.data,
+        })
+      }
+    } else {
+      setFieldsValue({ permissionIdentity: unref(2) })
+    }
+    setModalProps({ loading: false })
+  })
+
+  const getTitle = computed(() => (!unref(isUpdate) ? '新增' : '编辑'))
+
+  async function handleSave(exit) {
+    try {
+      const values = await validate()
+      loading.value = true
+      setModalProps({ confirmLoading: true, loading: true })
+      const res: API.DataResult = await EditSysPrintTemplate(values)
+      loading.value = false
+      if (res.succeeded) {
+        createMessage.success(res.message)
+        emit('success')
+      } else {
+        createMessage.error(res.message)
+      }
+      exit && closeModal()
+    } finally {
+      setModalProps({ confirmLoading: false, loading: false })
+    }
+  }
+</script>
diff --git a/src/views/system/print/index.vue b/src/views/system/print/index.vue
index ac43e887..5fbfc65f 100644
--- a/src/views/system/print/index.vue
+++ b/src/views/system/print/index.vue
@@ -1,62 +1,98 @@
 <template>
-  <div>
-    <BasicTable
-      class="ds-table"
-      @register="registerTable"
-    >
-      <template #toolbar>
-        <a-button type="link" @click="handleCreate">
-          <span class="iconfont icon-tianjia"></span>
-          新建
+  <div class="ds-print-tem">
+    <div class="flex">
+      <div class="opt">
+        <a-button
+          type="link"
+          @click="handleCreate"
+        >
+          <span class="iconfont icon-new_document"></span>
+          添加模块
         </a-button>
-      </template>
-      <template #bodyCell="{ column, record }">
-        <template v-if="column.key === 'action'">
-          <TableAction
-            :actions="[
-              {
-                icon: 'clarity:note-edit-line',
-                tooltip: '编辑',
-                onClick: handleEdit.bind(null, record),
-              },
-              {
-                icon: 'ant-design:delete-outlined',
-                tooltip: '删除',
-                color: 'error',
-                popConfirm: {
-                  title: '是否要删除此条数据？',
-                  okText: '是',
-                  cancelText: '否',
-                  confirm: handleDelete.bind(null, record)
+        <a-spin :spinning="mloading">
+          <div class="list-box">
+            <div v-for="item in modelList" :key="item.id" class="item" @click="toggleTable(item)">
+              <span class="count">{{ item.templateCount }}</span><span>{{ item.moduleName }}</span>
+              <span style="float: right" class="iconfont icon-bianji1" @click="handleEdit(item)"></span>
+            </div>
+            <img v-if="modelList.length == 0" src="../../../assets/images/nodata1.png" alt="">
+          </div>
+        </a-spin>
+      </div>
+      <BasicTable
+        class="ds-table"
+        @register="registerTable"
+      >
+        <template #toolbar>
+          <a-button type="link" @click="createTem">
+            <span class="iconfont icon-tianjia"></span>
+            新建
+          </a-button>
+        </template>
+        <template #bodyCell="{ column, record }">
+          <template v-if="column.key === 'action'">
+            <TableAction
+              :actions="[
+                {
+                  icon: 'clarity:note-edit-line',
+                  tooltip: '编辑',
+                  onClick: handleEdit.bind(null, record),
+                },
+                {
+                  icon: 'ant-design:delete-outlined',
+                  tooltip: '删除',
+                  color: 'error',
+                  popConfirm: {
+                    title: '是否要删除此条数据？',
+                    okText: '是',
+                    cancelText: '否',
+                    confirm: handleDelete.bind(null, record)
+                  }
                 }
-              }
-            ]"
-          />
+              ]"
+            />
+          </template>
         </template>
-      </template>
-    </BasicTable>
+      </BasicTable>
+    </div>
+    <!-- 新增模块弹窗 -->
     <Modal @register="registerModal" @success="handleSuccess" />
+    <!-- 模版弹窗 -->
+    <temModal @register="registerTemModal" @success="temSuccess" />
   </div>
 </template>
 <script lang="ts" setup>
-  import { onMounted } from 'vue'
+  import { onMounted, ref } from 'vue'
   import { BasicTable, useTable, TableAction } from '/@/components/Table'
   import { formatParams } from '/@/hooks/web/common'
-  import { GetClientParamList, BatchDelClientParam } from './api'
+  import { GetSysPrintTemplateList, GetPrintModuleList, BatchDelClientParam } from './api'
   import { useModal } from '/@/components/Modal'
+  // 模块弹窗
   import Modal from './components/Modal.vue'
+  // 模版弹窗
+  import temModal from './components/temModal.vue'
   import { columns, searchFormSchema } from './columns'
   import { useMessage } from '/@/hooks/web/useMessage'
   const { notification } = useMessage()
-  const [registerModal, { openModal }] = useModal()
+  // 模块弹窗
+  const [registerModal, { openModal: openModal1 }] = useModal()
+  // 模版弹窗
+  const [registerTemModal, { openModal: openModal2 }] = useModal()
+  // 模块列表
+  const modelList = ref([])
+  const mloading = ref(false)
   const [registerTable, { reload, getForm, getPaginationRef }] = useTable({
     api: async (p) => {
-      const res: API.DataResult = await GetClientParamList(p)
+      const res: API.DataResult = await GetSysPrintTemplateList(p)
       return new Promise((resolve) => {
         resolve({ data: [...res.data], total: res.count })
       })
     },
     beforeFetch: (p) => {
+      if (modalId) {
+        p['id'] = modalId
+      }
+      initModel()
       return formatParams(p)
     },
     columns,
@@ -79,20 +115,42 @@
       fixed: 'right',
     },
   })
-
+  // 初始化模块数据
+  const initModel = () => {
+    mloading.value = true
+    GetPrintModuleList().then(res => {
+      modelList.value = res.data
+      mloading.value = false
+    }).catch(() => {
+      mloading.value = false
+    })
+  }
+  // 添加模块
   function handleCreate() {
-    openModal(true, {
-      isParent: false,
+    openModal1(true, {
       isUpdate: false,
     })
   }
-
-  function handleEdit(record: Recordable) {
-    openModal(true, {
+  // 创建模版
+  const createTem = () => {
+    openModal2(true, {
+      isUpdate: false,
+    })
+  }
+  // 编辑模块
+  function handleEdit(record) {
+    openModal1(true, {
       record,
       isUpdate: true,
     })
   }
+  // 存选中的模块id
+  let modalId = ''
+  // 切换表格
+  const toggleTable = (item) => {
+    modalId = item.id
+    reload()
+  }
   // 删除
   async function handleDelete(record: Recordable) {
     const res: API.DataResult = await BatchDelClientParam({
@@ -110,6 +168,52 @@
     //初始化字典选项
   })
   function handleSuccess() {
+    initModel()
+  }
+  const temSuccess = () => {
     reload()
   }
 </script>
+
+<style lang="less">
+.ds-print-tem {
+  .opt {
+    padding: 10px;
+  }
+  .list-box {
+    border: 1px solid #E8EBED;
+    border-radius: 2px;
+    margin: 0 10px;
+    width: 210px;
+    padding: 16px 20px;
+    img {
+      margin: 20px 0 40px;
+    }
+    .item {
+      cursor: pointer;
+    }
+  }
+  .count {
+    width: 32px;
+    height: 20px;
+    border-radius: 2px;
+    background: #F5F9FC;
+    display: inline-block;
+    color: #257AFA;
+    text-align: center;
+    line-height: 19px;
+    margin-right: 8px;
+    margin-bottom: 8px;
+  }
+  .icon-bianji1 {
+    margin-top: 3px;
+    color: #257AFA;
+    display: none;
+  }
+  .item:hover {
+    .icon-bianji1 {
+      display: block;
+    }
+  }
+}
+</style>
\ No newline at end of file