From 6eb668f6c996d4ead7e96600bd7de337ce9daff4 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: Fri, 30 Aug 2024 11:08:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=80=E6=9D=A5=E5=8D=95=E4=BD=8D=20?=
 =?UTF-8?q?=E8=B4=B9=E7=94=A8=E4=BB=A3=E7=A0=81=20=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../infoclient/ClientAccountDateModal.vue     |  27 ++-
 .../infoclient/TenantAuditStepModal.vue       | 158 ++----------------
 src/views/baseinfo/infoclient/columns.tsx     |   2 +-
 .../infoclient/tabs3/TenantAuditStepModal.vue |  21 +--
 .../baseinfo/infoclient/tabs3/columns.tsx     |   1 +
 src/views/baseinfo/infoclient/tabs3/index.vue |   5 +-
 src/views/fee/code/index.vue                  |  38 +----
 7 files changed, 41 insertions(+), 211 deletions(-)

diff --git a/src/views/baseinfo/infoclient/ClientAccountDateModal.vue b/src/views/baseinfo/infoclient/ClientAccountDateModal.vue
index 6ac65630..96a7a374 100644
--- a/src/views/baseinfo/infoclient/ClientAccountDateModal.vue
+++ b/src/views/baseinfo/infoclient/ClientAccountDateModal.vue
@@ -57,25 +57,20 @@
   })
 
   const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
-    console.log(data, 3333333333333333333333333)
     resetFields()
     setModalProps({ confirmLoading: false, loading: true })
     isUpdate.value = !!data?.isUpdate
+    rowId.value = data.record.id
     if (unref(isUpdate)) {
       setModalProps({ confirmLoading: true })
-
-      rowId.value = data.record.id
       const res: API.DataResult = await getClientBankInfo({ id: unref(rowId) })
       if (res.succeeded) {
         setFieldsValue({
           ...res.data,
         })
-        // console.log('返回数据Form', getFieldsValue());
-        // setFieldsValue({ trainId: unref(res.data.trainId) });
       }
       setModalProps({ confirmLoading: false })
     } else {
-      rowId.value = data.record.id
       setFieldsValue({ permissionIdentity: unref(2), clientId: data.record.id })
     }
     setModalProps({ loading: false })
@@ -97,11 +92,11 @@
         //刷新页面
         if (!exit) {
           if (unref(isUpdate)) {
-            await refresh()
+            // await refresh()
           } else {
             rowId.value = res.data
             isUpdate.value = true
-            await refresh()
+            // await refresh()
           }
         }
       }
@@ -111,12 +106,12 @@
       setModalProps({ confirmLoading: false, loading: false })
     }
   }
-  async function refresh() {
-    // const res: API.DataResult = await getClientBankInfo({ id: unref(rowId) })
-    // if (res.succeeded) {
-    //   await setFieldsValue({
-    //     ...res.data,
-    //   })
-    // }
-  }
+  // async function refresh() {
+  //   const res: API.DataResult = await getClientBankInfo({ id: unref(rowId) })
+  //   if (res.succeeded) {
+  //     await setFieldsValue({
+  //       ...res.data,
+  //     })
+  //   }
+  // }
 </script>
diff --git a/src/views/baseinfo/infoclient/TenantAuditStepModal.vue b/src/views/baseinfo/infoclient/TenantAuditStepModal.vue
index f165e784..55adab9e 100644
--- a/src/views/baseinfo/infoclient/TenantAuditStepModal.vue
+++ b/src/views/baseinfo/infoclient/TenantAuditStepModal.vue
@@ -160,7 +160,7 @@
               </div>
             </div>
             <div>
-              <Tabs3 :client-id="clientId" />
+              <Tabs3 :client-id="clientId" :saleId="saleId" :sourceId="sourceId" />
             </div>
           </a-tab-pane>
           <!-- <a-tab-pane key="3" tab="账期信息">
@@ -455,13 +455,19 @@
     createTime: '',
   })
   const auditStatusText = ref('')
-
+  // 揽货人id
+  const saleId = ref('')
+  // 业务来源id
+  const sourceId = ref('')
   async function getData(type) {
     list.value.splice(0)
     const res: API.DataResult = await getCodeGoodsTypeInfo({ id: unref(rowId) })
     if (res.succeeded) {
       clientId.value = res.data.id
+      saleId.value = res.data.saleId
+      sourceId.value = res.data.sourceId
       customerName.value = res.data.shortName
+      auditStatusText.value = res.data.auditStatusText
       res.data.ArrclientTag = []
       if (res.data.clientTag) {
         res.data.others = res.data.clientTag.others
@@ -490,61 +496,6 @@
             Arr.push({ label: item.detailName, value: item.id })
           })
         })
-        // updateSchema(
-        //   rowId.value
-        //     ? {
-        //         label: '来源明细',
-        //         field: 'sourceDetailId',
-        //         component: 'DEdit',
-        //         required: false,
-        //         dynamicDisabled: ({ values }) => {
-        //           return !values.sourceId
-        //         },
-        //         colProps: { span: 4 },
-        //         componentProps: async (e) => {
-        //           const { formModel } = e
-        //           console.log(formModel, 2222)
-
-        //           return {
-        //             formModel: formModel,
-        //             onEdit: () => {
-        //               const { formActionType } = e
-        //               formActionType ? formActionType.linkageForm(e) : null
-        //             },
-        //           }
-        //         },
-        //       }
-        //     : {
-        //         label: '来源明细',
-        //         field: 'sourceDetailId',
-        //         component: 'Select',
-        //         required: false,
-        //         dynamicDisabled: ({ values }) => {
-        //           return !values.sourceId
-        //         },
-        //         colProps: { span: 4 },
-        //         componentProps: ({ formModel }) => {
-        //           return {
-        //             allowClear: true,
-        //             options: Arr,
-        //             showSearch: true,
-        //             filterOption: (input: string, option: any) => {
-        //               return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
-        //             },
-        //             onChange: (e, obj) => {
-        //               if (e && obj) {
-        //                 formModel.sourceDetailId = obj.value
-        //                 formModel.sourceDetailName = obj.label
-        //               }
-        //               if (!e && !obj) {
-        //                 formModel.sourceDetailId = ''
-        //                 formModel.sourceDetailName = ''
-        //               }
-        //             },
-        //           }
-        //         },
-        //       },
-        // )
         activeKey.value = '2'
         await setFieldsValue1({
           ...res.data,
@@ -552,16 +503,6 @@
         activeKey.value = '1'
         reload()
       }
-
-      // if (res.data.clientTag) {
-      //   await getClientBankList({
-      //     clientId: res.data.clientTag.clientId,
-      //   }).then((res) => {
-      //     setTableData(res.data)
-      //   })
-      // }
-
-      // setFieldsValue({ trainId: unref(res.data.trainId) });
     }
   }
   onMounted(async () => {
@@ -599,79 +540,6 @@
       await setFieldsValue1({})
     }
   })
-  // const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
-  //   // activeKey.value = '1'
-  //   // selectedKeys.value = ['menu1']
-  //   // resetFields()
-  //   // resetFields1()
-  //   // setModalProps({ confirmLoading: false, loading: true })
-  //   isUpdate.value = !!data?.isUpdate
-  //   if (unref(isUpdate)) {
-  //     // setModalProps({ confirmLoading: true });
-  //     rowId.value = data.record.id
-  //     activeKey.value = '2'
-  //     list.value.splice(0)
-  //     const res: API.DataResult = await getCodeGoodsTypeInfo({ id: unref(rowId) })
-  //     if (res.succeeded) {
-  //       clientId.value = res.data.id
-  //       customerName.value = res.data.shortName
-  //       res.data.ArrclientTag = []
-  //       if (res.data.clientTag) {
-  //         res.data.others = res.data.clientTag.others
-  //         Object.keys(res.data.clientTag).forEach((item) => {
-  //           if (item.indexOf('is') != -1) {
-  //             if (res.data.clientTag[item]) {
-  //               res.data.ArrclientTag.push(item)
-  //             }
-  //           } else {
-  //             clientTag_o.value[item] = res.data.clientTag[item]
-  //           }
-  //         })
-  //       }
-  //       // 处理 发票抬头列表
-  //       res.data.invoiceHeaders.forEach((item) => {
-  //         list.value.push(item)
-  //       })
-  //       await setFieldsValue({
-  //         ...res.data,
-  //       })
-  //       activeKey.value = '2'
-  //       await setFieldsValue1({
-  //         ...res.data,
-  //       })
-  //       activeKey.value = '1'
-  //       reload()
-  //       // if (res.data.clientTag) {
-  //       //   await getClientBankList({
-  //       //     clientId: res.data.clientTag.clientId,
-  //       //   }).then((res) => {
-  //       //     setTableData(res.data)
-  //       //   })
-  //       // }
-
-  //       // setFieldsValue({ trainId: unref(res.data.trainId) });
-  //     }
-  //     // setModalProps({ confirmLoading: false });
-  //   } else {
-  //     list.value.splice(0)
-  //     setTableData([])
-  //     clientId.value = ''
-
-  //     clientTag_o.value = {
-  //       id: '',
-  //       clientId: '',
-  //       others: '',
-  //       note: '',
-  //       createTime: '',
-  //     }
-  //     rowId.value = ''
-  //     activeKey.value = '2'
-  //     await setFieldsValue({})
-  //     activeKey.value = '1'
-  //     await setFieldsValue1({})
-  //   }
-  //   setModalProps({ loading: false })
-  // })
   const getTitle = computed(() => (!rowId.value ? '新增往来单位' : '编辑往来单位'))
   // 新建
   function handleCreate() {
@@ -679,15 +547,12 @@
     go(`/infoclientDetail?addNum=${addNum}`)
   }
   // 提交
-  async function handleSave(exit) {
+  async function handleSave() {
     // try {
     const values = await validate().catch(() => {
       notification.warning({ message: '请补全基本信息中必填内容！', duration: 3 })
     })
-    // const values1 = await validate1().catch(() => {
-    // notification.warning({ message: '请补全财务信息中必填内容！', duration: 3 })
-    // })
-    // if (values && values1) {
+
     if (values) {
       // setModalProps({ confirmLoading: true, loading: true })
       // TODO custom api
@@ -727,7 +592,7 @@
         invoiceHeaders,
       })
       if (res.succeeded) {
-        if (!exit && !rowId.value) {
+        if (!rowId.value) {
           rowId.value = res.data
           clientId.value = res.data
           // isUpdate.value = true
@@ -735,7 +600,6 @@
             ...getFieldsValue(),
             id: res.data,
           })
-          auditStatusText.value = getFieldsValue().auditStatusText
         }
         getData(false)
         notification.success({ message: res.message, duration: 3 })
diff --git a/src/views/baseinfo/infoclient/columns.tsx b/src/views/baseinfo/infoclient/columns.tsx
index f93e5151..8ad54fba 100644
--- a/src/views/baseinfo/infoclient/columns.tsx
+++ b/src/views/baseinfo/infoclient/columns.tsx
@@ -1069,7 +1069,7 @@ export const formSchema: FormSchema[] = [
     colProps: { span: 4 },
     componentProps: ({ formModel }) => {
       return {
-        api: GetAllClientList,
+        api: GetAllClientList(),
         labelField: 'shortName',
         valueField: 'id',
         resultField: 'data',
diff --git a/src/views/baseinfo/infoclient/tabs3/TenantAuditStepModal.vue b/src/views/baseinfo/infoclient/tabs3/TenantAuditStepModal.vue
index 031054fe..6d51a98b 100644
--- a/src/views/baseinfo/infoclient/tabs3/TenantAuditStepModal.vue
+++ b/src/views/baseinfo/infoclient/tabs3/TenantAuditStepModal.vue
@@ -55,38 +55,35 @@
     schemas: formSchema,
     showActionButtonGroup: false,
   })
-
   const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
     resetFields()
     setModalProps({ confirmLoading: false, loading: true })
     isUpdate.value = !!data?.isUpdate
     if (unref(isUpdate)) {
-      // setModalProps({ confirmLoading: true });
       rowId.value = data.record.id
       const res: API.DataResult = await ApiInfo({ id: unref(rowId) })
       if (res.succeeded) {
         setFieldsValue({
           ...res.data,
         })
-        // console.log('返回数据Form', getFieldsValue());
-        // setFieldsValue({ trainId: unref(res.data.trainId) });
       }
-      // setModalProps({ confirmLoading: false });
     } else {
-      setFieldsValue({ permissionIdentity: unref(2), clientId: data.clientId })
+      console.log(data)
+
+      setFieldsValue({
+        permissionIdentity: unref(2),
+        clientId: data.clientId,
+        saleId: data.saleId,
+        sourceId: data.sourceId,
+      })
     }
     setModalProps({ loading: false })
   })
-
   const getTitle = computed(() => (!unref(isUpdate) ? '新增账期信息' : '编辑账期信息'))
-
   async function handleSave(exit) {
     try {
       const values = await validate()
       setModalProps({ confirmLoading: true, loading: true })
-      // TODO custom api
-
-      // loading.value = true;
       const res: API.DataResult = await ApiEdit(values)
       if (res.succeeded) {
         notification.success({ message: res.message, duration: 3 })
@@ -102,10 +99,8 @@
           }
         }
       }
-
       exit && closeModal()
     } finally {
-      // loading.value = false;
       setModalProps({ confirmLoading: false, loading: false })
     }
   }
diff --git a/src/views/baseinfo/infoclient/tabs3/columns.tsx b/src/views/baseinfo/infoclient/tabs3/columns.tsx
index 65fe688b..521fbd31 100644
--- a/src/views/baseinfo/infoclient/tabs3/columns.tsx
+++ b/src/views/baseinfo/infoclient/tabs3/columns.tsx
@@ -417,6 +417,7 @@ export const formSchema: FormSchema[] = [
   {
     field: 'commissionRate',
     label: '运杂费比例',
+    required: true,
     component: 'InputNumber',
     colProps: { span: 8 },
     defaultValue: '',
diff --git a/src/views/baseinfo/infoclient/tabs3/index.vue b/src/views/baseinfo/infoclient/tabs3/index.vue
index fa8881b9..665462e3 100644
--- a/src/views/baseinfo/infoclient/tabs3/index.vue
+++ b/src/views/baseinfo/infoclient/tabs3/index.vue
@@ -58,6 +58,8 @@
   const { notification } = useMessage()
   const props = defineProps({
     clientId: { type: String },
+    saleId: { type: String },
+    sourceId: { type: String },
   })
   const [registerModal, { openModal }] = useModal()
   const visible = ref(false)
@@ -140,7 +142,8 @@
   function handleCreate() {
     openModal(true, {
       clientId: props.clientId,
-      isParent: false,
+      saleId: props.saleId,
+      sourceId: props.sourceId,
       isUpdate: false,
     })
   }
diff --git a/src/views/fee/code/index.vue b/src/views/fee/code/index.vue
index f8ad68f6..56c65646 100644
--- a/src/views/fee/code/index.vue
+++ b/src/views/fee/code/index.vue
@@ -6,9 +6,7 @@
 
 <template>
   <div>
-    <BasicTable
-      @register="registerTable"
-    >
+    <BasicTable @register="registerTable">
       <template #toolbar>
         <a-button type="primary" @click="handleCreate"> 新建 </a-button>
       </template>
@@ -38,9 +36,10 @@
   import { GetFeeCodeList } from './api'
   import { useModal } from '/@/components/Modal'
   import Modal from './components/Modal.vue'
+  import { formatParams } from '/@/hooks/web/common'
   import { columns, searchFormSchema } from './columns'
   const [registerModal, { openModal }] = useModal()
-  const [registerTable, { reload, getForm, getPaginationRef }] = useTable({
+  const [registerTable, { reload }] = useTable({
     title: '费用代码',
     api: async (p) => {
       const res: API.DataResult = await GetFeeCodeList(p)
@@ -49,35 +48,8 @@
         resolve({ data: [...res.data], total: res.count })
       })
     },
-    beforeFetch: () => {
-      var currentPageInfo: any = getPaginationRef()
-      var data = getForm().getFieldsValue()
-      const postParam: API.PageRequest = {
-        queryCondition: '',
-        pageCondition: {
-          pageIndex: currentPageInfo.current,
-          pageSize: currentPageInfo.pageSize,
-          sortConditions: [],
-        },
-      }
-      let condition: API.ConditionItem[] = []
-      if (!!data.UserName) {
-        condition.push({
-          FieldName: 'UserName',
-          FieldValue: data.UserName,
-          ConditionalType: 1,
-        })
-      }
-      if (!!data.UserCode) {
-        condition.push({
-          FieldName: 'UserCode',
-          FieldValue: data.UserCode,
-          ConditionalType: 1,
-        })
-      }
-      postParam.queryCondition = JSON.stringify(condition)
-      // console.log(postParam);
-      return postParam
+    beforeFetch: (p) => {
+      return formatParams(p)
     },
     columns,
     formConfig: {