From efb01ad0b0413c5d3bf17297c2ae2f6231c0d0b1 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: Thu, 29 Aug 2024 17:58:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=80=E6=9D=A5=E5=8D=95=E4=BD=8D=20?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=20=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/baseinfo/ReleaseType/columns.tsx    |  11 +-
 src/views/baseinfo/infoclient/EditColumns.tsx |  41 +++
 .../infoclient/ReleaseType/columns.tsx        |   4 +-
 .../infoclient/TenantAuditStepModal.vue       |  78 +++--
 src/views/baseinfo/infoclient/columns.tsx     |  67 ++--
 .../baseinfo/infoclient/menu2/columns.tsx     | 325 +++++++++---------
 .../baseinfo/infoclient/tabs3/columns.tsx     | 148 ++++----
 src/views/fee/template/index.vue              |   4 +-
 8 files changed, 390 insertions(+), 288 deletions(-)

diff --git a/src/views/baseinfo/ReleaseType/columns.tsx b/src/views/baseinfo/ReleaseType/columns.tsx
index f55d0f37..aeac9ed1 100644
--- a/src/views/baseinfo/ReleaseType/columns.tsx
+++ b/src/views/baseinfo/ReleaseType/columns.tsx
@@ -3,7 +3,7 @@ import { Tag } from 'ant-design-vue'
 import { GetClientListByCode, GetCarrierSelectList, GetClientPortSelectList } from '/@/api/common'
 export const columns: BasicColumn[] = [
   {
-    title: '承运商',
+    title: '船公司',
     dataIndex: 'carrier',
     sorter: true,
     width: 150,
@@ -21,7 +21,7 @@ export const columns: BasicColumn[] = [
     width: 200,
   },
   {
-    title: '放舱方式名称',
+    title: '放舱方式',
     dataIndex: 'releaseTypeName',
     sorter: true,
     width: 200,
@@ -30,7 +30,7 @@ export const columns: BasicColumn[] = [
 
 export const searchFormSchema: FormSchema[] = [
   {
-    label: '承运商',
+    label: '船公司',
     field: 'carrier',
     labelSlot: 'carrierId',
     component: 'ApiSelect',
@@ -120,7 +120,7 @@ export const formSchema: FormSchema[] = [
     show: false,
   },
   {
-    label: '承运商',
+    label: '船公司',
     field: 'carrier',
     labelSlot: 'carrierId',
     component: 'ApiSelect',
@@ -145,6 +145,7 @@ export const formSchema: FormSchema[] = [
             formModel.carrierId = ''
           }
         },
+        getPopupContainer: () => document.body,
       }
     },
   },
@@ -187,6 +188,7 @@ export const formSchema: FormSchema[] = [
             formModel.customerName = ''
           }
         },
+        getPopupContainer: () => document.body,
       }
     },
   },
@@ -207,6 +209,7 @@ export const formSchema: FormSchema[] = [
         showName: 'pinYinCode',
         valueField: 'ediCode',
         immediate: true,
+        getPopupContainer: () => document.body,
       }
     },
   },
diff --git a/src/views/baseinfo/infoclient/EditColumns.tsx b/src/views/baseinfo/infoclient/EditColumns.tsx
index f994f5e8..a9edc38e 100644
--- a/src/views/baseinfo/infoclient/EditColumns.tsx
+++ b/src/views/baseinfo/infoclient/EditColumns.tsx
@@ -814,3 +814,44 @@ export const EditformSchema: FormSchema[] = [
     },
   },
 ]
+export const EditformSchema2: FormSchema[] = [
+  {
+    field: 'farCode',
+    label: '财务应收账款代码',
+    component: 'DEdit',
+    defaultValue: '',
+    colProps: { span: 8 },
+    componentProps: (e) => {
+      return {
+        onEdit: () => {
+          const { formActionType } = e
+          formActionType ? formActionType.linkageForm(e) : null
+        },
+      }
+    },
+  },
+  {
+    field: 'fapCode',
+    label: '财务应付账款代码',
+    component: 'DEdit',
+    defaultValue: '',
+    colProps: { span: 8 },
+    componentProps: (e) => {
+      return {
+        onEdit: () => {
+          const { formActionType } = e
+          formActionType ? formActionType.linkageForm(e) : null
+        },
+      }
+    },
+  },
+  {
+    field: 'Divider',
+    component: 'Divider',
+    label: '',
+    colProps: { span: 24 },
+    componentProps: {
+      class: 'infoclientDivider',
+    },
+  },
+]
diff --git a/src/views/baseinfo/infoclient/ReleaseType/columns.tsx b/src/views/baseinfo/infoclient/ReleaseType/columns.tsx
index 10b4d59b..8968ba9d 100644
--- a/src/views/baseinfo/infoclient/ReleaseType/columns.tsx
+++ b/src/views/baseinfo/infoclient/ReleaseType/columns.tsx
@@ -15,7 +15,7 @@ export const columns: BasicColumn[] = [
     width: 200,
   },
   {
-    title: '放舱方式名称',
+    title: '放舱方式',
     dataIndex: 'releaseTypeName',
     sorter: true,
     width: 200,
@@ -54,7 +54,6 @@ export const searchFormSchema: FormSchema[] = [
     label: '起运港',
     field: 'loadingPort',
     component: 'ApiSelect',
-
     colProps: { span: 4 },
     componentProps: () => {
       return {
@@ -151,6 +150,7 @@ export const formSchema: FormSchema[] = [
         showName: 'pinYinCode',
         valueField: 'ediCode',
         immediate: true,
+        getPopupContainer: () => document.body,
       }
     },
   },
diff --git a/src/views/baseinfo/infoclient/TenantAuditStepModal.vue b/src/views/baseinfo/infoclient/TenantAuditStepModal.vue
index 8daa3381..f165e784 100644
--- a/src/views/baseinfo/infoclient/TenantAuditStepModal.vue
+++ b/src/views/baseinfo/infoclient/TenantAuditStepModal.vue
@@ -80,9 +80,9 @@
           <a-tab-pane key="2" tab="财务账期信息">
             <div>
               <p class="title">财务信息</p>
-              <BasicForm @register="registerForm2" />
+              <BasicForm @register="registerForm2" @linkageForm="linkageForm2" />
               <div class="FlexTable">
-                <div class="HotTable">
+                <!-- <div class="HotTable">
                   <div>
                     <span class="title Fapiao">发票信息</span>
                     <a-button type="link" @click="TableAdd" class="pl0">
@@ -117,11 +117,11 @@
                       />
                     </hot-table>
                   </div>
-                </div>
+                </div> -->
                 <div class="BTable">
                   <BasicTable @register="registerTable" @row-dbClick="EditRow" :maxHeight="140">
                     <template #tableTitle>
-                      <span class="title">银行信息</span>
+                      <span class="title">银行/发票信息</span>
                       <a-button
                         type="link"
                         @click="addboxLine({ id: rowId })"
@@ -198,7 +198,7 @@
   import { BasicModal, useModalInner } from '/@/components/Modal'
   import { BasicForm, useForm } from '/@/components/Form/index'
   import { formSchema, formSchema2, Tablecolumns } from './columns'
-  import { EditformSchema } from './EditColumns'
+  import { EditformSchema, EditformSchema2 } from './EditColumns'
   import {
     editCodeGoodsType,
     getCodeGoodsTypeInfo,
@@ -249,6 +249,19 @@
       activeKey.value = oval
       notification.warning({ message: '请先保存！', duration: 3 })
     }
+    if (rowId.value && Number(nval) == 2) {
+      console.log(formSchema2, EditformSchema2)
+
+      formSchema2.forEach((item) => {
+        if (item.show !== false && item.component !== 'Divider') {
+          EditformSchema2.forEach((item2) => {
+            if (item.field == item2.field) {
+              updateSchema1(item2)
+            }
+          })
+        }
+      })
+    }
   })
   watch(
     rowId,
@@ -311,6 +324,7 @@
       }
     })
   }
+
   const [
     registerForm2,
     {
@@ -318,12 +332,20 @@
       getFieldsValue: getFieldsValue1,
       setFieldsValue: setFieldsValue1,
       validate: validate1,
+      updateSchema: updateSchema1,
     },
   ] = useForm({
     labelWidth: 140,
     schemas: formSchema2,
     showActionButtonGroup: false,
   })
+  const linkageForm2 = (e) => {
+    formSchema2.forEach((item) => {
+      if (item.field == e.schema.field) {
+        updateSchema1(item)
+      }
+    })
+  }
   // const dataSource = ref<any>([])
   // 创建银行信息列表
   const [registerTable, { reload, setTableData, getPaginationRef, getDataSource, getSelectRows }] =
@@ -960,29 +982,29 @@
     }
   }
   .FlexTable {
-    display: flex;
-    :deep(.HotTable) {
-      width: 33%;
-      > div {
-        &:nth-child(1) {
-          padding: 14px 8px 8px 8px;
-          display: flex;
-          .Fapiao {
-            // flex: 1;
-            margin-right: 10px;
-          }
-        }
-      }
-      .handsontableInput {
-        height: 40.5px !important;
-        line-height: 40.5px !important;
-      }
-    }
-    .BTable {
-      height: 153px;
-      margin-left: 15px;
-      width: 66%;
-    }
+    // display: flex;
+    // :deep(.HotTable) {
+    //   width: 33%;
+    //   > div {
+    //     &:nth-child(1) {
+    //       padding: 14px 8px 8px 8px;
+    //       display: flex;
+    //       .Fapiao {
+    //         // flex: 1;
+    //         margin-right: 10px;
+    //       }
+    //     }
+    //   }
+    //   .handsontableInput {
+    //     height: 40.5px !important;
+    //     line-height: 40.5px !important;
+    //   }
+    // }
+    // .BTable {
+    //   height: 153px;
+    //   margin-left: 15px;
+    //   width: 66%;
+    // }
   }
   :deep(.handsontable) {
     .htCore {
diff --git a/src/views/baseinfo/infoclient/columns.tsx b/src/views/baseinfo/infoclient/columns.tsx
index b83ee2d1..f93e5151 100644
--- a/src/views/baseinfo/infoclient/columns.tsx
+++ b/src/views/baseinfo/infoclient/columns.tsx
@@ -838,6 +838,16 @@ export const formSchema: FormSchema[] = [
       }
     },
   },
+  {
+    field: 'blContent',
+    label: '提单信息',
+    component: 'InputTextArea',
+    defaultValue: '',
+    colProps: { span: 12 },
+    componentProps: {
+      rows: 4,
+    },
+  },
   {
     field: 'Divider3',
     component: 'Divider',
@@ -1170,7 +1180,7 @@ export const formSchema: FormSchema[] = [
     field: 'saleOrgId',
     label: '分公司',
     component: 'Select',
-    colProps: { span: 8 },
+    colProps: { span: 12 },
     componentProps: ({ formModel }) => {
       return {
         options: OrgList,
@@ -1189,12 +1199,15 @@ export const formSchema: FormSchema[] = [
     },
   },
   {
-    label: '',
-    field: 'Space1',
-    component: 'Space',
-    defaultValue: '',
-    colProps: {
-      span: 16,
+    label: '推送设置',
+    field: 'notifications',
+    component: 'Select',
+    colProps: { span: 12 },
+    componentProps: {
+      options: notificationsData,
+      allowClear: true,
+      mode: 'multiple',
+      class: 'NoLimitHeight',
     },
   },
   {
@@ -1220,28 +1233,6 @@ export const formSchema: FormSchema[] = [
       }
     },
   },
-  {
-    label: '推送设置',
-    field: 'notifications',
-    component: 'Select',
-    colProps: { span: 12 },
-    componentProps: {
-      options: notificationsData,
-      allowClear: true,
-      mode: 'multiple',
-      class: 'NoLimitHeight',
-    },
-  },
-  {
-    field: 'blContent',
-    label: '提单信息',
-    component: 'InputTextArea',
-    defaultValue: '',
-    colProps: { span: 12 },
-    componentProps: {
-      rows: 4,
-    },
-  },
   {
     field: 'note',
     label: '备注',
@@ -1252,6 +1243,15 @@ export const formSchema: FormSchema[] = [
       rows: 4,
     },
   },
+  // {
+  //   label: '',
+  //   field: 'Space1',
+  //   component: 'Space',
+  //   defaultValue: '',
+  //   colProps: {
+  //     span: 16,
+  //   },
+  // },
 ]
 
 export const formSchema2: FormSchema[] = [
@@ -1269,6 +1269,15 @@ export const formSchema2: FormSchema[] = [
     defaultValue: '',
     colProps: { span: 8 },
   },
+  {
+    field: 'Divider',
+    component: 'Divider',
+    label: '',
+    colProps: { span: 24 },
+    componentProps: {
+      class: 'infoclientDivider',
+    },
+  },
 ]
 
 export const form3columns: BasicColumn[] = [
diff --git a/src/views/baseinfo/infoclient/menu2/columns.tsx b/src/views/baseinfo/infoclient/menu2/columns.tsx
index cdf3912d..ab818613 100644
--- a/src/views/baseinfo/infoclient/menu2/columns.tsx
+++ b/src/views/baseinfo/infoclient/menu2/columns.tsx
@@ -236,200 +236,55 @@ export const formSchema: FormSchema[] = [
     label: '姓名',
     component: 'Input',
     required: true,
-    colProps: { span: 12 },
+    colProps: { span: 8 },
   },
   {
     field: 'enName',
     label: '英文名',
     component: 'Input',
     required: true,
-    colProps: { span: 12 },
-  },
-  // {
-  //   field: 'codeName',
-  //   label: '代码',
-  //   component: 'Input',
-  //   required: true,
-  //   colProps: { span: 12 },
-  //   componentProps: {
-  //     maxlength: 6,
-  //   },
-  // },
-  // {
-  //   field: 'shortName',
-  //   label: '简称',
-  //   component: 'Input',
-  //   required: true,
-  //   colProps: { span: 12 },
-  // },
-
-  {
-    field: 'address',
-    label: '通讯地址',
-    component: 'Input',
-    colProps: { span: 12 },
-    defaultValue: '',
+    colProps: { span: 8 },
   },
   {
     field: 'email',
     label: '邮箱',
     component: 'Input',
-    colProps: { span: 12 },
+    colProps: { span: 8 },
     defaultValue: 0,
   },
   {
     field: 'mobile',
     label: '手机',
     component: 'Input',
-    colProps: { span: 12 },
+    colProps: { span: 8 },
     defaultValue: 0,
   },
   {
     field: 'tel',
     label: '电话',
     component: 'Input',
-    colProps: { span: 12 },
+    colProps: { span: 8 },
     defaultValue: 0,
   },
-  // {
-  //   field: 'fax',
-  //   label: '传真',
-  //   component: 'Input',
-  //   colProps: { span: 12 },
-  //   defaultValue: 0,
-  // },
   {
     field: 'qq',
     label: 'QQ',
     component: 'Input',
-    colProps: { span: 12 },
+    colProps: { span: 8 },
     defaultValue: '',
   },
-  // {
-  //   label: '船公司名称',
-  //   field: 'carrier',
-  //   component: 'Input',
-  //   show: false,
-  // },
-  // {
-  //   label: '船公司',
-  //   field: 'carrierId',
-  //   labelSlot: 'carrierId',
-  //   component: 'ApiSelect',
-  //   required: false,
-  //   dynamicDisabled: false,
-  //   colProps: { span: 12 },
-  //   componentProps: ({ formModel }) => {
-  //     return {
-  //       allowClear: true,
-  //       showSearch: true,
-  //       api: () => {
-  //         return new Promise((resolve) => {
-  //           const arr = getOptions('carrier')
-  //           resolve(arr)
-  //         })
-  //       },
-  //       labelField: 'name',
-  //       showName: 'shortName',
-  //       valueField: 'id',
-  //       filterOption: (input: string, option: any) => {
-  //         return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
-  //       },
-  //       onChange: (e, obj) => {
-  //         if (obj) {
-  //           formModel.carrier = obj.label
-  //         } else {
-  //           formModel.carrier = ''
-  //         }
-  //       },
-  //     }
-  //   },
-  // },
-
-  {
-    field: 'isDefault',
-    label: '默认联系人',
-    component: 'Switch',
-    colProps: { span: 12 },
-    defaultValue: false,
-    componentProps: {
-      checkedChildren: '是',
-      unCheckedChildren: '否',
-    },
-  },
-  {
-    field: 'isOperator',
-    label: '是否为操作',
-    component: 'Switch',
-    colProps: { span: 12 },
-    defaultValue: false,
-    componentProps: {
-      checkedChildren: '是',
-      unCheckedChildren: '否',
-    },
-  },
-  {
-    field: 'isFinancialStaff',
-    label: '是否为财务',
-    component: 'Switch',
-    colProps: { span: 12 },
-    defaultValue: false,
-    componentProps: {
-      checkedChildren: '是',
-      unCheckedChildren: '否',
-    },
-  },
-  {
-    field: 'isSaleMan',
-    label: '是否为销售',
-    component: 'Switch',
-    colProps: { span: 12 },
-    defaultValue: false,
-    componentProps: {
-      checkedChildren: '是',
-      unCheckedChildren: '否',
-    },
-  },
-  // {
-  //   field: 'isOther',
-  //   label: '是否为其他',
-  //   component: 'RadioButtonGroup',
-  //   defaultValue: false,
-  //   colProps: { span: 12 },
-  //   componentProps: {
-  //     options: [
-  //       { label: '是', value: true },
-  //       { label: '否', value: false },
-  //     ],
-  //   },
-  // },
   {
-    field: 'isInsurance',
-    label: '是否保险联系人',
-    component: 'Switch',
-    colProps: { span: 12 },
-    defaultValue: false,
-    componentProps: {
-      checkedChildren: '是',
-      unCheckedChildren: '否',
-    },
-  },
-  {
-    field: 'isCheckAccount',
-    label: '是否对账联系人',
-    component: 'Switch',
-    colProps: { span: 12 },
-    defaultValue: false,
-    componentProps: {
-      checkedChildren: '是',
-      unCheckedChildren: '否',
-    },
+    field: 'address',
+    label: '通讯地址',
+    component: 'Input',
+    colProps: { span: 16 },
+    defaultValue: '',
   },
   {
     field: 'anniversary1',
     label: '提醒日期1',
     component: 'DatePicker',
-    colProps: { span: 12 },
+    colProps: { span: 8 },
     defaultValue: '',
     componentProps: {
       showTime: false,
@@ -440,7 +295,7 @@ export const formSchema: FormSchema[] = [
     field: 'anniversary2',
     label: '提醒日期2',
     component: 'DatePicker',
-    colProps: { span: 12 },
+    colProps: { span: 8 },
     defaultValue: '',
     componentProps: {
       showTime: false,
@@ -451,16 +306,72 @@ export const formSchema: FormSchema[] = [
     field: 'anniversaryNote1',
     label: '提醒备注1',
     component: 'Input',
-    colProps: { span: 12 },
+    colProps: { span: 8 },
   },
   {
     field: 'anniversaryNote2',
     label: '提醒备注2',
     component: 'Input',
-    colProps: { span: 12 },
+    colProps: { span: 8 },
   },
+  // {
+  //   field: 'isOperator',
+  //   label: '是否为操作',
+  //   component: 'Switch',
+  //   colProps: { span: 12 },
+  //   defaultValue: false,
+  //   componentProps: {
+  //     checkedChildren: '是',
+  //     unCheckedChildren: '否',
+  //   },
+  // },
+  // {
+  //   field: 'isFinancialStaff',
+  //   label: '是否为财务',
+  //   component: 'Switch',
+  //   colProps: { span: 12 },
+  //   defaultValue: false,
+  //   componentProps: {
+  //     checkedChildren: '是',
+  //     unCheckedChildren: '否',
+  //   },
+  // },
+  // {
+  //   field: 'isSaleMan',
+  //   label: '是否为销售',
+  //   component: 'Switch',
+  //   colProps: { span: 12 },
+  //   defaultValue: false,
+  //   componentProps: {
+  //     checkedChildren: '是',
+  //     unCheckedChildren: '否',
+  //   },
+  // },
+
+  // {
+  //   field: 'isInsurance',
+  //   label: '是否保险联系人',
+  //   component: 'Switch',
+  //   colProps: { span: 12 },
+  //   defaultValue: false,
+  //   componentProps: {
+  //     checkedChildren: '是',
+  //     unCheckedChildren: '否',
+  //   },
+  // },
+  // {
+  //   field: 'isCheckAccount',
+  //   label: '是否对账联系人',
+  //   component: 'Switch',
+  //   colProps: { span: 12 },
+  //   defaultValue: false,
+  //   componentProps: {
+  //     checkedChildren: '是',
+  //     unCheckedChildren: '否',
+  //   },
+  // },
   {
-    label: '岗位',
+    label: '岗位类型',
     field: 'jobs',
     component: 'ApiSelect',
     colProps: { span: 12 },
@@ -488,7 +399,18 @@ export const formSchema: FormSchema[] = [
     component: 'InputTextArea',
     colProps: { span: 12 },
     componentProps: {
-      rows: 2,
+      rows: 1,
+    },
+  },
+  {
+    field: 'isDefault',
+    label: '默认联系人',
+    component: 'Switch',
+    colProps: { span: 8 },
+    defaultValue: false,
+    componentProps: {
+      checkedChildren: '是',
+      unCheckedChildren: '否',
     },
   },
   {
@@ -496,7 +418,7 @@ export const formSchema: FormSchema[] = [
     label: '是否可用',
     component: 'Switch',
     defaultValue: 0,
-    colProps: { span: 12 },
+    colProps: { span: 8 },
     componentProps: {
       checkedChildren: '是',
       checkedValue: 0,
@@ -504,4 +426,81 @@ export const formSchema: FormSchema[] = [
       unCheckedValue: 1,
     },
   },
+  // {
+  //   field: 'isOther',
+  //   label: '是否为其他',
+  //   component: 'RadioButtonGroup',
+  //   defaultValue: false,
+  //   colProps: { span: 12 },
+  //   componentProps: {
+  //     options: [
+  //       { label: '是', value: true },
+  //       { label: '否', value: false },
+  //     ],
+  //   },
+  // },
+  // {
+  //   field: 'codeName',
+  //   label: '代码',
+  //   component: 'Input',
+  //   required: true,
+  //   colProps: { span: 12 },
+  //   componentProps: {
+  //     maxlength: 6,
+  //   },
+  // },
+  // {
+  //   field: 'shortName',
+  //   label: '简称',
+  //   component: 'Input',
+  //   required: true,
+  //   colProps: { span: 12 },
+  // },
+  // {
+  //   field: 'fax',
+  //   label: '传真',
+  //   component: 'Input',
+  //   colProps: { span: 12 },
+  //   defaultValue: 0,
+  // },
+  // {
+  //   label: '船公司名称',
+  //   field: 'carrier',
+  //   component: 'Input',
+  //   show: false,
+  // },
+  // {
+  //   label: '船公司',
+  //   field: 'carrierId',
+  //   labelSlot: 'carrierId',
+  //   component: 'ApiSelect',
+  //   required: false,
+  //   dynamicDisabled: false,
+  //   colProps: { span: 12 },
+  //   componentProps: ({ formModel }) => {
+  //     return {
+  //       allowClear: true,
+  //       showSearch: true,
+  //       api: () => {
+  //         return new Promise((resolve) => {
+  //           const arr = getOptions('carrier')
+  //           resolve(arr)
+  //         })
+  //       },
+  //       labelField: 'name',
+  //       showName: 'shortName',
+  //       valueField: 'id',
+  //       filterOption: (input: string, option: any) => {
+  //         return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+  //       },
+  //       onChange: (e, obj) => {
+  //         if (obj) {
+  //           formModel.carrier = obj.label
+  //         } else {
+  //           formModel.carrier = ''
+  //         }
+  //       },
+  //     }
+  //   },
+  // },
 ]
diff --git a/src/views/baseinfo/infoclient/tabs3/columns.tsx b/src/views/baseinfo/infoclient/tabs3/columns.tsx
index f0875837..65fe688b 100644
--- a/src/views/baseinfo/infoclient/tabs3/columns.tsx
+++ b/src/views/baseinfo/infoclient/tabs3/columns.tsx
@@ -201,7 +201,7 @@ export const formSchema: FormSchema[] = [
     label: '业务类型',
     required: true,
     component: 'Select',
-    colProps: { span: 12 },
+    colProps: { span: 8 },
     defaultValue: '1',
     componentProps: {
       options: ListData.businessType,
@@ -216,7 +216,7 @@ export const formSchema: FormSchema[] = [
     field: 'saleId',
     label: '揽货人',
     component: 'Select',
-    colProps: { span: 12 },
+    colProps: { span: 8 },
     defaultValue: '',
     componentProps: {
       options: SaleUserList,
@@ -231,7 +231,7 @@ export const formSchema: FormSchema[] = [
     field: 'sourceId',
     label: '业务来源',
     component: 'Select',
-    colProps: { span: 12 },
+    colProps: { span: 8 },
     defaultValue: '',
     componentProps: {
       options: ClientSourceList,
@@ -246,7 +246,7 @@ export const formSchema: FormSchema[] = [
     field: 'beginDate',
     label: '合同生效日期',
     component: 'DatePicker',
-    colProps: { span: 12 },
+    colProps: { span: 8 },
     defaultValue: '',
     componentProps: {
       showTime: false,
@@ -257,19 +257,18 @@ export const formSchema: FormSchema[] = [
     field: 'endDate',
     label: '合同结束日期',
     component: 'DatePicker',
-    colProps: { span: 12 },
+    colProps: { span: 8 },
     defaultValue: '',
     componentProps: {
       showTime: false,
       style: 'width:100%',
     },
   },
-
   {
     field: 'accountStartDate',
     label: '账期起算标准',
     component: 'Select',
-    colProps: { span: 12 },
+    colProps: { span: 8 },
     defaultValue: '',
     componentProps: {
       options: accountStartDateList,
@@ -280,59 +279,12 @@ export const formSchema: FormSchema[] = [
       },
     },
   },
-  {
-    field: 'allowAmount',
-    label: '信用额度',
-    required: true,
-    component: 'InputNumber',
-    colProps: { span: 12 },
-    defaultValue: 0,
-  },
-  {
-    field: 'commissionRate',
-    label: '运杂费比例',
-    component: 'InputNumber',
-    colProps: { span: 12 },
-    defaultValue: '',
-  },
-  {
-    field: 'note',
-    label: '备注',
-    component: 'Input',
-    colProps: { span: 24 },
-    componentProps: {
-      rows: 2,
-    },
-  },
-  {
-    field: 'isSpecial',
-    label: '特批放单客户',
-    component: 'Switch',
-    colProps: { span: 12 },
-    componentProps: {
-      checkedChildren: '是',
-      unCheckedChildren: '否',
-    },
-  },
-  {
-    field: 'status',
-    label: '是否可用',
-    component: 'Switch',
-    defaultValue: 0,
-    colProps: { span: 12 },
-    componentProps: {
-      checkedChildren: '是',
-      checkedValue: 0,
-      unCheckedChildren: '否',
-      unCheckedValue: 1,
-    },
-  },
   {
     field: 'accountType',
     label: '账期',
     required: true,
     component: 'Select',
-    colProps: { span: 12 },
+    colProps: { span: 8 },
     defaultValue: '',
     componentProps: ({ formModel }) => {
       return {
@@ -351,11 +303,28 @@ export const formSchema: FormSchema[] = [
       }
     },
   },
+  {
+    label: '',
+    field: 'Space1',
+    component: 'Space',
+    defaultValue: '',
+    ifShow: ({ values }) => {
+      return RaccountTypeLabel(values) == '' ||
+        RaccountTypeLabel(values) == '三月结' ||
+        RaccountTypeLabel(values) == '旬结' ||
+        RaccountTypeLabel(values) == '票结'
+        ? true
+        : false
+    },
+    colProps: {
+      span: 16,
+    },
+  },
   {
     field: 'accountMonth',
     label: '间隔月份',
     component: 'InputNumber',
-    colProps: { span: 12 },
+    colProps: { span: 8 },
     required: true,
     ifShow: ({ values }) => {
       return RaccountTypeLabel(values) == '月结' ? true : false
@@ -369,7 +338,7 @@ export const formSchema: FormSchema[] = [
     field: 'accountDays',
     label: '账期日期',
     component: 'InputNumber',
-    colProps: { span: 12 },
+    colProps: { span: 8 },
     ifShow: ({ values }) => {
       return RaccountTypeLabel(values) == '月结' ? true : false
     },
@@ -383,7 +352,7 @@ export const formSchema: FormSchema[] = [
     field: 'accountDays',
     label: '账期日期',
     component: 'InputNumber',
-    colProps: { span: 12 },
+    colProps: { span: 8 },
     required: true,
     ifShow: ({ values }) => {
       return RaccountTypeLabel(values) == '约定天数' ? true : false
@@ -394,11 +363,23 @@ export const formSchema: FormSchema[] = [
       max: 31,
     },
   },
+  {
+    label: '',
+    field: 'Space1',
+    component: 'Space',
+    defaultValue: '',
+    ifShow: ({ values }) => {
+      return RaccountTypeLabel(values) == '约定天数' ? true : false
+    },
+    colProps: {
+      span: 8,
+    },
+  },
   {
     field: 'accountFirstHalf',
     label: '上半月',
     component: 'InputNumber',
-    colProps: { span: 12 },
+    colProps: { span: 8 },
 
     required: true,
     ifShow: ({ values }) => {
@@ -414,7 +395,7 @@ export const formSchema: FormSchema[] = [
     field: 'accountSecondHalf',
     label: '下半月',
     component: 'InputNumber',
-    colProps: { span: 12 },
+    colProps: { span: 8 },
     required: true,
     ifShow: ({ values }) => {
       return RaccountTypeLabel(values) == '半月结' ? true : false
@@ -425,4 +406,51 @@ export const formSchema: FormSchema[] = [
       max: 31,
     },
   },
+  {
+    field: 'allowAmount',
+    label: '信用额度',
+    required: true,
+    component: 'InputNumber',
+    colProps: { span: 8 },
+    defaultValue: 0,
+  },
+  {
+    field: 'commissionRate',
+    label: '运杂费比例',
+    component: 'InputNumber',
+    colProps: { span: 8 },
+    defaultValue: '',
+  },
+  {
+    field: 'note',
+    label: '备注',
+    component: 'Input',
+    colProps: { span: 8 },
+    componentProps: {
+      rows: 1,
+    },
+  },
+  {
+    field: 'isSpecial',
+    label: '特批放单客户',
+    component: 'Switch',
+    colProps: { span: 8 },
+    componentProps: {
+      checkedChildren: '是',
+      unCheckedChildren: '否',
+    },
+  },
+  {
+    field: 'status',
+    label: '是否可用',
+    component: 'Switch',
+    defaultValue: 0,
+    colProps: { span: 8 },
+    componentProps: {
+      checkedChildren: '是',
+      checkedValue: 0,
+      unCheckedChildren: '否',
+      unCheckedValue: 1,
+    },
+  },
 ]
diff --git a/src/views/fee/template/index.vue b/src/views/fee/template/index.vue
index bc7673fd..f9a7f27a 100644
--- a/src/views/fee/template/index.vue
+++ b/src/views/fee/template/index.vue
@@ -38,8 +38,8 @@
       const res: API.DataResult = await GetFeeTemplateList(p)
       // 处理下拉框数据
       const dicts = await getDictOption('business_type')
-      res?.data.forEach(row => {
-        dicts.forEach(item => {
+      res?.data.forEach((row) => {
+        dicts.forEach((item) => {
           if (item.value == row.opType) {
             row.opTypeName = item.label
           }