From 24e99d90f4412c9d1a5550e55565f92465e6316a Mon Sep 17 00:00:00 2001
From: sunzehua <sunzehua@jchshipping.net>
Date: Thu, 29 Aug 2024 08:44:35 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=8F=91=E7=A5=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operation/invoiceApply/detail/index.vue   | 318 +++++++++++++++++-
 1 file changed, 308 insertions(+), 10 deletions(-)

diff --git a/src/views/operation/invoiceApply/detail/index.vue b/src/views/operation/invoiceApply/detail/index.vue
index 5fad8840..d8c0e80e 100644
--- a/src/views/operation/invoiceApply/detail/index.vue
+++ b/src/views/operation/invoiceApply/detail/index.vue
@@ -90,7 +90,7 @@
                     <div class="left">
                         <div class="title">票面信息</div>
                         <BasicForm @register="registerForm" @linkageForm="linkageForm">
-
+                           
                         </BasicForm>
                     </div>
                     <div class="right">
@@ -113,7 +113,8 @@
                         <div>
                             <BasicForm @register="markForm">
                                 <template #note="{ model, field }">
-                                    <div style="display: flex;align-items: center;height: 22px;line-height: 22px;font-size: 12px">
+                                    <div
+                                        style="display: flex;align-items: center;height: 22px;line-height: 22px;font-size: 12px">
                                         备注:
                                         <a-button @click="openTempName" style="margin: 0 15px 0 20px;" type="link"> <i
                                                 class="icon-a-17Btuichu iconfont"></i>
@@ -128,7 +129,11 @@
                     </div>
                 </div>
                 <div class="bottom">
-
+                    <BasicForm @register="registerBottomForm" @linkageForm="linkageFormBottom">
+                        <template #createByNameSlot="{ model, field }">
+                            <span style="font-size: 12px;color: #7a8798;" >申请人:131223</span>
+                            </template>
+                    </BasicForm>
                 </div>
             </div>
 
@@ -136,9 +141,9 @@
 
 
 
-            <feeTable :id="id" @handleSuccess="handleSuccess" @updateListSave=updateListSave
+            <!-- <feeTable :id="id" @handleSuccess="handleSuccess" @updateListSave=updateListSave
                 @updateAmount="updateAmount" ref="feeTableRef">
-            </feeTable>
+            </feeTable> -->
             <a-modal @cancel="open = false" width="700px" :visible="open" title="模板设置" @ok="handleSaveTemp">
                 <div style="display: flex;">
                     <div class="label-list">
@@ -559,6 +564,7 @@ const bankForm = [
             }
         },
     },
+
 ]
 const EditBankForm = [
     {
@@ -645,7 +651,7 @@ const EditBankForm = [
     },
 ]
 const markFormS = [
-{
+    {
         field: 'invoiceRemark',
         label: '开票要求',
         component: 'InputTextArea',
@@ -665,8 +671,272 @@ const markFormS = [
     },
 ]
 const bottomForm = [
-    
+    {
+        field: 'customer',
+        label: '',
+        component: 'Input',
+        show: false,
+        colProps: { span: 12 },
+    },
+    {
+        field: 'customerId',
+        label: '',
+        component: 'Input',
+        show: false,
+        colProps: { span: 12 },
+    },
+    {
+        field: 'createByName',
+        label: '申请人',
+        component: 'Input',
+        colProps: { span: 4 },
+    },
+    // {
+    //     field: 'applyDate',
+    //     label: '申请日期',
+    //     component: 'DatePicker',
+    //     colProps: { span: 4 },
+    //     defaultValue: dayjs().format('YYYY-MM-DD'),
+    //     componentProps: {
+    //         valueFormat: 'YYYY-MM-DD',
+    //         format: 'YYYY-MM-DD',
+    //     },
+    // },
+    {
+        label: '客户名称',
+        field: 'customerName',
+        required: true,
+        component: 'ApiSelect',
+        colProps: { span: 4 },
+        componentProps: ({ formModel }) => {
+            return {
+                api: GetClientListByCode,
+                params: { code: 'controller' },
+                labelField: 'pinYinCode',
+                valueField: 'shortName',
+                showName: 'shortName',
+                resultField: 'data',
+                immediate: false,
+                onChange: (e, obj) => {
+                    if (obj) {
+                        const queryStr = [{
+                            FieldName: 'ClientId',
+                            FieldValue: obj.id,
+                            ConditionalType: '0'
+                        }]
+                        const data = {
+                            pageCondition: {
+                                "pageIndex": 1,
+                                "pageSize": 20,
+                                "sortConditions": []
+                            },
+                            queryCondition: JSON.stringify(queryStr)
+                        }
+                        GetClientBankList(data).then(res => {
+                            res.data.forEach(item => {
+                                item.name = item.bankName + '  ' + item.bankAgentName
+                            })
+                            bankList.value = res.data
+                        })
+                        formModel.customerId = obj.id
+                        customerList.value.forEach(item => {
+                            if (item.id == e) {
+                                formModel.customer = item
+                            }
+                        })
+                        feeTableRef.value.changeCust(obj.id)
+                    }
+                    if (!obj && !e) {
+                        bankList.value = []
+                        formModel.customer = {}
+                        formModel.customerId = ''
+                    }
+                },
+            }
+        },
+    },
+    {
+        field: 'saleDeptId',
+        label: '所属分部',
+        component: 'ApiSelect',
+        colProps: { span: 4 },
+        componentProps: () => {
+            return {
+                api: GetOrgList,
+                resultField: 'data',
+            }
+        },
+    },
+    {
+        label: '代开客户',
+        field: 'autualCustomerName',
+        component: 'ApiSelect',
+        dynamicDisabled: false,
+        colProps: { span: 4 },
+        componentProps: () => {
+            return {
+                api: () => {
+                    return new Promise((resolve) => {
+                        GetControllerClientList().then((res) => {
+                            resolve(res)
+                        })
+                    })
+                },
+                immediate: false,
+                labelField: 'shortName',
+                valueField: 'shortName',
+                resultField: 'data',
+                filterOption: (input: string, option: any) => {
+                    return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+                },
+            }
+        },
+    },
+]
+const bottomFormEdit = [
+    {
+        field: 'customer',
+        label: '',
+        component: 'DEdit',
+        show: false,
+        colProps: { span: 12 },
+    },
+    {
+        field: 'customerId',
+        label: '',
+        component: 'DEdit',
+        show: false,
+        colProps: { span: 12 },
+    },
+    {
+        field: 'createByName',
+        label: '申请人',
+        slot: 'createByNameSlot',
+        component: 'DEdit',
+        colProps: { span: 4 },
+    },
+    // {
+    //     field: 'applyDate',
+    //     label: '申请日期',
+    //     component: 'DEdit',
+    //     colProps: { span: 4 },
+    //     defaultValue: '',
+    //     componentProps: (e) => {
+    //         return {
+    //             valueFormat: 'YYYY-MM-DD',
+    //             format: 'YYYY-MM-DD',
+    //             onEdit: () => {
+    //                 const { formActionType } = e
+    //                 formActionType ? formActionType.linkageForm(e) : null
+    //             },
+    //         }
+    //     },
+    // },
+    {
+        label: '客户名称',
+        field: 'customerName',
+        required: true,
+        component: 'DEdit',
+        colProps: { span: 4 },
+        componentProps: (e) => {
+            const { formModel } = e
+            return {
+                api: GetClientListByCode,
+                params: { code: 'controller' },
+                labelField: 'pinYinCode',
+                valueField: 'shortName',
+                showName: 'shortName',
+                resultField: 'data',
+                immediate: false,
+                onEdit: () => {
+                    const { formActionType } = e
+                    formActionType ? formActionType.linkageForm(e) : null
+                },
+                onChange: (e, obj) => {
+                    if (obj) {
+                        const queryStr = [{
+                            FieldName: 'ClientId',
+                            FieldValue: obj.id,
+                            ConditionalType: '0'
+                        }]
+                        const data = {
+                            pageCondition: {
+                                "pageIndex": 1,
+                                "pageSize": 20,
+                                "sortConditions": []
+                            },
+                            queryCondition: JSON.stringify(queryStr)
+                        }
+                        GetClientBankList(data).then(res => {
+                            res.data.forEach(item => {
+                                item.name = item.bankName + '  ' + item.bankAgentName
+                            })
+                            bankList.value = res.data
+                        })
+                        formModel.customerId = obj.id
+                        customerList.value.forEach(item => {
+                            if (item.id == e) {
+                                formModel.customer = item
+                            }
+                        })
+                        feeTableRef.value.changeCust(obj.id)
+                    }
+                    if (!obj && !e) {
+                        bankList.value = []
+                        formModel.customer = {}
+                        formModel.customerId = ''
+                    }
+                },
+            }
+        },
+    },
+    {
+        field: 'saleDeptId',
+        label: '所属分部',
+        component: 'DEdit',
+        colProps: { span: 4 },
+        componentProps: (e) => {
+            return {
+                api: GetOrgList,
+                resultField: 'data',
+                onEdit: () => {
+                    const { formActionType } = e
+                    formActionType ? formActionType.linkageForm(e) : null
+                },
+            }
+        },
+    },
+    {
+        label: '代开客户',
+        field: 'autualCustomerName',
+        component: 'DEdit',
+        dynamicDisabled: false,
+        colProps: { span: 4 },
+        componentProps: (e) => {
+            return {
+                api: () => {
+                    return new Promise((resolve) => {
+                        GetControllerClientList().then((res) => {
+                            resolve(res)
+                        })
+                    })
+                },
+                immediate: false,
+                labelField: 'shortName',
+                valueField: 'shortName',
+                resultField: 'data',
+                filterOption: (input: string, option: any) => {
+                    return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+                },
+                onEdit: () => {
+                    const { formActionType } = e
+                    formActionType ? formActionType.linkageForm(e) : null
+                },
+            }
+        },
+    },
 ]
+
 const route = useRoute()
 const { createMessage } = useMessage()
 const id = ref(route.query.id)
@@ -680,6 +950,11 @@ const [markForm, { resetFields: markresetFields, setFieldsValue: marksetFieldsVa
     schemas: markFormS,
     showActionButtonGroup: false,
 })
+const [registerBottomForm, { resetFields: bottomResetFields, setFieldsValue: bottomRsetFieldsValue, updateSchema: updateSchemaBottom }] = useForm({
+    labelWidth: 100,
+    schemas: bottomForm,
+    showActionButtonGroup: false,
+})
 const linkageForm = (e) => {
     bankForm.forEach((item) => {
         if (item.field == e.schema.field) {
@@ -687,6 +962,13 @@ const linkageForm = (e) => {
         }
     })
 }
+const linkageFormBottom = (e) => {
+    bottomForm.forEach((item) => {
+        if (item.field == e.schema.field) {
+            updateSchemaBottom(item)
+        }
+    })
+}
 const feeTableRef = ref(null) as any
 const open = ref(false)
 const nameFlag = ref(false)
@@ -779,6 +1061,15 @@ function init() {
             })
         }
     })
+    bottomForm.forEach((item) => {
+        if (item.show !== false && item.component !== 'Divider') {
+            bottomFormEdit.forEach((item2) => {
+                if (item.field == item2.field) {
+                    updateSchemaBottom(item2)
+                }
+            })
+        }
+    })
 }
 function handleAddLabel(val) {
     tempContent.value += '[' + val.displayName + ']'
@@ -952,14 +1243,20 @@ function handleSelect(value) {
     .top {
         display: flex;
         align-items: flex-start;
+        padding-bottom: 10px;
+        border-bottom: 1px solid #e8e8e8;
+    }
+    .bottom{
+        padding: 5px 0px;
+        border-bottom: 1px solid #e8e8e8;
     }
-
     .left {
         width: 40%;
     }
 
     .right {
-        width: 60%;
+        width: 55%;
+        margin-left: 5%;
     }
 }
 
@@ -990,7 +1287,8 @@ function handleSelect(value) {
     font-weight: bold;
     margin: 0 10px;
 }
-.box{
+
+.box {
     padding: 0 20px;
 }
 </style>
\ No newline at end of file

From 814f056dfb7f749ac7f9a1dcd189d3dc9931fd22 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 09:41:39 +0800
Subject: [PATCH 2/3] =?UTF-8?q?DEdit=20=E6=B7=BB=E5=8A=A0=20=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Form/src/Ds/components/DEdit.vue          |    8 +-
 .../operation/invoiceApply/detail/index.vue   | 2078 +++++++++--------
 2 files changed, 1074 insertions(+), 1012 deletions(-)

diff --git a/src/components/Form/src/Ds/components/DEdit.vue b/src/components/Form/src/Ds/components/DEdit.vue
index d268a3e4..fdf5cdd3 100644
--- a/src/components/Form/src/Ds/components/DEdit.vue
+++ b/src/components/Form/src/Ds/components/DEdit.vue
@@ -11,6 +11,7 @@
   import { useAttrs } from '/@/hooks/core/useAttrs'
   import { useI18n } from '/@/hooks/web/useI18n'
   import { useAppStore } from '/@/store/modules/app'
+  import dayjs from 'dayjs'
   const appStore = useAppStore()
   type OptionsItem = { label: string; value: string; disabled?: boolean }
   export default defineComponent({
@@ -50,7 +51,9 @@
       const attrs = useAttrs()
       const { t } = useI18n()
       const [state] = useRuleFormItem(props, 'value', 'change')
-
+      function isDate(value) {
+        return value instanceof Date || Object.prototype.toString.call(value) === '[object Date]'
+      }
       function GetState() {
         let RData: any = null
         if (state.value) {
@@ -78,6 +81,8 @@
                 RData = item[props.labelField]
               }
             })
+          } else if (state.value.$d && state.value.$isDayjsObject) {
+            RData = dayjs(state.value.$d).format('YYYY-MM-DD')
           } else {
             if (props.label == '来源明细') {
               appStore.getSourceData.forEach((item) => {
@@ -105,6 +110,7 @@
       function CilckEdit() {
         emit('edit')
       }
+
       return { attrs, t, showTooltip, props, state, CilckEdit, GetState }
     },
   })
diff --git a/src/views/operation/invoiceApply/detail/index.vue b/src/views/operation/invoiceApply/detail/index.vue
index d8c0e80e..0dd060f5 100644
--- a/src/views/operation/invoiceApply/detail/index.vue
+++ b/src/views/operation/invoiceApply/detail/index.vue
@@ -1,1191 +1,1247 @@
 <template>
-    <div class="main">
-        <a-spin :spinning="loading">
-            <div class="infoclientBox">
-                <div style="display: flex;align-items: center;">
-                    <a-tooltip placement="top" :mouseEnterDelay="0.5">
-                        <template #title>
-                            <span>新建</span>
-                        </template>
-                        <span class="ds-action-svg-btn" @click="handleCreate">
-                            <img src="../../../../assets/svg/infoclient//xinjian.svg" class="SvgImg" />
-                        </span>
-                    </a-tooltip>
-                    <a-tooltip placement="top" :mouseEnterDelay="0.5">
-                        <template #title>
-                            <span>保存</span>
-                        </template>
-                        <span class="ds-action-svg-btn" @click="handleSave">
-                            <img src="../../../../assets/svg/infoclient/baocun.svg" class="SvgImg" />
-                        </span>
-                    </a-tooltip>
-                    <a-tooltip placement="top" :mouseEnterDelay="0.5">
-                        <template #title>
-                            <span>打印</span>
-                        </template>
-                        <span class="ds-action-svg-btn" @click="handleSave">
-                            <img src="../../../../assets/svg/infoclient/dayin.svg" class="SvgImg" />
-                        </span>
-                    </a-tooltip>
-                    <a-tooltip placement="top" :mouseEnterDelay="0.5">
-                        <template #title>
-                            <span>提交审核</span>
-                        </template>
-                        <span class="ds-action-svg-btn" @click="SubmitAudit">
-                            <img src="../../../../assets/svg/infoclient/tijiao.svg" class="SvgImg" />
-                        </span>
-                    </a-tooltip>
-                    <a-tooltip placement="top" :mouseEnterDelay="0.5">
-                        <template #title>
-                            <span>撤销审核</span>
-                        </template>
-                        <span class="ds-action-svg-btn" @click="Withdraw">
-                            <img src="../../../../assets/svg/infoclient/chexiaotijiao.svg" class="SvgImg" />
-                        </span>
-                    </a-tooltip>
-                    <a-dropdown>
-                        <a class="ant-dropdown-link">
-                            <i class="icon-xianshang iconfont" style="font-size: 15px;"></i>
-                            {{ getCategory() }}
-                            <DownOutlined />
-                        </a>
-                        <template #overlay>
-                            <a-menu @click="onClick">
-                                <a-menu-item :key="0">
-                                    <a href="javascript:;">普通发票</a>
-                                </a-menu-item>
-                                <a-menu-item :key="1">
-                                    <a href="javascript:;">电子发票</a>
-                                </a-menu-item>
-                                <a-menu-item :key="2">
-                                    <a href="javascript:;">纸质发票</a>
-                                </a-menu-item>
-                            </a-menu>
-                        </template>
-                    </a-dropdown>
-                    <div class="status">
-                        <i class="icon-chenggong iconfont" style="font-size: 14px;"></i>
-                        审核通过
-                    </div>
-                    <div @mouseover="showTooltip = true" @mouseleave="showTooltip = false" class="invoiceNo">
-                        发票号：
-                        <span v-show="invoiceEditFlag"> {{ form.invoiceNO }}</span>
-                        <a-input style="width: 70%;" size="small" v-show="!invoiceEditFlag"
-                            v-model:value="form.invoiceNO" />
-                        <span class="iconfont icon-bianji1" style="cursor: pointer;" @click="CilckEdit"
-                            v-show="showTooltip"></span>
-                    </div>
-                </div>
-                <div style="color: #8a96a5;font-size: 12px">
-                    申请单号：{{ form.applicationNO }}
-                </div>
-
-            </div>
-            <!-- <div>
+  <div class="main">
+    <a-spin :spinning="loading">
+      <div class="infoclientBox">
+        <div style="display: flex; align-items: center">
+          <a-tooltip placement="top" :mouseEnterDelay="0.5">
+            <template #title>
+              <span>新建</span>
+            </template>
+            <span class="ds-action-svg-btn" @click="handleCreate">
+              <img src="../../../../assets/svg/infoclient//xinjian.svg" class="SvgImg" />
+            </span>
+          </a-tooltip>
+          <a-tooltip placement="top" :mouseEnterDelay="0.5">
+            <template #title>
+              <span>保存</span>
+            </template>
+            <span class="ds-action-svg-btn" @click="handleSave">
+              <img src="../../../../assets/svg/infoclient/baocun.svg" class="SvgImg" />
+            </span>
+          </a-tooltip>
+          <a-tooltip placement="top" :mouseEnterDelay="0.5">
+            <template #title>
+              <span>打印</span>
+            </template>
+            <span class="ds-action-svg-btn" @click="handleSave">
+              <img src="../../../../assets/svg/infoclient/dayin.svg" class="SvgImg" />
+            </span>
+          </a-tooltip>
+          <a-tooltip placement="top" :mouseEnterDelay="0.5">
+            <template #title>
+              <span>提交审核</span>
+            </template>
+            <span class="ds-action-svg-btn" @click="SubmitAudit">
+              <img src="../../../../assets/svg/infoclient/tijiao.svg" class="SvgImg" />
+            </span>
+          </a-tooltip>
+          <a-tooltip placement="top" :mouseEnterDelay="0.5">
+            <template #title>
+              <span>撤销审核</span>
+            </template>
+            <span class="ds-action-svg-btn" @click="Withdraw">
+              <img src="../../../../assets/svg/infoclient/chexiaotijiao.svg" class="SvgImg" />
+            </span>
+          </a-tooltip>
+          <a-dropdown>
+            <a class="ant-dropdown-link">
+              <i class="icon-xianshang iconfont" style="font-size: 15px"></i>
+              {{ getCategory() }}
+              <DownOutlined />
+            </a>
+            <template #overlay>
+              <a-menu @click="onClick">
+                <a-menu-item :key="0">
+                  <a href="javascript:;">普通发票</a>
+                </a-menu-item>
+                <a-menu-item :key="1">
+                  <a href="javascript:;">电子发票</a>
+                </a-menu-item>
+                <a-menu-item :key="2">
+                  <a href="javascript:;">纸质发票</a>
+                </a-menu-item>
+              </a-menu>
+            </template>
+          </a-dropdown>
+          <div class="status">
+            <i class="icon-chenggong iconfont" style="font-size: 14px"></i>
+            审核通过
+          </div>
+          <div @mouseover="showTooltip = true" @mouseleave="showTooltip = false" class="invoiceNo">
+            发票号：
+            <span v-show="invoiceEditFlag"> {{ form.invoiceNO }}</span>
+            <a-input
+              style="width: 70%"
+              size="small"
+              v-show="!invoiceEditFlag"
+              v-model:value="form.invoiceNO"
+            />
+            <span
+              class="iconfont icon-bianji1"
+              style="cursor: pointer"
+              @click="CilckEdit"
+              v-show="showTooltip"
+            ></span>
+          </div>
+        </div>
+        <div style="color: #8a96a5; font-size: 12px"> 申请单号：{{ form.applicationNO }} </div>
+      </div>
+      <!-- <div>
                 <a-button type="link" @click="handleSave"> <i class="iconfont icon-zhcc_tidan"></i>保存</a-button>
                 <a-button type="link"><i class="iconfont icon-return"></i>撤销审核</a-button>
             </div> -->
-            <div class="box">
-                <div class="top">
-                    <div class="left">
-                        <div class="title">票面信息</div>
-                        <BasicForm @register="registerForm" @linkageForm="linkageForm">
-                           
-                        </BasicForm>
-                    </div>
-                    <div class="right">
-                        <div class="title">申请开票金额</div>
-                        <div style="display: flex;margin-bottom: 15px">
-                            <div class="apply" :class="{ active: form.isYB }">
-                                <a-checkbox v-model:checked="form.isYB" @change="handleChangeApply">
-                                    原币申请
-                                    <span class="rmb">2000.00 RMB</span>
-                                    <span class="yb">20.00 USD </span>
-                                </a-checkbox>
-                            </div>
-                            <div class="apply" :class="{ active: form.isRMB }">
-                                <a-checkbox v-model:checked="form.isRMB"
-                                    @change="handleChangeApply1">折算人民币申请</a-checkbox>
-                                <span></span>
-                                <span></span>
-                            </div>
-                        </div>
-                        <div>
-                            <BasicForm @register="markForm">
-                                <template #note="{ model, field }">
-                                    <div
-                                        style="display: flex;align-items: center;height: 22px;line-height: 22px;font-size: 12px">
-                                        备注:
-                                        <a-button @click="openTempName" style="margin: 0 15px 0 20px;" type="link"> <i
-                                                class="icon-a-17Btuichu iconfont"></i>
-                                            提取备注</a-button>
-                                        <a-button type="link" @click="openTemp"><i
-                                                class="icon-jichupeizhi iconfont"></i>模板设置</a-button>
-                                    </div>
-                                    <a-textarea v-model:value="model[field]" :auto-size="{ minRows: 3, maxRows: 7 }" />
-                                </template>
-                            </BasicForm>
-                        </div>
-                    </div>
-                </div>
-                <div class="bottom">
-                    <BasicForm @register="registerBottomForm" @linkageForm="linkageFormBottom">
-                        <template #createByNameSlot="{ model, field }">
-                            <span style="font-size: 12px;color: #7a8798;" >申请人:131223</span>
-                            </template>
-                    </BasicForm>
-                </div>
+      <div class="box">
+        <div class="top">
+          <div class="left">
+            <div class="title">票面信息</div>
+            <BasicForm @register="registerForm" @linkageForm="linkageForm"> </BasicForm>
+          </div>
+          <div class="right">
+            <div class="title">申请开票金额</div>
+            <div style="display: flex; margin-bottom: 15px">
+              <div class="apply" :class="{ active: form.isYB }">
+                <a-checkbox v-model:checked="form.isYB" @change="handleChangeApply">
+                  原币申请
+                  <span class="rmb">2000.00 RMB</span>
+                  <span class="yb">20.00 USD </span>
+                </a-checkbox>
+              </div>
+              <div class="apply" :class="{ active: form.isRMB }">
+                <a-checkbox v-model:checked="form.isRMB" @change="handleChangeApply1"
+                  >折算人民币申请</a-checkbox
+                >
+                <span></span>
+                <span></span>
+              </div>
             </div>
+            <div>
+              <BasicForm @register="markForm">
+                <template #note="{ model, field }">
+                  <div
+                    style="
+                      display: flex;
+                      align-items: center;
+                      height: 22px;
+                      line-height: 22px;
+                      font-size: 12px;
+                    "
+                  >
+                    备注:
+                    <a-button @click="openTempName" style="margin: 0 15px 0 20px" type="link">
+                      <i class="icon-a-17Btuichu iconfont"></i> 提取备注</a-button
+                    >
+                    <a-button type="link" @click="openTemp"
+                      ><i class="icon-jichupeizhi iconfont"></i>模板设置</a-button
+                    >
+                  </div>
+                  <a-textarea
+                    v-model:value="model[field]"
+                    :auto-size="{ minRows: 3, maxRows: 7 }"
+                  />
+                </template>
+              </BasicForm>
+            </div>
+          </div>
+        </div>
+        <div class="bottom">
+          <BasicForm @register="registerBottomForm" @linkageForm="linkageFormBottom">
+            <template #createByNameSlot="{ model, field }">
+              <span style="font-size: 12px; color: #7a8798">申请人:131223</span>
+            </template>
+          </BasicForm>
+        </div>
+      </div>
 
-
-
-
-
-            <!-- <feeTable :id="id" @handleSuccess="handleSuccess" @updateListSave=updateListSave
+      <!-- <feeTable :id="id" @handleSuccess="handleSuccess" @updateListSave=updateListSave
                 @updateAmount="updateAmount" ref="feeTableRef">
             </feeTable> -->
-            <a-modal @cancel="open = false" width="700px" :visible="open" title="模板设置" @ok="handleSaveTemp">
-                <div style="display: flex;">
-                    <div class="label-list">
-                        <div class="label-item" @click="handleAddLabel(item)" v-for="item in labelList"
-                            :key="item.fieldName">{{
-                                item.displayName }}
-                        </div>
-                    </div>
-                    <div style="width: 80%;margin-left: 10px">
-                        <a-textarea style="height: 90%;" v-model:value="tempContent" />
-                        <div style="margin-top: 15px;">
-                            <span>发票备注模板</span>
-                            <el-autocomplete v-model="tempName" style="width: 81%;margin-left: 10px;"
-                                :fetch-suggestions="querySearch" clearable @select="handleSelect" />
-                        </div>
-                    </div>
-                </div>
-            </a-modal>
-            <a-modal @cancel="nameFlag = false" width="700px" :visible="nameFlag" title="提取发票备注" @ok="handleRender">
-                <a-select v-model:value="tempNameId" style="width: 80%">
-                    <a-select-option :value="item.id" v-for="(item, index) in tempList" :key="index">{{ item.name
-                        }}</a-select-option>
-                </a-select>
-            </a-modal>
-        </a-spin>
-    </div>
+      <a-modal
+        @cancel="open = false"
+        width="700px"
+        :visible="open"
+        title="模板设置"
+        @ok="handleSaveTemp"
+      >
+        <div style="display: flex">
+          <div class="label-list">
+            <div
+              class="label-item"
+              @click="handleAddLabel(item)"
+              v-for="item in labelList"
+              :key="item.fieldName"
+              >{{ item.displayName }}
+            </div>
+          </div>
+          <div style="width: 80%; margin-left: 10px">
+            <a-textarea style="height: 90%" v-model:value="tempContent" />
+            <div style="margin-top: 15px">
+              <span>发票备注模板</span>
+              <el-autocomplete
+                v-model="tempName"
+                style="width: 81%; margin-left: 10px"
+                :fetch-suggestions="querySearch"
+                clearable
+                @select="handleSelect"
+              />
+            </div>
+          </div>
+        </div>
+      </a-modal>
+      <a-modal
+        @cancel="nameFlag = false"
+        width="700px"
+        :visible="nameFlag"
+        title="提取发票备注"
+        @ok="handleRender"
+      >
+        <a-select v-model:value="tempNameId" style="width: 80%">
+          <a-select-option :value="item.id" v-for="(item, index) in tempList" :key="index">{{
+            item.name
+          }}</a-select-option>
+        </a-select>
+      </a-modal>
+    </a-spin>
+  </div>
 </template>
 <script lang="ts" setup>
-import { ref, onMounted, watch } from 'vue'
-import { BasicForm, useForm } from '/@/components/Form/index'
-import { AutoComplete } from 'ant-design-vue'
-import feeTable from './feeTable.vue';
-import { DownOutlined } from '@ant-design/icons-vue';
-import { InvoiceApplicationSave, InvoiceApplicationGet, GetTemplateFields, SaveTemplate, GetTemplateList, RenderTemplate, GetClientBankList, GetOrgList } from '../api'
-import { useMessage } from '/@/hooks/web/useMessage'
-import { useRoute } from 'vue-router'
-import {
-    GetControllerClientList, GetCustomerServiceList
-} from '/@/views/operation/seaexport/api/BookingLedger'
-import { GetFeeCurrencySelectList, GetClientListByCode } from '/@/api/common'
-import dayjs from 'dayjs'
-import { useGo } from '/@/hooks/web/usePage'
-const go = useGo()
-const CategoryData = [
+  import { ref, onMounted, watch } from 'vue'
+  import { BasicForm, useForm } from '/@/components/Form/index'
+  import { AutoComplete } from 'ant-design-vue'
+  import feeTable from './feeTable.vue'
+  import { DownOutlined } from '@ant-design/icons-vue'
+  import {
+    InvoiceApplicationSave,
+    InvoiceApplicationGet,
+    GetTemplateFields,
+    SaveTemplate,
+    GetTemplateList,
+    RenderTemplate,
+    GetClientBankList,
+    GetOrgList,
+  } from '../api'
+  import { useMessage } from '/@/hooks/web/useMessage'
+  import { useRoute } from 'vue-router'
+  import {
+    GetControllerClientList,
+    GetCustomerServiceList,
+  } from '/@/views/operation/seaexport/api/BookingLedger'
+  import { GetFeeCurrencySelectList, GetClientListByCode } from '/@/api/common'
+  import dayjs from 'dayjs'
+  import { useGo } from '/@/hooks/web/usePage'
+  const go = useGo()
+  const CategoryData = [
     { value: 0, label: '普通发票' },
     { value: 1, label: '电子发票' },
     { value: 2, label: '纸质发票' },
-]
-const bankList = ref([]) as any
-const showTooltip = ref(false)
-const customerList = ref([]) as any
-const form = ref({
+  ]
+  const bankList = ref([]) as any
+  const showTooltip = ref(false)
+  const customerList = ref([]) as any
+  const form = ref({
     invoiceNO: '',
     isRMB: false,
     isYB: false,
     category: 0,
-    applicationNO: '13123'
-})
+    applicationNO: '13123',
+  })
 
-// 发票单号
-const invoiceEditFlag = ref(true)
-function CilckEdit() {
+  // 发票单号
+  const invoiceEditFlag = ref(true)
+  function CilckEdit() {
     invoiceEditFlag.value = !invoiceEditFlag.value
-}
-// 切换申请类型
-function onClick({ key }) {
+  }
+  // 切换申请类型
+  function onClick({ key }) {
     form.value.category = key
-}
-function getCategory() {
+  }
+  function getCategory() {
     let str = ''
-    CategoryData.forEach(item => {
-        if (item.value == form.value.category) {
-            str = item.label
-        }
+    CategoryData.forEach((item) => {
+      if (item.value == form.value.category) {
+        str = item.label
+      }
     })
     return str
-}
-const detailForm = [
+  }
+  const detailForm = [
     {
-        field: 'id',
-        label: '',
-        component: 'Input',
-        show: false,
+      field: 'id',
+      label: '',
+      component: 'Input',
+      show: false,
     },
     {
-        field: 'applicationNO',
-        label: '申请单号',
-        component: 'Input',
-        dynamicDisabled: true,
-        colProps: { span: 4 },
+      field: 'applicationNO',
+      label: '申请单号',
+      component: 'Input',
+      dynamicDisabled: true,
+      colProps: { span: 4 },
     },
     {
-        field: 'statusText',
-        label: '状态',
-        component: 'Input',
-        dynamicDisabled: true,
-        colProps: { span: 4 },
+      field: 'statusText',
+      label: '状态',
+      component: 'Input',
+      dynamicDisabled: true,
+      colProps: { span: 4 },
     },
     {
-        field: 'createByName',
-        label: '申请人',
-        component: 'Input',
-        dynamicDisabled: true,
-        colProps: { span: 4 },
+      field: 'createByName',
+      label: '申请人',
+      component: 'Input',
+      dynamicDisabled: true,
+      colProps: { span: 4 },
     },
     {
-        field: 'applyDate',
-        label: '申请开票日期',
-        component: 'DatePicker',
-        colProps: { span: 4 },
-        defaultValue: dayjs().format('YYYY-MM-DD'),
-        componentProps: {
-            valueFormat: 'YYYY-MM-DD',
-            format: 'YYYY-MM-DD',
-        },
+      field: 'applyDate',
+      label: '申请开票日期',
+      component: 'DatePicker',
+      colProps: { span: 4 },
+      defaultValue: dayjs().format('YYYY-MM-DD'),
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD',
+        format: 'YYYY-MM-DD',
+      },
     },
     {
-        field: 'invoiceNO',
-        label: '发票号',
-        component: 'Input',
-        colProps: { span: 4 },
+      field: 'invoiceNO',
+      label: '发票号',
+      component: 'Input',
+      colProps: { span: 4 },
     },
     {
-        field: 'AcutalInvoiceNO',
-        label: '实际发票号',
-        dynamicDisabled: true,
-        component: 'Input',
-        colProps: { span: 4 },
+      field: 'AcutalInvoiceNO',
+      label: '实际发票号',
+      dynamicDisabled: true,
+      component: 'Input',
+      colProps: { span: 4 },
     },
     {
-        field: 'invoiceHeader',
-        label: '发票抬头',
-        component: 'Input',
-        colProps: { span: 12 },
+      field: 'invoiceHeader',
+      label: '发票抬头',
+      component: 'Input',
+      colProps: { span: 12 },
     },
     {
-        field: 'taxID',
-        label: '纳税人识别号',
-        component: 'Input',
-        colProps: { span: 12 },
+      field: 'taxID',
+      label: '纳税人识别号',
+      component: 'Input',
+      colProps: { span: 12 },
     },
     {
-        field: 'customerAddTel',
-        label: '地址电话',
-        component: 'Input',
-        colProps: { span: 12 },
+      field: 'customerAddTel',
+      label: '地址电话',
+      component: 'Input',
+      colProps: { span: 12 },
     },
     {
-        field: 'customerBank',
-        label: '',
-        component: 'Input',
-        show: false,
-        colProps: { span: 12 },
+      field: 'customerBank',
+      label: '',
+      component: 'Input',
+      show: false,
+      colProps: { span: 12 },
     },
     {
-        field: 'customerBankId',
-        label: '开户行及账号',
-        colProps: { span: 12 },
-        component: 'Select',
-        componentProps: ({ formModel }) => {
-            return {
-                options: bankList.value,
-                fieldNames: {
-                    label: 'name',
-                    value: 'id',
-                },
-                onChange: (e, obj) => {
-                    if (obj) {
-                        bankList.value.forEach(item => {
-                            if (item.id == e) {
-                                formModel.customerBank = item
-                            }
-                        })
-                    }
-                    if (!obj && !e) {
-                        formModel.customerBank = {}
-                    }
-                },
+      field: 'customerBankId',
+      label: '开户行及账号',
+      colProps: { span: 12 },
+      component: 'Select',
+      componentProps: ({ formModel }) => {
+        return {
+          options: bankList.value,
+          fieldNames: {
+            label: 'name',
+            value: 'id',
+          },
+          onChange: (e, obj) => {
+            if (obj) {
+              bankList.value.forEach((item) => {
+                if (item.id == e) {
+                  formModel.customerBank = item
+                }
+              })
             }
-        },
-    },
-    {
-        field: 'currency',
-        label: '币别',
-        defaultValue: 'CNY',
-        component: 'ApiSelect',
-        colProps: { span: 4 },
-        componentProps: () => {
-            return {
-                api: GetFeeCurrencySelectList,
-                labelField: 'name',
-                valueField: 'codeName',
-                resultField: 'data',
+            if (!obj && !e) {
+              formModel.customerBank = {}
             }
-        },
+          },
+        }
+      },
     },
     {
-        field: 'category',
-        label: '申请类型',
-        component: 'Select',
-        colProps: { span: 4 },
-        componentProps: {
-            options: CategoryData,
-        },
+      field: 'currency',
+      label: '币别',
+      defaultValue: 'CNY',
+      component: 'ApiSelect',
+      colProps: { span: 4 },
+      componentProps: () => {
+        return {
+          api: GetFeeCurrencySelectList,
+          labelField: 'name',
+          valueField: 'codeName',
+          resultField: 'data',
+        }
+      },
     },
     {
-        field: 'invoiceCurrency',
-        label: '发票币别',
-        defaultValue: 'CNY',
-        component: 'ApiSelect',
-        colProps: { span: 4 },
-        componentProps: () => {
-            return {
-                api: GetFeeCurrencySelectList,
-                labelField: 'name',
-                valueField: 'codeName',
-                resultField: 'data',
-            }
-        },
+      field: 'category',
+      label: '申请类型',
+      component: 'Select',
+      colProps: { span: 4 },
+      componentProps: {
+        options: CategoryData,
+      },
     },
     {
-        field: 'customer',
-        label: '',
-        component: 'Input',
-        show: false,
-        colProps: { span: 12 },
+      field: 'invoiceCurrency',
+      label: '发票币别',
+      defaultValue: 'CNY',
+      component: 'ApiSelect',
+      colProps: { span: 4 },
+      componentProps: () => {
+        return {
+          api: GetFeeCurrencySelectList,
+          labelField: 'name',
+          valueField: 'codeName',
+          resultField: 'data',
+        }
+      },
     },
     {
-        field: 'customerId',
-        label: '',
-        component: 'Input',
-        show: false,
-        colProps: { span: 12 },
+      field: 'customer',
+      label: '',
+      component: 'Input',
+      show: false,
+      colProps: { span: 12 },
     },
     {
-        label: '委托单位',
-        field: 'customerName',
-        required: true,
-        component: 'ApiSelect',
-        colProps: { span: 4 },
-        componentProps: ({ formModel }) => {
-            return {
-                api: GetClientListByCode,
-                params: { code: 'controller' },
-                labelField: 'pinYinCode',
-                valueField: 'shortName',
-                showName: 'shortName',
-                resultField: 'data',
-                immediate: false,
-                onChange: (e, obj) => {
-                    if (obj) {
-                        const queryStr = [{
-                            FieldName: 'ClientId',
-                            FieldValue: obj.id,
-                            ConditionalType: '0'
-                        }]
-                        const data = {
-                            pageCondition: {
-                                "pageIndex": 1,
-                                "pageSize": 20,
-                                "sortConditions": []
-                            },
-                            queryCondition: JSON.stringify(queryStr)
-                        }
-                        GetClientBankList(data).then(res => {
-                            res.data.forEach(item => {
-                                item.name = item.bankName + '  ' + item.bankAgentName
-                            })
-                            bankList.value = res.data
-                        })
-                        formModel.customerId = obj.id
-                        customerList.value.forEach(item => {
-                            if (item.id == e) {
-                                formModel.customer = item
-                            }
-                        })
-                        feeTableRef.value.changeCust(obj.id)
-                    }
-                    if (!obj && !e) {
-                        bankList.value = []
-                        formModel.customer = {}
-                        formModel.customerId = ''
-                    }
-                },
-            }
-        },
+      field: 'customerId',
+      label: '',
+      component: 'Input',
+      show: false,
+      colProps: { span: 12 },
     },
     {
-        label: '代开客户',
-        field: 'autualCustomerName',
-        component: 'ApiSelect',
-        dynamicDisabled: false,
-        colProps: { span: 4 },
-        componentProps: () => {
-            return {
-                api: () => {
-                    return new Promise((resolve) => {
-                        GetControllerClientList().then((res) => {
-                            resolve(res)
-                        })
-                    })
+      label: '委托单位',
+      field: 'customerName',
+      required: true,
+      component: 'ApiSelect',
+      colProps: { span: 4 },
+      componentProps: ({ formModel }) => {
+        return {
+          api: GetClientListByCode,
+          params: { code: 'controller' },
+          labelField: 'pinYinCode',
+          valueField: 'shortName',
+          showName: 'shortName',
+          resultField: 'data',
+          immediate: false,
+          onChange: (e, obj) => {
+            if (obj) {
+              const queryStr = [
+                {
+                  FieldName: 'ClientId',
+                  FieldValue: obj.id,
+                  ConditionalType: '0',
                 },
-                immediate: false,
-                labelField: 'shortName',
-                valueField: 'shortName',
-                resultField: 'data',
-                filterOption: (input: string, option: any) => {
-                    return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+              ]
+              const data = {
+                pageCondition: {
+                  pageIndex: 1,
+                  pageSize: 20,
+                  sortConditions: [],
                 },
+                queryCondition: JSON.stringify(queryStr),
+              }
+              GetClientBankList(data).then((res) => {
+                res.data.forEach((item) => {
+                  item.name = item.bankName + '  ' + item.bankAgentName
+                })
+                bankList.value = res.data
+              })
+              formModel.customerId = obj.id
+              customerList.value.forEach((item) => {
+                if (item.id == e) {
+                  formModel.customer = item
+                }
+              })
+              feeTableRef.value.changeCust(obj.id)
+            }
+            if (!obj && !e) {
+              bankList.value = []
+              formModel.customer = {}
+              formModel.customerId = ''
             }
-        },
+          },
+        }
+      },
     },
     {
-        field: 'applyAmount',
-        label: '申请金额',
-        component: 'InputNumber',
-        colProps: { span: 4 },
+      label: '代开客户',
+      field: 'autualCustomerName',
+      component: 'ApiSelect',
+      dynamicDisabled: false,
+      colProps: { span: 4 },
+      componentProps: () => {
+        return {
+          api: () => {
+            return new Promise((resolve) => {
+              GetControllerClientList().then((res) => {
+                resolve(res)
+              })
+            })
+          },
+          immediate: false,
+          labelField: 'shortName',
+          valueField: 'shortName',
+          resultField: 'data',
+          filterOption: (input: string, option: any) => {
+            return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+          },
+        }
+      },
     },
     {
-        field: 'invoiceAmount',
-        label: '开票金额',
-        component: 'InputNumber',
-        colProps: { span: 4 },
+      field: 'applyAmount',
+      label: '申请金额',
+      component: 'InputNumber',
+      colProps: { span: 4 },
     },
     {
-        field: 'taxRate',
-        label: '开票税率',
-        component: 'InputNumber',
-        colProps: { span: 4 },
+      field: 'invoiceAmount',
+      label: '开票金额',
+      component: 'InputNumber',
+      colProps: { span: 4 },
     },
     {
-        field: 'otherCurrencyAmount',
-        label: '外币金额',
-        component: 'InputNumber',
-        colProps: { span: 4 },
+      field: 'taxRate',
+      label: '开票税率',
+      component: 'InputNumber',
+      colProps: { span: 4 },
     },
     {
-        field: 'saleDeptId',
-        label: '所属分部',
-        component: 'ApiSelect',
-        colProps: { span: 4 },
-        componentProps: () => {
-            return {
-                api: GetOrgList,
-                resultField: 'data',
-            }
-        },
+      field: 'otherCurrencyAmount',
+      label: '外币金额',
+      component: 'InputNumber',
+      colProps: { span: 4 },
     },
     {
-        field: 'note',
-        label: '',
-        component: 'InputTextArea',
-        colProps: { span: 12 },
-        slot: 'note',
+      field: 'saleDeptId',
+      label: '所属分部',
+      component: 'ApiSelect',
+      colProps: { span: 4 },
+      componentProps: () => {
+        return {
+          api: GetOrgList,
+          resultField: 'data',
+        }
+      },
     },
     {
-        field: 'invoiceRemark',
-        label: '开票要求',
-        component: 'InputTextArea',
-        colProps: { span: 12 },
-        componentProps: () => {
-            return {
-                autoSize: { minRows: 4, maxRows: 7 }
-            }
-        },
+      field: 'note',
+      label: '',
+      component: 'InputTextArea',
+      colProps: { span: 12 },
+      slot: 'note',
     },
-]
-const bankForm = [
     {
-        field: 'invoiceHeader',
-        label: '发票抬头',
-        component: 'Input',
-        colProps: { span: 24 },
+      field: 'invoiceRemark',
+      label: '开票要求',
+      component: 'InputTextArea',
+      colProps: { span: 12 },
+      componentProps: () => {
+        return {
+          autoSize: { minRows: 4, maxRows: 7 },
+        }
+      },
     },
+  ]
+  const bankForm = [
     {
-        field: 'taxID',
-        label: '纳税人识别号',
-        component: 'Input',
-        colProps: { span: 24 },
+      field: 'invoiceHeader',
+      label: '发票抬头',
+      component: 'Input',
+      colProps: { span: 24 },
     },
     {
-        field: 'customerAddTel',
-        label: '地址电话',
-        component: 'Input',
-        colProps: { span: 24 },
+      field: 'taxID',
+      label: '纳税人识别号',
+      component: 'Input',
+      colProps: { span: 24 },
     },
     {
-        field: 'customerBank',
-        label: '',
-        component: 'Input',
-        show: false,
-        colProps: { span: 12 },
+      field: 'customerAddTel',
+      label: '地址电话',
+      component: 'Input',
+      colProps: { span: 24 },
     },
     {
-        field: 'customerBankId',
-        label: '开户行及账号',
-        colProps: { span: 24 },
-        component: 'Select',
-        componentProps: ({ formModel }) => {
-            return {
-                options: bankList.value,
-                fieldNames: {
-                    label: 'name',
-                    value: 'id',
-                },
-                onChange: (e, obj) => {
-                    if (obj) {
-                        bankList.value.forEach(item => {
-                            if (item.id == e) {
-                                formModel.customerBank = item
-                            }
-                        })
-                    }
-                    if (!obj && !e) {
-                        formModel.customerBank = {}
-                    }
-                },
-            }
-        },
+      field: 'customerBank',
+      label: '',
+      component: 'Input',
+      show: false,
+      colProps: { span: 12 },
     },
-
-]
-const EditBankForm = [
     {
-        field: 'invoiceHeader',
-        label: '发票抬头',
-        component: 'DEdit',
-        defaultValue: '',
-        colProps: { span: 24 },
-        componentProps: (e) => {
-            return {
-                onEdit: () => {
-                    const { formActionType } = e
-                    formActionType ? formActionType.linkageForm(e) : null
-                },
+      field: 'customerBankId',
+      label: '开户行及账号',
+      colProps: { span: 24 },
+      component: 'Select',
+      componentProps: ({ formModel }) => {
+        return {
+          options: bankList.value,
+          fieldNames: {
+            label: 'name',
+            value: 'id',
+          },
+          onChange: (e, obj) => {
+            if (obj) {
+              bankList.value.forEach((item) => {
+                if (item.id == e) {
+                  formModel.customerBank = item
+                }
+              })
             }
-        },
+            if (!obj && !e) {
+              formModel.customerBank = {}
+            }
+          },
+        }
+      },
     },
+  ]
+  const EditBankForm = [
     {
-        field: 'taxID',
-        label: '纳税人识别号',
-        component: 'DEdit',
-        colProps: { span: 24 },
-        componentProps: (e) => {
-            return {
-                onEdit: () => {
-                    const { formActionType } = e
-                    formActionType ? formActionType.linkageForm(e) : null
-                },
-            }
-        },
+      field: 'invoiceHeader',
+      label: '发票抬头',
+      component: 'DEdit',
+      defaultValue: '',
+      colProps: { span: 24 },
+      componentProps: (e) => {
+        return {
+          onEdit: () => {
+            const { formActionType } = e
+            formActionType ? formActionType.linkageForm(e) : null
+          },
+        }
+      },
     },
     {
-        field: 'customerAddTel',
-        label: '地址电话',
-        component: 'DEdit',
-        colProps: { span: 24 },
-        componentProps: (e) => {
-            return {
-                onEdit: () => {
-                    const { formActionType } = e
-                    formActionType ? formActionType.linkageForm(e) : null
-                },
-            }
-        },
+      field: 'taxID',
+      label: '纳税人识别号',
+      component: 'DEdit',
+      colProps: { span: 24 },
+      componentProps: (e) => {
+        return {
+          onEdit: () => {
+            const { formActionType } = e
+            formActionType ? formActionType.linkageForm(e) : null
+          },
+        }
+      },
     },
     {
-        field: 'customerBank',
-        label: '',
-        component: 'DEdit',
-        show: false,
-        colProps: { span: 24 },
+      field: 'customerAddTel',
+      label: '地址电话',
+      component: 'DEdit',
+      colProps: { span: 24 },
+      componentProps: (e) => {
+        return {
+          onEdit: () => {
+            const { formActionType } = e
+            formActionType ? formActionType.linkageForm(e) : null
+          },
+        }
+      },
     },
     {
-        field: 'customerBankId',
-        label: 'RMB开户行/账号',
-        colProps: { span: 24 },
-        component: 'DEdit',
-        componentProps: (e) => {
-            const { formModel } = e
-            return {
-                options: bankList.value,
-                fieldNames: {
-                    label: 'name',
-                    value: 'id',
-                },
-                onEdit: () => {
-                    const { formActionType } = e
-                    formActionType ? formActionType.linkageForm(e) : null
-                },
-                onChange: (e, obj) => {
-                    if (obj) {
-                        bankList.value.forEach(item => {
-                            if (item.id == e) {
-                                formModel.customerBank = item
-                            }
-                        })
-                    }
-                    if (!obj && !e) {
-                        formModel.customerBank = {}
-                    }
-                },
-            }
-        },
+      field: 'customerBank',
+      label: '',
+      component: 'DEdit',
+      show: false,
+      colProps: { span: 24 },
     },
-]
-const markFormS = [
     {
-        field: 'invoiceRemark',
-        label: '开票要求',
-        component: 'InputTextArea',
-        colProps: { span: 12 },
-        componentProps: () => {
-            return {
-                autoSize: { minRows: 3, maxRows: 7 }
+      field: 'customerBankId',
+      label: 'RMB开户行/账号',
+      colProps: { span: 24 },
+      component: 'DEdit',
+      componentProps: (e) => {
+        const { formModel } = e
+        return {
+          options: bankList.value,
+          fieldNames: {
+            label: 'name',
+            value: 'id',
+          },
+          onEdit: () => {
+            const { formActionType } = e
+            formActionType ? formActionType.linkageForm(e) : null
+          },
+          onChange: (e, obj) => {
+            if (obj) {
+              bankList.value.forEach((item) => {
+                if (item.id == e) {
+                  formModel.customerBank = item
+                }
+              })
+            }
+            if (!obj && !e) {
+              formModel.customerBank = {}
             }
-        },
+          },
+        }
+      },
     },
+  ]
+  const markFormS = [
     {
-        field: 'note',
-        label: '',
-        component: 'InputTextArea',
-        colProps: { span: 12 },
-        slot: 'note',
+      field: 'invoiceRemark',
+      label: '开票要求',
+      component: 'InputTextArea',
+      colProps: { span: 12 },
+      componentProps: () => {
+        return {
+          autoSize: { minRows: 3, maxRows: 7 },
+        }
+      },
     },
-]
-const bottomForm = [
     {
-        field: 'customer',
-        label: '',
-        component: 'Input',
-        show: false,
-        colProps: { span: 12 },
+      field: 'note',
+      label: '',
+      component: 'InputTextArea',
+      colProps: { span: 12 },
+      slot: 'note',
     },
+  ]
+  const bottomForm = [
     {
-        field: 'customerId',
-        label: '',
-        component: 'Input',
-        show: false,
-        colProps: { span: 12 },
+      field: 'customer',
+      label: '',
+      component: 'Input',
+      show: false,
+      colProps: { span: 12 },
     },
     {
-        field: 'createByName',
-        label: '申请人',
-        component: 'Input',
-        colProps: { span: 4 },
+      field: 'customerId',
+      label: '',
+      component: 'Input',
+      show: false,
+      colProps: { span: 12 },
     },
-    // {
-    //     field: 'applyDate',
-    //     label: '申请日期',
-    //     component: 'DatePicker',
-    //     colProps: { span: 4 },
-    //     defaultValue: dayjs().format('YYYY-MM-DD'),
-    //     componentProps: {
-    //         valueFormat: 'YYYY-MM-DD',
-    //         format: 'YYYY-MM-DD',
-    //     },
-    // },
     {
-        label: '客户名称',
-        field: 'customerName',
-        required: true,
-        component: 'ApiSelect',
-        colProps: { span: 4 },
-        componentProps: ({ formModel }) => {
-            return {
-                api: GetClientListByCode,
-                params: { code: 'controller' },
-                labelField: 'pinYinCode',
-                valueField: 'shortName',
-                showName: 'shortName',
-                resultField: 'data',
-                immediate: false,
-                onChange: (e, obj) => {
-                    if (obj) {
-                        const queryStr = [{
-                            FieldName: 'ClientId',
-                            FieldValue: obj.id,
-                            ConditionalType: '0'
-                        }]
-                        const data = {
-                            pageCondition: {
-                                "pageIndex": 1,
-                                "pageSize": 20,
-                                "sortConditions": []
-                            },
-                            queryCondition: JSON.stringify(queryStr)
-                        }
-                        GetClientBankList(data).then(res => {
-                            res.data.forEach(item => {
-                                item.name = item.bankName + '  ' + item.bankAgentName
-                            })
-                            bankList.value = res.data
-                        })
-                        formModel.customerId = obj.id
-                        customerList.value.forEach(item => {
-                            if (item.id == e) {
-                                formModel.customer = item
-                            }
-                        })
-                        feeTableRef.value.changeCust(obj.id)
-                    }
-                    if (!obj && !e) {
-                        bankList.value = []
-                        formModel.customer = {}
-                        formModel.customerId = ''
-                    }
-                },
-            }
-        },
+      field: 'createByName',
+      label: '申请人',
+      component: 'Input',
+      colProps: { span: 4 },
     },
     {
-        field: 'saleDeptId',
-        label: '所属分部',
-        component: 'ApiSelect',
-        colProps: { span: 4 },
-        componentProps: () => {
-            return {
-                api: GetOrgList,
-                resultField: 'data',
-            }
-        },
+      field: 'applyDate',
+      label: '申请日期',
+      component: 'DatePicker',
+      colProps: { span: 4 },
+      defaultValue: dayjs().format('YYYY-MM-DD'),
+      //   componentProps: {
+      //     valueFormat: 'YYYY-MM-DD',
+      //     format: 'YYYY-MM-DD',
+      //   },
     },
     {
-        label: '代开客户',
-        field: 'autualCustomerName',
-        component: 'ApiSelect',
-        dynamicDisabled: false,
-        colProps: { span: 4 },
-        componentProps: () => {
-            return {
-                api: () => {
-                    return new Promise((resolve) => {
-                        GetControllerClientList().then((res) => {
-                            resolve(res)
-                        })
-                    })
+      label: '客户名称',
+      field: 'customerName',
+      required: true,
+      component: 'ApiSelect',
+      colProps: { span: 4 },
+      componentProps: ({ formModel }) => {
+        return {
+          api: GetClientListByCode,
+          params: { code: 'controller' },
+          labelField: 'pinYinCode',
+          valueField: 'shortName',
+          showName: 'shortName',
+          resultField: 'data',
+          immediate: false,
+          onChange: (e, obj) => {
+            if (obj) {
+              const queryStr = [
+                {
+                  FieldName: 'ClientId',
+                  FieldValue: obj.id,
+                  ConditionalType: '0',
                 },
-                immediate: false,
-                labelField: 'shortName',
-                valueField: 'shortName',
-                resultField: 'data',
-                filterOption: (input: string, option: any) => {
-                    return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+              ]
+              const data = {
+                pageCondition: {
+                  pageIndex: 1,
+                  pageSize: 20,
+                  sortConditions: [],
                 },
+                queryCondition: JSON.stringify(queryStr),
+              }
+              GetClientBankList(data).then((res) => {
+                res.data.forEach((item) => {
+                  item.name = item.bankName + '  ' + item.bankAgentName
+                })
+                bankList.value = res.data
+              })
+              formModel.customerId = obj.id
+              customerList.value.forEach((item) => {
+                if (item.id == e) {
+                  formModel.customer = item
+                }
+              })
+              feeTableRef.value.changeCust(obj.id)
+            }
+            if (!obj && !e) {
+              bankList.value = []
+              formModel.customer = {}
+              formModel.customerId = ''
             }
-        },
+          },
+        }
+      },
     },
-]
-const bottomFormEdit = [
     {
-        field: 'customer',
-        label: '',
-        component: 'DEdit',
-        show: false,
-        colProps: { span: 12 },
+      field: 'saleDeptId',
+      label: '所属分部',
+      component: 'ApiSelect',
+      colProps: { span: 4 },
+      componentProps: () => {
+        return {
+          api: GetOrgList,
+          resultField: 'data',
+        }
+      },
     },
     {
-        field: 'customerId',
-        label: '',
-        component: 'DEdit',
-        show: false,
-        colProps: { span: 12 },
+      label: '代开客户',
+      field: 'autualCustomerName',
+      component: 'ApiSelect',
+      dynamicDisabled: false,
+      colProps: { span: 4 },
+      componentProps: () => {
+        return {
+          api: () => {
+            return new Promise((resolve) => {
+              GetControllerClientList().then((res) => {
+                resolve(res)
+              })
+            })
+          },
+          immediate: false,
+          labelField: 'shortName',
+          valueField: 'shortName',
+          resultField: 'data',
+          filterOption: (input: string, option: any) => {
+            return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+          },
+        }
+      },
     },
+  ]
+  const bottomFormEdit = [
     {
-        field: 'createByName',
-        label: '申请人',
-        slot: 'createByNameSlot',
-        component: 'DEdit',
-        colProps: { span: 4 },
+      field: 'customer',
+      label: '',
+      component: 'DEdit',
+      show: false,
+      colProps: { span: 12 },
     },
-    // {
-    //     field: 'applyDate',
-    //     label: '申请日期',
-    //     component: 'DEdit',
-    //     colProps: { span: 4 },
-    //     defaultValue: '',
-    //     componentProps: (e) => {
-    //         return {
-    //             valueFormat: 'YYYY-MM-DD',
-    //             format: 'YYYY-MM-DD',
-    //             onEdit: () => {
-    //                 const { formActionType } = e
-    //                 formActionType ? formActionType.linkageForm(e) : null
-    //             },
-    //         }
-    //     },
-    // },
     {
-        label: '客户名称',
-        field: 'customerName',
-        required: true,
-        component: 'DEdit',
-        colProps: { span: 4 },
-        componentProps: (e) => {
-            const { formModel } = e
-            return {
-                api: GetClientListByCode,
-                params: { code: 'controller' },
-                labelField: 'pinYinCode',
-                valueField: 'shortName',
-                showName: 'shortName',
-                resultField: 'data',
-                immediate: false,
-                onEdit: () => {
-                    const { formActionType } = e
-                    formActionType ? formActionType.linkageForm(e) : null
-                },
-                onChange: (e, obj) => {
-                    if (obj) {
-                        const queryStr = [{
-                            FieldName: 'ClientId',
-                            FieldValue: obj.id,
-                            ConditionalType: '0'
-                        }]
-                        const data = {
-                            pageCondition: {
-                                "pageIndex": 1,
-                                "pageSize": 20,
-                                "sortConditions": []
-                            },
-                            queryCondition: JSON.stringify(queryStr)
-                        }
-                        GetClientBankList(data).then(res => {
-                            res.data.forEach(item => {
-                                item.name = item.bankName + '  ' + item.bankAgentName
-                            })
-                            bankList.value = res.data
-                        })
-                        formModel.customerId = obj.id
-                        customerList.value.forEach(item => {
-                            if (item.id == e) {
-                                formModel.customer = item
-                            }
-                        })
-                        feeTableRef.value.changeCust(obj.id)
-                    }
-                    if (!obj && !e) {
-                        bankList.value = []
-                        formModel.customer = {}
-                        formModel.customerId = ''
-                    }
-                },
-            }
-        },
+      field: 'customerId',
+      label: '',
+      component: 'DEdit',
+      show: false,
+      colProps: { span: 12 },
     },
     {
-        field: 'saleDeptId',
-        label: '所属分部',
-        component: 'DEdit',
-        colProps: { span: 4 },
-        componentProps: (e) => {
-            return {
-                api: GetOrgList,
-                resultField: 'data',
-                onEdit: () => {
-                    const { formActionType } = e
-                    formActionType ? formActionType.linkageForm(e) : null
-                },
-            }
-        },
+      field: 'createByName',
+      label: '申请人',
+      slot: 'createByNameSlot',
+      component: 'DEdit',
+      colProps: { span: 4 },
     },
     {
-        label: '代开客户',
-        field: 'autualCustomerName',
-        component: 'DEdit',
-        dynamicDisabled: false,
-        colProps: { span: 4 },
-        componentProps: (e) => {
-            return {
-                api: () => {
-                    return new Promise((resolve) => {
-                        GetControllerClientList().then((res) => {
-                            resolve(res)
-                        })
-                    })
-                },
-                immediate: false,
-                labelField: 'shortName',
-                valueField: 'shortName',
-                resultField: 'data',
-                filterOption: (input: string, option: any) => {
-                    return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      field: 'applyDate',
+      label: '申请日期',
+      component: 'DEdit',
+      colProps: { span: 4 },
+      defaultValue: '',
+      componentProps: (e) => {
+        return {
+          valueFormat: 'YYYY-MM-DD',
+          format: 'YYYY-MM-DD',
+          onEdit: () => {
+            const { formActionType } = e
+            formActionType ? formActionType.linkageForm(e) : null
+          },
+        }
+      },
+    },
+    {
+      label: '客户名称',
+      field: 'customerName',
+      required: true,
+      component: 'DEdit',
+      colProps: { span: 4 },
+      componentProps: (e) => {
+        const { formModel } = e
+        return {
+          api: GetClientListByCode,
+          params: { code: 'controller' },
+          labelField: 'pinYinCode',
+          valueField: 'shortName',
+          showName: 'shortName',
+          resultField: 'data',
+          immediate: false,
+          onEdit: () => {
+            const { formActionType } = e
+            formActionType ? formActionType.linkageForm(e) : null
+          },
+          onChange: (e, obj) => {
+            if (obj) {
+              const queryStr = [
+                {
+                  FieldName: 'ClientId',
+                  FieldValue: obj.id,
+                  ConditionalType: '0',
                 },
-                onEdit: () => {
-                    const { formActionType } = e
-                    formActionType ? formActionType.linkageForm(e) : null
+              ]
+              const data = {
+                pageCondition: {
+                  pageIndex: 1,
+                  pageSize: 20,
+                  sortConditions: [],
                 },
+                queryCondition: JSON.stringify(queryStr),
+              }
+              GetClientBankList(data).then((res) => {
+                res.data.forEach((item) => {
+                  item.name = item.bankName + '  ' + item.bankAgentName
+                })
+                bankList.value = res.data
+              })
+              formModel.customerId = obj.id
+              customerList.value.forEach((item) => {
+                if (item.id == e) {
+                  formModel.customer = item
+                }
+              })
+              feeTableRef.value.changeCust(obj.id)
+            }
+            if (!obj && !e) {
+              bankList.value = []
+              formModel.customer = {}
+              formModel.customerId = ''
             }
-        },
+          },
+        }
+      },
+    },
+    {
+      field: 'saleDeptId',
+      label: '所属分部',
+      component: 'DEdit',
+      colProps: { span: 4 },
+      componentProps: (e) => {
+        return {
+          api: GetOrgList,
+          resultField: 'data',
+          onEdit: () => {
+            const { formActionType } = e
+            formActionType ? formActionType.linkageForm(e) : null
+          },
+        }
+      },
+    },
+    {
+      label: '代开客户',
+      field: 'autualCustomerName',
+      component: 'DEdit',
+      dynamicDisabled: false,
+      colProps: { span: 4 },
+      componentProps: (e) => {
+        return {
+          api: () => {
+            return new Promise((resolve) => {
+              GetControllerClientList().then((res) => {
+                resolve(res)
+              })
+            })
+          },
+          immediate: false,
+          labelField: 'shortName',
+          valueField: 'shortName',
+          resultField: 'data',
+          filterOption: (input: string, option: any) => {
+            return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+          },
+          onEdit: () => {
+            const { formActionType } = e
+            formActionType ? formActionType.linkageForm(e) : null
+          },
+        }
+      },
     },
-]
+  ]
 
-const route = useRoute()
-const { createMessage } = useMessage()
-const id = ref(route.query.id)
-const [registerForm, { resetFields, setFieldsValue, validate, updateSchema }] = useForm({
+  const route = useRoute()
+  const { createMessage } = useMessage()
+  const id = ref(route.query.id)
+  const [registerForm, { resetFields, setFieldsValue, validate, updateSchema }] = useForm({
     labelWidth: 100,
     schemas: bankForm,
     showActionButtonGroup: false,
-})
-const [markForm, { resetFields: markresetFields, setFieldsValue: marksetFieldsValue }] = useForm({
+  })
+  const [markForm, { resetFields: markresetFields, setFieldsValue: marksetFieldsValue }] = useForm({
     labelWidth: 100,
     schemas: markFormS,
     showActionButtonGroup: false,
-})
-const [registerBottomForm, { resetFields: bottomResetFields, setFieldsValue: bottomRsetFieldsValue, updateSchema: updateSchemaBottom }] = useForm({
+  })
+  const [
+    registerBottomForm,
+    {
+      resetFields: bottomResetFields,
+      setFieldsValue: bottomRsetFieldsValue,
+      updateSchema: updateSchemaBottom,
+    },
+  ] = useForm({
     labelWidth: 100,
     schemas: bottomForm,
     showActionButtonGroup: false,
-})
-const linkageForm = (e) => {
+  })
+  const linkageForm = (e) => {
     bankForm.forEach((item) => {
-        if (item.field == e.schema.field) {
-            updateSchema(item)
-        }
+      if (item.field == e.schema.field) {
+        updateSchema(item)
+      }
     })
-}
-const linkageFormBottom = (e) => {
+  }
+  const linkageFormBottom = (e) => {
     bottomForm.forEach((item) => {
-        if (item.field == e.schema.field) {
-            updateSchemaBottom(item)
-        }
+      if (item.field == e.schema.field) {
+        updateSchemaBottom(item)
+      }
     })
-}
-const feeTableRef = ref(null) as any
-const open = ref(false)
-const nameFlag = ref(false)
-async function handleSave() {
+  }
+  const feeTableRef = ref(null) as any
+  const open = ref(false)
+  const nameFlag = ref(false)
+  async function handleSave() {
     const values = await validate()
     const data = {
-        ...values,
-        invoiceDetails: feeTableRef.value.list
+      ...values,
+      invoiceDetails: feeTableRef.value.list,
     }
     loading.value = true
-    InvoiceApplicationSave(data).then(res => {
+    InvoiceApplicationSave(data)
+      .then((res) => {
         if (res.succeeded) {
-            createMessage.success('保存成功')
-            go(`/invoiceapplyDetail?id=${res.data.id}`)
+          createMessage.success('保存成功')
+          go(`/invoiceapplyDetail?id=${res.data.id}`)
         } else {
-            createMessage.error(res.message)
+          createMessage.error(res.message)
         }
         loading.value = false
-    }).catch(err => {
+      })
+      .catch((err) => {
         loading.value = false
-    })
-}
-const loading = ref(false)
-function updateAmount(val) {
+      })
+  }
+  const loading = ref(false)
+  function updateAmount(val) {
     setFieldsValue({
-        invoiceAmount: val
+      invoiceAmount: val,
     })
-}
-const tempContent = ref('')
-function handleSaveTemp() {
+  }
+  const tempContent = ref('')
+  function handleSaveTemp() {
     const data = {
-        name: tempName.value,
-        content: tempContent.value,
-        id: ''
+      name: tempName.value,
+      content: tempContent.value,
+      id: '',
     }
     if (tempId.value) {
-        data.id = tempId.value
+      data.id = tempId.value
     }
-    SaveTemplate([data]).then(res => {
-        if (res.succeeded) {
-            createMessage.success('保存成功')
-            GetTemplateList().then(res => {
-                tempList.value = res.data
-                tempList.value.forEach(item => {
-                    item.value = item.name
-                })
-            })
-        } else {
-            createMessage.error(res.message)
-        }
+    SaveTemplate([data]).then((res) => {
+      if (res.succeeded) {
+        createMessage.success('保存成功')
+        GetTemplateList().then((res) => {
+          tempList.value = res.data
+          tempList.value.forEach((item) => {
+            item.value = item.name
+          })
+        })
+      } else {
+        createMessage.error(res.message)
+      }
     })
-}
-onMounted(() => {
+  }
+  onMounted(() => {
     init()
-})
-const labelList = ref([]) as any
-const tempList = ref([]) as any
-function openTemp() {
+  })
+  const labelList = ref([]) as any
+  const tempList = ref([]) as any
+  function openTemp() {
     open.value = true
-    GetTemplateFields().then(res => {
-        labelList.value = res.data
+    GetTemplateFields().then((res) => {
+      labelList.value = res.data
     })
-    GetTemplateList().then(res => {
-        tempList.value = res.data
-        tempList.value.forEach(item => {
-            item.value = item.name
-        })
+    GetTemplateList().then((res) => {
+      tempList.value = res.data
+      tempList.value.forEach((item) => {
+        item.value = item.name
+      })
     })
-}
-function handleChangeApply(e) {
+  }
+  function handleChangeApply(e) {
     form.value.isRMB = !e.target.checked
-}
-function handleChangeApply1(e) {
+  }
+  function handleChangeApply1(e) {
     form.value.isYB = !e.target.checked
-}
-function init() {
+  }
+  function init() {
     if (id.value) {
-        getDetail()
+      getDetail()
     } else {
-        setFieldsValue({
-            statusText: '未提交'
-        })
+      setFieldsValue({
+        statusText: '未提交',
+      })
     }
     bankForm.forEach((item) => {
-        if (item.show !== false && item.component !== 'Divider') {
-            EditBankForm.forEach((item2) => {
-                if (item.field == item2.field) {
-                    updateSchema(item2)
-                }
-            })
-        }
+      if (item.show !== false && item.component !== 'Divider') {
+        EditBankForm.forEach((item2) => {
+          if (item.field == item2.field) {
+            updateSchema(item2)
+          }
+        })
+      }
     })
     bottomForm.forEach((item) => {
-        if (item.show !== false && item.component !== 'Divider') {
-            bottomFormEdit.forEach((item2) => {
-                if (item.field == item2.field) {
-                    updateSchemaBottom(item2)
-                }
-            })
-        }
+      if (item.show !== false && item.component !== 'Divider') {
+        bottomFormEdit.forEach((item2) => {
+          if (item.field == item2.field) {
+            updateSchemaBottom(item2)
+          }
+        })
+      }
     })
-}
-function handleAddLabel(val) {
+  }
+  function handleAddLabel(val) {
     tempContent.value += '[' + val.displayName + ']'
-}
-function getDetail() {
-    InvoiceApplicationGet({ id: id.value }).then(res => {
-        if (res.succeeded) {
-            setFieldsValue(res.data)
-            getBankInfo(res.data.customerId)
-            feeTableRef.value.init(res.data)
-        }
+  }
+  function getDetail() {
+    InvoiceApplicationGet({ id: id.value }).then((res) => {
+      if (res.succeeded) {
+        setFieldsValue(res.data)
+        getBankInfo(res.data.customerId)
+        feeTableRef.value.init(res.data)
+      }
     })
-
-}
-function openTempName() {
+  }
+  function openTempName() {
     nameFlag.value = true
-    GetTemplateList().then(res => {
-        tempList.value = res.data
-        tempList.value.forEach(item => {
-            item.value = item.name
-        })
+    GetTemplateList().then((res) => {
+      tempList.value = res.data
+      tempList.value.forEach((item) => {
+        item.value = item.name
+      })
     })
-}
-function getBankInfo(customerId) {
-    const queryStr = [{
+  }
+  function getBankInfo(customerId) {
+    const queryStr = [
+      {
         FieldName: 'ClientId',
         FieldValue: customerId,
-        ConditionalType: '0'
-    }]
+        ConditionalType: '0',
+      },
+    ]
     const data = {
-        pageCondition: {
-            "pageIndex": 1,
-            "pageSize": 20,
-            "sortConditions": []
-        },
-        queryCondition: JSON.stringify(queryStr)
+      pageCondition: {
+        pageIndex: 1,
+        pageSize: 20,
+        sortConditions: [],
+      },
+      queryCondition: JSON.stringify(queryStr),
     }
-    GetClientBankList(data).then(res => {
-        res.data.forEach(item => {
-            item.name = item.bankName + '  ' + item.bankAgentName
-        })
-        bankList.value = res.data
+    GetClientBankList(data).then((res) => {
+      res.data.forEach((item) => {
+        item.name = item.bankName + '  ' + item.bankAgentName
+      })
+      bankList.value = res.data
     })
-}
+  }
 
-function handleSuccess() {
+  function handleSuccess() {
     getDetail()
-}
-async function updateListSave(arr) {
+  }
+  async function updateListSave(arr) {
     const values = await validate()
     const data = {
-        ...values,
-        details: arr
+      ...values,
+      details: arr,
     }
     loading.value = true
-    InvoiceApplicationSave(data).then(res => {
+    InvoiceApplicationSave(data)
+      .then((res) => {
         if (res.succeeded) {
-            createMessage.success('保存成功')
-            go(`/invoiceapplyDetail?id=${res.data.id}`)
+          createMessage.success('保存成功')
+          go(`/invoiceapplyDetail?id=${res.data.id}`)
         } else {
-            createMessage.error(res.message)
+          createMessage.error(res.message)
         }
         loading.value = false
-    }).catch(err => {
+      })
+      .catch((err) => {
         loading.value = false
-    })
-}
-const tempNameId = ref('')
-function handleRender() {
+      })
+  }
+  const tempNameId = ref('')
+  function handleRender() {
     let temp = ''
-    tempList.value.forEach(item => {
-        if (item.id == tempNameId.value) {
-            temp = item.content
-        }
+    tempList.value.forEach((item) => {
+      if (item.id == tempNameId.value) {
+        temp = item.content
+      }
     })
     const data = {
-        id: id.value,
-        template: temp
+      id: id.value,
+      template: temp,
     }
-    RenderTemplate(data).then(res => {
-
-    })
-
-}
-const tempName = ref('')
-const tempId = ref('')
-const querySearch = (queryString: string, cb: any) => {
+    RenderTemplate(data).then((res) => {})
+  }
+  const tempName = ref('')
+  const tempId = ref('')
+  const querySearch = (queryString: string, cb: any) => {
     cb(tempList.value)
-}
-function handleSelect(value) {
+  }
+  function handleSelect(value) {
     tempId.value = value.id
     tempContent.value = value.content
-}
+  }
 </script>
 <style lang="less" scoped>
-.main {
+  .main {
     // padding: 20px;
     padding-top: 5px;
-}
+  }
 
-/deep/ .ant-btn-link {
+  /deep/ .ant-btn-link {
     padding: 0px !important;
-}
+  }
 
-.label-list {
+  .label-list {
     max-height: 400px;
     width: 20%;
     overflow-y: scroll;
 
     .label-item {
-        margin-bottom: 5px;
-        cursor: pointer;
+      margin-bottom: 5px;
+      cursor: pointer;
     }
-}
+  }
 
-.infoclientBox {
+  .infoclientBox {
     display: flex;
     background: rgba(245, 249, 252, 1);
     padding: 10px 20px;
@@ -1194,73 +1250,73 @@ function handleSelect(value) {
     margin-bottom: 10px;
 
     .ds-action-svg-btn {
-        margin-right: 20px;
+      margin-right: 20px;
 
-        .SvgImg {
-            width: 16px;
-            cursor: pointer;
+      .SvgImg {
+        width: 16px;
+        cursor: pointer;
 
-            &.rotate {
-                transform: rotate(180deg);
-            }
+        &.rotate {
+          transform: rotate(180deg);
         }
+      }
     }
-}
+  }
 
-.ant-dropdown-link {
+  .ant-dropdown-link {
     font-size: 12px;
     margin-left: 30px;
     padding-right: 15px;
     border-right: 1px solid #ccc;
-}
+  }
 
-.status {
+  .status {
     color: #1ca8a5;
     font-size: 12px;
     padding-right: 15px;
     border-right: 1px solid #ccc;
     margin-left: 15px;
-}
+  }
 
-.invoiceNo {
+  .invoiceNo {
     color: #297cfa;
     margin-left: 15px;
     font-size: 12px;
     display: flex;
     align-items: center;
-}
+  }
 
-.box {
+  .box {
     padding: 0px 10px;
 
     .title {
-        font-size: 12px;
-        font-weight: bold;
-        color: black;
-        margin-bottom: 10px;
+      font-size: 12px;
+      font-weight: bold;
+      color: black;
+      margin-bottom: 10px;
     }
 
     .top {
-        display: flex;
-        align-items: flex-start;
-        padding-bottom: 10px;
-        border-bottom: 1px solid #e8e8e8;
+      display: flex;
+      align-items: flex-start;
+      padding-bottom: 10px;
+      border-bottom: 1px solid #e8e8e8;
     }
-    .bottom{
-        padding: 5px 0px;
-        border-bottom: 1px solid #e8e8e8;
+    .bottom {
+      padding: 5px 0px;
+      border-bottom: 1px solid #e8e8e8;
     }
     .left {
-        width: 40%;
+      width: 40%;
     }
 
     .right {
-        width: 55%;
-        margin-left: 5%;
+      width: 55%;
+      margin-left: 5%;
     }
-}
+  }
 
-.apply {
+  .apply {
     background-color: #f5f9fc;
     cursor: pointer;
     padding: 4px 10px;
@@ -1268,27 +1324,27 @@ function handleSelect(value) {
     border: 1px solid white;
 
     /deep/ .ant-checkbox-wrapper {
-        font-size: 12px !important;
+      font-size: 12px !important;
     }
 
     &.active {
-        border: 1px solid #5396fa;
+      border: 1px solid #5396fa;
     }
-}
+  }
 
-.rmb {
+  .rmb {
     color: #ba3849;
     font-weight: bold;
     margin: 0 10px;
-}
+  }
 
-.yb {
+  .yb {
     color: #17a6a3;
     font-weight: bold;
     margin: 0 10px;
-}
+  }
 
-.box {
+  .box {
     padding: 0 20px;
-}
-</style>
\ No newline at end of file
+  }
+</style>

From c6fb743a27a10f88693cfdb9654da49990c3f101 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 13:47:31 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=BE=80=E6=9D=A5=E5=8D=95=E4=BD=8D=20?=
 =?UTF-8?q?=E7=AE=B1=E7=AE=A1=20=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BuyCtn/TenantAuditStepModal.vue           |  95 ++++-----
 .../ContainerManagement/BuyCtn/index.vue      |   2 +
 .../CtnScrap/TenantAuditStepModal.vue         |  95 ++++-----
 .../ContainerManagement/CtnScrap/index.vue    |   2 +
 .../RentIn/TenantAuditStepModal.vue           |  95 ++++-----
 .../ContainerManagement/RentIn/index.vue      |   2 +
 .../RentOneWay/TenantAuditStepModal.vue       |  82 ++++----
 .../ContainerManagement/RentOneWay/index.vue  |   2 +
 .../RentOut/TenantAuditStepModal.vue          |  95 ++++-----
 .../ContainerManagement/RentOut/index.vue     |   2 +
 .../SellCtn/TenantAuditStepModal.vue          |  95 ++++-----
 .../ContainerManagement/SellCtn/index.vue     |   2 +
 src/views/baseinfo/infoclient/EditColumns.tsx | 188 +++++++++---------
 .../infoclient/TenantAuditStepModal.vue       |   4 +-
 src/views/baseinfo/infoclient/columns.tsx     | 167 +++++++---------
 .../baseinfo/infoclient/tabs3/columns.tsx     | 140 ++++++-------
 16 files changed, 508 insertions(+), 560 deletions(-)

diff --git a/src/views/ContainerManagement/BuyCtn/TenantAuditStepModal.vue b/src/views/ContainerManagement/BuyCtn/TenantAuditStepModal.vue
index c1f9bcd5..f642e619 100644
--- a/src/views/ContainerManagement/BuyCtn/TenantAuditStepModal.vue
+++ b/src/views/ContainerManagement/BuyCtn/TenantAuditStepModal.vue
@@ -279,69 +279,60 @@
     })
   }
   async function MakeFee() {
-    if (rowId.value) {
-      ApiMakeFee({ id: rowId.value }).then((res) => {
-        notification.success({ message: res.message, duration: 3 })
-      })
-    } else {
-      await handleSave(false)
-      MakeFee()
-    }
+    await handleSave(false)
+    ApiMakeFee({ id: rowId.value }).then((res) => {
+      notification.success({ message: res.message, duration: 3 })
+      emit('success')
+    })
   }
   async function Confirm() {
-    if (rowId.value) {
-      let type: boolean = true
-      let ApiData: any = {
-        id: rowId.value,
-        ids: [],
-      }
-      list.value.forEach((e: any, i) => {
-        if (e.selected) {
-          if (e.id) {
-            ApiData.ids.push(e.id)
-          } else {
-            type = false
-          }
+    await handleSave(false)
+    let type: boolean = true
+    let ApiData: any = {
+      id: rowId.value,
+      ids: [],
+    }
+    list.value.forEach((e: any, i) => {
+      if (e.selected) {
+        if (e.id) {
+          ApiData.ids.push(e.id)
+        } else {
+          type = false
         }
-      })
-      if (type) {
-        ApiConfirm(ApiData).then((res) => {
-          notification.success({ message: res.message, duration: 3 })
-        })
-      } else {
-        notification.success({ message: '请先保存明细表', duration: 3 })
       }
+    })
+    if (type) {
+      ApiConfirm(ApiData).then((res) => {
+        notification.success({ message: res.message, duration: 3 })
+        emit('success')
+      })
     } else {
-      await handleSave(false)
-      Confirm()
+      notification.success({ message: '请先保存明细表', duration: 3 })
     }
   }
   async function Cancel() {
-    if (rowId.value) {
-      let type: boolean = true
-      let ApiData: any = {
-        id: rowId.value,
-        ids: [],
-      }
-      list.value.forEach((e: any, i) => {
-        if (e.selected) {
-          if (e.id) {
-            ApiData.ids.push(e.id)
-          } else {
-            type = false
-          }
+    await handleSave(false)
+    let type: boolean = true
+    let ApiData: any = {
+      id: rowId.value,
+      ids: [],
+    }
+    list.value.forEach((e: any, i) => {
+      if (e.selected) {
+        if (e.id) {
+          ApiData.ids.push(e.id)
+        } else {
+          type = false
         }
-      })
-      if (type) {
-        ApiCancel(ApiData).then((res) => {
-          notification.success({ message: res.message, duration: 3 })
-        })
-      } else {
-        notification.success({ message: '请先保存明细表', duration: 3 })
       }
+    })
+    if (type) {
+      ApiCancel(ApiData).then((res) => {
+        notification.success({ message: res.message, duration: 3 })
+        emit('success')
+      })
     } else {
-      await handleSave(false)
-      Cancel()
+      notification.success({ message: '请先保存明细表', duration: 3 })
     }
   }
   async function handleSave(exit) {
diff --git a/src/views/ContainerManagement/BuyCtn/index.vue b/src/views/ContainerManagement/BuyCtn/index.vue
index dbfbb59d..2f334873 100644
--- a/src/views/ContainerManagement/BuyCtn/index.vue
+++ b/src/views/ContainerManagement/BuyCtn/index.vue
@@ -113,6 +113,7 @@
       })
     }
     ApiConfirm(ApiData).then((res) => {
+      reload()
       notification.success({ message: res.message, duration: 3 })
     })
   }
@@ -131,6 +132,7 @@
       })
     }
     ApiCancel(ApiData).then((res) => {
+      reload()
       notification.success({ message: res.message, duration: 3 })
     })
   }
diff --git a/src/views/ContainerManagement/CtnScrap/TenantAuditStepModal.vue b/src/views/ContainerManagement/CtnScrap/TenantAuditStepModal.vue
index 62798693..674c7748 100644
--- a/src/views/ContainerManagement/CtnScrap/TenantAuditStepModal.vue
+++ b/src/views/ContainerManagement/CtnScrap/TenantAuditStepModal.vue
@@ -290,69 +290,60 @@
     })
   }
   async function MakeFee() {
-    if (rowId.value) {
-      ApiMakeFee({ id: rowId.value }).then((res) => {
-        notification.success({ message: res.message, duration: 3 })
-      })
-    } else {
-      await handleSave(false)
-      MakeFee()
-    }
+    await handleSave(false)
+    ApiMakeFee({ id: rowId.value }).then((res) => {
+      emit('success')
+      notification.success({ message: res.message, duration: 3 })
+    })
   }
   async function Confirm() {
-    if (rowId.value) {
-      let type: boolean = true
-      let ApiData: any = {
-        id: rowId.value,
-        ids: [],
-      }
-      list.value.forEach((e: any, i) => {
-        if (e.selected) {
-          if (e.id) {
-            ApiData.ids.push(e.id)
-          } else {
-            type = false
-          }
+    await handleSave(false)
+    let type: boolean = true
+    let ApiData: any = {
+      id: rowId.value,
+      ids: [],
+    }
+    list.value.forEach((e: any, i) => {
+      if (e.selected) {
+        if (e.id) {
+          ApiData.ids.push(e.id)
+        } else {
+          type = false
         }
-      })
-      if (type) {
-        ApiConfirm(ApiData).then((res) => {
-          notification.success({ message: res.message, duration: 3 })
-        })
-      } else {
-        notification.success({ message: '请先保存明细表', duration: 3 })
       }
+    })
+    if (type) {
+      ApiConfirm(ApiData).then((res) => {
+        notification.success({ message: res.message, duration: 3 })
+        emit('success')
+      })
     } else {
-      await handleSave(false)
-      Confirm()
+      notification.success({ message: '请先保存明细表', duration: 3 })
     }
   }
   async function Cancel() {
-    if (rowId.value) {
-      let type: boolean = true
-      let ApiData: any = {
-        id: rowId.value,
-        ids: [],
-      }
-      list.value.forEach((e: any, i) => {
-        if (e.selected) {
-          if (e.id) {
-            ApiData.ids.push(e.id)
-          } else {
-            type = false
-          }
+    await handleSave(false)
+    let type: boolean = true
+    let ApiData: any = {
+      id: rowId.value,
+      ids: [],
+    }
+    list.value.forEach((e: any, i) => {
+      if (e.selected) {
+        if (e.id) {
+          ApiData.ids.push(e.id)
+        } else {
+          type = false
         }
-      })
-      if (type) {
-        ApiCancel(ApiData).then((res) => {
-          notification.success({ message: res.message, duration: 3 })
-        })
-      } else {
-        notification.success({ message: '请先保存明细表', duration: 3 })
       }
+    })
+    if (type) {
+      ApiCancel(ApiData).then((res) => {
+        notification.success({ message: res.message, duration: 3 })
+        emit('success')
+      })
     } else {
-      await handleSave(false)
-      Cancel()
+      notification.success({ message: '请先保存明细表', duration: 3 })
     }
   }
   async function handleSave(exit) {
diff --git a/src/views/ContainerManagement/CtnScrap/index.vue b/src/views/ContainerManagement/CtnScrap/index.vue
index fbad336e..0953057f 100644
--- a/src/views/ContainerManagement/CtnScrap/index.vue
+++ b/src/views/ContainerManagement/CtnScrap/index.vue
@@ -113,6 +113,7 @@
       })
     }
     ApiConfirm(ApiData).then((res) => {
+      reload()
       notification.success({ message: res.message, duration: 3 })
     })
   }
@@ -131,6 +132,7 @@
       })
     }
     ApiCancel(ApiData).then((res) => {
+      reload()
       notification.success({ message: res.message, duration: 3 })
     })
   }
diff --git a/src/views/ContainerManagement/RentIn/TenantAuditStepModal.vue b/src/views/ContainerManagement/RentIn/TenantAuditStepModal.vue
index a2e085eb..29687fb3 100644
--- a/src/views/ContainerManagement/RentIn/TenantAuditStepModal.vue
+++ b/src/views/ContainerManagement/RentIn/TenantAuditStepModal.vue
@@ -292,69 +292,60 @@
     })
   }
   async function MakeFee() {
-    if (rowId.value) {
-      ApiMakeFee({ id: rowId.value }).then((res) => {
-        notification.success({ message: res.message, duration: 3 })
-      })
-    } else {
-      await handleSave(false)
-      MakeFee()
-    }
+    await handleSave(false)
+    ApiMakeFee({ id: rowId.value }).then((res) => {
+      emit('success')
+      notification.success({ message: res.message, duration: 3 })
+    })
   }
   async function Confirm() {
-    if (rowId.value) {
-      let type: boolean = true
-      let ApiData: any = {
-        id: rowId.value,
-        ids: [],
-      }
-      list.value.forEach((e: any, i) => {
-        if (e.selected) {
-          if (e.id) {
-            ApiData.ids.push(e.id)
-          } else {
-            type = false
-          }
+    await handleSave(false)
+    let type: boolean = true
+    let ApiData: any = {
+      id: rowId.value,
+      ids: [],
+    }
+    list.value.forEach((e: any, i) => {
+      if (e.selected) {
+        if (e.id) {
+          ApiData.ids.push(e.id)
+        } else {
+          type = false
         }
-      })
-      if (type) {
-        ApiConfirm(ApiData).then((res) => {
-          notification.success({ message: res.message, duration: 3 })
-        })
-      } else {
-        notification.success({ message: '请先保存明细表', duration: 3 })
       }
+    })
+    if (type) {
+      ApiConfirm(ApiData).then((res) => {
+        notification.success({ message: res.message, duration: 3 })
+        emit('success')
+      })
     } else {
-      await handleSave(false)
-      Confirm()
+      notification.success({ message: '请先保存明细表', duration: 3 })
     }
   }
   async function Cancel() {
-    if (rowId.value) {
-      let type: boolean = true
-      let ApiData: any = {
-        id: rowId.value,
-        ids: [],
-      }
-      list.value.forEach((e: any, i) => {
-        if (e.selected) {
-          if (e.id) {
-            ApiData.ids.push(e.id)
-          } else {
-            type = false
-          }
+    await handleSave(false)
+    let type: boolean = true
+    let ApiData: any = {
+      id: rowId.value,
+      ids: [],
+    }
+    list.value.forEach((e: any, i) => {
+      if (e.selected) {
+        if (e.id) {
+          ApiData.ids.push(e.id)
+        } else {
+          type = false
         }
-      })
-      if (type) {
-        ApiCancel(ApiData).then((res) => {
-          notification.success({ message: res.message, duration: 3 })
-        })
-      } else {
-        notification.success({ message: '请先保存明细表', duration: 3 })
       }
+    })
+    if (type) {
+      ApiCancel(ApiData).then((res) => {
+        notification.success({ message: res.message, duration: 3 })
+        emit('success')
+      })
     } else {
-      await handleSave(false)
-      Cancel()
+      notification.success({ message: '请先保存明细表', duration: 3 })
     }
   }
   async function handleSave(exit) {
diff --git a/src/views/ContainerManagement/RentIn/index.vue b/src/views/ContainerManagement/RentIn/index.vue
index 7e3fd1df..06ec202e 100644
--- a/src/views/ContainerManagement/RentIn/index.vue
+++ b/src/views/ContainerManagement/RentIn/index.vue
@@ -113,6 +113,7 @@
       })
     }
     ApiConfirm(ApiData).then((res) => {
+      reload()
       notification.success({ message: res.message, duration: 3 })
     })
   }
@@ -131,6 +132,7 @@
       })
     }
     ApiCancel(ApiData).then((res) => {
+      reload()
       notification.success({ message: res.message, duration: 3 })
     })
   }
diff --git a/src/views/ContainerManagement/RentOneWay/TenantAuditStepModal.vue b/src/views/ContainerManagement/RentOneWay/TenantAuditStepModal.vue
index 1471886c..82e98e44 100644
--- a/src/views/ContainerManagement/RentOneWay/TenantAuditStepModal.vue
+++ b/src/views/ContainerManagement/RentOneWay/TenantAuditStepModal.vue
@@ -286,59 +286,53 @@
   //   })
   // }
   async function Confirm() {
-    if (rowId.value) {
-      let type: boolean = true
-      let ApiData: any = {
-        id: rowId.value,
-        ids: [],
-      }
-      list.value.forEach((e: any, i) => {
-        if (e.selected) {
-          if (e.id) {
-            ApiData.ids.push(e.id)
-          } else {
-            type = false
-          }
+    await handleSave(false)
+    let type: boolean = true
+    let ApiData: any = {
+      id: rowId.value,
+      ids: [],
+    }
+    list.value.forEach((e: any, i) => {
+      if (e.selected) {
+        if (e.id) {
+          ApiData.ids.push(e.id)
+        } else {
+          type = false
         }
-      })
-      if (type) {
-        ApiConfirm(ApiData).then((res) => {
-          notification.success({ message: res.message, duration: 3 })
-        })
-      } else {
-        notification.success({ message: '请先保存明细表', duration: 3 })
       }
+    })
+    if (type) {
+      ApiConfirm(ApiData).then((res) => {
+        notification.success({ message: res.message, duration: 3 })
+        emit('success')
+      })
     } else {
-      await handleSave(false)
-      Confirm()
+      notification.success({ message: '请先保存明细表', duration: 3 })
     }
   }
   async function Cancel() {
-    if (rowId.value) {
-      let type: boolean = true
-      let ApiData: any = {
-        id: rowId.value,
-        ids: [],
-      }
-      list.value.forEach((e: any, i) => {
-        if (e.selected) {
-          if (e.id) {
-            ApiData.ids.push(e.id)
-          } else {
-            type = false
-          }
+    await handleSave(false)
+    let type: boolean = true
+    let ApiData: any = {
+      id: rowId.value,
+      ids: [],
+    }
+    list.value.forEach((e: any, i) => {
+      if (e.selected) {
+        if (e.id) {
+          ApiData.ids.push(e.id)
+        } else {
+          type = false
         }
-      })
-      if (type) {
-        ApiCancel(ApiData).then((res) => {
-          notification.success({ message: res.message, duration: 3 })
-        })
-      } else {
-        notification.success({ message: '请先保存明细表', duration: 3 })
       }
+    })
+    if (type) {
+      ApiCancel(ApiData).then((res) => {
+        notification.success({ message: res.message, duration: 3 })
+        emit('success')
+      })
     } else {
-      await handleSave(false)
-      Cancel()
+      notification.success({ message: '请先保存明细表', duration: 3 })
     }
   }
   async function handleSave(exit) {
diff --git a/src/views/ContainerManagement/RentOneWay/index.vue b/src/views/ContainerManagement/RentOneWay/index.vue
index 231aef66..2592f0ec 100644
--- a/src/views/ContainerManagement/RentOneWay/index.vue
+++ b/src/views/ContainerManagement/RentOneWay/index.vue
@@ -113,6 +113,7 @@
       })
     }
     ApiConfirm(ApiData).then((res) => {
+      reload()
       notification.success({ message: res.message, duration: 3 })
     })
   }
@@ -131,6 +132,7 @@
       })
     }
     ApiCancel(ApiData).then((res) => {
+      reload()
       notification.success({ message: res.message, duration: 3 })
     })
   }
diff --git a/src/views/ContainerManagement/RentOut/TenantAuditStepModal.vue b/src/views/ContainerManagement/RentOut/TenantAuditStepModal.vue
index d860e9bf..48b1a1c8 100644
--- a/src/views/ContainerManagement/RentOut/TenantAuditStepModal.vue
+++ b/src/views/ContainerManagement/RentOut/TenantAuditStepModal.vue
@@ -310,69 +310,60 @@
     })
   }
   async function MakeFee() {
-    if (rowId.value) {
-      ApiMakeFee({ id: rowId.value }).then((res) => {
-        notification.success({ message: res.message, duration: 3 })
-      })
-    } else {
-      await handleSave(false)
-      MakeFee()
-    }
+    await handleSave(false)
+    ApiMakeFee({ id: rowId.value }).then((res) => {
+      notification.success({ message: res.message, duration: 3 })
+      emit('success')
+    })
   }
   async function Confirm() {
-    if (rowId.value) {
-      let type: boolean = true
-      let ApiData: any = {
-        id: rowId.value,
-        ids: [],
-      }
-      list.value.forEach(async (e: any, i) => {
-        if (e.selected) {
-          if (e.id) {
-            ApiData.ids.push(e.id)
-          } else {
-            type = false
-          }
+    await handleSave(false)
+    let type: boolean = true
+    let ApiData: any = {
+      id: rowId.value,
+      ids: [],
+    }
+    list.value.forEach(async (e: any, i) => {
+      if (e.selected) {
+        if (e.id) {
+          ApiData.ids.push(e.id)
+        } else {
+          type = false
         }
-      })
-      if (type) {
-        ApiConfirm(ApiData).then((res) => {
-          notification.success({ message: res.message, duration: 3 })
-        })
-      } else {
-        notification.success({ message: '请先保存明细表', duration: 3 })
       }
+    })
+    if (type) {
+      ApiConfirm(ApiData).then((res) => {
+        notification.success({ message: res.message, duration: 3 })
+        emit('success')
+      })
     } else {
-      await handleSave(false)
-      Confirm()
+      notification.success({ message: '请先保存明细表', duration: 3 })
     }
   }
   async function Cancel() {
-    if (rowId.value) {
-      let type: boolean = true
-      let ApiData: any = {
-        id: rowId.value,
-        ids: [],
-      }
-      list.value.forEach((e: any, i) => {
-        if (e.selected) {
-          if (e.id) {
-            ApiData.ids.push(e.id)
-          } else {
-            type = false
-          }
+    await handleSave(false)
+    let type: boolean = true
+    let ApiData: any = {
+      id: rowId.value,
+      ids: [],
+    }
+    list.value.forEach((e: any, i) => {
+      if (e.selected) {
+        if (e.id) {
+          ApiData.ids.push(e.id)
+        } else {
+          type = false
         }
-      })
-      if (type) {
-        ApiCancel(ApiData).then((res) => {
-          notification.success({ message: res.message, duration: 3 })
-        })
-      } else {
-        notification.success({ message: '请先保存明细表', duration: 3 })
       }
+    })
+    if (type) {
+      ApiCancel(ApiData).then((res) => {
+        notification.success({ message: res.message, duration: 3 })
+        emit('success')
+      })
     } else {
-      await handleSave(false)
-      Cancel()
+      notification.success({ message: '请先保存明细表', duration: 3 })
     }
   }
   async function handleSave(exit) {
diff --git a/src/views/ContainerManagement/RentOut/index.vue b/src/views/ContainerManagement/RentOut/index.vue
index c89d9cd3..0776e5bc 100644
--- a/src/views/ContainerManagement/RentOut/index.vue
+++ b/src/views/ContainerManagement/RentOut/index.vue
@@ -113,6 +113,7 @@
       })
     }
     ApiConfirm(ApiData).then((res) => {
+      reload()
       notification.success({ message: res.message, duration: 3 })
     })
   }
@@ -131,6 +132,7 @@
       })
     }
     ApiCancel(ApiData).then((res) => {
+      reload()
       notification.success({ message: res.message, duration: 3 })
     })
   }
diff --git a/src/views/ContainerManagement/SellCtn/TenantAuditStepModal.vue b/src/views/ContainerManagement/SellCtn/TenantAuditStepModal.vue
index 4738ead3..9daa0e63 100644
--- a/src/views/ContainerManagement/SellCtn/TenantAuditStepModal.vue
+++ b/src/views/ContainerManagement/SellCtn/TenantAuditStepModal.vue
@@ -290,69 +290,60 @@
     })
   }
   async function MakeFee() {
-    if (rowId.value) {
-      ApiMakeFee({ id: rowId.value }).then((res) => {
-        notification.success({ message: res.message, duration: 3 })
-      })
-    } else {
-      await handleSave(false)
-      MakeFee()
-    }
+    await handleSave(false)
+    ApiMakeFee({ id: rowId.value }).then((res) => {
+      notification.success({ message: res.message, duration: 3 })
+      emit('success')
+    })
   }
   async function Confirm() {
-    if (rowId.value) {
-      let type: boolean = true
-      let ApiData: any = {
-        id: rowId.value,
-        ids: [],
-      }
-      list.value.forEach((e: any, i) => {
-        if (e.selected) {
-          if (e.id) {
-            ApiData.ids.push(e.id)
-          } else {
-            type = false
-          }
+    await handleSave(false)
+    let type: boolean = true
+    let ApiData: any = {
+      id: rowId.value,
+      ids: [],
+    }
+    list.value.forEach((e: any, i) => {
+      if (e.selected) {
+        if (e.id) {
+          ApiData.ids.push(e.id)
+        } else {
+          type = false
         }
-      })
-      if (type) {
-        ApiConfirm(ApiData).then((res) => {
-          notification.success({ message: res.message, duration: 3 })
-        })
-      } else {
-        notification.success({ message: '请先保存明细表', duration: 3 })
       }
+    })
+    if (type) {
+      ApiConfirm(ApiData).then((res) => {
+        notification.success({ message: res.message, duration: 3 })
+        emit('success')
+      })
     } else {
-      await handleSave(false)
-      Confirm()
+      notification.success({ message: '请先保存明细表', duration: 3 })
     }
   }
   async function Cancel() {
-    if (rowId.value) {
-      let type: boolean = true
-      let ApiData: any = {
-        id: rowId.value,
-        ids: [],
-      }
-      list.value.forEach((e: any, i) => {
-        if (e.selected) {
-          if (e.id) {
-            ApiData.ids.push(e.id)
-          } else {
-            type = false
-          }
+    await handleSave(false)
+    let type: boolean = true
+    let ApiData: any = {
+      id: rowId.value,
+      ids: [],
+    }
+    list.value.forEach((e: any, i) => {
+      if (e.selected) {
+        if (e.id) {
+          ApiData.ids.push(e.id)
+        } else {
+          type = false
         }
-      })
-      if (type) {
-        ApiCancel(ApiData).then((res) => {
-          notification.success({ message: res.message, duration: 3 })
-        })
-      } else {
-        notification.success({ message: '请先保存明细表', duration: 3 })
       }
+    })
+    if (type) {
+      ApiCancel(ApiData).then((res) => {
+        notification.success({ message: res.message, duration: 3 })
+        emit('success')
+      })
     } else {
-      await handleSave(false)
-      Cancel()
+      notification.success({ message: '请先保存明细表', duration: 3 })
     }
   }
   async function handleSave(exit) {
diff --git a/src/views/ContainerManagement/SellCtn/index.vue b/src/views/ContainerManagement/SellCtn/index.vue
index fbad336e..0953057f 100644
--- a/src/views/ContainerManagement/SellCtn/index.vue
+++ b/src/views/ContainerManagement/SellCtn/index.vue
@@ -113,6 +113,7 @@
       })
     }
     ApiConfirm(ApiData).then((res) => {
+      reload()
       notification.success({ message: res.message, duration: 3 })
     })
   }
@@ -131,6 +132,7 @@
       })
     }
     ApiCancel(ApiData).then((res) => {
+      reload()
       notification.success({ message: res.message, duration: 3 })
     })
   }
diff --git a/src/views/baseinfo/infoclient/EditColumns.tsx b/src/views/baseinfo/infoclient/EditColumns.tsx
index b783339a..f994f5e8 100644
--- a/src/views/baseinfo/infoclient/EditColumns.tsx
+++ b/src/views/baseinfo/infoclient/EditColumns.tsx
@@ -180,23 +180,6 @@ export const EditformSchema: FormSchema[] = [
       }
     },
   },
-
-  {
-    field: 'ediCode',
-    label: 'EDI代码',
-    component: 'DEdit',
-    defaultValue: '',
-    colProps: { span: 4 },
-    componentProps: (e) => {
-      return {
-        onEdit: () => {
-          const { formActionType } = e
-          formActionType ? formActionType.linkageForm(e) : null
-        },
-      }
-    },
-  },
-
   {
     field: 'organizationCode',
     label: '社会信用代码',
@@ -243,46 +226,13 @@ export const EditformSchema: FormSchema[] = [
     },
   },
   {
-    field: 'pcorpName',
-    label: '所属集团名称',
-    component: 'DEdit',
-    defaultValue: '',
-    show: false,
-  },
-  {
-    field: 'pcorpId',
-    label: '所属集团',
+    field: 'ediCode',
+    label: 'EDI代码',
     component: 'DEdit',
     defaultValue: '',
     colProps: { span: 4 },
     componentProps: (e) => {
-      const { formModel } = e
       return {
-        treeData: OrgTree,
-        allowClear: true,
-        showSearch: true,
-        filterOption: (input: string, option: any) => {
-          return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
-        },
-        onChange: (e) => {
-          if (e) {
-            const ForTree = (data, key, callback) => {
-              for (let i = 0; i < data.length; i++) {
-                if (data[i].value == key) {
-                  return callback(data[i], i, data)
-                }
-                if (data[i].children) {
-                  ForTree(data[i].children, key, callback)
-                }
-              }
-            }
-            let obj: any = {}
-            ForTree(OrgTree, e, (item, index, arr) => {
-              obj = item
-            })
-            formModel.pcorpName = obj.title
-          }
-        },
         onEdit: () => {
           const { formActionType } = e
           formActionType ? formActionType.linkageForm(e) : null
@@ -290,6 +240,7 @@ export const EditformSchema: FormSchema[] = [
       }
     },
   },
+
   {
     field: 'Divider1',
     component: 'Divider',
@@ -482,22 +433,22 @@ export const EditformSchema: FormSchema[] = [
     },
   },
   {
-    label: '操作人Name',
-    field: 'operatorName',
+    label: '客服Name',
+    field: 'customerServiceName',
     component: 'Input',
     defaultValue: '',
     show: false,
   },
   {
-    field: 'operatorId',
-    label: '操作人',
+    field: 'customerService',
+    label: '客服',
     component: 'DEdit',
     colProps: { span: 4 },
     defaultValue: '',
     componentProps: (e) => {
       const { formModel } = e
       return {
-        options: OperatorUserList,
+        options: CustomerServiceList,
         allowClear: true,
         showSearch: true,
         filterOption: (input: string, option: any) => {
@@ -505,12 +456,12 @@ export const EditformSchema: FormSchema[] = [
         },
         onChange: (e, obj) => {
           if (e && obj) {
-            formModel.operatorId = obj.value
-            formModel.operatorName = obj.label
+            formModel.customerService = obj.value
+            formModel.customerServiceName = obj.label
           }
           if (!e && !obj) {
-            formModel.operatorId = ''
-            formModel.operatorName = ''
+            formModel.customerService = ''
+            formModel.customerServiceName = ''
           }
         },
         onEdit: () => {
@@ -521,22 +472,22 @@ export const EditformSchema: FormSchema[] = [
     },
   },
   {
-    label: '单证Name',
-    field: 'docName',
+    label: '操作人Name',
+    field: 'operatorName',
     component: 'Input',
     defaultValue: '',
     show: false,
   },
   {
-    field: 'doc',
-    label: '单证',
+    field: 'operatorId',
+    label: '操作人',
     component: 'DEdit',
     colProps: { span: 4 },
     defaultValue: '',
     componentProps: (e) => {
       const { formModel } = e
       return {
-        options: VouchingClerkList,
+        options: OperatorUserList,
         allowClear: true,
         showSearch: true,
         filterOption: (input: string, option: any) => {
@@ -544,12 +495,12 @@ export const EditformSchema: FormSchema[] = [
         },
         onChange: (e, obj) => {
           if (e && obj) {
-            formModel.doc = obj.value
-            formModel.docName = obj.label
+            formModel.operatorId = obj.value
+            formModel.operatorName = obj.label
           }
           if (!e && !obj) {
-            formModel.doc = ''
-            formModel.docName = ''
+            formModel.operatorId = ''
+            formModel.operatorName = ''
           }
         },
         onEdit: () => {
@@ -560,22 +511,22 @@ export const EditformSchema: FormSchema[] = [
     },
   },
   {
-    label: '客服Name',
-    field: 'customerServiceName',
+    label: '单证Name',
+    field: 'docName',
     component: 'Input',
     defaultValue: '',
     show: false,
   },
   {
-    field: 'customerService',
-    label: '客服',
+    field: 'doc',
+    label: '单证',
     component: 'DEdit',
     colProps: { span: 4 },
     defaultValue: '',
     componentProps: (e) => {
       const { formModel } = e
       return {
-        options: CustomerServiceList,
+        options: VouchingClerkList,
         allowClear: true,
         showSearch: true,
         filterOption: (input: string, option: any) => {
@@ -583,12 +534,12 @@ export const EditformSchema: FormSchema[] = [
         },
         onChange: (e, obj) => {
           if (e && obj) {
-            formModel.customerService = obj.value
-            formModel.customerServiceName = obj.label
+            formModel.doc = obj.value
+            formModel.docName = obj.label
           }
           if (!e && !obj) {
-            formModel.customerService = ''
-            formModel.customerServiceName = ''
+            formModel.doc = ''
+            formModel.docName = ''
           }
         },
         onEdit: () => {
@@ -598,6 +549,7 @@ export const EditformSchema: FormSchema[] = [
       }
     },
   },
+
   {
     field: 'commissionUserId',
     label: '提成参与人',
@@ -707,21 +659,21 @@ export const EditformSchema: FormSchema[] = [
       }
     },
   },
-  {
-    field: 'unitPrice',
-    label: '冷藏费率',
-    component: 'DEdit',
-    defaultValue: '',
-    colProps: { span: 4 },
-    componentProps: (e) => {
-      return {
-        onEdit: () => {
-          const { formActionType } = e
-          formActionType ? formActionType.linkageForm(e) : null
-        },
-      }
-    },
-  },
+  // {
+  //   field: 'unitPrice',
+  //   label: '冷藏费率',
+  //   component: 'DEdit',
+  //   defaultValue: '',
+  //   colProps: { span: 4 },
+  //   componentProps: (e) => {
+  //     return {
+  //       onEdit: () => {
+  //         const { formActionType } = e
+  //         formActionType ? formActionType.linkageForm(e) : null
+  //       },
+  //     }
+  //   },
+  // },
   {
     field: 'commissionRate',
     label: '提成比例',
@@ -813,4 +765,52 @@ export const EditformSchema: FormSchema[] = [
       }
     },
   },
+  {
+    field: 'pcorpName',
+    label: '所属集团名称',
+    component: 'DEdit',
+    defaultValue: '',
+    show: false,
+  },
+  {
+    field: 'pcorpId',
+    label: '所属集团',
+    component: 'DEdit',
+    defaultValue: '',
+    colProps: { span: 4 },
+    componentProps: (e) => {
+      const { formModel } = e
+      return {
+        treeData: OrgTree,
+        allowClear: true,
+        showSearch: true,
+        filterOption: (input: string, option: any) => {
+          return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+        },
+        onChange: (e) => {
+          if (e) {
+            const ForTree = (data, key, callback) => {
+              for (let i = 0; i < data.length; i++) {
+                if (data[i].value == key) {
+                  return callback(data[i], i, data)
+                }
+                if (data[i].children) {
+                  ForTree(data[i].children, key, callback)
+                }
+              }
+            }
+            let obj: any = {}
+            ForTree(OrgTree, e, (item, index, arr) => {
+              obj = item
+            })
+            formModel.pcorpName = obj.title
+          }
+        },
+        onEdit: () => {
+          const { formActionType } = e
+          formActionType ? formActionType.linkageForm(e) : null
+        },
+      }
+    },
+  },
 ]
diff --git a/src/views/baseinfo/infoclient/TenantAuditStepModal.vue b/src/views/baseinfo/infoclient/TenantAuditStepModal.vue
index c2443ab8..8daa3381 100644
--- a/src/views/baseinfo/infoclient/TenantAuditStepModal.vue
+++ b/src/views/baseinfo/infoclient/TenantAuditStepModal.vue
@@ -262,7 +262,7 @@
               }
             })
 
-            if (item.field == 'overdueDays') {
+            if (item.field == 'pcorpId') {
               appendSchemaByField(
                 {
                   field: 'Divider5',
@@ -273,7 +273,7 @@
                     class: 'infoclientDivider',
                   },
                 },
-                'overdueDays',
+                'pcorpId',
               )
             }
           }
diff --git a/src/views/baseinfo/infoclient/columns.tsx b/src/views/baseinfo/infoclient/columns.tsx
index 42f3e211..b83ee2d1 100644
--- a/src/views/baseinfo/infoclient/columns.tsx
+++ b/src/views/baseinfo/infoclient/columns.tsx
@@ -174,8 +174,8 @@ export const columns: BasicColumn[] = [
     width: 150,
   },
   {
-    title: '所属分部',
-    dataIndex: 'saleOrgIdList',
+    title: '分公司',
+    dataIndex: 'saleOrgId',
     sorter: true,
     width: 150,
     customRender: ({ text }) => {
@@ -433,12 +433,6 @@ export const searchFormSchema: FormSchema[] = [
     component: 'Input',
     colProps: { span: 4 },
   },
-  {
-    field: 'orderNo',
-    label: '财务序号',
-    component: 'Input',
-    colProps: { span: 4 },
-  },
 
   {
     field: 'registrationNo',
@@ -527,15 +521,6 @@ export const formSchema: FormSchema[] = [
     },
     colProps: { span: 4 },
   },
-
-  {
-    field: 'ediCode',
-    label: 'EDI代码',
-    component: 'Input',
-    defaultValue: '',
-    colProps: { span: 4 },
-  },
-
   {
     field: 'organizationCode',
     label: '社会信用代码',
@@ -558,40 +543,13 @@ export const formSchema: FormSchema[] = [
     colProps: { span: 4 },
   },
   {
-    field: 'pcorpName',
-    label: '所属集团名称',
+    field: 'ediCode',
+    label: 'EDI代码',
     component: 'Input',
     defaultValue: '',
-    show: false,
-  },
-  {
-    field: 'pcorpId',
-    label: '所属集团',
-    defaultValue: '',
-    component: 'ApiSelect',
     colProps: { span: 4 },
-    componentProps: ({ formModel }) => {
-      return {
-        api: GetAllClientList,
-        labelField: 'shortName',
-        valueField: 'id',
-        resultField: 'data',
-        filterOption: (input: string, option: any) => {
-          return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
-        },
-        onChange: (e, obj) => {
-          if (e && obj) {
-            formModel.pcorpId = obj.value
-            formModel.pcorpName = obj.label
-          }
-          if (!e && !obj) {
-            formModel.pcorpId = ''
-            formModel.pcorpName = ''
-          }
-        },
-      }
-    },
   },
+
   // {
   //   field: 'pcorpId',
   //   label: '所属集团',
@@ -762,21 +720,21 @@ export const formSchema: FormSchema[] = [
     },
   },
   {
-    label: '操作人Name',
-    field: 'operatorName',
+    label: '',
+    field: 'customerServiceName',
     component: 'Input',
     defaultValue: '',
     show: false,
   },
   {
-    field: 'operatorId',
-    label: '操作人',
+    field: 'customerService',
+    label: '客服',
     component: 'Select',
     colProps: { span: 4 },
     defaultValue: '',
     componentProps: ({ formModel }) => {
       return {
-        options: OperatorUserList,
+        options: CustomerServiceList,
         allowClear: true,
         showSearch: true,
         filterOption: (input: string, option: any) => {
@@ -784,33 +742,33 @@ export const formSchema: FormSchema[] = [
         },
         onChange: (e, obj) => {
           if (e && obj) {
-            formModel.operatorId = obj.value
-            formModel.operatorName = obj.label
+            formModel.customerService = obj.value
+            formModel.customerServiceName = obj.label
           }
           if (!e && !obj) {
-            formModel.operatorId = ''
-            formModel.operatorName = ''
+            formModel.customerService = ''
+            formModel.customerServiceName = ''
           }
         },
       }
     },
   },
   {
-    label: '',
-    field: 'docName',
+    label: '操作人Name',
+    field: 'operatorName',
     component: 'Input',
     defaultValue: '',
     show: false,
   },
   {
-    field: 'doc',
-    label: '单证',
+    field: 'operatorId',
+    label: '操作人',
     component: 'Select',
     colProps: { span: 4 },
     defaultValue: '',
     componentProps: ({ formModel }) => {
       return {
-        options: VouchingClerkList,
+        options: OperatorUserList,
         allowClear: true,
         showSearch: true,
         filterOption: (input: string, option: any) => {
@@ -818,12 +776,12 @@ export const formSchema: FormSchema[] = [
         },
         onChange: (e, obj) => {
           if (e && obj) {
-            formModel.doc = obj.value
-            formModel.docName = obj.label
+            formModel.operatorId = obj.value
+            formModel.operatorName = obj.label
           }
           if (!e && !obj) {
-            formModel.doc = ''
-            formModel.docName = ''
+            formModel.operatorId = ''
+            formModel.operatorName = ''
           }
         },
       }
@@ -831,20 +789,20 @@ export const formSchema: FormSchema[] = [
   },
   {
     label: '',
-    field: 'customerServiceName',
+    field: 'docName',
     component: 'Input',
     defaultValue: '',
     show: false,
   },
   {
-    field: 'customerService',
-    label: '客服',
+    field: 'doc',
+    label: '单证',
     component: 'Select',
     colProps: { span: 4 },
     defaultValue: '',
     componentProps: ({ formModel }) => {
       return {
-        options: CustomerServiceList,
+        options: VouchingClerkList,
         allowClear: true,
         showSearch: true,
         filterOption: (input: string, option: any) => {
@@ -852,17 +810,18 @@ export const formSchema: FormSchema[] = [
         },
         onChange: (e, obj) => {
           if (e && obj) {
-            formModel.customerService = obj.value
-            formModel.customerServiceName = obj.label
+            formModel.doc = obj.value
+            formModel.docName = obj.label
           }
           if (!e && !obj) {
-            formModel.customerService = ''
-            formModel.customerServiceName = ''
+            formModel.doc = ''
+            formModel.docName = ''
           }
         },
       }
     },
   },
+
   {
     field: 'commissionUserId',
     label: '提成参与人',
@@ -991,13 +950,13 @@ export const formSchema: FormSchema[] = [
     defaultValue: '',
     colProps: { span: 4 },
   },
-  {
-    field: 'unitPrice',
-    label: '冷藏费率',
-    component: 'Input',
-    defaultValue: '',
-    colProps: { span: 4 },
-  },
+  // {
+  //   field: 'unitPrice',
+  //   label: '冷藏费率',
+  //   component: 'Input',
+  //   defaultValue: '',
+  //   colProps: { span: 4 },
+  // },
   {
     field: 'commissionRate',
     label: '提成比例',
@@ -1085,6 +1044,41 @@ export const formSchema: FormSchema[] = [
       return !values.isOverdueDeduction
     },
   },
+  {
+    field: 'pcorpName',
+    label: '所属集团名称',
+    component: 'Input',
+    defaultValue: '',
+    show: false,
+  },
+  {
+    field: 'pcorpId',
+    label: '所属集团',
+    defaultValue: '',
+    component: 'ApiSelect',
+    colProps: { span: 4 },
+    componentProps: ({ formModel }) => {
+      return {
+        api: GetAllClientList,
+        labelField: 'shortName',
+        valueField: 'id',
+        resultField: 'data',
+        filterOption: (input: string, option: any) => {
+          return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+        },
+        onChange: (e, obj) => {
+          if (e && obj) {
+            formModel.pcorpId = obj.value
+            formModel.pcorpName = obj.label
+          }
+          if (!e && !obj) {
+            formModel.pcorpId = ''
+            formModel.pcorpName = ''
+          }
+        },
+      }
+    },
+  },
   // {
   //   field: 'auditStatus',
   //   label: '审批状态',
@@ -1174,7 +1168,7 @@ export const formSchema: FormSchema[] = [
   },
   {
     field: 'saleOrgId',
-    label: '所属分部',
+    label: '分公司',
     component: 'Select',
     colProps: { span: 8 },
     componentProps: ({ formModel }) => {
@@ -1275,13 +1269,6 @@ export const formSchema2: FormSchema[] = [
     defaultValue: '',
     colProps: { span: 8 },
   },
-  {
-    field: 'orderNo',
-    label: '财务序号',
-    component: 'Input',
-    defaultValue: '',
-    colProps: { span: 8 },
-  },
 ]
 
 export const form3columns: BasicColumn[] = [
@@ -1316,12 +1303,12 @@ export const form3columns: BasicColumn[] = [
     width: 200,
   },
   {
-    title: '账期类型',
+    title: '账期',
     dataIndex: 'accountType',
     width: 200,
   },
   {
-    title: '账期标准',
+    title: '账期起算标准',
     dataIndex: 'accountStartDate',
     width: 200,
   },
diff --git a/src/views/baseinfo/infoclient/tabs3/columns.tsx b/src/views/baseinfo/infoclient/tabs3/columns.tsx
index 04f58245..f0875837 100644
--- a/src/views/baseinfo/infoclient/tabs3/columns.tsx
+++ b/src/views/baseinfo/infoclient/tabs3/columns.tsx
@@ -27,7 +27,7 @@ if (FnbusinessType.length) {
     ListData.businessType.push({ label: e.name, value: e.value })
   })
 }
-// 账期类型 字典
+// 账期 字典
 const accountTypeList = await getDictOption('infoclient_business_accountType')
 function RaccountTypeLabel(values) {
   let RData = ''
@@ -39,7 +39,7 @@ function RaccountTypeLabel(values) {
   return RData
 }
 
-// 账期标准 字典
+// 账期起算标准 字典
 const accountStartDateList = await getDictOption('infoclient_business_accountStartDate')
 export const columns: BasicColumn[] = [
   {
@@ -95,7 +95,7 @@ export const columns: BasicColumn[] = [
     },
   },
   {
-    title: '账期类型',
+    title: '账期',
     dataIndex: 'accountType',
     width: 200,
     customRender: ({ text }) => {
@@ -109,7 +109,7 @@ export const columns: BasicColumn[] = [
     },
   },
   {
-    title: '账期标准',
+    title: '账期起算标准',
     dataIndex: 'accountStartDate',
     width: 200,
     customRender: ({ text }) => {
@@ -188,6 +188,14 @@ export const formSchema: FormSchema[] = [
     defaultValue: '',
     show: false,
   },
+  {
+    field: 'contractId',
+    label: '合同Id',
+    component: 'Input',
+    colProps: { span: 12 },
+    defaultValue: '',
+    show: false,
+  },
   {
     field: 'businessType',
     label: '业务类型',
@@ -256,33 +264,10 @@ export const formSchema: FormSchema[] = [
       style: 'width:100%',
     },
   },
-  {
-    field: 'accountType',
-    label: '账期类型',
-    required: true,
-    component: 'Select',
-    colProps: { span: 12 },
-    defaultValue: '',
-    componentProps: ({ formModel }) => {
-      return {
-        options: accountTypeList,
-        allowClear: true,
-        showSearch: true,
-        filterOption: (input: string, option: any) => {
-          return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
-        },
-        onChange: () => {
-          formModel.accountMonth = 1
-          formModel.accountDays = 1
-          formModel.accountFirstHalf = 1
-          formModel.accountSecondHalf = 16
-        },
-      }
-    },
-  },
+
   {
     field: 'accountStartDate',
-    label: '账期标准',
+    label: '账期起算标准',
     component: 'Select',
     colProps: { span: 12 },
     defaultValue: '',
@@ -310,7 +295,62 @@ export const formSchema: FormSchema[] = [
     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 },
+    defaultValue: '',
+    componentProps: ({ formModel }) => {
+      return {
+        options: accountTypeList,
+        allowClear: true,
+        showSearch: true,
+        filterOption: (input: string, option: any) => {
+          return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+        },
+        onChange: () => {
+          formModel.accountMonth = 1
+          formModel.accountDays = 1
+          formModel.accountFirstHalf = 1
+          formModel.accountSecondHalf = 16
+        },
+      }
+    },
+  },
   {
     field: 'accountMonth',
     label: '间隔月份',
@@ -385,44 +425,4 @@ export const formSchema: FormSchema[] = [
       max: 31,
     },
   },
-  {
-    field: 'contractId',
-    label: '合同Id',
-    component: 'Input',
-    colProps: { span: 12 },
-    defaultValue: '',
-    show: false,
-  },
-  {
-    field: 'note',
-    label: '备注',
-    component: 'Input',
-    colProps: { span: 12 },
-    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,
-    },
-  },
 ]