From e03499cb4119177a8f404c27f29eaa372e8ac302 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?=
 <14166000+zhangtonghai@user.noreply.gitee.com>
Date: Tue, 10 Sep 2024 17:26:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=80=E6=9D=A5=E5=8D=95=E4=BD=8D=20?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 index.html                                    |   2 +-
 .../Form/src/Ds/components/DEdit.vue          |   3 +-
 src/hooks/web/common.ts                       |  14 +-
 src/views/baseinfo/infoclient/EditColumns.tsx |  37 +++-
 .../infoclient/TenantAuditStepModal.vue       | 163 +++++++++++---
 src/views/baseinfo/infoclient/abc.json        |  85 +-------
 src/views/baseinfo/infoclient/api.ts          |  12 ++
 src/views/baseinfo/infoclient/columns.tsx     | 201 ++++++++++++++----
 src/views/baseinfo/infoclient/index.vue       | 144 +++++--------
 .../baseinfo/infoclient/menu2/columns.tsx     |  17 +-
 src/views/system/user/columns.tsx             |   6 +-
 11 files changed, 447 insertions(+), 237 deletions(-)
diff --git a/index.html b/index.html
index 01a0bc78..f6c4ea57 100644
--- a/index.html
+++ b/index.html
@@ -10,7 +10,7 @@
     />
     <title><%= title %></title>
     <link rel="icon" href="/favicon.ico" />
-    <link rel="stylesheet" href="//at.alicdn.com/t/c/font_3756681_vejmkmf3sz.css" />
+    <link rel="stylesheet" href="//at.alicdn.com/t/c/font_3756681_gav4guhyv4i.css" />
   </head>
   <body>
     <script>
diff --git a/src/components/Form/src/Ds/components/DEdit.vue b/src/components/Form/src/Ds/components/DEdit.vue
index e257db8d..2ee9f79b 100644
--- a/src/components/Form/src/Ds/components/DEdit.vue
+++ b/src/components/Form/src/Ds/components/DEdit.vue
@@ -97,7 +97,8 @@
               })
               // RData = props.ShowName
             } else {
-              RData = state.value ? state.value.replace(/\"/g, '') : ''
+              RData = state.value
+              // RData = state.value ? state.value.replace(/\"/g, '') : ''
             }
           }
         }
diff --git a/src/hooks/web/common.ts b/src/hooks/web/common.ts
index e2c4d26b..37f4db94 100644
--- a/src/hooks/web/common.ts
+++ b/src/hooks/web/common.ts
@@ -134,9 +134,10 @@ export function updateFormItem(updateSchema, formNo) {
 }
 
 // 返回表格查询的参数 multipleList(需要多选查询的字段名数组)
-export function formatParams(params = {}, equal:any = []) {
+export function formatParams(params = {}, equal: any = [], otherQuery: any = []) {
   const postData = {
     queryCondition: '',
+    otherQueryCondition: {},
     pageCondition: {
       pageIndex: params?.page,
       pageSize: params?.pageSize,
@@ -145,8 +146,17 @@ export function formatParams(params = {}, equal:any = []) {
   }
   const conditions = [] as any
   for (let key in params) {
+    let IsContinue = true
+    if (otherQuery.length) {
+      otherQuery.forEach((item) => {
+        if (key == item) {
+          IsContinue = false
+          postData.otherQueryCondition[key]=params[key]
+        }
+      })
+    }
     // 排除不是分页排序等字段
-    if (key != 'page' && key != 'pageSize' && key != 'order' && key != 'field') {
+    if (IsContinue && key != 'page' && key != 'pageSize' && key != 'order' && key != 'field') {
       if (key == 'advancedSearchParams') {
         // 高级查询
         conditions.push(params[key])
diff --git a/src/views/baseinfo/infoclient/EditColumns.tsx b/src/views/baseinfo/infoclient/EditColumns.tsx
index 1bd4622a..a360d93e 100644
--- a/src/views/baseinfo/infoclient/EditColumns.tsx
+++ b/src/views/baseinfo/infoclient/EditColumns.tsx
@@ -115,9 +115,9 @@ export const EditformSchema: FormSchema[] = [
     label: '助记码',
     component: 'DEdit',
     defaultValue: '',
-    dynamicDisabled: ({ values }) => {
-      return true
-    },
+    // dynamicDisabled: ({ values }) => {
+    //   return true
+    // },
     colProps: { span: 4 },
     componentProps: (e) => {
       return {
@@ -188,7 +188,36 @@ export const EditformSchema: FormSchema[] = [
       }
     },
   },
-
+  {
+    field: 'registeredCapital',
+    label: '注册资金',
+    component: 'DEdit',
+    defaultValue: '',
+    colProps: { span: 4 },
+    componentProps: (e) => {
+      return {
+        onEdit: () => {
+          const { formActionType } = e
+          formActionType ? formActionType.linkageForm(e) : null
+        },
+      }
+    },
+  },
+  {
+    field: 'registrationTime',
+    label: '注册时间',
+    component: 'DEdit',
+    defaultValue: '',
+    colProps: { span: 4 },
+    componentProps: (e) => {
+      return {
+        onEdit: () => {
+          const { formActionType } = e
+          formActionType ? formActionType.linkageForm(e) : null
+        },
+      }
+    },
+  },
   {
     field: 'Divider1',
     component: 'Divider',
diff --git a/src/views/baseinfo/infoclient/TenantAuditStepModal.vue b/src/views/baseinfo/infoclient/TenantAuditStepModal.vue
index d2e58a09..df17b52a 100644
--- a/src/views/baseinfo/infoclient/TenantAuditStepModal.vue
+++ b/src/views/baseinfo/infoclient/TenantAuditStepModal.vue
@@ -57,6 +57,38 @@
           <span class="iconfont icon-time" v-if="auditStatusText == '待审批'"></span>
           <span>{{ auditStatusText }}</span>
         </span>
+        <Divider type="vertical" />
+        <span class="gradeClass">
+          <span>客户等级：</span>
+          <a-select class="gradeSelect" :bordered="false" v-model:value="grade">
+            <a-select-option value="A">A</a-select-option>
+            <a-select-option value="B">B</a-select-option>
+            <a-select-option value="C">C</a-select-option>
+            <a-select-option value="D">D</a-select-option>
+          </a-select>
+        </span>
+        <Divider type="vertical" />
+        <span>
+          <a-select
+            class="CustomerOrSupplierSelect"
+            :class="CustomerOrSupplier"
+            :bordered="false"
+            v-model:value="CustomerOrSupplier"
+          >
+            <a-select-option value="isCustomer">
+              <span class="iconfont icon-yonghu1"></span>
+              客户
+            </a-select-option>
+            <a-select-option value="isSupplier">
+              <span class="iconfont icon-a-dianpushangchengxianxing"></span>
+              供应商
+            </a-select-option>
+            <a-select-option value="isCustomerAndisSupplier">
+              <span class="iconfont icon-quxiaopeidui"></span>
+              客户&供应商
+            </a-select-option>
+          </a-select>
+        </span>
       </div>
       <div class="ConfigFormBox">
         <ConfigForm
@@ -174,6 +206,7 @@
   import {
     editCodeGoodsType,
     getCodeGoodsTypeInfo,
+    ApiGetUsage,
     editClientBank,
     getClientBankList,
     DeleteInvoiceHeader,
@@ -182,6 +215,7 @@
     ApiWithdraw,
   } from './api'
   import { GetFormSetListByModule } from '/@/api/common'
+  import { ApiList } from './menu2/api'
   // 引入表格权限信息（包含id和name）
   import { permissionsInfo } from '/@/hooks/web/usePermission'
   import { GetClientSourceDetailSelectList } from '/@/views/operation/seaexport/api/BookingLedger'
@@ -197,12 +231,14 @@
   import { useModal } from '/@/components/Modal'
   import CustomerParams from './customerParams/index.vue'
   import ReleaseType from './ReleaseType/index.vue'
+  import { formatParams } from '/@/hooks/web/common'
   import { useRoute } from 'vue-router'
   const route = useRoute()
   import { useGo } from '/@/hooks/web/usePage'
   const go = useGo()
   // 字典
   import { getDictOption } from '/@/utils/dictUtil'
+  import { up } from 'inquirer/lib/utils/readline'
   // import Menus5 from './menu5/index.vue'
   // import { tr } from 'node_modules/element-plus/es/locale'
   // 声明Emits
@@ -215,6 +251,8 @@
   const clientId = ref('')
   const customerName = ref('')
   const DIYformSchema = ref([])
+  const grade = ref('A')
+  const CustomerOrSupplier = ref('')
   // 获取表单设置数据
   const getFormSet = async () => {
     let res: any = await GetFormSetListByModule({ permissionId: permissionsInfo().permissionId })
@@ -233,14 +271,12 @@
     selectedKeys.value = ['menu1']
     resetFields()
     resetFields1()
-    if (route.query.id) {
+    if (route.query && route.query.id) {
       rowId.value = route.query.id
       activeKey.value = '2'
       getData(true)
     } else {
-      setTableData([])
       clientId.value = ''
-
       clientTag_o.value = {
         id: '',
         clientId: '',
@@ -250,10 +286,16 @@
       }
       rowId.value = ''
       activeKey.value = '2'
-      await setFieldsValue({})
+      reload()
+      setFieldsValue({})
       auditStatusText.value = ''
       activeKey.value = '1'
-      await setFieldsValue1({})
+      setFieldsValue1({})
+      if (route.path == '/CustomerinfoclientDetail') {
+        CustomerOrSupplier.value = 'isCustomer'
+      } else if (route.path == '/SupplierinfoclientDetail') {
+        CustomerOrSupplier.value = 'isSupplier'
+      }
     }
   })
   watch(activeKey, (nval, oval) => {
@@ -490,29 +532,51 @@
           }
         })
       }
+
       if (type) {
-        console.log(res.data, '??????????????????')
         if (!res.data.serviceItemCodes) {
           res.data.serviceItemCodes = []
         }
+        grade.value = res.data.grade
+        if (res.data.isCustomer && res.data.isSupplier) {
+          CustomerOrSupplier.value = 'isCustomerAndisSupplier'
+        } else if (res.data.isCustomer) {
+          CustomerOrSupplier.value = 'isCustomer'
+        } else if (res.data.isSupplier) {
+          CustomerOrSupplier.value = 'isSupplier'
+        }
+
         await setFieldsValue({
           ...res.data,
         })
         clearValidate()
         auditStatusText.value = res.data.auditStatusText
-        let Arr: any = []
-        await GetClientSourceDetailSelectList({ id: res.data.sourceId }).then((res) => {
-          res.data.forEach((item) => {
-            Arr.push({ label: item.detailName, value: item.id })
-          })
-        })
+        // let Arr: any = []
+        // await GetClientSourceDetailSelectList({ id: res.data.sourceId }).then((res) => {
+        //   res.data.forEach((item) => {
+        //     Arr.push({ label: item.detailName, value: item.id })
+        //   })
+        // })
         activeKey.value = '2'
-        await setFieldsValue1({
+        setFieldsValue1({
           ...res.data,
         })
         activeKey.value = '1'
         reload()
       }
+      ApiGetUsage({ ids: [unref(rowId)] }).then((res) => {
+        if (res.data[0].isUsed) {
+          updateSchema({
+            field: 'shortName',
+            dynamicDisabled: true,
+          })
+        } else {
+          updateSchema({
+            field: 'shortName',
+            dynamicDisabled: false,
+          })
+        }
+      })
     }
   }
 
@@ -520,7 +584,7 @@
   // 新建
   function handleCreate() {
     const addNum = Math.round(Math.random() * 1000)
-    go(`/infoclientDetail?addNum=${addNum}`)
+    go(`${route.fullPath}?addNum=${addNum}`)
   }
   // 提交
   async function handleSave() {
@@ -528,7 +592,6 @@
     const values = await validate().catch(() => {
       notification.warning({ message: '请补全基本信息中必填内容！', duration: 3 })
     })
-
     if (values) {
       // setModalProps({ confirmLoading: true, loading: true })
       // TODO custom api
@@ -549,6 +612,18 @@
       values.clientTag = { ...values.clientTag, ...clientTag_o.value }
 
       values.clientTag.others = values.others
+
+      values.grade = grade.value
+      if (CustomerOrSupplier.value == 'isCustomerAndisSupplier') {
+        values.isCustomer = true
+        values.isSupplier = true
+      } else if (CustomerOrSupplier.value == 'isCustomer') {
+        values.isCustomer = true
+        values.isSupplier = false
+      } else if (CustomerOrSupplier.value == 'isSupplier') {
+        values.isCustomer = false
+        values.isSupplier = true
+      }
       // loading.value = true;
       const res = await editCodeGoodsType({
         ...values,
@@ -559,12 +634,12 @@
           rowId.value = res.data
           clientId.value = res.data
           // isUpdate.value = true
-          await setFieldsValue({
-            ...getFieldsValue(),
-            id: res.data,
-          })
+          // await setFieldsValue({
+          //   // ...getFieldsValue(),
+          //   id: res.data,
+          // })
         }
-        getData(false)
+        getData(true)
         notification.success({ message: res.message, duration: 3 })
         emit('success')
       } else {
@@ -586,16 +661,21 @@
   // 提交审核(Auth)
   async function SubmitAudit() {
     if (rowId.value) {
-      const auditStatus = getFieldsValue().auditStatus
-      if (auditStatus == -1 || auditStatus == 2) {
-        let ApiData: any = { ids: [rowId.value] }
-        let res = await ApiSubmitAudit(ApiData)
-        if (res.succeeded) {
-          notification.success({ message: res.message, duration: 3 })
-          getData(true)
+      const res = await ApiList(formatParams({ ClientId: clientId.value }))
+      if (res.succeeded && res.data.length) {
+        const auditStatus = getFieldsValue().auditStatus
+        if (auditStatus == -1 || auditStatus == 2) {
+          let ApiData: any = { ids: [rowId.value] }
+          let res = await ApiSubmitAudit(ApiData)
+          if (res.succeeded) {
+            notification.success({ message: res.message, duration: 3 })
+            getData(true)
+          }
+        } else {
+          notification.warning({ message: '当前审核状态，禁止提交审核！', duration: 3 })
         }
       } else {
-        notification.warning({ message: '当前审核状态，禁止提交审核！', duration: 3 })
+        notification.warning({ message: '至少拥有一条联系人信息！', duration: 3 })
       }
     } else {
       notification.warning({ message: '请先保存！', duration: 3 })
@@ -623,6 +703,14 @@
     const res = await getCodeGoodsTypeInfo({ id: unref(rowId) })
     if (res.succeeded) {
       clientId.value = res.data.id
+      grade.value = res.data.grade
+      if (res.data.isCustomer && res.data.isSupplier) {
+        CustomerOrSupplier.value = 'isCustomerAndisSupplier'
+      } else if (res.data.isCustomer) {
+        CustomerOrSupplier.value = 'isCustomer'
+      } else if (res.data.isSupplier) {
+        CustomerOrSupplier.value = 'isSupplier'
+      }
       await setFieldsValue({
         ...res.data,
       })
@@ -631,6 +719,25 @@
   }
 </script>
 <style lang="less" scoped>
+  .gradeClass {
+    color: #2881f4 !important;
+    .gradeSelect {
+      width: 60px;
+      color: #2881f4 !important;
+    }
+  }
+  .CustomerOrSupplierSelect {
+    width: 150px;
+    &.isCustomer {
+      color: #27a9a3 !important;
+    }
+    &.isSupplier {
+      color: #b82a49 !important;
+    }
+    &.isCustomerAndisSupplier {
+      color: #2881f4 !important;
+    }
+  }
   .auditStatusText {
     color: #333333;
     &.active {
diff --git a/src/views/baseinfo/infoclient/abc.json b/src/views/baseinfo/infoclient/abc.json
index e042b073..449f0b4c 100644
--- a/src/views/baseinfo/infoclient/abc.json
+++ b/src/views/baseinfo/infoclient/abc.json
@@ -1,75 +1,12 @@
-{
-  "id": "",
-  "description": "08221348",
-  "shortName": "08221348",
-  "enFullName": "",
-  "enShortName": "",
-  "codeName": "",
-  "ediCode": "",
-  "organizationCode": "",
-  "registrationNo": "",
-  "inspectionNo": "",
-  "pcorpName": "",
-  "pcorpId": "",
-  "chief": "",
-  "tel": "",
-  "email": "",
-  "web": "",
-  "city": "",
-  "province": "",
-  "country": "",
-  "address": "",
-  "sale": "",
-  "saleId": "",
-  "operatorName": "",
-  "operatorId": "",
-  "docName": "",
-  "doc": "",
-  "customerServiceName": "",
-  "customerService": "",
-  "commissionUserId": "",
-  "sourceName": "",
-  "sourceDetailName": "",
-  "sourceDetailId": "",
-  "unitPrice": "",
-  "commissionRate": 0,
-  "proportionRate": 0,
-  "feeFRT": "",
-  "invoicingMethod": "",
-  "overdueDays": 0,
-  "status": 0,
-  "isMortgageLastOrder": false,
-  "Space1": "",
-  "blContent": "",
-  "note": "",
-  "clientTag": {
-    "isBooking": false,
-    "isYard": false,
-    "isTruck": false,
-    "isController": false,
-    "isCustom": false,
-    "isAgent": false,
-    "isAgentCn": false,
-    "isExpress": false,
-    "isAirLines": false,
-    "isShipper": false,
-    "isNotifyParty": false,
-    "isWareHouse": false,
-    "isWharf": false,
-    "isInsurer": false,
-    "isLeasing": false,
-    "isTradingAgency": false,
-    "isOther": false,
-    "isShipAgency": false,
-    "isEnterprise": false,
-    "isShipperCn": false,
-    "IsContract": false,
-    "isDomesticPeers": false,
-    "isForeignCounterparts": false,
-    "id": "",
-    "clientId": "",
-    "note": "",
-    "createTime": ""
+[
+  {
+    "ConditionalList": [
+      {
+        "Key": 1,
+        "Value": { "FieldName": "description", "FieldValue": "1", "ConditionalType": 1 }
+      },
+      { "Key": 1, "Value": { "FieldName": "shortName", "FieldValue": "1", "ConditionalType": 1 } }
+    ]
   },
-  "invoiceHeaders": []
-}
+  { "FieldName": "isCustomer", "FieldValue": 1, "ConditionalType": 0 }
+]
diff --git a/src/views/baseinfo/infoclient/api.ts b/src/views/baseinfo/infoclient/api.ts
index e0e8fd7b..1bf9e2f6 100644
--- a/src/views/baseinfo/infoclient/api.ts
+++ b/src/views/baseinfo/infoclient/api.ts
@@ -25,8 +25,20 @@ enum Api {
   SubmitAudit = '/mainApi/ClientInfo/SubmitAudit',
   Withdraw = '/mainApi/ClientInfo/Withdraw',
   
+
+  GetUsage = '/mainApi/ClientInfo/GetUsage',
+  
   
   
+}
+
+// 确定往来单位是否已使用 (Auth)
+export function ApiGetUsage(data: any) {
+  return request<DataResult>({
+    url: Api.GetUsage,
+    method: 'post',
+    data,
+  })
 }
 // 提交审核 (Auth)
 export function ApiSubmitAudit(data: PageRequest) {
diff --git a/src/views/baseinfo/infoclient/columns.tsx b/src/views/baseinfo/infoclient/columns.tsx
index 978cbcbe..52b3b4e3 100644
--- a/src/views/baseinfo/infoclient/columns.tsx
+++ b/src/views/baseinfo/infoclient/columns.tsx
@@ -289,47 +289,152 @@ export const columns: BasicColumn[] = [
 ]
 export const searchFormSchema: FormSchema[] = [
   {
-    field: 'description',
-    label: '客户全称',
+    field: 'description:shortName',
+    label: '客户名称',
     component: 'Input',
     colProps: { span: 4 },
   },
   {
-    field: 'shortName',
-    label: '客户简称',
+    field: 'contactInfo',
+    label: '联系方式',
     component: 'Input',
     colProps: { span: 4 },
   },
-  // {
-  //   field: 'codeName',
-  //   label: '助记码',
-  //   component: 'Input',
-  //   colProps: { span: 4 },
-  // },
-
-  // {
-  //   field: 'registrationNo',
-  //   label: '海关备案号',
-  //   component: 'Input',
-  //   colProps: { span: 4 },
-  // },
-  // {
-  //   field: 'inspectionNo',
-  //   label: '商检备案号',
-  //   component: 'Input',
-  //   colProps: { span: 4 },
-  // },
   {
-    field: 'organizationCode',
-    label: '社会信用代码',
+    field: 'city',
+    label: '城市',
     component: 'Input',
     colProps: { span: 4 },
   },
   {
-    field: 'tel',
-    label: '电话',
-    component: 'Input',
+    field: 'country',
+    label: '国家',
+    component: 'Select',
+    colProps: { span: 4 },
+    componentProps: () => {
+      return {
+        options: ClientCountryList,
+        allowClear: true,
+        showSearch: true,
+        filterOption: (input: string, option: any) => {
+          return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+        },
+      }
+    },
+  },
+  {
+    field: 'isContractExpired',
+    label: '是否合同超期',
+    component: 'Switch',
+    colProps: { span: 4 },
+    componentProps: () => {
+      return {
+        checkedChildren: '是',
+        unCheckedChildren: '否',
+      }
+    },
+  },
+  {
+    label: '客户属性',
+    field: 'clientTag',
+    component: 'ApiSelect',
     colProps: { span: 4 },
+    componentProps: () => {
+      return {
+        api: () => {
+          return new Promise((resolve) => {
+            getDictOption('infoclient-ArrclientTag').then((res) => {
+              resolve(res)
+            })
+          })
+        },
+        labelField: 'label',
+        valueField: 'value',
+        resultField: 'data',
+        allowClear: true,
+        mode: 'multiple',
+        class: 'NoLimitHeight',
+      }
+    },
+  },
+  {
+    label: '揽货人',
+    field: 'sale',
+    component: 'ApiSelect',
+    required: false,
+    dynamicDisabled: false,
+    colProps: { span: 4 },
+    componentProps: ({ formModel }) => {
+      return {
+        api: GetSaleList,
+        labelField: 'pinYinCode',
+        showName: 'userName',
+        valueField: 'userName',
+        resultField: 'data',
+      }
+    },
+  },
+  {
+    field: 'customerServiceName',
+    label: '客服',
+    component: 'ApiSelect',
+    colProps: { span: 4 },
+    componentProps: ({ formModel }) => {
+      return {
+        api: GetCustomerServiceList,
+        labelField: 'pinYinCode',
+        showName: 'userName',
+        valueField: 'userName',
+        allowClear: true,
+        showSearch: true,
+        resultField: 'data',
+      }
+    },
+  },
+  {
+    field: 'operatorName',
+    label: '操作人',
+    component: 'ApiSelect',
+    colProps: { span: 4 },
+    componentProps: ({ formModel }) => {
+      return {
+        api: GetOperatorUserList,
+        labelField: 'pinYinCode',
+        valueField: 'userName',
+        showName: 'userName',
+        allowClear: true,
+        showSearch: true,
+        immediate: false,
+        resultField: 'data',
+      }
+    },
+  },
+  {
+    field: 'docName',
+    label: '单证',
+    component: 'ApiSelect',
+    colProps: { span: 4 },
+    componentProps: ({ formModel }) => {
+      return {
+        api: GetVouchingClerkList,
+        labelField: 'pinYinCode',
+        valueField: 'userName',
+        showName: 'userName',
+        immediate: false,
+        resultField: 'data',
+      }
+    },
+  },
+  {
+    field: 'commissionUserId',
+    label: '提成参与人',
+    component: 'Select',
+    colProps: { span: 4 },
+    componentProps: () => {
+      return {
+        options: UserData,
+      }
+    },
   },
 ]
 
@@ -386,9 +491,9 @@ export const formSchema: FormSchema[] = [
     field: 'codeName',
     label: '助记码',
     component: 'Input',
-    dynamicDisabled: ({ values }) => {
-      return true
-    },
+    // dynamicDisabled: ({ values }) => {
+    //   return true
+    // },
     colProps: { span: 4 },
   },
   {
@@ -415,10 +520,35 @@ export const formSchema: FormSchema[] = [
     field: 'ediCode',
     label: 'EDI代码',
     component: 'Input',
-
     colProps: { span: 4 },
   },
-
+  {
+    field: 'registeredCapital',
+    label: '注册资金',
+    component: 'InputNumber',
+    colProps: { span: 4 },
+    componentProps: () => {
+      return {
+        min: '0',
+        step: '0.01',
+        stringMode: true,
+      }
+    },
+  },
+  {
+    field: 'registrationTime',
+    label: '注册时间',
+    component: 'DatePicker',
+    colProps: { span: 4 },
+    componentProps: () => {
+      return {
+        showTime: true,
+        allowClear: true,
+        format: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+      }
+    },
+  },
   {
     field: 'Divider1',
     component: 'Divider',
@@ -446,7 +576,6 @@ export const formSchema: FormSchema[] = [
     field: 'email',
     label: '邮箱',
     component: 'Input',
-
     colProps: { span: 4 },
   },
   {
@@ -863,11 +992,11 @@ export const formSchema: FormSchema[] = [
       unCheckedChildren: '否',
     },
   },
-
   {
     field: 'isOverdueDeduction',
     label: '是否超期扣单',
     component: 'Switch',
+    defaultValue: true,
     colProps: { span: 4 },
     componentProps: ({ formModel }) => {
       return {
@@ -885,7 +1014,7 @@ export const formSchema: FormSchema[] = [
     field: 'isMortgageLastOrder',
     label: '是否押最后一单',
     component: 'Switch',
-    defaultValue: false,
+    defaultValue: true,
     colProps: { span: 4 },
     componentProps: {
       checkedChildren: '是',
diff --git a/src/views/baseinfo/infoclient/index.vue b/src/views/baseinfo/infoclient/index.vue
index 7b4091a0..ae7d759b 100644
--- a/src/views/baseinfo/infoclient/index.vue
+++ b/src/views/baseinfo/infoclient/index.vue
@@ -57,7 +57,8 @@
 <script lang="ts" setup>
   import { checkPermissions } from '/@/hooks/Permissions/index'
   import { BasicTable, useTable, TableAction } from '/@/components/Table'
-  import { getCodeGoodsTypeList, Delete } from './api'
+  import { getCodeGoodsTypeList, Delete, ApiGetUsage } from './api'
+  import { formatParams } from '/@/hooks/web/common'
   import {
     GetClientSourceSelectList,
     GetClientSourceDetailSelectList,
@@ -67,7 +68,10 @@
   const { notification } = useMessage()
   import { useGo } from '/@/hooks/web/usePage'
   const go = useGo()
+  import { useRoute } from 'vue-router'
+  const route = useRoute()
   import { useAppStore } from '/@/store/modules/app'
+  import { e } from 'unocss'
   const appStore = useAppStore()
   const [registerTable, { reload, getForm, getSelectRows }] = useTable({
     title: '',
@@ -96,84 +100,25 @@
       })
     },
     beforeFetch: (p) => {
-      var data = getForm().getFieldsValue()
-      const postParam: API.PageRequest = {
-        queryCondition: '',
-        pageCondition: {
-          pageIndex: p.page,
-          pageSize: p.pageSize,
-          sortConditions: [],
-        },
-      }
-      if (p.field) {
-        postParam.pageCondition.sortConditions = [
-          {
-            sortField: p.field,
-            listSortDirection: p.order == 'ascend' ? 0 : 1,
-          },
-        ]
-      } else {
-        postParam.pageCondition.sortConditions = []
-      }
-      let condition: API.ConditionItem[] = []
-      if (!!data.shortName) {
-        condition.push({
-          FieldName: 'shortName',
-          FieldValue: data.shortName,
-          ConditionalType: 1,
-        })
-      }
-      if (!!data.codeName) {
-        condition.push({
-          FieldName: 'codeName',
-          FieldValue: data.codeName,
-          ConditionalType: 1,
-        })
-      }
-      if (!!data.orderNo) {
-        condition.push({
-          FieldName: 'orderNo',
-          FieldValue: data.orderNo,
-          ConditionalType: 1,
-        })
-      }
-      if (!!data.description) {
-        condition.push({
-          FieldName: 'description',
-          FieldValue: data.description,
-          ConditionalType: 1,
-        })
-      }
-      if (!!data.registrationNo) {
-        condition.push({
-          FieldName: 'registrationNo',
-          FieldValue: data.registrationNo,
-          ConditionalType: 1,
-        })
-      }
-      if (!!data.inspectionNo) {
-        condition.push({
-          FieldName: 'inspectionNo',
-          FieldValue: data.inspectionNo,
-          ConditionalType: 1,
+      if (p.clientTag && p.clientTag.length) {
+        let obj = {}
+        p.clientTag.forEach((e) => {
+          obj[e] = true
         })
+        p.clientTag = obj
       }
-      if (!!data.organizationCode) {
-        condition.push({
-          FieldName: 'organizationCode',
-          FieldValue: data.organizationCode,
-          ConditionalType: 1,
-        })
-      }
-      if (!!data.tel) {
-        condition.push({
-          FieldName: 'tel',
-          FieldValue: data.tel,
-          ConditionalType: 1,
-        })
+      if (route.path == '/Customerinfoclient') {
+        p.isCustomer = 1
+      } else if (route.path == '/Supplierinfoclient') {
+        p.isSupplier = 1
       }
-      postParam.queryCondition = JSON.stringify(condition)
-      return postParam
+      console.log(p)
+
+      return formatParams(
+        p,
+        ['isCustomer', 'isSupplier'],
+        ['contactInfo', 'isContractExpired', 'clientTag'],
+      )
     },
     columns,
     formConfig: {
@@ -205,7 +150,7 @@
   }
   function handleCreate() {
     const addNum = Math.round(Math.random() * 1000)
-    go(`/infoclientDetail?addNum=${addNum}`)
+    go(`${route.fullPath}Detail?addNum=${addNum}`)
   }
 
   // 删除
@@ -219,18 +164,43 @@
         ids.push(item.id)
       }
     })
+
     if (ids.length) {
-      const res = await Delete({
-        id: '',
-        ids: ids,
-      })
+      let NoUsageIds = []
+      let type = true
+      let res: any = await ApiGetUsage({ ids })
       if (res.succeeded) {
-        if (StateDelType) {
-          notification.success({ message: res.message, duration: 3 })
-        } else {
-          notification.success({ message: '已删除，除待审核以外选中数据！', duration: 3 })
+        res.data.forEach((item) => {
+          if (item.isUsed) {
+            type = false
+          } else {
+            NoUsageIds.push(item.id)
+          }
+        })
+      }
+      if (NoUsageIds.length) {
+        const res = await Delete({
+          id: '',
+          ids: NoUsageIds,
+        })
+        if (res.succeeded) {
+          if (StateDelType) {
+            notification.success({ message: res.message, duration: 3 })
+          } else {
+            if (!type) {
+              notification.success({
+                message: '已删除，除待审核、已使用以外选中数据！',
+                duration: 3,
+              })
+            } else {
+              notification.success({ message: '已删除，除待审核以外选中数据！', duration: 3 })
+            }
+          }
+
+          reload()
         }
-        reload()
+      } else {
+        notification.success({ message: '选中数据，均已被使用！', duration: 3 })
       }
     } else {
       notification.warning({ message: '待审核数据，禁止删除！', duration: 3 })
@@ -238,7 +208,7 @@
   }
   function handleAudit(record) {
     if (!checkPermissions('op:infoclient:edit')) {
-      go(`/infoclientDetail?id=${record.id}`)
+      go(`${route.fullPath}Detail?id=${record.id}`)
     }
   }
 </script>
diff --git a/src/views/baseinfo/infoclient/menu2/columns.tsx b/src/views/baseinfo/infoclient/menu2/columns.tsx
index ab818613..081d6696 100644
--- a/src/views/baseinfo/infoclient/menu2/columns.tsx
+++ b/src/views/baseinfo/infoclient/menu2/columns.tsx
@@ -242,7 +242,6 @@ export const formSchema: FormSchema[] = [
     field: 'enName',
     label: '英文名',
     component: 'Input',
-    required: true,
     colProps: { span: 8 },
   },
   {
@@ -250,6 +249,7 @@ export const formSchema: FormSchema[] = [
     label: '邮箱',
     component: 'Input',
     colProps: { span: 8 },
+    required: true,
     defaultValue: 0,
   },
   {
@@ -257,6 +257,13 @@ export const formSchema: FormSchema[] = [
     label: '手机',
     component: 'Input',
     colProps: { span: 8 },
+    dynamicRules: ({ values }) => {
+      return [
+        {
+          required: values.tel ? false : true,
+        },
+      ]
+    },
     defaultValue: 0,
   },
   {
@@ -264,6 +271,13 @@ export const formSchema: FormSchema[] = [
     label: '电话',
     component: 'Input',
     colProps: { span: 8 },
+    dynamicRules: ({ values }) => {
+      return [
+        {
+          required: values.mobile ? false : true,
+        },
+      ]
+    },
     defaultValue: 0,
   },
   {
@@ -374,6 +388,7 @@ export const formSchema: FormSchema[] = [
     label: '岗位类型',
     field: 'jobs',
     component: 'ApiSelect',
+    required: true,
     colProps: { span: 12 },
     componentProps: () => {
       return {
diff --git a/src/views/system/user/columns.tsx b/src/views/system/user/columns.tsx
index 6cdd6e4f..1c3793d9 100644
--- a/src/views/system/user/columns.tsx
+++ b/src/views/system/user/columns.tsx
@@ -243,9 +243,9 @@ export const formSchema: FormSchema[] = [
     label: '助记码',
     component: 'Input',
     colProps: { span: 6 },
-    dynamicDisabled: () => {
-      return true
-    },
+    // dynamicDisabled: () => {
+    //   return true
+    // },
   },
   {
     field: 'password',
