diff --git a/src/components/Container/src/ScrollContainer.vue b/src/components/Container/src/ScrollContainer.vue
index afdba247..4ce4fffd 100644
--- a/src/components/Container/src/ScrollContainer.vue
+++ b/src/components/Container/src/ScrollContainer.vue
@@ -82,7 +82,7 @@
     height: 100%;
 
     .scrollbar__wrap {
-      margin-bottom: 18px !important;
+      margin-bottom: 0 !important;
       overflow-x: hidden;
     }
 
diff --git a/src/components/EmailModal.vue/index.vue b/src/components/EmailModal.vue/index.vue
new file mode 100644
index 00000000..ebb14ed6
--- /dev/null
+++ b/src/components/EmailModal.vue/index.vue
@@ -0,0 +1,218 @@
+<!--
+ * @Author: lijj
+ * @Date: 2024-05-06 09:18:47
+ * @Description: 邮件发送弹窗组件
+-->
+<template>
+  <div>
+    <a-modal 
+      class="ds-form-detail ds-modal-small"
+      v-model:visible="visible"
+      v-if="visible"
+      title="邮件发送"
+      width="640px"
+      :maskClosable="false"
+    >
+      <a-spin :spinning="loading">
+        <div>
+          <a-form
+            layout="vertical"
+            autocomplete="off"
+            class="ant-form-small"
+          >
+            <div class="flex" style="justify-content: space-between;">
+              <a-form-item
+                label="关键字"
+              >
+                <a-input v-model:value="name" @keyup.enter="search" style="width: 400px;"></a-input>
+              </a-form-item>
+              <div>
+                <a-button @click="reset">重 置</a-button>
+                <a-button @click="search" type="primary">查 询</a-button>
+              </div>
+            </div>
+          </a-form>
+        </div>
+        <div>
+          <h4>模版</h4>
+        </div>
+        <a-row :gutter="10">
+          <a-col :span="12" v-for="item in modelData" class="mb10" :key="item.id">
+            <div class="model-card">
+              <span class="tem-name">
+                {{ item.templateName }}
+              </span>
+              <span class="flex flex-btns">
+                <dl @click="toPrint(item.id, '1')">
+                  <dt><img src="../../assets/images/PDF2.png" alt=""></dt>
+                  <dd>pdf</dd>
+                </dl>
+                <dl @click="toPrint(item.id, '2', item.name)">
+                  <dt><img src="../../assets/images/xksx2.png" alt=""></dt>
+                  <dd>xlsx</dd>
+                </dl>
+                <dl @click="toPrint(item.id, '3')">
+                  <dt><img src="../../assets/images/DOC2.png" alt=""></dt>
+                  <dd>doc</dd>
+                </dl>
+              </span>  
+            </div>
+          </a-col>
+        </a-row>
+        <div v-show="!modelData.length" class="no-data">
+          <span class="iconfont icon-wushuju" :style="{ fontSize: '50px' }"></span>
+          <div class="mb10">暂无数据</div>
+        </div>
+      </a-spin>
+      <template #footer>
+      </template>
+    </a-modal>
+  </div>
+</template>
+
+<script lang="ts" setup name="DsPrint">
+  import { ref, defineExpose, defineProps } from 'vue'
+  import { GetOpenPrintTemplateList, GetOpenJsonPrintInfo } from '/@/views/operation/seaexport/api/BookingLedger.js'
+  import { useMessage } from '/@/hooks/web/useMessage'
+  const { createMessage } = useMessage()
+  const props = defineProps({
+    // 模块id（根据id查询所有模版）
+    id: {
+      type: String,
+      default: null
+    }
+  })
+  // 关键字名称
+  const name = ref()
+  // 弹窗开关
+  const visible = ref(false)
+  const loading = ref(false)
+  // 打印格式
+  const type = ref('1')
+  // 打印模版数据
+  const modelData = ref([])
+  // 保存打印的数据
+  const jsonDataStr = ref()
+  // 附件原始数据
+  const sourceData = ref([])
+  // 组件初始化接口 (接收打印的数据list)
+  const init = (v) => {
+    visible.value = true
+    if (v) jsonDataStr.value = JSON.stringify(v)
+    loading.value = true
+    GetOpenPrintTemplateList({ id: props.id }).then(r => {
+      loading.value = false
+      // 保存原始数据
+      modelData.value = r.data
+      sourceData.value = JSON.parse(JSON.stringify(r.data))
+    }).catch(() => {
+      loading.value = false
+    })
+  }
+  // 重置
+  const reset = () => {
+    name.value = null
+    modelData.value = sourceData.value
+  }
+  // 查询
+  const search = () => {
+    if (!name.value) return reset()
+    const source = JSON.parse(JSON.stringify(sourceData.value))
+    modelData.value = source.filter(item => {
+      return item.templateName.includes(name.value)
+    })
+  }
+  const handleOk = () => {
+    visible.value = false
+  }
+
+  const handleCancel = () => {
+    visible.value = false
+  }
+
+  // 跳转打印
+  const toPrint = (id, type, name) => {
+    const postData = {
+      jsonDataStr: jsonDataStr.value,
+      printType: type,
+      templateId: id
+    }
+    loading.value = true
+    GetOpenJsonPrintInfo(postData).then(res => {
+      loading.value = false
+      if (!res.succeeded) {
+        createMessage.error(res.message)
+      } else {
+        let fileURL = `http://60.209.125.238:3009/PrintTempFile/${res.data}`
+        if (type == 1) {
+          window.open(fileURL)
+        } else {
+          window.open(`//60.209.125.238:3009/PrintTempFile/${res.data}`, '_blank')
+        }
+      }
+    })
+  }
+
+  defineExpose({
+    init
+  })
+</script>
+<style lang="less">
+  .ds-print {
+    .message {
+      font-size: 12px;
+      color: #f05;
+    }
+    .tem-name {
+      font-size: 12px;
+      color: #7A8798;
+    }
+    .ant-spin-container {
+      min-height: 270;
+    }
+    .model-card {
+      padding: 10px;
+      background: #F5F9FC;
+      border-radius: 2px;
+      border-left: 1px solid #257AFA;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+    }
+    .ant-modal-footer {
+      display: none;
+    }
+    .ant-btn {
+      width: 80px;
+      margin-left: 10px;
+      margin-top: 25px;
+    }
+    h4 {
+      margin: 16px 0 13px;
+    }
+    dt {
+      img {
+        width: 16px;
+        height: 18px;
+      }
+    }
+    dd {
+      font-size: 10px;
+      margin: 0;
+      color: #257AFA;
+    }
+    dl {
+      margin: 0 10px 0 7px;
+      cursor: pointer;
+    }
+    .flex-btns {
+      position: relative;
+      top: 2px;
+    }
+    .no-data {
+      text-align: center;
+      color: #7A8798;
+    }
+  }
+</style>
+ 
\ No newline at end of file
diff --git a/src/components/Modal/src/index.less b/src/components/Modal/src/index.less
index 54d48357..79813b48 100644
--- a/src/components/Modal/src/index.less
+++ b/src/components/Modal/src/index.less
@@ -24,7 +24,7 @@
   }
 
   &-title {
-    font-size: 16px;
+    font-size: 12px;
     font-weight: bold;
 
     .base-title {
@@ -33,8 +33,7 @@
   }
 
   .ant-modal-body {
-    padding: 20;
-
+    padding: 0 30px;
     > .scrollbar > .scrollbar__bar.is-horizontal {
       display: none;
     }
@@ -107,9 +106,6 @@
   }
 }
 
-.ant-modal-confirm .ant-modal-body {
-  padding: 24px !important;
-}
 @media screen and (max-height: 600px) {
   .ant-modal {
     top: 60px;
diff --git a/src/design/ant/form.less b/src/design/ant/form.less
index cefa073e..20456d81 100644
--- a/src/design/ant/form.less
+++ b/src/design/ant/form.less
@@ -24,6 +24,10 @@
   .ant-select-selection-search-input, .ant-input-affix-wrapper, .ant-input-number-input {
     height: 26px!important;
   }
+  // 解除文本框高度受限制
+  .ant-input-affix-wrapper-textarea-with-clear-btn {
+    height: auto!important;
+  }
   .ant-picker-small {
     height: 26px;
     width: 100%;
diff --git a/src/design/ant/modal.less b/src/design/ant/modal.less
index 43cdc0b7..f8eb1d78 100644
--- a/src/design/ant/modal.less
+++ b/src/design/ant/modal.less
@@ -6,13 +6,20 @@
     font-size: 12px;
     position: relative;
     top: 16px;
-    left: 16px;
+    left: 15px;
+    .vben-basic-title {
+      padding-left: 0;
+    }
   }
 }
 .ant-modal-body {
   padding: 15px 30px;
-  margin-top: 5px;
+  margin-top: 0;
+  .scroll-container {
+    padding: 0 30px!important;
+  }
   .ant-form {
+    height: 100%;
     background-color: #F5F9FC;
     border-radius: 2px;
     padding: 10px 20px 15px;
@@ -26,9 +33,17 @@
       }
     }
   }
+  .vben-basic-table {
+    .ant-table-wrapper {
+      padding: 0;
+    }
+    .ant-table-title {
+      padding: 8px 0!important;
+    }
+  }
 }
 .ant-modal-footer {
-  border: none;
+  border-top: none!important;
   padding: 5px 30px 20px;
   .ant-btn {
     height: 26px;
diff --git a/src/design/ant/table.less b/src/design/ant/table.less
index ed06bd62..cd1cc13f 100644
--- a/src/design/ant/table.less
+++ b/src/design/ant/table.less
@@ -9,12 +9,6 @@
   }
   .ant-table-wrapper {
     padding: 0!important;
-    .ant-table-title {
-      padding: 0;
-    }
-    .ant-table-title {
-      padding: 5px 10px!important;
-    }
   }
   .ant-table-selection-column {
     border-right: 1px solid rgba(232, 232, 232, 1) !important;
diff --git a/src/design/iconfont.less b/src/design/iconfont.less
index f0c86188..daebd273 100644
--- a/src/design/iconfont.less
+++ b/src/design/iconfont.less
@@ -1,7 +1,9 @@
-.icon-locksuo, .icon-duihao1 {
+.icon-locksuo,
+.icon-duihao1 {
   color: #17a6a3;
 }
-.icon-lock-openkaisuo, .icon-chahao {
+.icon-lock-openkaisuo,
+.icon-chahao {
   color: @msg-color;
 }
 .IconColor {
diff --git a/src/views/baseinfo/infoclient/TenantAuditStepModal.vue b/src/views/baseinfo/infoclient/TenantAuditStepModal.vue
index 2715c4f7..c6797e90 100644
--- a/src/views/baseinfo/infoclient/TenantAuditStepModal.vue
+++ b/src/views/baseinfo/infoclient/TenantAuditStepModal.vue
@@ -40,6 +40,10 @@
           <!-- 合同管理 -->
           <CustTemplateDetail :client-id="clientId" :customer-name="customerName" class="RUnit" />
         </a-tab-pane>
+        <a-tab-pane key="8" tab="客户参数">
+          <!-- 客户参数表格 -->
+          <CustomerParams :client-id="clientId" :customer-name="customerName"></CustomerParams>
+        </a-tab-pane>
       </a-tabs>
 
       <!-- 图片管理 -->
@@ -89,6 +93,7 @@
   import Menus3 from './menu3/index.vue'
   import Menus4 from './menu4/index.vue'
   import CustTemplateDetail from './custTemplateDetail/index.vue'
+  import CustomerParams from './customerParams/index.vue'
   import { number } from 'vue-types'
   // import Menus5 from './menu5/index.vue'
   // import { tr } from 'node_modules/element-plus/es/locale'
@@ -183,8 +188,6 @@
       activeKey.value = '2'
       const res: API.DataResult = await getCodeGoodsTypeInfo({ id: unref(rowId) })
       if (res.succeeded) {
-        console.log(res, 11111111)
-
         clientId.value = res.data.id
         customerName.value = res.data.shortName
         res.data.ArrclientTag = []
diff --git a/src/views/baseinfo/infoclient/customerParams/api.ts b/src/views/baseinfo/infoclient/customerParams/api.ts
new file mode 100644
index 00000000..f076ded1
--- /dev/null
+++ b/src/views/baseinfo/infoclient/customerParams/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/baseinfo/infoclient/customerParams/columns.tsx b/src/views/baseinfo/infoclient/customerParams/columns.tsx
new file mode 100644
index 00000000..19e3463a
--- /dev/null
+++ b/src/views/baseinfo/infoclient/customerParams/columns.tsx
@@ -0,0 +1,165 @@
+/*
+ * @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 { 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: 'customerId',
+    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: 'customerName',
+    label: '客户名称',
+    dynamicDisabled: true,
+    component: 'Input',
+    colProps: { span: 12 }
+  },
+  {
+    field: 'orderNo',
+    label: '排序',
+    required: true,
+    component: 'Input',
+    colProps: { span: 12 }
+  },
+  {
+    field: 'note',
+    label: '备注',
+    component: 'InputTextArea',
+    colProps: { span: 24 }
+  }
+]
diff --git a/src/views/baseinfo/infoclient/customerParams/components/Modal.vue b/src/views/baseinfo/infoclient/customerParams/components/Modal.vue
new file mode 100644
index 00000000..3847fe61
--- /dev/null
+++ b/src/views/baseinfo/infoclient/customerParams/components/Modal.vue
@@ -0,0 +1,113 @@
+<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({ 
+        customerId: data.clientId,
+        customerName: data.customerName
+      })
+    }
+    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/baseinfo/infoclient/customerParams/index.vue b/src/views/baseinfo/infoclient/customerParams/index.vue
new file mode 100644
index 00000000..729bab93
--- /dev/null
+++ b/src/views/baseinfo/infoclient/customerParams/index.vue
@@ -0,0 +1,125 @@
+<template>
+  <div>
+    <BasicTable
+      @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, defineProps } 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 props = defineProps({
+    // 客户id
+    clientId: {
+      type: String
+    },
+    // 客户名称
+    customerName: {
+      type: String
+    }
+  })
+  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,
+    isTreeTable: false,
+    pagination: true,
+    striped: true,
+    useSearchForm: false,
+    showTableSetting: false,
+    bordered: true,
+    showIndexColumn: true,
+    canResize: false,
+    actionColumn: {
+      width: 80,
+      title: '操作',
+      dataIndex: 'action',
+      fixed: 'right',
+    },
+    id: 10
+  })
+
+  function handleCreate() {
+    openModal(true, {
+      customerName: props.customerName,
+      clientId: props.clientId,
+      isUpdate: false
+    })
+  }
+
+  function handleEdit(record: Recordable) {
+    openModal(true, {
+      record,
+      isUpdate: true,
+      customerName: props.customerName,
+      clientId: props.clientId
+    })
+  }
+  // 删除
+  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>
+  
\ No newline at end of file
diff --git a/src/views/baseinfo/infoclient/index.vue b/src/views/baseinfo/infoclient/index.vue
index ba74baee..2227e0b1 100644
--- a/src/views/baseinfo/infoclient/index.vue
+++ b/src/views/baseinfo/infoclient/index.vue
@@ -21,13 +21,24 @@
                 onClick: handleAudit.bind(null, record),
                 disabled: checkPermissions('op:infoclient:edit'),
               },
+              {
+                icon: 'ant-design:delete-outlined',
+                tooltip: '删除',
+                color: 'error',
+                popConfirm: {
+                  title: '是否要删除此条数据？',
+                  okText: '是',
+                  cancelText: '否',
+                  confirm: handleDelete.bind(null, record)
+                }
+              }
             ]"
           />
         </template>
       </template>
     </BasicTable>
     <TenantAuditStepModal @register="registerModal" @success="handleSuccess" />
-    <a-modal
+    <!-- <a-modal
       :visible="visible"
       title="往来单位信息"
       width="70%"
@@ -35,7 +46,7 @@
       @cancel="handleCancel"
     >
       <ImportFlow v-if="visible" ref="refImportFlow" />
-    </a-modal>
+    </a-modal> -->
   </div>
 </template>
 <script lang="ts" setup>
@@ -47,7 +58,7 @@
   import TenantAuditStepModal from './TenantAuditStepModal.vue'
   import { columns, searchFormSchema, formSchema } from './columns'
   import { useMessage } from '/@/hooks/web/useMessage'
-  const { notification } = useMessage()
+  const { createMessage } = useMessage()
   let filterInfo: Partial<Recordable<string[]>> = []
   let sortInfo: SorterResult = {}
   const visible = ref<boolean>(false)
@@ -130,25 +141,16 @@
     })
   }
 
-  // const handleOk = async () => {
-  //   let ids = []
-  //   refImportFlow.value.getSelectData().forEach((e) => {
-  //     ids.push(e.id)
-  //   })
-  //   const res: API.DataResult = await importCodeGoodsType({
-  //     ids,
-  //     id: '',
-  //   })
-  //   if (res.succeeded) {
-  //     notification.success({ message: res.message, duration: 3 })
-  //   } else {
-  //     notification.error({ message: res.message, duration: 3 })
-  //   }
-  //   reload()
-  //   visible.value = false
-  // }
-  const handleCancel = () => {
-    visible.value = false
+  // 删除
+  async function handleDelete(record: Recordable) {
+    const res: API.DataResult = await BatchDelClientParam({
+      id: '',
+      ids: [record.id],
+    })
+    if (res.succeeded) {
+      createMessage.success(res.message)
+      reload()
+    }
   }
   function handleAudit(record: Recordable) {
     if (!checkPermissions('op:infoclient:edit')) {
diff --git a/src/views/operation/seaexport/api/BookingLedger.js b/src/views/operation/seaexport/api/BookingLedger.js
index 78f56a76..e7a8bde9 100644
--- a/src/views/operation/seaexport/api/BookingLedger.js
+++ b/src/views/operation/seaexport/api/BookingLedger.js
@@ -1990,11 +1990,11 @@ export function GetBusinessOrderContactList(data) {
 }
 
 // 委托单位联系人编辑
-export function EditBusinessOrderContact(params) {
+export function EditBusinessOrderContact(data) {
   return request({
     url: '/opApi/BusinessOrderContact/EditBusinessOrderContact',
-    method: 'get',
-    params
+    method: 'post',
+    data
   })
 }
 
diff --git a/src/views/operation/seaexport/detail/modules/Letter/OpBusinessYardColumns.tsx b/src/views/operation/seaexport/detail/modules/Letter/OpBusinessYardColumns.tsx
index 5a204b19..8398411b 100644
--- a/src/views/operation/seaexport/detail/modules/Letter/OpBusinessYardColumns.tsx
+++ b/src/views/operation/seaexport/detail/modules/Letter/OpBusinessYardColumns.tsx
@@ -711,7 +711,6 @@ export const formSchema: FormSchema[] = [
     label: '截港日期',
     field: 'closingDate',
     component: 'DatePicker',
-    defaultValue: null,
     colProps: {
       span: 8,
     },
diff --git a/src/views/operation/seaexport/detail/modules/PersonModal.vue b/src/views/operation/seaexport/detail/modules/PersonModal.vue
index b64c7920..0481fe95 100644
--- a/src/views/operation/seaexport/detail/modules/PersonModal.vue
+++ b/src/views/operation/seaexport/detail/modules/PersonModal.vue
@@ -3,20 +3,25 @@
     v-bind="$attrs"
     :use-wrapper="true"
     :title="getTitle"
-    :form-schema="personFormSchema"
     width="50%"
+    class="person-modal"
     @register="registerModal"
     @ok="handleSave"
   >
     <!-- 包装表单 -->
     <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"
+      <template #customerContactId="data">
+        <a-select 
+          v-model:value="data.values.customerContactId"
+          :default-active-first-option="false"
+          :show-arrow="false"
+          allowClear
+          :filter-option="false"
+          :not-found-content="null"
+          @change="personChange"
         >
-          <a-select-option v-for="item in personList" :key="item.id" :value="item.id">
-              {{ item.userName }}
+          <a-select-option v-for="item in personList" :label="item.shortName" :key="item.id" :value="item.id">
+            {{ item.shortName }}
           </a-select-option>
         </a-select>
       </template>
@@ -24,31 +29,18 @@
     <!--右下角按钮-->
     <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>
@@ -116,7 +108,13 @@
   })
 
   const getTitle = computed(() => (!unref(isUpdate) ? '新增' : '编辑'))
-
+  // 选择联系人
+  const personChange = (e, obj) => {
+    setFieldsValue({
+      customerContactId: e,
+      name: obj.label
+    })
+  }
   async function handleSave(exit) {
     try {
       const values = await validate()
@@ -127,8 +125,6 @@
       if (res.succeeded) {
         createMessage.success(res.message)
         emit('success')
-      } else {
-        createMessage.error(res.message)
       }
       exit && closeModal()
     } finally {
diff --git a/src/views/operation/seaexport/detail/modules/baseInfo.tsx b/src/views/operation/seaexport/detail/modules/baseInfo.tsx
index ccd52b45..93b04504 100644
--- a/src/views/operation/seaexport/detail/modules/baseInfo.tsx
+++ b/src/views/operation/seaexport/detail/modules/baseInfo.tsx
@@ -725,7 +725,7 @@ export const basicInfoFormSchema: FormSchema[] = [
   {
     label: '订舱代理',
     field: 'forwarderId',
-    labelSlot: 'forwarder',
+    labelSlot: 'forwarderId',
     component: 'ApiSelect',
     required: false,
     dynamicDisabled: false,
@@ -2673,31 +2673,25 @@ export const otherInfoFormSchema: FormSchema[] = [
 // 关系人表单
 export const personFormSchema: FormSchema[] = [
   {
-    field: 'service',
+    field: 'id',
+    label: '',
+    component: 'Input',
+    show: false
+  },
+  {
+    field: 'customerContactId',
     label: '联系人',
     component: 'ApiSelect',
     required: false,
     dynamicDisabled: false,
-    slot: 'service',
-    // defaultValue: '',
+    slot: 'customerContactId',
     colProps: { span: 12 },
-    // 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
-    //     },
-    //   }
-    // }
+  },
+  {
+    field: 'name',
+    label: '',
+    component: 'Input',
+    show: false
   },
   {
     label: '邮箱',
@@ -2707,7 +2701,7 @@ export const personFormSchema: FormSchema[] = [
   },
   {
     label: '电话',
-    field: 'email',
+    field: 'tel',
     component: 'Input',
     colProps: { span: 12 },
   },
@@ -2775,6 +2769,18 @@ export const personColumns: BasicColumn[] = [
     sorter: true,
     width: 120,
   },
+  {
+    dataIndex: 'customerTypeName',
+    title: '客户类别',
+    sorter: true,
+    width: 120,
+  },
+  {
+    dataIndex: 'customerName',
+    title: '客户名称',
+    sorter: true,
+    width: 140,
+  },
   {
     dataIndex: 'note',
     title: '备注',
diff --git a/src/views/operation/seaexport/detail/modules/basicInfo.vue b/src/views/operation/seaexport/detail/modules/basicInfo.vue
index 0cd0fb1a..7831f4ba 100644
--- a/src/views/operation/seaexport/detail/modules/basicInfo.vue
+++ b/src/views/operation/seaexport/detail/modules/basicInfo.vue
@@ -11,7 +11,7 @@
       :isTransfer="true"
       name="基础表单"
       id="0"
-      formNo="0"
+      formNo="10"
       ref="RefChilrenRef"
     >
       <a-button type="link">
@@ -24,24 +24,24 @@
       <template #customerId="item">
         <span class="iconfont icon-tuandui" @click="openPersonModal(item, '委托单位', 'customerId')"></span>
       </template>
-      <!-- <template #truckerId>
-        <span class="iconfont icon-tuandui" @click="openPersonModal"></span>
+      <template #truckerId="item">
+        <span class="iconfont icon-tuandui" @click="openPersonModal(item, '车队', 'truckerId')"></span>
       </template>
-      <template #carrierId>
-        <span class="iconfont icon-tuandui" @click="openPersonModal"></span>
+      <template #carrierId="item">
+        <span class="iconfont icon-tuandui" @click="openPersonModal(item, '船公司', 'carrierId')"></span>
       </template>
-      <template #forwarder>
-        <span class="iconfont icon-tuandui" @click="openPersonModal"></span>
+      <template #forwarderId="item">
+        <span class="iconfont icon-tuandui" @click="openPersonModal(item, '订舱代理', 'forwarderId')"></span>
       </template>
-      <template #shipAgencyId>
-        <span class="iconfont icon-tuandui" @click="openPersonModal"></span>
+      <template #shipAgencyId="item">
+        <span class="iconfont icon-tuandui" @click="openPersonModal(item, '船代', 'shipAgencyId')"></span>
+      </template>
+      <template #yardId="item">
+        <span class="iconfont icon-tuandui" @click="openPersonModal(item, '场站', 'yardId')"></span>
+      </template>
+      <template #customserId="item">
+        <span class="iconfont icon-tuandui" @click="openPersonModal(item, '报关行', 'customserId')"></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>
@@ -83,8 +83,8 @@
             />
           </template>
         </template>
-        <template #footer></template>
       </BasicTable>
+      <template #footer></template>
     </a-modal>
     <PersonModal @register="registerModal" @success="handleSuccess" />
   </div>
@@ -146,7 +146,18 @@
     isTreeTable: false,
     pagination: true,
     striped: true,
-    useSearchForm: false,
+    formConfig: {
+      labelWidth: 120,
+      schemas: [
+        {
+          label: '联系人',
+          field: 'name',
+          component: 'Input',
+          colProps: { span: 4 }
+        }
+      ]
+    },
+    useSearchForm: true,
     showTableSetting: false,
     bordered: true,
     showIndexColumn: true,
@@ -178,6 +189,7 @@
   let companyType = '' 
   // 打开关系人弹窗
   const openPersonModal = (item, type, field) => {
+    console.log(item)
     if (item?.values[field]) {
       companyId = item.values[field]
     } else {
diff --git a/src/views/operation/seaexport/detail/modules/preOrder copy.vue b/src/views/operation/seaexport/detail/modules/preOrder copy.vue
index 8d6b7a54..17db04df 100644
--- a/src/views/operation/seaexport/detail/modules/preOrder copy.vue	
+++ b/src/views/operation/seaexport/detail/modules/preOrder copy.vue	
@@ -3033,7 +3033,7 @@
   .pre-order {
     margin-left: -15px;
     margin-right: -3px;
-    margin-top: -8px;
+    padding-top: 30px;
   }
 
   .order-btn-list {
diff --git a/src/views/system/notice/columns.tsx b/src/views/system/notice/columns.tsx
index e16eff0a..4b841c04 100644
--- a/src/views/system/notice/columns.tsx
+++ b/src/views/system/notice/columns.tsx
@@ -147,7 +147,6 @@ export const formSchema: FormSchema[] = [
     component: 'DatePicker',
     required: true,
     componentProps: {
-      // showTime: true,
       valueFormat: 'YYYY-MM-DD',
     },
     colProps: { span: 8 },
diff --git a/src/views/system/print/api.ts b/src/views/system/print/api.ts
index 2e5bdf4f..ad0eede3 100644
--- a/src/views/system/print/api.ts
+++ b/src/views/system/print/api.ts
@@ -16,7 +16,7 @@ enum Api {
   delete = '/mainApi/ClientParam/BatchDelClientParam',
   GetTenantParamDataSelectList = '/mainApi/ClientParam/GetTenantParamDataSelectList'
 }
-// 列表 (Auth)
+// 模版列表 (Auth)
 export function GetSysPrintTemplateList(data) {
   return request<DataResult>({
     url: Api.list,
@@ -59,11 +59,11 @@ export function EditSysPrintTemplate(data: PageRequest) {
 }
 
 // 模版详情
-export function GetSysPrintTemplateInfo(data: PageRequest) {
+export function GetSysPrintTemplateInfo(params) {
   return request<DataResult>({
     url: Api.temInfo,
-    method: 'post',
-    data
+    method: 'get',
+    params
   })
 }
 
diff --git a/src/views/system/print/columns.tsx b/src/views/system/print/columns.tsx
index 7c788683..f01062bb 100644
--- a/src/views/system/print/columns.tsx
+++ b/src/views/system/print/columns.tsx
@@ -77,8 +77,9 @@ export const formSchema: FormSchema[] = [
   {
     field: 'disable',
     label: '是否可用',
+    slot: 'disable',
     defaultValue: 0,
-    component: 'RadioButtonGroup',
+    component: 'Switch',
     colProps: { span: 12 },
     componentProps: {
       options: [
@@ -91,7 +92,10 @@ export const formSchema: FormSchema[] = [
     field: 'note',
     label: '备注',
     component: 'InputTextArea',
-    colProps: { span: 24 }
+    colProps: { span: 24 },
+    componentProps: {
+      autoSize: { minRows: 5, maxRows: 5 }
+    }
   }
 ]
 
@@ -114,8 +118,9 @@ export const temFormSchema: FormSchema[] = [
   {
     field: 'printType',
     label: '打印类型',
-    required: true,
     component: 'Select',
+    show: false,
+    defaultValue: 1,
     colProps: { span: 12 },
     componentProps: () => {
       return {
@@ -136,7 +141,7 @@ export const temFormSchema: FormSchema[] = [
     label: '所属模块',
     field: 'templateCode',
     component: 'ApiSelect',
-    required: false,
+    required: true,
     dynamicDisabled: false,
     // defaultValue: '',
     colProps: { span: 12 },
@@ -178,7 +183,8 @@ export const temFormSchema: FormSchema[] = [
   {
     field: 'isUseDataSource',
     label: '是否使用数据源',
-    defaultValue: 0,
+    slot: 'isUseDataSource',
+    defaultValue: false,
     component: 'RadioButtonGroup',
     colProps: { span: 12 },
     componentProps: {
@@ -188,13 +194,55 @@ export const temFormSchema: FormSchema[] = [
       ]
     }
   },
+  {
+    field: 'sourceSql',
+    label: '数据源',
+    component: 'InputTextArea',
+    colProps: { span: 24 },
+    componentProps: {
+      autoSize: { minRows: 3, maxRows: 20 }
+    },
+    show: ({ values }) => {
+      return values.isUseDataSource
+    }
+  },
+  {
+    field: 'inParamColumn',
+    label: '入口参数',
+    component: 'Input',
+    colProps: { span: 12 },
+    show: ({ values }) => {
+      return values.isUseDataSource
+    }
+  },
+  {
+    field: 'groupBy',
+    label: '分组字段',
+    component: 'Input',
+    colProps: { span: 12 },
+    show: ({ values }) => {
+      return values.isUseDataSource
+    }
+  },
+  {
+    field: 'columnView',
+    label: '参数',
+    component: 'InputTextArea',
+    colProps: { span: 24 },
+    componentProps: {
+      autoSize: { minRows: 3, maxRows: 20 }
+    },
+    show: ({ values }) => {
+      return values.isUseDataSource
+    }
+  },
   {
     field: 'printJsonContent',
     label: '打印设计内容',
     component: 'InputTextArea',
     colProps: { span: 24 },
     componentProps: {
-      autoSize: { minRows: 3, maxRows: 20 }
+      autoSize: { minRows: 5, 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 0b525a20..a0fee10e 100644
--- a/src/views/system/print/components/Modal.vue
+++ b/src/views/system/print/components/Modal.vue
@@ -1,15 +1,16 @@
 <template>
   <BasicModal
-    v-bind="$attrs"
-    :use-wrapper="true"
     :title="getTitle"
     :form-schema="formSchema"
     width="50%"
     @register="registerModal"
     @ok="handleSave"
   >
-    <!-- 包装表单 -->
-    <BasicForm @register="registerForm" />
+    <BasicForm @register="registerForm" style="height: 260px;">
+      <template #disable="{ model, field }">
+        <a-switch v-model:checked="model[field]" /> <span class="switch-tex">{{ model[field] ? '启用' : '禁用' }}</span>
+      </template>
+    </BasicForm>
     <!--右下角按钮-->
     <template #footer>
       <a-button
@@ -108,3 +109,10 @@
     }
   }
 </script>
+
+<style lang="less">
+  .switch-tex {
+    font-size: 12px;
+    margin-left: 5px;
+  }
+</style>
\ No newline at end of file
diff --git a/src/views/system/print/components/temModal.vue b/src/views/system/print/components/temModal.vue
index 91e933d2..672deff6 100644
--- a/src/views/system/print/components/temModal.vue
+++ b/src/views/system/print/components/temModal.vue
@@ -8,8 +8,11 @@
     @register="registerModal"
     @ok="handleSave"
   >
-    <!-- 包装表单 -->
-    <BasicForm @register="registerForm" />
+    <BasicForm @register="registerForm" style="min-height: 300px;">
+      <template #isUseDataSource="{ model, field }">
+        <a-switch v-model:checked="model[field]" /> <span class="switch-tex">{{ model[field] ? '是' : '否' }}</span>
+      </template>
+    </BasicForm>
     <!--右下角按钮-->
     <template #footer>
       <a-button
@@ -108,3 +111,10 @@
     }
   }
 </script>
+
+<style lang="less">
+  .switch-tex {
+    font-size: 12px;
+    margin-left: 5px;
+  }
+</style>
\ No newline at end of file
diff --git a/src/views/system/print/index.vue b/src/views/system/print/index.vue
index 62e1c2b5..e1434791 100644
--- a/src/views/system/print/index.vue
+++ b/src/views/system/print/index.vue
@@ -12,7 +12,7 @@
         <a-spin :spinning="mloading">
           <div class="list-box">
             <div v-for="item in modelList" :key="item.id" class="item">
-              <span @click="toggleTable(item)"><span class="count">{{ item.templateCount }}</span><span>{{ item.moduleName }}</span></span>
+              <span :class="{active: item.id == moduleId}" @click="toggleTable(item)"><span class="count">{{ item.templateCount }}</span><span>{{ item.moduleName }}</span></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="">
@@ -101,13 +101,8 @@
       })
     },
     beforeFetch: (p) => {
-      if (modalId) {
-        const condition = {
-          FieldName: 'modalId',
-          FieldValue: modalId,
-          ConditionalType: 1
-        }
-        p['queryCondition'] = JSON.stringify(condition)
+      if (moduleId.value) {
+        p['moduleId'] = moduleId.value
       }
       return formatParams(p)
     },
@@ -145,16 +140,16 @@
   }
   // 编辑模块
   function handleEdit(record) {
-    openModal1(true, {
+    openModal2(true, {
       record,
       isUpdate: true,
     })
   }
   // 存选中的模块id
-  let modalId = ''
+  const moduleId = ref('')
   // 切换表格
   const toggleTable = (item) => {
-    modalId = item.id
+    moduleId.value = item.id
     reload()
   }
   // 删除
@@ -224,5 +219,12 @@
       display: block;
     }
   }
+  .active {
+    span {color: #257AFA;}
+    .count {
+      background: #257AFA;
+      color: #ffffff;
+    }
+  }
 }
 </style>
\ No newline at end of file