1、企业信息变更后修改企业基础信息及企业证件信息

src/api/fta/enterprisechange/index.ts

@@ -1,57 +1,82 @@
-import request from '@/config/axios'
+import request from '@/config/axios'
-
+
-// 企业信息变更 VO
+// 企业信息变更 VO
-export interface EnterpriseChangeVO {
+export interface EnterpriseChangeVO {
-  id: number // 编号
+  id: number // 编号
-  oldEnterpriseJson: string // 变更前企业信息Json字符串
+  name: string // 企业名称
-  oldEnterpriseName: string // 变更前企业名称
+  legalPerson: string // 企业法定代表人
-  oldLegalPerson: string // 变更前企业法定代表人
+  unifiedCreditCode: string // 统一信用代码
-  name: string // 企业名称
+  telephone: string // 电话
-  legalPerson: string // 企业法定代表人
+  mailbox: string // 邮箱
-  unifiedCreditCode: string // 统一社会信用代码
+  registerAddress: string // 注册地址
-  telephone: string // 电话
+  communicationAddress: string // 通信地址
-  mailbox: string // 邮箱
+  operateState: number // 经营状态
-  registerAddress: string // 注册地址
+  isSecure: number //是否涉及危化证
-  communicationAddress: string // 通信地址
+  establishDate: Date // 成立日期
-  operateState: number // 经营状态
+  enterpriseType: number // 企业类型
-  establishDate: Date // 成立日期
+  enterpriseBelongingToRegion: string // 企业所属地区
-  enterpriseType: number // 企业类型
+  enterpriseBelongingToIndustry: string // 企业所属行业
-  enterpriseBelongingToRegion: string // 企业所属地区
+  registerOffice: string // 登记机关
-  enterpriseBelongingToIndustry: string // 企业所属行业
+  operatePermitRange: string // 经营许可范围
-  registerOffice: string // 登记机关
+  principalImageUrl: undefined  //  主要负责人证图片
-  operatePermitRange: string // 经营许可范围
+  securityImageUrl: undefined  //  安全员证图片
-  isSecure: number // 是否涉及危化证
+  dangerImageUrl: undefined  //  危化证图片
-}
+  principalCertificateNumber: undefined  //  负责人证号
-
+  principalName: undefined  //  负责人姓名
-// 企业信息变更 API
+  principalPersonnelType: undefined  // 负责人员类型
-export const EnterpriseChangeApi = {
+  principalSex: undefined  // 负责人性别
-  // 查询企业信息变更分页
+  principalCategoryOfEmployment: undefined  //  负责人行业类别
-  getEnterpriseChangePage: async (params: any) => {
+  principalDateOfIssue: undefined  // 负责人证初领日期
-    return await request.get({ url: `/fta/enterprise-change/page`, params })
+  principalExpiryDate: undefined  //  负责人证到期日期
-  },
+  principalLicenceIssuingAuthority: undefined  // 负责人证签发机关
-
+  securityCertificateNumber: undefined  //  安全员证号
-  // 查询企业信息变更详情
+  securityName: undefined  //   安全员姓名
-  getEnterpriseChange: async (id: number) => {
+  securityPersonnelType: undefined  //  安全员人员类型
-    return await request.get({ url: `/fta/enterprise-change/get?id=` + id })
+  securitySex: undefined  //  安全员性别
-  },
+  securityCategoryOfEmployment: undefined  // 安全员行业类别
-
+  securityDateOfIssue: undefined  //  安全员初领日期
-  // 新增企业信息变更
+  securityExpiryDate: undefined  // 安全员证到期日期
-  createEnterpriseChange: async (data: EnterpriseChangeVO) => {
+  securityLicenceIssuingAuthority: undefined  //  安全员证签发机关
-    return await request.post({ url: `/fta/enterprise-change/create`, data })
+  dangerBusinessPattern: undefined  //  危化证经营方式
-  },
+  dangerLicenceIssuingAuthority: undefined  //  危化证发证机关
-
+  dangerDateOfIssue: undefined  //  危化证初领日期
-  // 修改企业信息变更
+  dangerExpiryDate: undefined  //   危化证到期日期
-  updateEnterpriseChange: async (data: EnterpriseChangeVO) => {
+}
-    return await request.put({ url: `/fta/enterprise-change/update`, data })
+
-  },
+// 企业信息变更 API
-
+export const EnterpriseChangeApi = {
-  // 删除企业信息变更
+  // 查询企业信息变更分页
-  deleteEnterpriseChange: async (id: number) => {
+  getEnterpriseChangePage: async (params: any) => {
-    return await request.delete({ url: `/fta/enterprise-change/delete?id=` + id })
+    return await request.get({ url: `/fta/enterprise-change/page`, params })
-  },
+  },
-
+
-  // 导出企业信息变更 Excel
+  // 查询企业信息变更详情
-  exportEnterpriseChange: async (params) => {
+  getEnterpriseChange: async (id: number) => {
-    return await request.download({ url: `/fta/enterprise-change/export-excel`, params })
+    return await request.get({ url: `/fta/enterprise-change/get?id=` + id })
-  },
+  },
-}
+
+  // 查询企业变更前信息
+  getOldEnterprise: async (id: number) => {
+    return await request.get({ url: `/fta/enterprise-change/getOldEnterprise?id=` + id })
+  },
+
+  // 新增企业信息变更
+  createEnterpriseChange: async (data: EnterpriseChangeVO) => {
+    return await request.post({ url: `/fta/enterprise-change/create`, data })
+  },
+
+  // 修改企业信息变更
+  updateEnterpriseChange: async (data: EnterpriseChangeVO) => {
+    return await request.put({ url: `/fta/enterprise-change/update`, data })
+  },
+
+  // 删除企业信息变更
+  deleteEnterpriseChange: async (id: number) => {
+    return await request.delete({ url: `/fta/enterprise-change/delete?id=` + id })
+  },
+
+  // 导出企业信息变更 Excel
+  exportEnterpriseChange: async (params) => {
+    return await request.download({ url: `/fta/enterprise-change/export-excel`, params })
+  },
+}

src/views/fta/enterprisechange/create.vue

@@ -27,30 +27,202 @@
       <el-col :span="12">
         <el-card class="mb-10px">
           <template #header>原企业信息</template>
-          <el-form
+          <el-form :model="formData" ref="startUserSelectAssigneesFormRef">
-            :model="startUserSelectAssignees"
+            <el-form-item label="企业名称" label-width="120px">
-            :rules="startUserSelectAssigneesFormRules"
+              <el-input v-model="formData.name" disabled />
-            ref="startUserSelectAssigneesFormRef"
+            </el-form-item>
-          >
+            <el-form-item label="企业法定代表人" label-width="120px">
-            <el-form-item
+              <el-input v-model="formData.legalPerson" disabled />
-              v-for="userTask in startUserSelectTasks"
+            </el-form-item>
-              :key="userTask.id"
+            <el-form-item label="统一信用代码" label-width="120px">
-              :label="`任务【${userTask.name}】`"
+              <el-input v-model="formData.unifiedCreditCode" disabled />
-              :prop="userTask.id"
+            </el-form-item>
-            >
+            <el-form-item label="电话" label-width="120px">
-              <el-select
+              <el-input v-model="formData.telephone" disabled />
-                v-model="startUserSelectAssignees[userTask.id]"
+            </el-form-item>
-                multiple
+            <el-form-item label="邮箱" label-width="120px">
-                placeholder="请选择审批人"
+              <el-input v-model="formData.mailbox" disabled />
-              >
+            </el-form-item>
+            <el-form-item label="注册地址" label-width="120px">
+              <el-input v-model="formData.registerAddress" disabled />
+            </el-form-item>
+            <el-form-item label="通信地址" label-width="120px">
+              <el-input v-model="formData.communicationAddress" disabled />
+            </el-form-item>
+            <el-form-item label="经营状态" label-width="120px">
+              <el-select v-model="formData.operateState" disabled>
                 <el-option
-                  v-for="user in userList"
+                  v-for="dict in getIntDictOptions(DICT_TYPE.ENTERPRISE_OPERATE_STATE)"
-                  :key="user.id"
+                  :key="dict.value"
-                  :label="user.nickname"
+                  :label="dict.label"
-                  :value="user.id"
+                  :value="dict.value"
                 />
               </el-select>
             </el-form-item>
+            <el-form-item label="成立日期" label-width="120px">
+              <el-date-picker
+                v-model="formData.establishDate"
+                type="date"
+                value-format="YYYY-MM-DD"
+                disabled
+              />
+            </el-form-item>
+            <el-form-item label="企业类型" label-width="120px">
+              <el-select v-model="formData.enterpriseType" disabled>
+                <el-option
+                  v-for="dict in getIntDictOptions(DICT_TYPE.ENTERPRISE_TYPE)"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="企业所属地区" label-width="120px">
+              <el-input v-model="formData.enterpriseBelongingToRegion" disabled />
+            </el-form-item>
+            <el-form-item label="企业所属行业" label-width="120px">
+              <el-input v-model="formData.enterpriseBelongingToIndustry" disabled />
+            </el-form-item>
+            <el-form-item label="登记机关" label-width="120px">
+              <el-input v-model="formData.registerOffice" disabled />
+            </el-form-item>
+            <el-form-item label="经营许可范围" label-width="120px">
+              <el-input v-model="formData.operatePermitRange" disabled />
+            </el-form-item>
+            <el-form-item label="是否涉及危化证" label-width="120px">
+              <el-select v-model="formData.isSecure" disabled>
+                <el-option
+                  v-for="dict in getIntDictOptions(DICT_TYPE.ENTERPRISE_IS_SECURITY)"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+            <el-divider content-position="left">主要负责人证</el-divider>
+            <el-form-item label="证号" label-width="120px">
+              <el-input v-model="formData.principalCertificateNumber" disabled />
+            </el-form-item>
+            <el-form-item label="姓名" label-width="120px">
+              <el-input v-model="formData.principalName" disabled />
+            </el-form-item>
+            <el-form-item label="人员类型" label-width="120px">
+              <el-select v-model="formData.principalPersonnelType" disabled>
+                <el-option
+                  v-for="dict in getStrDictOptions(DICT_TYPE.CREDENTIAL_PERSONNEL_TYPE)"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="性别" label-width="120px">
+              <el-select v-model="formData.principalSex" disabled>
+                <el-option
+                  v-for="dict in getIntDictOptions(DICT_TYPE.CREDENTIAL_SEX)"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="行业类别" label-width="120px">
+              <el-select v-model="formData.principalCategoryOfEmployment" disabled>
+                <el-option
+                  v-for="dict in getStrDictOptions(DICT_TYPE.CREDENTIAL_CATEGORY_OF_EMPLOYMENT)"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="初领日期" label-width="120px">
+              <el-date-picker v-model="formData.principalDateOfIssue" type="date" value-format="YYYY-MM-DD" disabled />
+            </el-form-item>
+            <el-form-item label="到期日期" label-width="120px">
+              <el-date-picker v-model="formData.principalExpiryDate" type="date" value-format="YYYY-MM-DD" disabled />
+            </el-form-item>
+            <el-form-item label="签发机关" label-width="120px">
+              <el-input v-model="formData.principalLicenceIssuingAuthority" disabled />
+            </el-form-item>
+            <el-form-item label="图片" label-width="120px">
+              <el-image style="width: 100px; height: 100px" :src="formData.principalImageUrl" :preview-src-list="[formData.principalImageUrl]" fit="fill" />
+            </el-form-item>
+            <el-divider content-position="left">安全员证</el-divider>
+            <el-form-item label="证号" label-width="120px">
+              <el-input v-model="formData.securityCertificateNumber" disabled />
+            </el-form-item>
+            <el-form-item label="姓名" label-width="120px">
+              <el-input v-model="formData.securityName" disabled />
+            </el-form-item>
+            <el-form-item label="人员类型" label-width="120px">
+              <el-select v-model="formData.securityPersonnelType" disabled>
+                <el-option
+                  v-for="dict in getStrDictOptions(DICT_TYPE.CREDENTIAL_PERSONNEL_TYPE)"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="性别" label-width="120px">
+              <el-select v-model="formData.securitySex" disabled>
+                <el-option
+                  v-for="dict in getIntDictOptions(DICT_TYPE.CREDENTIAL_SEX)"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="行业类别" label-width="120px">
+              <el-select v-model="formData.securityCategoryOfEmployment" disabled>
+                <el-option
+                  v-for="dict in getStrDictOptions(DICT_TYPE.CREDENTIAL_CATEGORY_OF_EMPLOYMENT)"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="初领日期" label-width="120px">
+              <el-date-picker v-model="formData.securityDateOfIssue" type="date" value-format="YYYY-MM-DD" disabled/>
+            </el-form-item>
+            <el-form-item label="到期日期" label-width="120px">
+              <el-date-picker v-model="formData.securityExpiryDate" type="date" value-format="YYYY-MM-DD" disabled/>
+            </el-form-item>
+            <el-form-item label="签发机关" label-width="120px">
+              <el-input v-model="formData.securityLicenceIssuingAuthority" disabled />
+            </el-form-item>
+            <el-form-item label="图片" label-width="120px">
+              <el-image style="width: 100px; height: 100px" :src="formData.securityImageUrl" :preview-src-list="[formData.securityImageUrl]" fit="fill" />
+            </el-form-item>
+
+            <div v-if="formData.isSecure == 1">
+              <el-divider content-position="left">危化证</el-divider>
+              <el-form-item label="经营方式" label-width="120px">
+                <el-select v-model="formData.dangerBusinessPattern" disabled>
+                  <el-option
+                    v-for="dict in getStrDictOptions(DICT_TYPE.CREDENTIAL_BUSINESS_PATTERN)"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  />
+                </el-select>
+              </el-form-item>
+              <el-form-item label="发证机关" label-width="120px">
+                <el-input v-model="formData.dangerLicenceIssuingAuthority" disabled />
+              </el-form-item>
+              <el-form-item label="发证日期" label-width="120px">
+                <el-date-picker v-model="formData.dangerDateOfIssue" type="date" value-format="YYYY-MM-DD" disabled/>
+              </el-form-item>
+              <el-form-item label="到期日期" label-width="120px">
+                <el-date-picker v-model="formData.dangerExpiryDate" type="date" value-format="YYYY-MM-DD" disabled/>
+              </el-form-item>
+              <el-form-item label="图片" label-width="120px">
+                <el-image style="width: 100px; height: 100px" :src="formData.dangerImageUrl" :preview-src-list="[formData.dangerImageUrl]" fit="fill" />
+              </el-form-item>
+            </div>
           </el-form>
         </el-card>
       </el-col>
@@ -58,29 +230,211 @@
         <el-card class="mb-10px">
           <template #header>变更后企业信息</template>
           <el-form
-            :model="startUserSelectAssignees"
+            :model="newFormData"
-            :rules="startUserSelectAssigneesFormRules"
+            :rules="newFormDataRules"
-            ref="startUserSelectAssigneesFormRef"
+            ref="newEnterpriseFormRef"
           >
-            <el-form-item
+            <el-form-item label="企业名称" prop="name" label-width="120px">
-              v-for="userTask in startUserSelectTasks"
+              <el-input v-model="newFormData.name" placeholder="请输入企业名称" />
-              :key="userTask.id"
+            </el-form-item>
-              :label="`任务【${userTask.name}】`"
+            <el-form-item label="企业法定代表人" prop="legalPerson" label-width="120px">
-              :prop="userTask.id"
+              <el-input v-model="newFormData.legalPerson" placeholder="请输入企业法定代表人" />
-            >
+            </el-form-item>
-              <el-select
+            <el-form-item label="统一信用代码" prop="unifiedCreditCode" label-width="120px">
-                v-model="startUserSelectAssignees[userTask.id]"
+              <el-input v-model="newFormData.unifiedCreditCode" placeholder="请输入统一信用代码" />
-                multiple
+            </el-form-item>
-                placeholder="请选择审批人"
+            <el-form-item label="电话" prop="telephone" label-width="120px">
-              >
+              <el-input v-model="newFormData.telephone" placeholder="请输入企业联系电话" />
+            </el-form-item>
+            <el-form-item label="邮箱" label-width="120px" prop="mailbox">
+              <el-input v-model="newFormData.mailbox" placeholder="请输入企业联系邮箱" />
+            </el-form-item>
+            <el-form-item label="注册地址" label-width="120px" prop="registerAddress">
+              <el-input v-model="newFormData.registerAddress"  placeholder="请输入企业注册地址" />
+            </el-form-item>
+            <el-form-item label="通信地址" label-width="120px" prop="communicationAddress">
+              <el-input v-model="newFormData.communicationAddress" placeholder="请输入企业通信地址" />
+            </el-form-item>
+            <el-form-item label="经营状态" label-width="120px" prop="operateState">
+              <el-select v-model="newFormData.operateState" placeholder="请选择企业经营状态">
                 <el-option
-                  v-for="user in userList"
+                  v-for="dict in getIntDictOptions(DICT_TYPE.ENTERPRISE_OPERATE_STATE)"
-                  :key="user.id"
+                  :key="dict.value"
-                  :label="user.nickname"
+                  :label="dict.label"
-                  :value="user.id"
+                  :value="dict.value"
                 />
               </el-select>
             </el-form-item>
+            <el-form-item label="成立日期" label-width="120px" prop="establishDate">
+              <el-date-picker
+                v-model="newFormData.establishDate"
+                type="date"
+                value-format="YYYY-MM-DD"
+                placeholder="请选择企业成立日期"
+              />
+            </el-form-item>
+            <el-form-item label="企业类型" label-width="120px" prop="enterpriseType">
+              <el-select v-model="newFormData.enterpriseType" placeholder="请选择企业类型">
+                <el-option
+                  v-for="dict in getIntDictOptions(DICT_TYPE.ENTERPRISE_TYPE)"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="企业所属地区" label-width="120px" prop="enterpriseBelongingToRegion">
+              <el-input v-model="newFormData.enterpriseBelongingToRegion" placeholder="请输入企业所属地区" />
+            </el-form-item>
+            <el-form-item label="企业所属行业" label-width="120px" prop="enterpriseBelongingToIndustry">
+              <el-input v-model="newFormData.enterpriseBelongingToIndustry" placeholder="请输入企业所属行业" />
+            </el-form-item>
+            <el-form-item label="登记机关" label-width="120px" prop="registerOffice">
+              <el-input v-model="newFormData.registerOffice" placeholder="请输入企业登记机关" />
+            </el-form-item>
+            <el-form-item label="经营许可范围" label-width="120px" prop="operatePermitRange">
+              <el-input v-model="newFormData.operatePermitRange" placeholder="请输入企业经营许可范围" />
+            </el-form-item>
+            <el-form-item label="是否涉及危化证" label-width="120px" prop="isSecure">
+              <el-select v-model="newFormData.isSecure" placeholder="请选择是否涉及危化证">
+                <el-option
+                  v-for="dict in getIntDictOptions(DICT_TYPE.ENTERPRISE_IS_SECURITY)"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+            <el-divider content-position="left">主要负责人证</el-divider>
+            <el-form-item label="证号" label-width="120px" prop="principalCertificateNumber">
+              <el-input v-model="newFormData.principalCertificateNumber" placeholder="请输入负责人证号" />
+            </el-form-item>
+            <el-form-item label="姓名" label-width="120px" prop="principalName">
+              <el-input v-model="newFormData.principalName" placeholder="请输入负责人姓名" />
+            </el-form-item>
+            <el-form-item label="人员类型" label-width="120px" prop="principalPersonnelType">
+              <el-select v-model="newFormData.principalPersonnelType" placeholder="请选择负责人人员类型">
+                <el-option
+                  v-for="dict in getStrDictOptions(DICT_TYPE.CREDENTIAL_PERSONNEL_TYPE)"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="性别" label-width="120px" prop="principalSex">
+              <el-select v-model="newFormData.principalSex" placeholder="请选择负责人性别">
+                <el-option
+                  v-for="dict in getIntDictOptions(DICT_TYPE.CREDENTIAL_SEX)"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="行业类别" label-width="120px" prop="principalCategoryOfEmployment">
+              <el-select v-model="newFormData.principalCategoryOfEmployment" placeholder="请选择行业类别">
+                <el-option
+                  v-for="dict in getStrDictOptions(DICT_TYPE.CREDENTIAL_CATEGORY_OF_EMPLOYMENT)"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="初领日期" label-width="120px" prop="principalDateOfIssue">
+              <el-date-picker v-model="newFormData.principalDateOfIssue" type="date" value-format="YYYY-MM-DD" placeholder="请选择证件初领日期" />
+            </el-form-item>
+            <el-form-item label="到期日期" label-width="120px" prop="principalExpiryDate">
+              <el-date-picker v-model="newFormData.principalExpiryDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择证件到期日期" />
+            </el-form-item>
+            <el-form-item label="签发机关" label-width="120px" prop="principalLicenceIssuingAuthority">
+              <el-input v-model="newFormData.principalLicenceIssuingAuthority" placeholder="请输入证件签发机关" />
+            </el-form-item>
+            <el-form-item label="图片" label-width="120px" prop="principalImageUrl">
+              <el-button v-if="newFormData.principalImageUrl == undefined" type="primary" plain @click="fileOpenForm(1)"><Icon icon="ep:upload" class="mr-5px" /> 上传文件</el-button>
+              <el-image v-if="newFormData.principalImageUrl != undefined" style="width: 100px; height: 100px" :src="newFormData.principalImageUrl" :preview-src-list="[newFormData.principalImageUrl]" fit="fill" />
+              <el-button v-if="newFormData.principalImageUrl != undefined" type="danger" plain @click="deletedImageUrl(1)">删除图片</el-button>
+            </el-form-item>
+            <el-divider content-position="left">安全员证</el-divider>
+            <el-form-item label="证号" label-width="120px" prop="securityCertificateNumber">
+              <el-input v-model="newFormData.securityCertificateNumber" placeholder="请输入安全员证号" />
+            </el-form-item>
+            <el-form-item label="姓名" label-width="120px" prop="securityName">
+              <el-input v-model="newFormData.securityName" placeholder="请输入安全员证姓名" />
+            </el-form-item>
+            <el-form-item label="人员类型" label-width="120px" prop="securityPersonnelType">
+              <el-select v-model="newFormData.securityPersonnelType" placeholder="请选择人员类型">
+                <el-option
+                  v-for="dict in getStrDictOptions(DICT_TYPE.CREDENTIAL_PERSONNEL_TYPE)"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="性别" label-width="120px" prop="securitySex">
+              <el-select v-model="newFormData.securitySex" placeholder="请选择人员性别">
+                <el-option
+                  v-for="dict in getIntDictOptions(DICT_TYPE.CREDENTIAL_SEX)"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="行业类别" label-width="120px" prop="securityCategoryOfEmployment">
+              <el-select v-model="newFormData.securityCategoryOfEmployment" placeholder="请选择行业类别">
+                <el-option
+                  v-for="dict in getStrDictOptions(DICT_TYPE.CREDENTIAL_CATEGORY_OF_EMPLOYMENT)"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="初领日期" label-width="120px" prop="securityDateOfIssue">
+              <el-date-picker v-model="newFormData.securityDateOfIssue" type="date" value-format="YYYY-MM-DD" placeholder="请选择证件初领日期"/>
+            </el-form-item>
+            <el-form-item label="到期日期" label-width="120px" prop="securityExpiryDate">
+              <el-date-picker v-model="newFormData.securityExpiryDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择证件到期日期"/>
+            </el-form-item>
+            <el-form-item label="签发机关" label-width="120px" prop="securityLicenceIssuingAuthority">
+              <el-input v-model="newFormData.securityLicenceIssuingAuthority" placeholder="请输入证件签发机关" />
+            </el-form-item>
+            <el-form-item label="图片" label-width="120px" prop="securityImageUrl">
+              <el-button v-if="newFormData.securityImageUrl == undefined" type="primary" plain @click="fileOpenForm(2)"><Icon icon="ep:upload" class="mr-5px" /> 上传文件</el-button>
+              <el-image v-if="newFormData.securityImageUrl != undefined" style="width: 100px; height: 100px" :src="newFormData.securityImageUrl" :preview-src-list="[newFormData.securityImageUrl]" fit="fill" />
+              <el-button v-if="newFormData.securityImageUrl != undefined" type="danger" plain @click="deletedImageUrl(2)">删除图片</el-button>
+            </el-form-item>
+
+            <div v-if="newFormData.isSecure == 1">
+              <el-divider content-position="left">危化证</el-divider>
+              <el-form-item label="经营方式" label-width="120px" prop="dangerBusinessPattern">
+                <el-select v-model="newFormData.dangerBusinessPattern" placeholder="请选择经营方式">
+                  <el-option
+                    v-for="dict in getStrDictOptions(DICT_TYPE.CREDENTIAL_BUSINESS_PATTERN)"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  />
+                </el-select>
+              </el-form-item>
+              <el-form-item label="发证机关" label-width="120px" prop="dangerLicenceIssuingAuthority">
+                <el-input v-model="newFormData.dangerLicenceIssuingAuthority" placeholder="请输入发证机关" />
+              </el-form-item>
+              <el-form-item label="发证日期" label-width="120px" prop="dangerDateOfIssue">
+                <el-date-picker v-model="newFormData.dangerDateOfIssue" type="date" value-format="YYYY-MM-DD" placeholder="请选择证件发证日期"/>
+              </el-form-item>
+              <el-form-item label="到期日期" label-width="120px" prop="dangerExpiryDate">
+                <el-date-picker v-model="newFormData.dangerExpiryDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择证件到期日期"/>
+              </el-form-item>
+              <el-form-item label="图片" label-width="120px" prop="dangerImageUrl">
+                <el-button v-if="newFormData.dangerImageUrl == undefined" type="primary" plain @click="fileOpenForm(3)"><Icon icon="ep:upload" class="mr-5px" /> 上传文件</el-button>
+                <el-image v-if="newFormData.dangerImageUrl != undefined" style="width: 100px; height: 100px" :src="newFormData.dangerImageUrl" :preview-src-list="[newFormData.dangerImageUrl]" fit="fill" />
+                <el-button v-if="newFormData.dangerImageUrl != undefined" type="danger" plain @click="deletedImageUrl(3)">删除图片</el-button>
+              </el-form-item>
+            </div>
           </el-form>
         </el-card>
       </el-col>
@@ -116,20 +470,25 @@
         </el-form>
       </el-card>
     </el-col>
-    <el-form-item>
+    <el-button style="float: left" :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
-      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
-    </el-form-item>
   </el-form>
 
   <!-- 选择企业基本信息弹窗 -->
   <SelectEnterprise ref="selectEnterpriseRef" @setOldEnterprise="getOldEnterprise" />
+
+  <!-- 上传文件弹窗 -->
+  <ImageFileForm ref="fileFormRef" :imageType="imageType" @success="setImageUrl" />
 </template>
 <script lang="ts" setup>
-import { EnterpriseInformationApi, EnterpriseInformationVO } from '@/api/fta/enterpriseinformation'
+import { EnterpriseInformationApi } from '@/api/fta/enterpriseinformation'
+import { EnterpriseChangeApi,EnterpriseChangeVO } from "@/api/fta/enterprisechange";
 import { useTagsViewStore } from '@/store/modules/tagsView'
 import * as DefinitionApi from '@/api/bpm/definition'
 import * as UserApi from '@/api/system/user'
 import SelectEnterprise from './selectEnterprise.vue'
+import {DICT_TYPE, getIntDictOptions, getStrDictOptions} from "@/utils/dict";
+import {formatDate} from "@/utils/formatTime";
+import ImageFileForm from "@/views/fta/enterpriseinformation/ImageFileForm.vue";
 defineOptions({ name: 'EnterpriseInformationCreate' })
 
 const message = useMessage() // 消息弹窗
@@ -154,7 +513,71 @@ const formData = ref({
   enterpriseBelongingToIndustry: undefined,
   registerOffice: undefined,
   operatePermitRange: undefined,
-})
+  principalImageUrl: undefined,
+  securityImageUrl: undefined,
+  dangerImageUrl: undefined,
+  principalCertificateNumber: undefined,
+  principalName: undefined,
+  principalPersonnelType: undefined,
+  principalSex: undefined,
+  principalCategoryOfEmployment: undefined,
+  principalDateOfIssue: undefined,
+  principalExpiryDate: undefined,
+  principalLicenceIssuingAuthority: undefined,
+  securityCertificateNumber: undefined,
+  securityName: undefined,
+  securityPersonnelType: undefined,
+  securitySex: undefined,
+  securityCategoryOfEmployment: undefined,
+  securityDateOfIssue: undefined,
+  securityExpiryDate: undefined,
+  securityLicenceIssuingAuthority: undefined,
+  dangerBusinessPattern: undefined,
+  dangerLicenceIssuingAuthority: undefined,
+  dangerDateOfIssue: undefined,
+  dangerExpiryDate: undefined
+})  // 变更前企业信息
+const newFormData = ref({
+  id: undefined,
+  name: undefined,
+  legalPerson: undefined,
+  unifiedCreditCode: undefined,
+  telephone: undefined,
+  mailbox: undefined,
+  registerAddress: undefined,
+  communicationAddress: undefined,
+  operateState: undefined,
+  isSecure: undefined,
+  establishDate: undefined,
+  enterpriseType: undefined,
+  enterpriseBelongingToRegion: undefined,
+  enterpriseBelongingToIndustry: undefined,
+  registerOffice: undefined,
+  operatePermitRange: undefined,
+  principalImageUrl: undefined,
+  securityImageUrl: undefined,
+  dangerImageUrl: undefined,
+  principalCertificateNumber: undefined,
+  principalName: undefined,
+  principalPersonnelType: undefined,
+  principalSex: undefined,
+  principalCategoryOfEmployment: undefined,
+  principalDateOfIssue: undefined,
+  principalExpiryDate: undefined,
+  principalLicenceIssuingAuthority: undefined,
+  securityCertificateNumber: undefined,
+  securityName: undefined,
+  securityPersonnelType: undefined,
+  securitySex: undefined,
+  securityCategoryOfEmployment: undefined,
+  securityDateOfIssue: undefined,
+  securityExpiryDate: undefined,
+  securityLicenceIssuingAuthority: undefined,
+  dangerBusinessPattern: undefined,
+  dangerLicenceIssuingAuthority: undefined,
+  dangerDateOfIssue: undefined,
+  dangerExpiryDate: undefined
+})  // 变更后企业信息
 const formRules = reactive({
   name: [{ required: true, message: '企业名称不能为空', trigger: 'blur' }],
   legalPerson: [{ required: true, message: '企业法定代表人不能为空', trigger: 'blur' }],
@@ -172,10 +595,52 @@ const formRules = reactive({
   operatePermitRange: [{ required: true, message: '经营许可范围不能为空', trigger: 'blur' }],
   isSecure: [{ required: true, message: '是否涉及危化证不能为空', trigger: 'blur' }]
 })
+const newFormDataRules = reactive({
+  name: [{ required: true, message: '企业名称不能为空', trigger: 'blur' }],
+  legalPerson: [{ required: true, message: '企业法定代表人不能为空', trigger: 'blur' }],
+  unifiedCreditCode: [{ required: true, message: '统一信用代码不能为空', trigger: 'blur' }],
+  telephone: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
+  mailbox: [{ required: true, message: '邮箱不能为空', trigger: 'blur' }],
+  registerAddress: [{ required: true, message: '注册地址不能为空', trigger: 'blur' }],
+  communicationAddress: [{ required: true, message: '通信地址不能为空', trigger: 'blur' }],
+  operateState: [{ required: true, message: '经营状态不能为空', trigger: 'change' }],
+  establishDate: [{ required: true, message: '成立日期不能为空', trigger: 'blur' }],
+  enterpriseType: [{ required: true, message: '企业类型不能为空', trigger: 'change' }],
+  enterpriseBelongingToRegion: [{ required: true, message: '企业所属地区不能为空', trigger: 'blur' }],
+  enterpriseBelongingToIndustry: [{ required: true, message: '企业所属行业不能为空', trigger: 'blur' }],
+  registerOffice: [{ required: true, message: '登记机关不能为空', trigger: 'blur' }],
+  operatePermitRange: [{ required: true, message: '经营许可范围不能为空', trigger: 'blur' }],
+  isSecure: [{ required: true, message: '是否涉及危化证不能为空', trigger: 'blur' }],
+  principalImageUrl: [{ required: true, message: '请上传主要负责人证图片', trigger: 'blur' }],
+  principalCertificateNumber: [{ required: true, message: '请输入负责人证号', trigger: 'blur' }],
+  principalName: [{ required: true, message: '请输入负责人证姓名', trigger: 'blur' }],
+  principalPersonnelType: [{ required: true, message: '请选择人员类型', trigger: 'blur' }],
+  principalSex: [{ required: true, message: '请选择性别', trigger: 'blur' }],
+  principalCategoryOfEmployment: [{ required: true, message: '请选择行业类别', trigger: 'blur' }],
+  principalDateOfIssue: [{ required: true, message: '请选择初领日期', trigger: 'blur' }],
+  principalExpiryDate: [{ required: true, message: '请选择证件到期日期', trigger: 'blur' }],
+  principalLicenceIssuingAuthority: [{ required: true, message: '请输入证件签发机关', trigger: 'blur' }],
+  securityCertificateNumber: [{ required: true, message: '请输入安全员证号', trigger: 'blur' }],
+  securityName: [{ required: true, message: '请输入安全员姓名', trigger: 'blur' }],
+  securityPersonnelType: [{ required: true, message: '请选择人员类型', trigger: 'blur' }],
+  securitySex: [{ required: true, message: '请选择性别', trigger: 'blur' }],
+  securityCategoryOfEmployment: [{ required: true, message: '请选择行业类别', trigger: 'blur' }],
+  securityDateOfIssue: [{ required: true, message: '请选择初领日期', trigger: 'blur' }],
+  securityExpiryDate: [{ required: true, message: '请选择到期日期', trigger: 'blur' }],
+  securityLicenceIssuingAuthority: [{ required: true, message: '请填写证件签发机关', trigger: 'blur' }],
+  securityImageUrl: [{ required: true, message: '请上传安全员证图片', trigger: 'blur' }],
+  dangerBusinessPattern: [{ required: true, message: '请选择经营方式', trigger: 'blur' }],
+  dangerLicenceIssuingAuthority: [{ required: true, message: '请输入发证机关', trigger: 'blur' }],
+  dangerDateOfIssue: [{ required: true, message: '请选择发证日期', trigger: 'blur' }],
+  dangerExpiryDate: [{ required: true, message: '请选择证件到期日期', trigger: 'blur' }],
+  dangerImageUrl: [{ required: true, message: '请上传危化证图片', trigger: 'blur' }]
+})
 const formRef = ref() // 表单 Ref
+const newEnterpriseFormRef = ref() // 新的企业信息表单
+const detailLoading = ref(false) // 表单的加载中
 
 // 指定审批人
-const processDefineKey = 'fta_enterprise' // 流程定义 Key
+const processDefineKey = 'fta_enterprise_change' // 流程定义 Key
 const startUserSelectTasks = ref([]) // 发起人需要选择审批人的用户任务列表
 const startUserSelectAssignees = ref({}) // 发起人选择审批人的数据
 const startUserSelectAssigneesFormRef = ref() // 发起人选择审批人的表单 Ref
@@ -188,17 +653,65 @@ const selectEnterpriseCom = () => {
   selectEnterpriseRef.value.open()
 }
 
-/** 上传图片成功，设置图片地址 */
+/** 根据选择的企业信息，设置并获取证书信息及企业信息 */
-const getOldEnterprise = (data: EnterpriseInformationVO) => {
+const getOldEnterprise = async (data: EnterpriseChangeVO) => {
   // 根据id获取该企业的证件信息
+  detailLoading.value = true
+  try {
+    formData.value = await EnterpriseInformationApi.getEnterpriseInformation(data.value.id)
+    formData.value.establishDate = formatDate(formData.value.establishDate, 'YYYY-MM-DD')
+    formData.value.principalDateOfIssue = formatDate(formData.value.principalDateOfIssue, 'YYYY-MM-DD')
+    formData.value.principalExpiryDate = formatDate(formData.value.principalExpiryDate, 'YYYY-MM-DD')
+    formData.value.securityDateOfIssue = formatDate(formData.value.securityDateOfIssue, 'YYYY-MM-DD')
+    formData.value.securityExpiryDate = formatDate(formData.value.securityExpiryDate, 'YYYY-MM-DD')
+    if (formData.value.isSecure == 1){
+      formData.value.dangerExpiryDate  = formatDate(formData.value.dangerExpiryDate, 'YYYY-MM-DD')
+      formData.value.dangerDateOfIssue = formatDate(formData.value.dangerDateOfIssue, 'YYYY-MM-DD')
+    }else {
+      formData.value.dangerExpiryDate = new Date()
+      formData.value.dangerDateOfIssue = new Date()
+    }
+    newFormData.value = {...formData.value}
+  } finally {
+    detailLoading.value = false
+  }
+}
 
+/** 添加/修改操作 */
+const fileFormRef = ref()
+const imageType = ref()   //打开弹框上传的图片类型  1主要负责人证图片  2安全员证图片  3危化证图片
+const fileOpenForm = (type: Number) => {
+  imageType.value = type
+  fileFormRef.value.open()
+}
+
+/** 上传图片成功，设置图片地址 */
+const setImageUrl = (value: String,imageType: Number) => {
+  if (imageType == 1){
+    newFormData.value.principalImageUrl = value
+  }else if(imageType == 2){
+    newFormData.value.securityImageUrl = value
+  }else if(imageType == 3){
+    newFormData.value.dangerImageUrl = value
+  }
+}
+
+/** 删除图片 */
+const deletedImageUrl = (imageType: Number) => {
+  if (imageType == 1){
+    newFormData.value.principalImageUrl = undefined
+  }else if(imageType == 2){
+    newFormData.value.securityImageUrl = undefined
+  }else if(imageType == 3){
+    newFormData.value.dangerImageUrl = undefined
+  }
 }
 
 /** 提交表单 */
 const submitForm = async () => {
   // 校验表单
-  if (!formRef) return
+  if (!newEnterpriseFormRef) return
-  const valid = await formRef.value.validate()
+  const valid = await newEnterpriseFormRef.value.validate()
   if (!valid) return
   // 校验指定审批人
   if (startUserSelectTasks.value?.length > 0) {
@@ -208,12 +721,12 @@ const submitForm = async () => {
   // 提交请求
   formLoading.value = true
   try {
-    const data = { ...formData.value } as unknown as EnterpriseInformationVO
+    const data = { ...newFormData.value } as unknown as EnterpriseChangeVO
     // 设置指定审批人
     if (startUserSelectTasks.value?.length > 0) {
       data.startUserSelectAssignees = startUserSelectAssignees.value
     }
-    await EnterpriseInformationApi.createEnterpriseInformation(data)
+    await EnterpriseChangeApi.createEnterpriseChange(data)
     message.success('发起成功')
     // 关闭当前 Tab
     delView(unref(currentRoute))

src/views/fta/enterprisechange/detail.vue

@@ -1,61 +1,264 @@
 <template>
   <ContentWrap>
-    <el-descriptions :column="1" border>
+    <el-row :gutter="20">
-      <el-descriptions-item label="企业名称">
+      <el-col :span="12">
-        {{ detailData.name }}
+        <el-descriptions :column="1" border title="变更前企业信息">
-      </el-descriptions-item>
+          <el-descriptions-item label="企业名称">
-      <el-descriptions-item label="企业法定代表人">
+            {{ oldDetailData.name }}
-        {{ detailData.legalPerson }}
+          </el-descriptions-item>
-      </el-descriptions-item>
+          <el-descriptions-item label="企业法定代表人">
-      <el-descriptions-item label="统一信用代码">
+            {{ oldDetailData.legalPerson }}
-        {{ detailData.unifiedCreditCode }}
+          </el-descriptions-item>
-      </el-descriptions-item>
+          <el-descriptions-item label="统一信用代码">
-      <el-descriptions-item label="电话">
+            {{ oldDetailData.unifiedCreditCode }}
-        {{ detailData.telephone }}
+          </el-descriptions-item>
-      </el-descriptions-item>
+          <el-descriptions-item label="电话">
-      <el-descriptions-item label="邮箱">
+            {{ oldDetailData.telephone }}
-        {{ detailData.mailbox }}
+          </el-descriptions-item>
-      </el-descriptions-item>
+          <el-descriptions-item label="邮箱">
-      <el-descriptions-item label="注册地址">
+            {{ oldDetailData.mailbox }}
-        {{ detailData.registerAddress }}
+          </el-descriptions-item>
-      </el-descriptions-item>
+          <el-descriptions-item label="注册地址">
-      <el-descriptions-item label="通信地址">
+            {{ oldDetailData.registerAddress }}
-        {{ detailData.communicationAddress }}
+          </el-descriptions-item>
-      </el-descriptions-item>
+          <el-descriptions-item label="通信地址">
-      <el-descriptions-item label="经营状态">
+            {{ oldDetailData.communicationAddress }}
-        <dict-tag :type="DICT_TYPE.ENTERPRISE_OPERATE_STATE" :value="detailData.operateState" />
+          </el-descriptions-item>
-      </el-descriptions-item>
+          <el-descriptions-item label="经营状态">
-      <el-descriptions-item label="成立日期">
+            <dict-tag :type="DICT_TYPE.ENTERPRISE_OPERATE_STATE" :value="oldDetailData.operateState" />
-        {{ formatDate(detailData.establishDate, 'YYYY-MM-DD') }}
+          </el-descriptions-item>
-      </el-descriptions-item>
+          <el-descriptions-item label="成立日期">
-      <el-descriptions-item label="企业类型">
+            {{ formatDate(oldDetailData.establishDate, 'YYYY-MM-DD') }}
-        <dict-tag :type="DICT_TYPE.ENTERPRISE_TYPE" :value="detailData.enterpriseType" />
+          </el-descriptions-item>
-      </el-descriptions-item>
+          <el-descriptions-item label="企业类型">
-      <el-descriptions-item label="企业所属地区">
+            <dict-tag :type="DICT_TYPE.ENTERPRISE_TYPE" :value="oldDetailData.enterpriseType" />
-        {{ detailData.enterpriseBelongingToRegion }}
+          </el-descriptions-item>
-      </el-descriptions-item>
+          <el-descriptions-item label="企业所属地区">
-      <el-descriptions-item label="企业所属行业">
+            {{ oldDetailData.enterpriseBelongingToRegion }}
-        {{ detailData.enterpriseBelongingToIndustry }}
+          </el-descriptions-item>
-      </el-descriptions-item>
+          <el-descriptions-item label="企业所属行业">
-      <el-descriptions-item label="登记机关">
+            {{ oldDetailData.enterpriseBelongingToIndustry }}
-        {{ detailData.registerOffice }}
+          </el-descriptions-item>
-      </el-descriptions-item>
+          <el-descriptions-item label="登记机关">
-      <el-descriptions-item label="经营许可范围">
+            {{ oldDetailData.registerOffice }}
-        {{ detailData.operatePermitRange }}
+          </el-descriptions-item>
-      </el-descriptions-item>
+          <el-descriptions-item label="经营许可范围">
-      <el-descriptions-item label="是否涉及危化证">
+            {{ oldDetailData.operatePermitRange }}
-        <dict-tag :type="DICT_TYPE.ENTERPRISE_IS_SECURITY" :value="detailData.isSecure" />
+          </el-descriptions-item>
-      </el-descriptions-item>
+          <el-descriptions-item label="是否涉及危化证">
-    </el-descriptions>
+            <dict-tag :type="DICT_TYPE.ENTERPRISE_IS_SECURITY" :value="oldDetailData.isSecure" />
+          </el-descriptions-item>
+        </el-descriptions>
+        <el-descriptions :column="2" border title="变更前主要负责人证">
+          <el-descriptions-item label="证号">
+            {{ oldDetailData.principalCertificateNumber }}
+          </el-descriptions-item>
+          <el-descriptions-item label="姓名">
+            {{ oldDetailData.principalName }}
+          </el-descriptions-item>
+          <el-descriptions-item label="人员类型">
+            <dict-tag :type="DICT_TYPE.CREDENTIAL_PERSONNEL_TYPE" :value="oldDetailData.principalPersonnelType" />
+          </el-descriptions-item>
+          <el-descriptions-item label="性别">
+            <dict-tag :type="DICT_TYPE.CREDENTIAL_SEX" :value="oldDetailData.principalSex" />
+          </el-descriptions-item>
+          <el-descriptions-item label="行业类别">
+            <dict-tag :type="DICT_TYPE.CREDENTIAL_CATEGORY_OF_EMPLOYMENT" :value="oldDetailData.principalCategoryOfEmployment" />
+          </el-descriptions-item>
+          <el-descriptions-item label="初领日期">
+            {{ formatDate(oldDetailData.principalDateOfIssue, 'YYYY-MM-DD') }}
+          </el-descriptions-item>
+          <el-descriptions-item label="到期日期">
+            {{ formatDate(oldDetailData.principalExpiryDate, 'YYYY-MM-DD') }}
+          </el-descriptions-item>
+          <el-descriptions-item label="签发机关">
+            {{ oldDetailData.principalLicenceIssuingAuthority }}
+          </el-descriptions-item>
+          <el-descriptions-item label="图片">
+            <el-image style="width: 100px; height: 100px" :src="oldDetailData.principalImageUrl" :preview-src-list="[oldDetailData.principalImageUrl]" fit="fill" />
+          </el-descriptions-item>
+        </el-descriptions>
+        <el-descriptions :column="2" border title="变更前安全员证">
+          <el-descriptions-item label="证号">
+            {{ oldDetailData.securityCertificateNumber }}
+          </el-descriptions-item>
+          <el-descriptions-item label="姓名">
+            {{ oldDetailData.securityName }}
+          </el-descriptions-item>
+          <el-descriptions-item label="人员类型">
+            <dict-tag :type="DICT_TYPE.CREDENTIAL_PERSONNEL_TYPE" :value="oldDetailData.securityPersonnelType" />
+          </el-descriptions-item>
+          <el-descriptions-item label="性别">
+            <dict-tag :type="DICT_TYPE.CREDENTIAL_SEX" :value="oldDetailData.securitySex" />
+          </el-descriptions-item>
+          <el-descriptions-item label="行业类别">
+            <dict-tag :type="DICT_TYPE.CREDENTIAL_CATEGORY_OF_EMPLOYMENT" :value="oldDetailData.securityCategoryOfEmployment" />
+          </el-descriptions-item>
+          <el-descriptions-item label="初领日期">
+            {{ formatDate(oldDetailData.securityDateOfIssue, 'YYYY-MM-DD') }}
+          </el-descriptions-item>
+          <el-descriptions-item label="到期日期">
+            {{ formatDate(oldDetailData.securityExpiryDate, 'YYYY-MM-DD') }}
+          </el-descriptions-item>
+          <el-descriptions-item label="签发机关">
+            {{ oldDetailData.securityLicenceIssuingAuthority }}
+          </el-descriptions-item>
+          <el-descriptions-item label="图片">
+            <el-image style="width: 100px; height: 100px" :src="oldDetailData.securityImageUrl" :preview-src-list="[oldDetailData.securityImageUrl]" fit="fill" />
+          </el-descriptions-item>
+        </el-descriptions>
+        <el-descriptions :column="2" border title="变更前危化证" v-if="oldDetailData.isSecure == 1">
+          <el-descriptions-item label="经营方式">
+            <dict-tag :type="DICT_TYPE.CREDENTIAL_BUSINESS_PATTERN" :value="oldDetailData.dangerBusinessPattern" />
+          </el-descriptions-item>
+          <el-descriptions-item label="发证机关">
+            {{ oldDetailData.dangerLicenceIssuingAuthority }}
+          </el-descriptions-item>
+          <el-descriptions-item label="发证日期">
+            {{ formatDate(oldDetailData.dangerDateOfIssue, 'YYYY-MM-DD') }}
+          </el-descriptions-item>
+          <el-descriptions-item label="到期日期">
+            {{ formatDate(oldDetailData.dangerExpiryDate, 'YYYY-MM-DD') }}
+          </el-descriptions-item>
+          <el-descriptions-item label="图片">
+            <el-image style="width: 100px; height: 100px" :src="oldDetailData.dangerImageUrl" :preview-src-list="[oldDetailData.dangerImageUrl]" fit="fill" />
+          </el-descriptions-item>
+        </el-descriptions>
+      </el-col>
+      <el-col :span="12">
+        <el-descriptions :column="1" border title="变更后企业信息">
+          <el-descriptions-item label="企业名称">
+            {{ detailData.name }}
+          </el-descriptions-item>
+          <el-descriptions-item label="企业法定代表人">
+            {{ detailData.legalPerson }}
+          </el-descriptions-item>
+          <el-descriptions-item label="统一信用代码">
+            {{ detailData.unifiedCreditCode }}
+          </el-descriptions-item>
+          <el-descriptions-item label="电话">
+            {{ detailData.telephone }}
+          </el-descriptions-item>
+          <el-descriptions-item label="邮箱">
+            {{ detailData.mailbox }}
+          </el-descriptions-item>
+          <el-descriptions-item label="注册地址">
+            {{ detailData.registerAddress }}
+          </el-descriptions-item>
+          <el-descriptions-item label="通信地址">
+            {{ detailData.communicationAddress }}
+          </el-descriptions-item>
+          <el-descriptions-item label="经营状态">
+            <dict-tag :type="DICT_TYPE.ENTERPRISE_OPERATE_STATE" :value="detailData.operateState" />
+          </el-descriptions-item>
+          <el-descriptions-item label="成立日期">
+            {{ formatDate(detailData.establishDate, 'YYYY-MM-DD') }}
+          </el-descriptions-item>
+          <el-descriptions-item label="企业类型">
+            <dict-tag :type="DICT_TYPE.ENTERPRISE_TYPE" :value="detailData.enterpriseType" />
+          </el-descriptions-item>
+          <el-descriptions-item label="企业所属地区">
+            {{ detailData.enterpriseBelongingToRegion }}
+          </el-descriptions-item>
+          <el-descriptions-item label="企业所属行业">
+            {{ detailData.enterpriseBelongingToIndustry }}
+          </el-descriptions-item>
+          <el-descriptions-item label="登记机关">
+            {{ detailData.registerOffice }}
+          </el-descriptions-item>
+          <el-descriptions-item label="经营许可范围">
+            {{ detailData.operatePermitRange }}
+          </el-descriptions-item>
+          <el-descriptions-item label="是否涉及危化证">
+            <dict-tag :type="DICT_TYPE.ENTERPRISE_IS_SECURITY" :value="detailData.isSecure" />
+          </el-descriptions-item>
+        </el-descriptions>
+        <el-descriptions :column="2" border title="变更后主要负责人证">
+          <el-descriptions-item label="证号">
+            {{ detailData.principalCertificateNumber }}
+          </el-descriptions-item>
+          <el-descriptions-item label="姓名">
+            {{ detailData.principalName }}
+          </el-descriptions-item>
+          <el-descriptions-item label="人员类型">
+            <dict-tag :type="DICT_TYPE.CREDENTIAL_PERSONNEL_TYPE" :value="detailData.principalPersonnelType" />
+          </el-descriptions-item>
+          <el-descriptions-item label="性别">
+            <dict-tag :type="DICT_TYPE.CREDENTIAL_SEX" :value="detailData.principalSex" />
+          </el-descriptions-item>
+          <el-descriptions-item label="行业类别">
+            <dict-tag :type="DICT_TYPE.CREDENTIAL_CATEGORY_OF_EMPLOYMENT" :value="detailData.principalCategoryOfEmployment" />
+          </el-descriptions-item>
+          <el-descriptions-item label="初领日期">
+            {{ formatDate(detailData.principalDateOfIssue, 'YYYY-MM-DD') }}
+          </el-descriptions-item>
+          <el-descriptions-item label="到期日期">
+            {{ formatDate(detailData.principalExpiryDate, 'YYYY-MM-DD') }}
+          </el-descriptions-item>
+          <el-descriptions-item label="签发机关">
+            {{ detailData.principalLicenceIssuingAuthority }}
+          </el-descriptions-item>
+          <el-descriptions-item label="图片">
+            <el-image style="width: 100px; height: 100px" :src="detailData.principalImageUrl" :preview-src-list="[detailData.principalImageUrl]" fit="fill" />
+          </el-descriptions-item>
+        </el-descriptions>
+        <el-descriptions :column="2" border title="变更后安全员证">
+          <el-descriptions-item label="证号">
+            {{ detailData.securityCertificateNumber }}
+          </el-descriptions-item>
+          <el-descriptions-item label="姓名">
+            {{ detailData.securityName }}
+          </el-descriptions-item>
+          <el-descriptions-item label="人员类型">
+            <dict-tag :type="DICT_TYPE.CREDENTIAL_PERSONNEL_TYPE" :value="detailData.securityPersonnelType" />
+          </el-descriptions-item>
+          <el-descriptions-item label="性别">
+            <dict-tag :type="DICT_TYPE.CREDENTIAL_SEX" :value="detailData.securitySex" />
+          </el-descriptions-item>
+          <el-descriptions-item label="行业类别">
+            <dict-tag :type="DICT_TYPE.CREDENTIAL_CATEGORY_OF_EMPLOYMENT" :value="detailData.securityCategoryOfEmployment" />
+          </el-descriptions-item>
+          <el-descriptions-item label="初领日期">
+            {{ formatDate(detailData.securityDateOfIssue, 'YYYY-MM-DD') }}
+          </el-descriptions-item>
+          <el-descriptions-item label="到期日期">
+            {{ formatDate(detailData.securityExpiryDate, 'YYYY-MM-DD') }}
+          </el-descriptions-item>
+          <el-descriptions-item label="签发机关">
+            {{ detailData.securityLicenceIssuingAuthority }}
+          </el-descriptions-item>
+          <el-descriptions-item label="图片">
+            <el-image style="width: 100px; height: 100px" :src="detailData.securityImageUrl" :preview-src-list="[detailData.securityImageUrl]" fit="fill" />
+          </el-descriptions-item>
+        </el-descriptions>
+        <el-descriptions :column="2" border title="变更后危化证" v-if="detailData.isSecure == 1">
+          <el-descriptions-item label="经营方式">
+            <dict-tag :type="DICT_TYPE.CREDENTIAL_BUSINESS_PATTERN" :value="detailData.dangerBusinessPattern" />
+          </el-descriptions-item>
+          <el-descriptions-item label="发证机关">
+            {{ detailData.dangerLicenceIssuingAuthority }}
+          </el-descriptions-item>
+          <el-descriptions-item label="发证日期">
+            {{ formatDate(detailData.dangerDateOfIssue, 'YYYY-MM-DD') }}
+          </el-descriptions-item>
+          <el-descriptions-item label="到期日期">
+            {{ formatDate(detailData.dangerExpiryDate, 'YYYY-MM-DD') }}
+          </el-descriptions-item>
+          <el-descriptions-item label="图片">
+            <el-image style="width: 100px; height: 100px" :src="detailData.dangerImageUrl" :preview-src-list="[detailData.dangerImageUrl]" fit="fill" />
+          </el-descriptions-item>
+        </el-descriptions>
+      </el-col>
+    </el-row>
   </ContentWrap>
 </template>
 <script lang="ts" setup>
 import { DICT_TYPE } from '@/utils/dict'
 import { formatDate } from '@/utils/formatTime'
 import { propTypes } from '@/utils/propTypes'
-import { EnterpriseInformationApi } from '@/api/fta/enterpriseinformation'
+import { EnterpriseChangeApi } from '@/api/fta/enterprisechange'
 
-defineOptions({ name: 'FtaEnterpriseDetail' })
+defineOptions({ name: 'FtaEnterpriseChangeDetail' })
 
 const { query } = useRoute() // 查询参数
 
@@ -64,13 +267,15 @@ const props = defineProps({
 })
 const detailLoading = ref(false) // 表单的加载中
 const detailData = ref<any>({}) // 详情数据
+const oldDetailData = ref<any>({})  //  历史详情数据
 const queryId = query.id as unknown as number // 从 URL 传递过来的 id 编号
 
 /** 获得数据 */
 const getInfo = async () => {
   detailLoading.value = true
   try {
-    detailData.value = await EnterpriseInformationApi.getEnterpriseInformation(props.id || queryId)
+    detailData.value = await EnterpriseChangeApi.getEnterpriseChange(props.id || queryId)
+    oldDetailData.value = await EnterpriseChangeApi.getOldEnterprise(props.id || queryId)
   } finally {
     detailLoading.value = false
   }

src/views/fta/enterprisechange/index.vue

@@ -155,7 +155,6 @@
         :formatter="dateFormatter"
         width="180px"
       />
-      <el-table-column label="流程实例编号" align="center" prop="processInstanceId" />
       <el-table-column label="审批结果" align="center" prop="status">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.BPM_PROCESS_INSTANCE_STATUS" :value="scope.row.status" />
@@ -175,16 +174,16 @@
           <dict-tag :type="DICT_TYPE.ENTERPRISE_OPERATE_STATE" :value="scope.row.operateState" />
         </template>
       </el-table-column>
-      <el-table-column label="成立日期" align="center" prop="establishDate" />
+      <el-table-column label="成立日期" align="center" prop="establishDate">
+        <template #default="scope">
+          {{ formatDate(scope.row.establishDate, 'YYYY-MM-DD') }}
+        </template>
+      </el-table-column>
       <el-table-column label="企业类型" align="center" prop="enterpriseType">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.ENTERPRISE_TYPE" :value="scope.row.enterpriseType" />
         </template>
       </el-table-column>
-      <el-table-column label="企业所属地区" align="center" prop="enterpriseBelongingToRegion" />
-      <el-table-column label="企业所属行业" align="center" prop="enterpriseBelongingToIndustry" />
-      <el-table-column label="登记机关" align="center" prop="registerOffice" />
-      <el-table-column label="经营许可范围" align="center" prop="operatePermitRange" />
       <el-table-column label="是否涉及危化证" align="center" prop="isSecure">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.ENTERPRISE_IS_SECURITY" :value="scope.row.isSecure" />
@@ -195,18 +194,24 @@
           <el-button
             link
             type="primary"
-            @click="openForm('update', scope.row.id)"
+            @click="handleDetail(scope.row)"
-            v-hasPermi="['fta:enterprise-change:update']"
           >
-            编辑
+            详情
           </el-button>
           <el-button
             link
-            type="danger"
+            type="primary"
-            @click="handleDelete(scope.row.id)"
+            @click="handleProcessDetail(scope.row)"
-            v-hasPermi="['fta:enterprise-change:delete']"
           >
-            删除
+            进度
+          </el-button>
+          <el-button
+            v-if="scope.row.result === 1"
+            link
+            type="danger"
+            @click="cancelLeave(scope.row)"
+          >
+            取消
           </el-button>
         </template>
       </el-table-column>
@@ -226,8 +231,7 @@
 
 <script setup lang="ts">
 import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
-import { dateFormatter } from '@/utils/formatTime'
+import {dateFormatter, formatDate} from '@/utils/formatTime'
-import download from '@/utils/download'
 import { EnterpriseChangeApi, EnterpriseChangeVO } from '@/api/fta/enterprisechange'
 import EnterpriseChangeForm from './EnterpriseChangeForm.vue'
 
@@ -294,6 +298,27 @@ const handleCreate = () => {
   router.push({ name: 'FtaEnterpriseChangeCreate' })
 }
 
+/** 详情操作 */
+const handleDetail = (row: EnterpriseChangeVO) => {
+  router.push({
+    name: 'FtaEnterpriseChangeDetail',
+    query: {
+      id: row.id
+    }
+  })
+}
+
+/** 审批进度 */
+const handleProcessDetail = (row) => {
+  console.log("审批进度当前行数据:",row.processInstanceId)
+  router.push({
+    name: 'BpmProcessInstanceDetail',
+    query: {
+      id: row.processInstanceId
+    }
+  })
+}
+
 /** 删除按钮操作 */
 const handleDelete = async (id: number) => {
   try {

src/views/fta/enterprisechange/selectEnterprise.vue

@@ -58,10 +58,11 @@ import {dateFormatter} from "@/utils/formatTime";
 defineOptions({ name: 'SelectEnterprise' })
 
 const dialogVisible = ref(false) // 弹窗的是否展示
+const message = useMessage() // 消息弹窗
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const list = ref<EnterpriseInformationVO[]>([]) // 列表的数据
 const total = ref(0) // 列表的总页数
-const currentRow = ref()  //选中的行数据
+const currentRow = ref(null)  //选中的行数据
 const queryRef = ref() // 搜索的表单
 const params = reactive({
   pageNo: 1,
@@ -77,6 +78,10 @@ const handleCurrentChange = (val: EnterpriseInformationVO | undefined) => {
 /** 点击确定键提交企业信息 */
 const emit = defineEmits(['setOldEnterprise'])
 const submitFormSuccess = () => {
+  if (currentRow.value == null) {
+    message.warning('请点击选择数据！')
+    return
+  }
   emit('setOldEnterprise',currentRow)
   dialogVisible.value = false
 }

src/views/fta/enterpriseinformation/create.vue

@@ -8,28 +8,28 @@
   >
     <el-card class="mb-10px">
       <template #header>企业基本信息</template>
-    <el-form-item label="企业名称" prop="name">
+    <el-form-item label="企业名称" prop="name" label-width="120px">
       <el-input v-model="formData.name" placeholder="请输入企业名称" />
     </el-form-item>
-    <el-form-item label="企业法定代表人" prop="legalPerson">
+    <el-form-item label="企业法定代表人" prop="legalPerson" label-width="120px">
       <el-input v-model="formData.legalPerson" placeholder="请输入企业法定代表人" />
     </el-form-item>
-    <el-form-item label="统一信用代码" prop="unifiedCreditCode">
+    <el-form-item label="统一信用代码" prop="unifiedCreditCode" label-width="120px">
       <el-input v-model="formData.unifiedCreditCode" placeholder="请输入统一信用代码" />
     </el-form-item>
-    <el-form-item label="电话" prop="telephone">
+    <el-form-item label="电话" prop="telephone" label-width="120px">
       <el-input v-model="formData.telephone" placeholder="请输入电话" />
     </el-form-item>
-    <el-form-item label="邮箱" prop="mailbox">
+    <el-form-item label="邮箱" prop="mailbox" label-width="120px">
       <el-input v-model="formData.mailbox" placeholder="请输入邮箱" />
     </el-form-item>
-    <el-form-item label="注册地址" prop="registerAddress">
+    <el-form-item label="注册地址" prop="registerAddress" label-width="120px">
       <el-input v-model="formData.registerAddress" placeholder="请输入注册地址" />
     </el-form-item>
-    <el-form-item label="通信地址" prop="communicationAddress">
+    <el-form-item label="通信地址" prop="communicationAddress" label-width="120px">
       <el-input v-model="formData.communicationAddress" placeholder="请输入通信地址" />
     </el-form-item>
-    <el-form-item label="经营状态" prop="operateState">
+    <el-form-item label="经营状态" prop="operateState" label-width="120px">
       <el-select v-model="formData.operateState" placeholder="请选择经营状态">
         <el-option
           v-for="dict in getIntDictOptions(DICT_TYPE.ENTERPRISE_OPERATE_STATE)"
@@ -39,7 +39,7 @@
         />
       </el-select>
     </el-form-item>
-    <el-form-item label="成立日期" prop="establishDate">
+    <el-form-item label="成立日期" prop="establishDate" label-width="120px">
       <el-date-picker
         v-model="formData.establishDate"
         type="date"
@@ -47,7 +47,7 @@
         placeholder="选择成立日期"
       />
     </el-form-item>
-    <el-form-item label="企业类型" prop="enterpriseType">
+    <el-form-item label="企业类型" prop="enterpriseType" label-width="120px">
       <el-select v-model="formData.enterpriseType" placeholder="请选择企业类型">
         <el-option
           v-for="dict in getIntDictOptions(DICT_TYPE.ENTERPRISE_TYPE)"
@@ -57,19 +57,19 @@
         />
       </el-select>
     </el-form-item>
-    <el-form-item label="企业所属地区" prop="enterpriseBelongingToRegion">
+    <el-form-item label="企业所属地区" prop="enterpriseBelongingToRegion" label-width="120px">
       <el-input v-model="formData.enterpriseBelongingToRegion" placeholder="请输入企业所属地区" />
     </el-form-item>
-    <el-form-item label="企业所属行业" prop="enterpriseBelongingToIndustry">
+    <el-form-item label="企业所属行业" prop="enterpriseBelongingToIndustry" label-width="120px">
       <el-input v-model="formData.enterpriseBelongingToIndustry" placeholder="请输入企业所属行业" />
     </el-form-item>
-    <el-form-item label="登记机关" prop="registerOffice">
+    <el-form-item label="登记机关" prop="registerOffice" label-width="120px">
       <el-input v-model="formData.registerOffice" placeholder="请输入登记机关" />
     </el-form-item>
-    <el-form-item label="经营许可范围" prop="operatePermitRange">
+    <el-form-item label="经营许可范围" prop="operatePermitRange" label-width="120px">
       <el-input v-model="formData.operatePermitRange" placeholder="请输入经营许可范围" />
     </el-form-item>
-    <el-form-item label="是否涉及危化证" prop="isSecure">
+    <el-form-item label="是否涉及危化证" prop="isSecure" label-width="120px">
       <el-select v-model="formData.isSecure" placeholder="请选择是否涉及危化证">
         <el-option
           v-for="dict in getIntDictOptions(DICT_TYPE.ENTERPRISE_IS_SECURITY)"
@@ -82,13 +82,13 @@
     </el-card>
     <el-card class="mb-10px">
       <template #header>主要负责人证</template>
-      <el-form-item label="证号" prop="principalCertificateNumber">
+      <el-form-item label="证号" prop="principalCertificateNumber" label-width="120px">
         <el-input v-model="formData.principalCertificateNumber" placeholder="请输入负责人证号" />
       </el-form-item>
-      <el-form-item label="姓名" prop="principalName">
+      <el-form-item label="姓名" prop="principalName" label-width="120px">
         <el-input v-model="formData.principalName" placeholder="请输入负责人证姓名" />
       </el-form-item>
-      <el-form-item label="人员类型" prop="principalPersonnelType">
+      <el-form-item label="人员类型" prop="principalPersonnelType" label-width="120px">
         <el-select v-model="formData.principalPersonnelType" placeholder="请选择人员类型">
           <el-option
             v-for="dict in getStrDictOptions(DICT_TYPE.CREDENTIAL_PERSONNEL_TYPE)"
@@ -98,7 +98,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="性别" prop="principalSex">
+      <el-form-item label="性别" prop="principalSex" label-width="120px">
         <el-select v-model="formData.principalSex" placeholder="请选择性别">
           <el-option
             v-for="dict in getIntDictOptions(DICT_TYPE.CREDENTIAL_SEX)"
@@ -108,7 +108,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="行业类别" prop="principalCategoryOfEmployment">
+      <el-form-item label="行业类别" prop="principalCategoryOfEmployment" label-width="120px">
         <el-select v-model="formData.principalCategoryOfEmployment" placeholder="请选择行业类别">
           <el-option
             v-for="dict in getStrDictOptions(DICT_TYPE.CREDENTIAL_CATEGORY_OF_EMPLOYMENT)"
@@ -118,16 +118,16 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="初领日期" prop="principalDateOfIssue">
+      <el-form-item label="初领日期" prop="principalDateOfIssue" label-width="120px">
         <el-date-picker v-model="formData.principalDateOfIssue" type="date" value-format="YYYY-MM-DD" placeholder="请选择证件初领日期"/>
       </el-form-item>
-      <el-form-item label="到期日期" prop="principalExpiryDate">
+      <el-form-item label="到期日期" prop="principalExpiryDate" label-width="120px">
         <el-date-picker v-model="formData.principalExpiryDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择证件初领日期"/>
       </el-form-item>
-      <el-form-item label="签发机关" prop="principalLicenceIssuingAuthority">
+      <el-form-item label="签发机关" prop="principalLicenceIssuingAuthority" label-width="120px">
         <el-input v-model="formData.principalLicenceIssuingAuthority" placeholder="请输入证件签发机关" />
       </el-form-item>
-      <el-form-item label="图片" prop="principalImageUrl">
+      <el-form-item label="图片" prop="principalImageUrl" label-width="120px">
         <el-button v-if="formData.principalImageUrl == undefined" type="primary" plain @click="fileOpenForm(1)"><Icon icon="ep:upload" class="mr-5px" /> 上传文件</el-button>
         <el-image v-if="formData.principalImageUrl != undefined" style="width: 100px; height: 100px" :src="formData.principalImageUrl" :preview-src-list="[formData.principalImageUrl]" fit="fill" />
         <el-button v-if="formData.principalImageUrl != undefined" type="danger" plain @click="deletedImageUrl(1)">删除图片</el-button>
@@ -135,13 +135,13 @@
     </el-card>
     <el-card class="mb-10px">
       <template #header>安全员证</template>
-      <el-form-item label="证号" prop="securityCertificateNumber">
+      <el-form-item label="证号" prop="securityCertificateNumber" label-width="120px">
         <el-input v-model="formData.securityCertificateNumber" placeholder="请输入安全员证号" />
       </el-form-item>
-      <el-form-item label="姓名" prop="securityName">
+      <el-form-item label="姓名" prop="securityName" label-width="120px">
         <el-input v-model="formData.securityName" placeholder="请输入安全员姓名" />
       </el-form-item>
-      <el-form-item label="人员类型" prop="securityPersonnelType">
+      <el-form-item label="人员类型" prop="securityPersonnelType" label-width="120px">
         <el-select v-model="formData.securityPersonnelType" placeholder="请选择人员类型">
           <el-option
             v-for="dict in getStrDictOptions(DICT_TYPE.CREDENTIAL_PERSONNEL_TYPE)"
@@ -151,7 +151,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="性别" prop="securitySex">
+      <el-form-item label="性别" prop="securitySex" label-width="120px">
         <el-select v-model="formData.securitySex" placeholder="请选择性别">
           <el-option
             v-for="dict in getIntDictOptions(DICT_TYPE.CREDENTIAL_SEX)"
@@ -161,7 +161,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="行业类别" prop="securityCategoryOfEmployment">
+      <el-form-item label="行业类别" prop="securityCategoryOfEmployment" label-width="120px">
         <el-select v-model="formData.securityCategoryOfEmployment" placeholder="请选择行业类别">
           <el-option
             v-for="dict in getStrDictOptions(DICT_TYPE.CREDENTIAL_CATEGORY_OF_EMPLOYMENT)"
@@ -171,16 +171,16 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="初领日期" prop="securityDateOfIssue">
+      <el-form-item label="初领日期" prop="securityDateOfIssue" label-width="120px">
         <el-date-picker v-model="formData.securityDateOfIssue" type="date" value-format="YYYY-MM-DD" placeholder="请选择证件初领日期"/>
       </el-form-item>
-      <el-form-item label="到期日期" prop="securityExpiryDate">
+      <el-form-item label="到期日期" prop="securityExpiryDate" label-width="120px">
         <el-date-picker v-model="formData.securityExpiryDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择证件到期日期"/>
       </el-form-item>
-      <el-form-item label="签发机关" prop="securityLicenceIssuingAuthority">
+      <el-form-item label="签发机关" prop="securityLicenceIssuingAuthority" label-width="120px">
         <el-input v-model="formData.securityLicenceIssuingAuthority" placeholder="请输入签发机关" />
       </el-form-item>
-      <el-form-item label="图片" prop="securityImageUrl">
+      <el-form-item label="图片" prop="securityImageUrl" label-width="120px">
         <el-button v-if="formData.securityImageUrl == undefined" type="primary" plain @click="fileOpenForm(2)"><Icon icon="ep:upload" class="mr-5px" /> 上传文件</el-button>
         <el-image v-if="formData.securityImageUrl != undefined" style="width: 100px; height: 100px" :src="formData.securityImageUrl" :preview-src-list="[formData.securityImageUrl]" fit="fill" />
         <el-button v-if="formData.securityImageUrl != undefined" type="danger" plain @click="deletedImageUrl(2)">删除图片</el-button>
@@ -188,7 +188,7 @@
     </el-card>
     <el-card class="mb-10px" v-if="formData.isSecure == 1">
       <template #header>危化证</template>
-      <el-form-item label="经营方式" prop="dangerBusinessPattern">
+      <el-form-item label="经营方式" prop="dangerBusinessPattern" label-width="120px">
         <el-select v-model="formData.dangerBusinessPattern" placeholder="请选择行业类别">
           <el-option
             v-for="dict in getStrDictOptions(DICT_TYPE.CREDENTIAL_BUSINESS_PATTERN)"
@@ -198,16 +198,16 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="发证机关" prop="dangerLicenceIssuingAuthority">
+      <el-form-item label="发证机关" prop="dangerLicenceIssuingAuthority" label-width="120px">
         <el-input v-model="formData.dangerLicenceIssuingAuthority" placeholder="请输入发证机关" />
       </el-form-item>
-      <el-form-item label="发证日期" prop="dangerDateOfIssue">
+      <el-form-item label="发证日期" prop="dangerDateOfIssue" label-width="120px">
         <el-date-picker v-model="formData.dangerDateOfIssue" type="date" value-format="YYYY-MM-DD" placeholder="请选择发证日期"/>
       </el-form-item>
-      <el-form-item label="到期日期" prop="dangerExpiryDate">
+      <el-form-item label="到期日期" prop="dangerExpiryDate" label-width="120px">
         <el-date-picker v-model="formData.dangerExpiryDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择到期日期"/>
       </el-form-item>
-      <el-form-item label="图片" prop="dangerImageUrl">
+      <el-form-item label="图片" prop="dangerImageUrl" label-width="120px">
         <el-button v-if="formData.dangerImageUrl == undefined" type="primary" plain @click="fileOpenForm(3)"><Icon icon="ep:upload" class="mr-5px" /> 上传文件</el-button>
         <el-image v-if="formData.dangerImageUrl != undefined" style="width: 100px; height: 100px" :src="formData.dangerImageUrl" :preview-src-list="[formData.dangerImageUrl]" fit="fill" />
         <el-button v-if="formData.dangerImageUrl != undefined" type="danger" plain @click="deletedImageUrl(3)">删除图片</el-button>
@@ -243,9 +243,7 @@
         </el-form>
       </el-card>
     </el-col>
-    <el-form-item>
+    <el-button style="float: left" :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
-      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
-    </el-form-item>
   </el-form>
   <!-- 上传文件弹窗 -->
   <ImageFileForm ref="fileFormRef" :imageType="imageType" @success="setImageUrl" />