diff --git a/src/views/admin/orgapplyinfo/components/OrgApplyInfoForm.vue b/src/views/admin/orgapplyinfo/components/OrgApplyInfoForm.vue
index 374d786..e2d7266 100644
--- a/src/views/admin/orgapplyinfo/components/OrgApplyInfoForm.vue
+++ b/src/views/admin/orgapplyinfo/components/OrgApplyInfoForm.vue
@@ -1,6 +1,6 @@
 <template>
   <a-spin :spinning="confirmLoading">
-    <JFormContainer >
+    <JFormContainer>
       <template #detail>
         <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol"
           name="OrgApplyInfoForm">
@@ -9,41 +9,42 @@
             <a-col :span="24">
               <SectionDivider :title="'机构信息'" />
             </a-col>
-            
+
           </a-row>
           <a-row>
             <a-col :span="12">
               <a-row>
                 <a-col :span="24">
-              <a-form-item label="营业执照照片" v-bind="validateInfos.comBusinessLicense"
-                id="OrgApplyInfoForm-comBusinessLicense" name="comBusinessLicense">
-                <JImageUpload :fileMax="1" v-model:value="formData.comBusinessLicense" :disabled="true"></JImageUpload>
-              </a-form-item>
-            </a-col>
+                  <a-form-item label="营业执照照片" v-bind="validateInfos.comBusinessLicense"
+                    id="OrgApplyInfoForm-comBusinessLicense" name="comBusinessLicense">
+                    <JImageUpload :fileMax="1" v-model:value="formData.comBusinessLicense" :disabled="true">
+                    </JImageUpload>
+                  </a-form-item>
+                </a-col>
                 <a-col :span="24">
                   <a-form-item label="信用代码" v-bind="validateInfos.comCreditCode" id="OrgApplyInfoForm-comCreditCode"
                     name="comCreditCode">
-                    {{formData.comCreditCode}}
+                    {{ formData.comCreditCode }}
                   </a-form-item>
                 </a-col>
                 <a-col :span="24">
                   <a-form-item label="企业名称" v-bind="validateInfos.comName" id="OrgApplyInfoForm-comName" name="comName">
-                    {{formData.comName}}
+                    {{ formData.comName }}
                   </a-form-item>
                 </a-col>
                 <a-col :span="24">
                   <a-form-item label="企业法人" v-bind="validateInfos.comLegalPerson" id="OrgApplyInfoForm-comLegalPerson"
                     name="comLegalPerson">
-                    {{formData.comLegalPerson}}
+                    {{ formData.comLegalPerson }}
                   </a-form-item>
                 </a-col>
                 <a-col :span="24">
                   <a-form-item label="注册地址" v-bind="validateInfos.comRegisterAddress"
                     id="OrgApplyInfoForm-comRegisterAddress" name="comRegisterAddress">
-                    {{formData.comRegisterAddress}}
+                    {{ formData.comRegisterAddress }}
                   </a-form-item>
                 </a-col>
-                
+
               </a-row>
             </a-col>
             <a-col :span="12">
@@ -51,43 +52,43 @@
                 <a-col :span="24">
                   <a-form-item label="机构所在地" v-bind="validateInfos.cityViewValue" id="OrgApplyInfoForm-cityViewValue"
                     name="cityViewValue">
-                    {{cityViewValue}}
+                    {{ cityViewValue }}
                   </a-form-item>
                 </a-col>
                 <a-col :span="24">
                   <a-form-item label="机构负责人" v-bind="validateInfos.orgLeader" id="OrgApplyInfoForm-orgLeader"
                     name="orgLeader">
-                    {{formData.orgLeader}}
+                    {{ formData.orgLeader }}
                   </a-form-item>
                 </a-col>
                 <a-col :span="24">
                   <a-form-item label="负责人电话" v-bind="validateInfos.orgLeaderPhone" id="OrgApplyInfoForm-orgLeaderPhone"
                     name="orgLeaderPhone">
-                    {{formData.orgLeaderPhone}}
+                    {{ formData.orgLeaderPhone }}
                   </a-form-item>
                 </a-col>
                 <a-col :span="24">
                   <a-form-item label="房屋性质" v-bind="validateInfos.orgPropertyType" id="OrgApplyInfoForm-orgPropertyType"
                     name="orgPropertyType">
-                    {{formData.orgPropertyType}}
+                    {{ formData.orgPropertyType }}
                   </a-form-item>
                 </a-col>
                 <a-col :span="24">
                   <a-form-item label="建筑面积" v-bind="validateInfos.orgBuildingArea" id="OrgApplyInfoForm-orgBuildingArea"
                     name="orgBuildingArea">
-                    {{formData.orgBuildingArea}} ㎡
+                    {{ formData.orgBuildingArea }} ㎡
                   </a-form-item>
                 </a-col>
                 <a-col :span="24">
                   <a-form-item label="机构地址" v-bind="validateInfos.orgAddress" id="OrgApplyInfoForm-orgAddress"
                     name="orgAddress">
-                    {{formData.orgAddress}}
+                    {{ formData.orgAddress }}
                   </a-form-item>
                 </a-col>
               </a-row>
             </a-col>
           </a-row>
-          
+
           <a-row>
             <a-col :span="24">
               <SectionDivider :title="'申请人身份证'" />
@@ -104,34 +105,35 @@
                 </a-col>
                 <a-col :span="24">
                   <a-form-item label="姓名" v-bind="validateInfos.name" id="OrgApplyInfoForm-name" name="name">
-                    {{formData.name}}
+                    {{ formData.name }}
                   </a-form-item>
                 </a-col>
                 <a-col :span="24">
                   <a-form-item label="性别" v-bind="validateInfos.sex" id="OrgApplyInfoForm-sex" name="sex">
-                    {{formData.sex}}
+                    {{ formData.sex }}
                   </a-form-item>
                 </a-col>
                 <a-col :span="24">
-                  <a-form-item label="民族" v-bind="validateInfos.national" id="OrgApplyInfoForm-national" name="national">
-                    {{formData.national}}
+                  <a-form-item label="民族" v-bind="validateInfos.national" id="OrgApplyInfoForm-national"
+                    name="national">
+                    {{ formData.national }}
                   </a-form-item>
                 </a-col>
                 <a-col :span="24">
                   <a-form-item label="出生日期" v-bind="validateInfos.birthDate" id="OrgApplyInfoForm-birthDate"
                     name="birthDate">
-                    {{formData.birthDate?formData.birthDate.substring(0,10):""}}
+                    {{ formData.birthDate ? formData.birthDate.substring(0, 10) : "" }}
                   </a-form-item>
                 </a-col>
                 <a-col :span="24">
                   <a-form-item label="身份证号" v-bind="validateInfos.idCard" id="OrgApplyInfoForm-idCard" name="idCard">
-                    {{formData.idCard}}
+                    {{ formData.idCard }}
                   </a-form-item>
                 </a-col>
                 <a-col :span="24">
                   <a-form-item label="住址" v-bind="validateInfos.idCardAddress" id="OrgApplyInfoForm-idCardAddress"
                     name="idCardAddress">
-                    {{formData.idCardAddress}}
+                    {{ formData.idCardAddress }}
                   </a-form-item>
                 </a-col>
               </a-row>
@@ -147,24 +149,27 @@
                 <a-col :span="24">
                   <a-form-item label="有效开始日期" v-bind="validateInfos.startTime" id="OrgApplyInfoForm-startTime"
                     name="startTime">
-                    {{formData.startTime?formData.startTime.substring(0,10):""}}
+                    {{ formData.startTime ? formData.startTime.substring(0, 10) : "" }}
                   </a-form-item>
                 </a-col>
                 <a-col :span="24">
-                  <a-form-item label="有效结束日期" v-bind="validateInfos.endTime" id="OrgApplyInfoForm-endTime" name="endTime">
-                    {{formData.endTime?formData.endTime.substring(0,10):""}}
+                  <a-form-item label="有效结束日期" v-bind="validateInfos.endTime" id="OrgApplyInfoForm-endTime"
+                    name="endTime">
+                    {{ formData.endTime
+                      ? (formData.endTime.substring(0, 10) == '9999-12-31' ? '长期' : formData.endTime.substring(0, 10))
+                      : "" }}
                   </a-form-item>
                 </a-col>
                 <a-col :span="24">
-                  <a-form-item label="签发机关" v-bind="validateInfos.issuingAuthority" id="OrgApplyInfoForm-issuingAuthority"
-                    name="issuingAuthority">
-                    {{formData.issuingAuthority}}
+                  <a-form-item label="签发机关" v-bind="validateInfos.issuingAuthority"
+                    id="OrgApplyInfoForm-issuingAuthority" name="issuingAuthority">
+                    {{ formData.issuingAuthority }}
                   </a-form-item>
                 </a-col>
               </a-row>
             </a-col>
           </a-row>
-          
+
           <a-row>
             <a-col :span="24">
               <SectionDivider :title="'加盟审核'" />
@@ -173,7 +178,8 @@
           <a-row>
             <a-col :span="12">
               <a-form-item label="审核意见" v-bind="validateInfos.status" id="OrgApplyInfoForm-status" name="status">
-                <a-select v-model:value="formData.status" style="width: 200px" placeholder="请选择审核意见" :disabled="sfsh!='1'">
+                <a-select v-model:value="formData.status" style="width: 200px" placeholder="请选择审核意见"
+                  :disabled="sfsh != '1'">
                   <a-select-option value="2">审核通过</a-select-option>
                   <a-select-option value="3">审核驳回</a-select-option>
                 </a-select>
@@ -181,28 +187,29 @@
             </a-col>
             <a-col :span="12" v-show="formData.status == '3' || formData.content">
               <a-form-item label="驳回原因" v-bind="validateInfos.content" id="OrgApplyInfoForm-content" name="content">
-                <a-textarea :autosize="{ minRows: 3 }" maxlength="50" show-count v-model:value="formData.content" :disabled="formData.status != '3'"
-                  allow-clear placeholder="请输入驳回原因"></a-textarea>
+                <a-textarea :autosize="{ minRows: 3 }" maxlength="50" show-count v-model:value="formData.content"
+                  :disabled="formData.status != '3'" allow-clear placeholder="请输入驳回原因"></a-textarea>
               </a-form-item>
             </a-col>
             <a-col :span="12" v-if="formData.auditBy">
               <a-form-item label="审核人" v-bind="validateInfos.auditBy" id="OrgApplyInfoForm-auditBy">
-                {{formData.auditBy}}
+                {{ formData.auditBy }}
               </a-form-item>
             </a-col>
             <a-col :span="12" v-if="formData.auditBy">
               <a-form-item label="审核时间" v-bind="validateInfos.auditTime" id="OrgApplyInfoForm-auditTime">
-                {{formData.auditTime}}
+                {{ formData.auditTime }}
               </a-form-item>
             </a-col>
             <a-col :span="12" v-show="formData.contract">
               <a-form-item label="加盟合同" v-bind="validateInfos.contract" id="OrgApplyInfoForm-contract">
-                <JUpload v-model:value="formData.contract" :maxCount="1" :buttonVisible="false" disabled="true" fileType="pdf"></JUpload>
+                <JUpload v-model:value="formData.contract" :maxCount="1" :buttonVisible="false" disabled="true"
+                  fileType="pdf"></JUpload>
               </a-form-item>
             </a-col>
             <a-col :span="12" v-if="formData.contractNote">
               <a-form-item label="备注信息" v-bind="validateInfos.contractNote" id="OrgApplyInfoForm-contractNote">
-                {{formData.contractNote}}
+                {{ formData.contractNote }}
               </a-form-item>
             </a-col>
           </a-row>
@@ -211,28 +218,28 @@
               <SectionDivider :title="'工单回执'" />
             </a-col>
             <a-col :span="12">
-              <a-form-item label="工单状态" >
-                {{formData.workOrderStatus_dictText}}
+              <a-form-item label="工单状态">
+                {{ formData.workOrderStatus_dictText }}
               </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-item label="处理人" >
-                {{formData.handleBy}}
+              <a-form-item label="处理人">
+                {{ formData.handleBy }}
               </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-item label="反馈附件" >
-                <JUpload v-model:value="formData.replyFile" :maxCount="1"  :buttonVisible="false" disabled></JUpload>
+              <a-form-item label="反馈附件">
+                <JUpload v-model:value="formData.replyFile" :maxCount="1" :buttonVisible="false" disabled></JUpload>
               </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-item label="反馈时间" >
-                {{formData.replyTime?formData.replyTime.substring(0,10):""}}
+              <a-form-item label="反馈时间">
+                {{ formData.replyTime ? formData.replyTime.substring(0, 10) : "" }}
               </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-item label="反馈内容" >
-                {{formData.replyContent}}
+              <a-form-item label="反馈内容">
+                {{ formData.replyContent }}
               </a-form-item>
             </a-col>
           </a-row>
@@ -258,8 +265,8 @@ import TencentMap from '/@/components/TencentMap/TencentMap.vue';
 import JImageUpload from '/@/components/Form/src/jeecg/components/JImageUpload.vue';
 import JUpload from '/@/components/Form/src/jeecg/components/JUpload/JUpload.vue';
 import { t } from '/@/hooks/web/useI18n';
-  import {encryptByBase64} from "@/utils/cipher";
-  import { useGlobSetting } from '/@/hooks/setting';
+import { encryptByBase64 } from "@/utils/cipher";
+import { useGlobSetting } from '/@/hooks/setting';
 const glob = useGlobSetting();
 
 const cityViewValue = ref('')
@@ -313,15 +320,15 @@ const formData = reactive<Record<string, any>>({
   orgCity_dictText: '',
   orgDistrict_dictText: '',
   franchiseTime: null,
-  contract:null,
-  contractNote:null,
+  contract: null,
+  contractNote: null,
   replyContent: '',
   replyFile: '',
   replyTime: '',
   handleBy: '',
   workOrderStatus: '',
   workOrderStatus_dictText: '',
-  auditBy:'',
+  auditBy: '',
   auditTime: '',
 
 });
@@ -360,17 +367,17 @@ const disabled = computed(() => {
 });
 
 
-  /**
-   * 预览
-   */
-  function handleView(record) {
-    if (record && record.url) {
-      console.log('glob.onlineUrl', glob.viewUrl);
-      let url = encodeURIComponent(encryptByBase64(record.url));
-      let previewUrl = `${glob.viewUrl}?url=` + url;
-      window.open(previewUrl, '_blank');
-    }
+/**
+ * 预览
+ */
+function handleView(record) {
+  if (record && record.url) {
+    console.log('glob.onlineUrl', glob.viewUrl);
+    let url = encodeURIComponent(encryptByBase64(record.url));
+    let previewUrl = `${glob.viewUrl}?url=` + url;
+    window.open(previewUrl, '_blank');
   }
+}
 /**
  * 新增
  */
@@ -400,9 +407,9 @@ function edit(record) {
       + (!!record.orgDistrict_dictText ? record.orgDistrict_dictText : '')
     //赋值
     Object.assign(formData, tmpData);
-    if(lsbl == '1'){
+    if (lsbl == '1') {
       sfsh.value = '1'
-    }else{
+    } else {
       sfsh.value = '0'
     }
   });
@@ -442,7 +449,7 @@ async function submitForm() {
       }
     }
   }
-  if(model.status == '2'){
+  if (model.status == '2') {
     model.buildStatus = 'approvalPass'//代表加盟审核通过
   }
   await saveOrUpdate(model, isUpdate.value)
diff --git a/src/views/admin/orgmodifyinfo/components/OrgHistoryForm.vue b/src/views/admin/orgmodifyinfo/components/OrgHistoryForm.vue
index e35ab84..dd7506a 100644
--- a/src/views/admin/orgmodifyinfo/components/OrgHistoryForm.vue
+++ b/src/views/admin/orgmodifyinfo/components/OrgHistoryForm.vue
@@ -22,7 +22,7 @@
         <a-row>
             <a-col :span="24" style="padding-top: 10px;padding-left: 30px;padding-right: 30px;">
                 <a-table :dataSource="filteredTableData" :columns="columns" :pagination="false" bordered size="small"
-                     :rowClassName="setRowClassName">
+                    :rowClassName="setRowClassName">
                     <template #bodyCell="{ column, record }">
                         <template v-if="column.dataIndex === 'd1'">
                             <span>{{ applyObj[record.d1] }}</span>
@@ -41,14 +41,18 @@
                             v-if="column.dataIndex === 'd3' && (record.d1 == 'orgProvince' || record.d1 == 'orgCity' || record.d1 == 'orgDistrict')">
                             <span>{{ provinceOptions[record.d3] }}</span>
                         </template>
-                        <template
-                            v-if="column.dataIndex === 'd2' && record.d1 == 'orgBuildingArea' ">
+                        <template v-if="column.dataIndex === 'd2' && record.d1 == 'orgBuildingArea'">
                             <span>{{ record.d2 }}㎡</span>
                         </template>
-                        <template
-                            v-if="column.dataIndex === 'd3'  && record.d1 == 'orgBuildingArea' ">
+                        <template v-if="column.dataIndex === 'd3' && record.d1 == 'orgBuildingArea'">
                             <span>{{ record.d3 }}㎡</span>
                         </template>
+                        <template v-if="column.dataIndex === 'd2' && record.d1 == 'endTime'">
+                            <span>{{ record.d2 == '9999-12-31' ? '长期' : record.d2 }}</span>
+                        </template>
+                        <template v-if="column.dataIndex === 'd3' && record.d1 == 'endTime'">
+                            <span>{{ record.d3 == '9999-12-31' ? '长期' : record.d3 }}</span>
+                        </template>
                     </template>
                 </a-table>
             </a-col>
@@ -119,7 +123,7 @@ const filteredTableData = computed(() => {
         && item.d1 !== 'commitTime'
         && item.d1 !== 'auditTime'
         && item.d1 !== 'franchiseTime'
-        
+
         && item.d1 !== 'buildStatus'
         && item.d1 !== 'contract'
         && item.d1 !== 'contractNote'
diff --git a/src/views/biz/nuEmployeesAdvisoryInfo/NuEmployeesAdvisoryInfo.data.ts b/src/views/biz/nuEmployeesAdvisoryInfo/NuEmployeesAdvisoryInfo.data.ts
index d190c6a..6ccadd4 100644
--- a/src/views/biz/nuEmployeesAdvisoryInfo/NuEmployeesAdvisoryInfo.data.ts
+++ b/src/views/biz/nuEmployeesAdvisoryInfo/NuEmployeesAdvisoryInfo.data.ts
@@ -99,13 +99,13 @@ export const columns: BasicColumn[] = [
     customRender: render.renderImage,
     defaultHidden: true,
   },
-  {
-    title: '健康证反面',
-    align: "center",
-    dataIndex: 'healthFmPath',
-    customRender: render.renderImage,
-    defaultHidden: true,
-  },
+  // {
+  //   title: '健康证反面',
+  //   align: "center",
+  //   dataIndex: 'healthFmPath',
+  //   customRender: render.renderImage,
+  //   defaultHidden: true,
+  // },
   {
     title: '资质证',
     align: "center",
diff --git a/src/views/biz/nuEmployeesAdvisoryInfo/components/NuEmployeesAdvisoryInfoForm.vue b/src/views/biz/nuEmployeesAdvisoryInfo/components/NuEmployeesAdvisoryInfoForm.vue
index 99fc5ba..86271d5 100644
--- a/src/views/biz/nuEmployeesAdvisoryInfo/components/NuEmployeesAdvisoryInfoForm.vue
+++ b/src/views/biz/nuEmployeesAdvisoryInfo/components/NuEmployeesAdvisoryInfoForm.vue
@@ -2,190 +2,219 @@
   <a-spin :spinning="confirmLoading">
     <JFormContainer :disabled="disabled">
       <template #detail>
-        <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" name="NuEmployeesAdvisoryInfoForm">
+        <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol"
+          name="NuEmployeesAdvisoryInfoForm">
           <a-row>
             <a-col :span="24">
               <SectionDivider :title="'基本信息'" />
             </a-col>
-						<a-col :span="12">
-							<a-form-item label="身份证正面" v-bind="validateInfos.cardZmPath" id="NuEmployeesAdvisoryInfoForm-cardZmPath" name="cardZmPath">
-								<j-image-upload :fileMax="1" text="无" v-model:value="formData.cardZmPath" disabled ></j-image-upload>
-							</a-form-item>
-						</a-col>
-						<a-col :span="12">
-							<a-form-item label="身份证反面" v-bind="validateInfos.cardFmPath" id="NuEmployeesAdvisoryInfoForm-cardFmPath" name="cardFmPath">
-								<j-image-upload :fileMax="1" text="无" v-model:value="formData.cardFmPath" disabled  ></j-image-upload>
-							</a-form-item>
-						</a-col>
-						<a-col :span="12">
-							<a-form-item label="咨询人姓名" v-bind="validateInfos.name" id="NuEmployeesAdvisoryInfoForm-name" name="name">
-								<!-- <a-input v-model:value="formData.name" placeholder="请输入咨询人姓名"  allow-clear disabled  ></a-input> -->
-                {{formData.name}}
-							</a-form-item>
-						</a-col>
-						<a-col :span="12">
-							<a-form-item label="性别" v-bind="validateInfos.sex" id="NuEmployeesAdvisoryInfoForm-sex" name="sex">
-								<!-- <a-input v-model:value="formData.sex" placeholder="请输入性别"  allow-clear disabled  ></a-input> -->
-                {{formData.sex}}
-							</a-form-item>
-						</a-col>
-						<a-col :span="12">
-							<a-form-item label="民族" v-bind="validateInfos.national" id="NuEmployeesAdvisoryInfoForm-national" name="national">
-								<!-- <a-input v-model:value="formData.national" placeholder="请输入民族"  allow-clear disabled  ></a-input> -->
-                {{formData.national}}
-							</a-form-item>
-						</a-col>
-						<a-col :span="12">
-							<a-form-item label="出生日期" v-bind="validateInfos.birthDate" id="NuEmployeesAdvisoryInfoForm-birthDate" name="birthDate">
-								<!-- <a-date-picker placeholder="请选择出生日期"  v-model:value="formData.birthDate" disabled  value-format="YYYY-MM-DD"  style="width: 100%"  allow-clear /> -->
-                {{formData.birthDate}}
-							</a-form-item>
-						</a-col>
-						<a-col :span="12">
-							<a-form-item label="住址" v-bind="validateInfos.idCardAddress" id="NuEmployeesAdvisoryInfoForm-idCardAddress" name="idCardAddress">
-								<!-- <a-input v-model:value="formData.idCardAddress" placeholder="请输入住址"  allow-clear disabled  ></a-input> -->
-                {{formData.idCardAddress}}
-							</a-form-item>
-						</a-col>
-						<a-col :span="12">
-							<a-form-item label="身份证号" v-bind="validateInfos.idCard" id="NuEmployeesAdvisoryInfoForm-idCard" name="idCard">
-								<!-- <a-input v-model:value="formData.idCard" placeholder="请输入身份证号"  allow-clear disabled  ></a-input> -->
-                {{formData.idCard}}
-							</a-form-item>
-						</a-col>
-						<a-col :span="12">
-							<a-form-item label="签发机关" v-bind="validateInfos.issuingAuthority" id="NuEmployeesAdvisoryInfoForm-issuingAuthority" name="issuingAuthority">
-								<!-- <a-input v-model:value="formData.issuingAuthority" placeholder="请输入签发机关"  allow-clear disabled  ></a-input> -->
-                {{formData.issuingAuthority}}
-							</a-form-item>
-						</a-col>
-						<a-col :span="12">
-							<a-form-item label="有效开始日期" v-bind="validateInfos.startTime" id="NuEmployeesAdvisoryInfoForm-startTime" name="startTime">
-								<!-- <a-date-picker placeholder="请选择有效开始日期"  v-model:value="formData.startTime" disabled  value-format="YYYY-MM-DD"  style="width: 100%"  allow-clear /> -->
-                {{formData.startTime}}
-							</a-form-item>
-						</a-col>
-						<a-col :span="12">
-							<a-form-item label="有效结束日期" v-bind="validateInfos.endTime" id="NuEmployeesAdvisoryInfoForm-endTime" name="endTime">
-								<!-- <a-date-picker placeholder="请选择有效结束日期"  v-model:value="formData.endTime" disabled  value-format="YYYY-MM-DD"  style="width: 100%"  allow-clear /> -->
-                {{formData.endTime}}
-							</a-form-item>
-						</a-col>
-						<a-col :span="12">
-							<a-form-item label="联系电话" v-bind="validateInfos.tel" id="NuEmployeesAdvisoryInfoForm-tel" name="tel">
-								<!-- <a-input v-model:value="formData.tel" placeholder="请输入联系电话"  allow-clear  disabled ></a-input> -->
-                {{formData.tel}}
-							</a-form-item>
-						</a-col>
+            <a-col :span="12">
+              <a-form-item label="身份证正面" v-bind="validateInfos.cardZmPath" id="NuEmployeesAdvisoryInfoForm-cardZmPath"
+                name="cardZmPath">
+                <j-image-upload :fileMax="1" text="无" v-model:value="formData.cardZmPath" disabled></j-image-upload>
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="身份证反面" v-bind="validateInfos.cardFmPath" id="NuEmployeesAdvisoryInfoForm-cardFmPath"
+                name="cardFmPath">
+                <j-image-upload :fileMax="1" text="无" v-model:value="formData.cardFmPath" disabled></j-image-upload>
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="咨询人姓名" v-bind="validateInfos.name" id="NuEmployeesAdvisoryInfoForm-name" name="name">
+                <!-- <a-input v-model:value="formData.name" placeholder="请输入咨询人姓名"  allow-clear disabled  ></a-input> -->
+                {{ formData.name }}
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="性别" v-bind="validateInfos.sex" id="NuEmployeesAdvisoryInfoForm-sex" name="sex">
+                <!-- <a-input v-model:value="formData.sex" placeholder="请输入性别"  allow-clear disabled  ></a-input> -->
+                {{ formData.sex }}
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="民族" v-bind="validateInfos.national" id="NuEmployeesAdvisoryInfoForm-national"
+                name="national">
+                <!-- <a-input v-model:value="formData.national" placeholder="请输入民族"  allow-clear disabled  ></a-input> -->
+                {{ formData.national }}
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="出生日期" v-bind="validateInfos.birthDate" id="NuEmployeesAdvisoryInfoForm-birthDate"
+                name="birthDate">
+                <!-- <a-date-picker placeholder="请选择出生日期"  v-model:value="formData.birthDate" disabled  value-format="YYYY-MM-DD"  style="width: 100%"  allow-clear /> -->
+                {{ formData.birthDate }}
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="住址" v-bind="validateInfos.idCardAddress"
+                id="NuEmployeesAdvisoryInfoForm-idCardAddress" name="idCardAddress">
+                <!-- <a-input v-model:value="formData.idCardAddress" placeholder="请输入住址"  allow-clear disabled  ></a-input> -->
+                {{ formData.idCardAddress }}
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="身份证号" v-bind="validateInfos.idCard" id="NuEmployeesAdvisoryInfoForm-idCard"
+                name="idCard">
+                <!-- <a-input v-model:value="formData.idCard" placeholder="请输入身份证号"  allow-clear disabled  ></a-input> -->
+                {{ formData.idCard }}
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="签发机关" v-bind="validateInfos.issuingAuthority"
+                id="NuEmployeesAdvisoryInfoForm-issuingAuthority" name="issuingAuthority">
+                <!-- <a-input v-model:value="formData.issuingAuthority" placeholder="请输入签发机关"  allow-clear disabled  ></a-input> -->
+                {{ formData.issuingAuthority }}
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="有效开始日期" v-bind="validateInfos.startTime" id="NuEmployeesAdvisoryInfoForm-startTime"
+                name="startTime">
+                <!-- <a-date-picker placeholder="请选择有效开始日期"  v-model:value="formData.startTime" disabled  value-format="YYYY-MM-DD"  style="width: 100%"  allow-clear /> -->
+                {{ formData.startTime }}
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="有效结束日期" v-bind="validateInfos.endTime" id="NuEmployeesAdvisoryInfoForm-endTime"
+                name="endTime">
+                <!-- <a-date-picker placeholder="请选择有效结束日期"  v-model:value="formData.endTime" disabled  value-format="YYYY-MM-DD"  style="width: 100%"  allow-clear /> -->
+                {{ formData.endTime == '9999-12-31' ? '长期' : formData.endTime }}
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="联系电话" v-bind="validateInfos.tel" id="NuEmployeesAdvisoryInfoForm-tel" name="tel">
+                <!-- <a-input v-model:value="formData.tel" placeholder="请输入联系电话"  allow-clear  disabled ></a-input> -->
+                {{ formData.tel }}
+              </a-form-item>
+            </a-col>
             <a-col :span="24">
               <SectionDivider :title="'其他信息'" />
             </a-col>
-						<a-col :span="12">
-							<a-form-item label="婚否" v-bind="validateInfos.maritalStatus" id="NuEmployeesAdvisoryInfoForm-maritalStatus" name="maritalStatus">
-								<!-- <a-input v-model:value="formData.maritalStatus" placeholder="请输入婚否"  allow-clear  disabled ></a-input> -->
-                {{formData.maritalStatus}}
-							</a-form-item>
-						</a-col>
-						<a-col :span="12">
-							<a-form-item label="身高" v-bind="validateInfos.height" id="NuEmployeesAdvisoryInfoForm-height" name="height">
-								<!-- <a-input v-model:value="formData.height" placeholder="请输入身高"  allow-clear  disabled ></a-input> -->
-                {{formData.height}}
-							</a-form-item>
-						</a-col>
-						<a-col :span="12">
-							<a-form-item label="体重" v-bind="validateInfos.weight" id="NuEmployeesAdvisoryInfoForm-weight" name="weight">
-								<!-- <a-input v-model:value="formData.weight" placeholder="请输入体重"  allow-clear  disabled ></a-input> -->
-                {{formData.weight}}
-							</a-form-item>
-						</a-col>
-						<a-col :span="12">
-							<a-form-item label="健康状况" v-bind="validateInfos.healthStatus" id="NuEmployeesAdvisoryInfoForm-healthStatus" name="healthStatus">
-								<!-- <a-input v-model:value="formData.healthStatus" placeholder="请输入健康状况"  allow-clear  disabled ></a-input> -->
-                {{formData.healthStatus}}
-							</a-form-item>
-						</a-col>
-						<a-col :span="12">
-							<a-form-item label="政治面貌" v-bind="validateInfos.politicalAppearance" id="NuEmployeesAdvisoryInfoForm-politicalAppearance" name="politicalAppearance">
-								<!-- <a-input v-model:value="formData.politicalAppearance" placeholder="请输入政治面貌"  allow-clear disabled  ></a-input> -->
-                {{formData.politicalAppearance}}
-							</a-form-item>
-						</a-col>
-						<a-col :span="12">
-							<a-form-item label="户口性质" v-bind="validateInfos.hukouType" id="NuEmployeesAdvisoryInfoForm-hukouType" name="hukouType">
-								<!-- <a-input v-model:value="formData.hukouType" placeholder="请输入户口性质"  allow-clear disabled  ></a-input> -->
-                {{formData.hukouType}}
-							</a-form-item>
-						</a-col>
-            
+            <a-col :span="12">
+              <a-form-item label="婚否" v-bind="validateInfos.maritalStatus"
+                id="NuEmployeesAdvisoryInfoForm-maritalStatus" name="maritalStatus">
+                <!-- <a-input v-model:value="formData.maritalStatus" placeholder="请输入婚否"  allow-clear  disabled ></a-input> -->
+                {{ formData.maritalStatus }}
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="身高" v-bind="validateInfos.height" id="NuEmployeesAdvisoryInfoForm-height"
+                name="height">
+                <!-- <a-input v-model:value="formData.height" placeholder="请输入身高"  allow-clear  disabled ></a-input> -->
+                {{ formData.height }}
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="体重" v-bind="validateInfos.weight" id="NuEmployeesAdvisoryInfoForm-weight"
+                name="weight">
+                <!-- <a-input v-model:value="formData.weight" placeholder="请输入体重"  allow-clear  disabled ></a-input> -->
+                {{ formData.weight }}
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="健康状况" v-bind="validateInfos.healthStatus"
+                id="NuEmployeesAdvisoryInfoForm-healthStatus" name="healthStatus">
+                <!-- <a-input v-model:value="formData.healthStatus" placeholder="请输入健康状况"  allow-clear  disabled ></a-input> -->
+                {{ formData.healthStatus }}
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="政治面貌" v-bind="validateInfos.politicalAppearance"
+                id="NuEmployeesAdvisoryInfoForm-politicalAppearance" name="politicalAppearance">
+                <!-- <a-input v-model:value="formData.politicalAppearance" placeholder="请输入政治面貌"  allow-clear disabled  ></a-input> -->
+                {{ formData.politicalAppearance }}
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="户口性质" v-bind="validateInfos.hukouType" id="NuEmployeesAdvisoryInfoForm-hukouType"
+                name="hukouType">
+                <!-- <a-input v-model:value="formData.hukouType" placeholder="请输入户口性质"  allow-clear disabled  ></a-input> -->
+                {{ formData.hukouType }}
+              </a-form-item>
+            </a-col>
+
             <a-col :span="24">
               <SectionDivider :title="'联系人信息'" />
             </a-col>
-						<a-col :span="12">
-							<a-form-item label="紧急联系人姓名" v-bind="validateInfos.contactName" id="NuEmployeesAdvisoryInfoForm-contactName" name="contactName">
-								<!-- <a-input v-model:value="formData.contactName" placeholder="请输入紧急联系人姓名"  allow-clear disabled  ></a-input> -->
-                {{formData.contactName}}
-							</a-form-item>
-						</a-col>
-						<a-col :span="12">
-							<a-form-item label="紧急联系人电话" v-bind="validateInfos.contactTel" id="NuEmployeesAdvisoryInfoForm-contactTel" name="contactTel">
-								<!-- <a-input v-model:value="formData.contactTel" placeholder="请输入紧急联系人电话"  allow-clear disabled  ></a-input> -->
-                {{formData.contactTel}}
-							</a-form-item>
-						</a-col>
-						<a-col :span="12">
-							<a-form-item label="与本人关系" v-bind="validateInfos.contactRelationship" id="NuEmployeesAdvisoryInfoForm-contactRelationship" name="contactRelationship">
-								<!-- <a-input v-model:value="formData.contactRelationship" placeholder="请输入紧急联系人与本人关系"  allow-clear disabled  ></a-input> -->
-                {{formData.contactRelationship}}
-							</a-form-item>
-						</a-col>
+            <a-col :span="12">
+              <a-form-item label="紧急联系人姓名" v-bind="validateInfos.contactName"
+                id="NuEmployeesAdvisoryInfoForm-contactName" name="contactName">
+                <!-- <a-input v-model:value="formData.contactName" placeholder="请输入紧急联系人姓名"  allow-clear disabled  ></a-input> -->
+                {{ formData.contactName }}
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="紧急联系人电话" v-bind="validateInfos.contactTel" id="NuEmployeesAdvisoryInfoForm-contactTel"
+                name="contactTel">
+                <!-- <a-input v-model:value="formData.contactTel" placeholder="请输入紧急联系人电话"  allow-clear disabled  ></a-input> -->
+                {{ formData.contactTel }}
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="与本人关系" v-bind="validateInfos.contactRelationship"
+                id="NuEmployeesAdvisoryInfoForm-contactRelationship" name="contactRelationship">
+                <!-- <a-input v-model:value="formData.contactRelationship" placeholder="请输入紧急联系人与本人关系"  allow-clear disabled  ></a-input> -->
+                {{ formData.contactRelationship }}
+              </a-form-item>
+            </a-col>
             <a-col :span="24">
               <SectionDivider :title="'银行卡信息'" />
             </a-col>
-						<a-col :span="12">
-							<a-form-item label="银行卡正面" v-bind="validateInfos.bankZmPath" id="NuEmployeesAdvisoryInfoForm-bankZmPath" name="bankZmPath">
-								<j-image-upload :fileMax="1" text="无" v-model:value="formData.bankZmPath" disabled  ></j-image-upload>
-							</a-form-item>
-						</a-col>
-						<a-col :span="12">
-							<a-form-item label="银行卡反面" v-bind="validateInfos.bankFmPath" id="NuEmployeesAdvisoryInfoForm-bankFmPath" name="bankFmPath">
-								<j-image-upload :fileMax="1" text="无" v-model:value="formData.bankFmPath"  disabled ></j-image-upload>
-							</a-form-item>
-						</a-col>
-						<a-col :span="12">
-							<a-form-item label="开户行" v-bind="validateInfos.openingBank" id="NuEmployeesAdvisoryInfoForm-openingBank" name="openingBank">
-								<!-- <a-input v-model:value="formData.openingBank" placeholder="请输入开户行"  allow-clear disabled  ></a-input> -->
-                {{formData.openingBank}}
-							</a-form-item>
-						</a-col>
-						<a-col :span="12">
-							<a-form-item label="银行卡号" v-bind="validateInfos.bankCard" id="NuEmployeesAdvisoryInfoForm-bankCard" name="bankCard">
-								<!-- <a-input v-model:value="formData.bankCard" placeholder="请输入银行卡号"  allow-clear disabled  ></a-input> -->
-                {{formData.bankCard}}
-							</a-form-item>
-						</a-col>
+            <a-col :span="12">
+              <a-form-item label="银行卡正面" v-bind="validateInfos.bankZmPath" id="NuEmployeesAdvisoryInfoForm-bankZmPath"
+                name="bankZmPath">
+                <j-image-upload :fileMax="1" text="无" v-model:value="formData.bankZmPath" disabled></j-image-upload>
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="银行卡反面" v-bind="validateInfos.bankFmPath" id="NuEmployeesAdvisoryInfoForm-bankFmPath"
+                name="bankFmPath">
+                <j-image-upload :fileMax="1" text="无" v-model:value="formData.bankFmPath" disabled></j-image-upload>
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="开户行" v-bind="validateInfos.openingBank" id="NuEmployeesAdvisoryInfoForm-openingBank"
+                name="openingBank">
+                <!-- <a-input v-model:value="formData.openingBank" placeholder="请输入开户行"  allow-clear disabled  ></a-input> -->
+                {{ formData.openingBank }}
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="银行卡号" v-bind="validateInfos.bankCard" id="NuEmployeesAdvisoryInfoForm-bankCard"
+                name="bankCard">
+                <!-- <a-input v-model:value="formData.bankCard" placeholder="请输入银行卡号"  allow-clear disabled  ></a-input> -->
+                {{ formData.bankCard }}
+              </a-form-item>
+            </a-col>
             <a-col :span="24">
               <SectionDivider :title="'证件信息'" />
             </a-col>
-						<a-col :span="12">
-							<a-form-item label="健康证正面" v-bind="validateInfos.healthZmPath" id="NuEmployeesAdvisoryInfoForm-healthZmPath" name="healthZmPath">
-								<j-image-upload :fileMax="1" text="无" v-model:value="formData.healthZmPath" disabled  ></j-image-upload>
-							</a-form-item>
-						</a-col>
-						<a-col :span="12">
-							<a-form-item label="健康证反面" v-bind="validateInfos.healthFmPath" id="NuEmployeesAdvisoryInfoForm-healthFmPath" name="healthFmPath">
-								<j-image-upload :fileMax="1" text="无" v-model:value="formData.healthFmPath"  disabled ></j-image-upload>
-							</a-form-item>
-						</a-col>
-						<a-col :span="12">
-							<a-form-item label="资质证" v-bind="validateInfos.qualificationPath" id="NuEmployeesAdvisoryInfoForm-qualificationPath" name="qualificationPath">
-								<j-image-upload :fileMax="0" text="无" v-model:value="formData.qualificationPath"  disabled ></j-image-upload>
-							</a-form-item>
-						</a-col>
-						<a-col :span="12">
-							<a-form-item label="无犯罪正面" v-bind="validateInfos.noCrimeCertificate" id="NuEmployeesAdvisoryInfoForm-noCrimeCertificate" name="noCrimeCertificate">
-								<j-image-upload :fileMax="1" text="无" v-model:value="formData.noCrimeCertificate"  disabled ></j-image-upload>
-							</a-form-item>
-						</a-col>
+            <a-col :span="12">
+              <a-form-item label="健康证正面" v-bind="validateInfos.healthZmPath"
+                id="NuEmployeesAdvisoryInfoForm-healthZmPath" name="healthZmPath">
+                <j-image-upload :fileMax="1" text="无" v-model:value="formData.healthZmPath" disabled></j-image-upload>
+              </a-form-item>
+            </a-col>
+            <!-- <a-col :span="12">
+              <a-form-item label="健康证反面" v-bind="validateInfos.healthFmPath"
+                id="NuEmployeesAdvisoryInfoForm-healthFmPath" name="healthFmPath">
+                <j-image-upload :fileMax="1" text="无" v-model:value="formData.healthFmPath" disabled></j-image-upload>
+              </a-form-item>
+            </a-col> -->
+            <a-col :span="12">
+              <a-form-item label="资质证" v-bind="validateInfos.qualificationPath"
+                id="NuEmployeesAdvisoryInfoForm-qualificationPath" name="qualificationPath">
+                <j-image-upload :fileMax="0" text="无" v-model:value="formData.qualificationPath"
+                  disabled></j-image-upload>
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="无犯罪正面" v-bind="validateInfos.noCrimeCertificate"
+                id="NuEmployeesAdvisoryInfoForm-noCrimeCertificate" name="noCrimeCertificate">
+                <j-image-upload :fileMax="1" text="无" v-model:value="formData.noCrimeCertificate"
+                  disabled></j-image-upload>
+              </a-form-item>
+            </a-col>
           </a-row>
         </a-form>
       </template>
@@ -194,159 +223,159 @@
 </template>
 
 <script lang="ts" setup>
-  import { ref, reactive, defineExpose, nextTick, defineProps, computed, onMounted } from 'vue';
-  import { defHttp } from '/@/utils/http/axios';
-  import { useMessage } from '/@/hooks/web/useMessage';
-  import JImageUpload from '/@/components/Form/src/jeecg/components/JImageUpload.vue';
-  import { getValueType } from '/@/utils';
-  import { saveOrUpdate } from '../NuEmployeesAdvisoryInfo.api';
-  import { Form } from 'ant-design-vue';
-  import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
+import { ref, reactive, defineExpose, nextTick, defineProps, computed, onMounted } from 'vue';
+import { defHttp } from '/@/utils/http/axios';
+import { useMessage } from '/@/hooks/web/useMessage';
+import JImageUpload from '/@/components/Form/src/jeecg/components/JImageUpload.vue';
+import { getValueType } from '/@/utils';
+import { saveOrUpdate } from '../NuEmployeesAdvisoryInfo.api';
+import { Form } from 'ant-design-vue';
+import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
 import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
-  const props = defineProps({
-    formDisabled: { type: Boolean, default: false },
-    formData: { type: Object, default: () => ({})},
-    formBpm: { type: Boolean, default: true }
-  });
-  const formRef = ref();
-  const useForm = Form.useForm;
-  const emit = defineEmits(['register', 'ok']);
-  const formData = reactive<Record<string, any>>({
-    id: '',
-    tel: '',   
-    name: '',   
-    sex: '',   
-    national: '',   
-    birthDate: '',   
-    idCardAddress: '',   
-    idCard: '',   
-    issuingAuthority: '',   
-    startTime: '',   
-    endTime: '',   
-    cardZmPath: '',   
-    cardFmPath: '',   
-    maritalStatus: '',   
-    height: '',   
-    weight: '',   
-    healthStatus: '',   
-    politicalAppearance: '',   
-    contactName: '',   
-    contactTel: '',   
-    contactRelationship: '',   
-    hukouType: '',   
-    bankZmPath: '',   
-    bankFmPath: '',   
-    openingBank: '',   
-    bankCard: '',   
-    healthZmPath: '',   
-    healthFmPath: '',   
-    qualificationPath: '',   
-    noCrimeCertificate: '',   
-  });
-  const { createMessage } = useMessage();
-  const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 8 } });
-  const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 12 } });
-  const confirmLoading = ref<boolean>(false);
-  //表单验证
-  const validatorRules = reactive({
-  });
-  const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
+const props = defineProps({
+  formDisabled: { type: Boolean, default: false },
+  formData: { type: Object, default: () => ({}) },
+  formBpm: { type: Boolean, default: true }
+});
+const formRef = ref();
+const useForm = Form.useForm;
+const emit = defineEmits(['register', 'ok']);
+const formData = reactive<Record<string, any>>({
+  id: '',
+  tel: '',
+  name: '',
+  sex: '',
+  national: '',
+  birthDate: '',
+  idCardAddress: '',
+  idCard: '',
+  issuingAuthority: '',
+  startTime: '',
+  endTime: '',
+  cardZmPath: '',
+  cardFmPath: '',
+  maritalStatus: '',
+  height: '',
+  weight: '',
+  healthStatus: '',
+  politicalAppearance: '',
+  contactName: '',
+  contactTel: '',
+  contactRelationship: '',
+  hukouType: '',
+  bankZmPath: '',
+  bankFmPath: '',
+  openingBank: '',
+  bankCard: '',
+  healthZmPath: '',
+  healthFmPath: '',
+  qualificationPath: '',
+  noCrimeCertificate: '',
+});
+const { createMessage } = useMessage();
+const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 8 } });
+const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 12 } });
+const confirmLoading = ref<boolean>(false);
+//表单验证
+const validatorRules = reactive({
+});
+const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
 
-  // 表单禁用
-  const disabled = computed(()=>{
-    if(props.formBpm === true){
-      if(props.formData.disabled === false){
-        return false;
-      }else{
-        return true;
+// 表单禁用
+const disabled = computed(() => {
+  if (props.formBpm === true) {
+    if (props.formData.disabled === false) {
+      return false;
+    } else {
+      return true;
+    }
+  }
+  return props.formDisabled;
+});
+
+
+/**
+ * 新增
+ */
+function add() {
+  edit({});
+}
+
+/**
+ * 编辑
+ */
+function edit(record) {
+  nextTick(() => {
+    resetFields();
+    const tmpData = {};
+    Object.keys(formData).forEach((key) => {
+      if (record.hasOwnProperty(key)) {
+        tmpData[key] = record[key]
+      }
+    })
+    //赋值
+    Object.assign(formData, tmpData);
+  });
+}
+
+/**
+ * 提交数据
+ */
+async function submitForm() {
+  try {
+    // 触发表单验证
+    await validate();
+  } catch ({ errorFields }) {
+    if (errorFields) {
+      const firstField = errorFields[0];
+      if (firstField) {
+        formRef.value.scrollToField(firstField.name, { behavior: 'smooth', block: 'center' });
       }
     }
-    return props.formDisabled;
-  });
-
-  
-  /**
-   * 新增
-   */
-  function add() {
-    edit({});
+    return Promise.reject(errorFields);
   }
-
-  /**
-   * 编辑
-   */
-  function edit(record) {
-    nextTick(() => {
-      resetFields();
-      const tmpData = {};
-      Object.keys(formData).forEach((key) => {
-        if(record.hasOwnProperty(key)){
-          tmpData[key] = record[key]
-        }
-      })
-      //赋值
-      Object.assign(formData, tmpData);
+  confirmLoading.value = true;
+  const isUpdate = ref<boolean>(false);
+  //时间格式化
+  let model = formData;
+  if (model.id) {
+    isUpdate.value = true;
+  }
+  //循环数据
+  for (let data in model) {
+    //如果该数据是数组并且是字符串类型
+    if (model[data] instanceof Array) {
+      let valueType = getValueType(formRef.value.getProps, data);
+      //如果是字符串类型的需要变成以逗号分割的字符串
+      if (valueType === 'string') {
+        model[data] = model[data].join(',');
+      }
+    }
+  }
+  await saveOrUpdate(model, isUpdate.value)
+    .then((res) => {
+      if (res.success) {
+        createMessage.success(res.message);
+        emit('ok');
+      } else {
+        createMessage.warning(res.message);
+      }
+    })
+    .finally(() => {
+      confirmLoading.value = false;
     });
-  }
-
-  /**
-   * 提交数据
-   */
-  async function submitForm() {
-    try {
-      // 触发表单验证
-      await validate();
-    } catch ({ errorFields }) {
-      if (errorFields) {
-        const firstField = errorFields[0];
-        if (firstField) {
-          formRef.value.scrollToField(firstField.name, { behavior: 'smooth', block: 'center' });
-        }
-      }
-      return Promise.reject(errorFields);
-    }
-    confirmLoading.value = true;
-    const isUpdate = ref<boolean>(false);
-    //时间格式化
-    let model = formData;
-    if (model.id) {
-      isUpdate.value = true;
-    }
-    //循环数据
-    for (let data in model) {
-      //如果该数据是数组并且是字符串类型
-      if (model[data] instanceof Array) {
-        let valueType = getValueType(formRef.value.getProps, data);
-        //如果是字符串类型的需要变成以逗号分割的字符串
-        if (valueType === 'string') {
-          model[data] = model[data].join(',');
-        }
-      }
-    }
-    await saveOrUpdate(model, isUpdate.value)
-      .then((res) => {
-        if (res.success) {
-          createMessage.success(res.message);
-          emit('ok');
-        } else {
-          createMessage.warning(res.message);
-        }
-      })
-      .finally(() => {
-        confirmLoading.value = false;
-      });
-  }
+}
 
 
-  defineExpose({
-    add,
-    edit,
-    submitForm,
-  });
+defineExpose({
+  add,
+  edit,
+  submitForm,
+});
 </script>
 
 <style lang="less" scoped>
-  .antd-modal-form {
-    padding: 14px;
-  }
+.antd-modal-form {
+  padding: 14px;
+}
 </style>