From f02604af65cdb87bcfb44bcd804f037435874974 Mon Sep 17 00:00:00 2001
From: "1378012178@qq.com" <1378012178@qq.com>
Date: Fri, 26 Sep 2025 09:30:30 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=91=98=E5=B7=A5=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=8F=98=E6=9B=B4=E5=AE=A1=E6=A0=B8=E6=B5=81=E7=A8=8B=202?=
 =?UTF-8?q?=E3=80=81=E5=91=98=E5=B7=A5-=E6=9C=BA=E6=9E=84=E5=85=A5?=
 =?UTF-8?q?=E4=BD=8F=E6=B5=81=E7=A8=8Bbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production                               |   6 +-
 .../employeesapply/EmployeesApply.api.ts      |  20 ++
 .../employeesapply/EmployeesApply.data.ts     |  43 +++
 .../employeesapply/EmployeesApplyList.vue     |   2 +-
 .../employeesapply/EmployeesInfoUpList.vue    | 259 +++++++++++++++++
 .../employeesapply/EmployeesInvidedList.vue   |   2 +-
 .../components/EmployeesApplyForm.vue         |  30 +-
 .../components/EmployeesApplyModal.vue        |  45 ++-
 .../components/EmployeesUpInfoForm.vue        | 269 ++++++++++++++++++
 9 files changed, 655 insertions(+), 21 deletions(-)
 create mode 100644 src/views/admin/employeesapply/EmployeesInfoUpList.vue
 create mode 100644 src/views/admin/employeesapply/components/EmployeesUpInfoForm.vue

diff --git a/.env.production b/.env.production
index 9cd485d..28cef7b 100644
--- a/.env.production
+++ b/.env.production
@@ -2,7 +2,7 @@
 VITE_USE_MOCK = false
 
 # 发布路径
-VITE_PUBLIC_PATH = /biz103
+VITE_PUBLIC_PATH = /biz101
 
 # 是否启用gzip或brotli压缩
 # 选项值: gzip | brotli | none
@@ -13,10 +13,10 @@ VITE_BUILD_COMPRESS = 'gzip'
 VITE_BUILD_COMPRESS_DELETE_ORIGIN_FILE = false
 
 #后台接口父地址(必填)
-VITE_GLOB_API_URL=/nursingunit103
+VITE_GLOB_API_URL=/nursingunit101
 
 #后台接口全路径地址(必填)
-VITE_GLOB_DOMAIN_URL=https://www.focusnu.com/nursingunit103
+VITE_GLOB_DOMAIN_URL=https://www.focusnu.com/nursingunit101
 
 # 接口父路径前缀
 VITE_GLOB_API_URL_PREFIX=
diff --git a/src/views/admin/employeesapply/EmployeesApply.api.ts b/src/views/admin/employeesapply/EmployeesApply.api.ts
index 32e4757..0539f2f 100644
--- a/src/views/admin/employeesapply/EmployeesApply.api.ts
+++ b/src/views/admin/employeesapply/EmployeesApply.api.ts
@@ -5,6 +5,7 @@ const { createConfirm } = useMessage();
 
 enum Api {
   list = '/admin/employeesapply/list',
+  getModifyInfo = '/admin/employeesapply/getModifyInfo',
   save = '/admin/employeesapply/add',
   edit = '/admin/employeesapply/edit',
   deleteOne = '/admin/employeesapply/delete',
@@ -12,6 +13,7 @@ enum Api {
   importExcel = '/admin/employeesapply/importExcel',
   exportXls = '/admin/employeesapply/exportXls',
   invide = '/admin/employeesapply/invide',
+  audit = '/admin/employeesapply/audit',
 }
 
 /**
@@ -31,6 +33,7 @@ export const getImportUrl = Api.importExcel;
  */
 export const list = (params) => defHttp.get({ url: Api.list, params });
 
+
 /**
  * 删除单个
  * @param params
@@ -79,3 +82,20 @@ export const saveOrUpdate = (params, isUpdate) => {
 export const invide = (params) => {
   return defHttp.post({ url: Api.invide, params });
 };
+
+
+/**
+ * 获取变更信息
+ * @param params
+ */
+export const getModifyInfo = (params) => {
+  return defHttp.post({ url: Api.getModifyInfo, params });
+}
+
+/**
+ * 审批提交
+ * @param params
+ */
+export const auditSubmit = (params) => {
+  return defHttp.post({ url: Api.audit, params });
+};
\ No newline at end of file
diff --git a/src/views/admin/employeesapply/EmployeesApply.data.ts b/src/views/admin/employeesapply/EmployeesApply.data.ts
index 1d20dd4..a5784d1 100644
--- a/src/views/admin/employeesapply/EmployeesApply.data.ts
+++ b/src/views/admin/employeesapply/EmployeesApply.data.ts
@@ -90,3 +90,46 @@ export const superQuerySchema = {
   status: {title: '申请状态 0历史 1申请中  2通过 3驳回',order: 28,view: 'text', type: 'string',},
   auditContent: {title: '审核备注',order: 29,view: 'text', type: 'string',},
 };
+
+export const applyObj = {
+  id: '员工申请ID',
+  openId: '微信OpenID',
+  employeeId: '员工ID',
+  name: '姓名',
+  sex: '性别',
+  national: '民族',
+  idCard: '身份证号',
+  tel: '联系电话',
+  dateOfBirth: '出生日期',
+  marriedOrNot: '婚否',
+  height: '身高',
+  weight: '体重',
+  address: '家庭住址',
+  isSmoking: '是否吸烟',
+  healthStatus: '健康状况',
+  houseAddress: '住址',
+  politicalAppearance: '政治面貌',
+  emergencyContact: '紧急联系人',
+  emergencyTel: '紧急联系人电话',
+  emergencyRelationship: '与本人关系',
+  hukouNature: '户口性质',
+  idCardPositive: '身份证正面',
+  idCardNegative: '身份证反面',
+  healthCertificatePositive: '健康证正面',
+  healthCertificateNegative: '健康证反面',
+  bankPositive: '银行卡正面',
+  bankNegative: '银行卡反面',
+  openingBank: '开户行',
+  bankCard: '银行卡号',
+  qualification: '资质证',
+  noCrimeCertificate: '无犯罪证明',
+  regional: '区域',
+  delFlag: '是否删除 0未删除 1删除',
+  createTime: '申请日期',
+  updateBy: '更新人',
+  updateTime: '更新日期',
+  status: '申请状态 1申请中 2通过 3驳回',
+  auditContent: '审核备注',
+  izHistory: '是否历史数据',
+  applyType: '申请类型 0被邀请 1主动申请 2信息变更'
+};
diff --git a/src/views/admin/employeesapply/EmployeesApplyList.vue b/src/views/admin/employeesapply/EmployeesApplyList.vue
index 70f0908..ac5668e 100644
--- a/src/views/admin/employeesapply/EmployeesApplyList.vue
+++ b/src/views/admin/employeesapply/EmployeesApplyList.vue
@@ -101,7 +101,7 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
       pageSizeOptions: ['15', '50', '70', '100'],
     },
     beforeFetch: async (params) => {
-      queryParam.isInvited = '1'
+      queryParam.applyType = '1'
       return Object.assign(params, queryParam);
     },
   },
diff --git a/src/views/admin/employeesapply/EmployeesInfoUpList.vue b/src/views/admin/employeesapply/EmployeesInfoUpList.vue
new file mode 100644
index 0000000..78109b4
--- /dev/null
+++ b/src/views/admin/employeesapply/EmployeesInfoUpList.vue
@@ -0,0 +1,259 @@
+<template>
+  <div class="p-2">
+    <!--查询区域-->
+    <div class="jeecg-basic-table-form-container">
+      <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol"
+        :wrapper-col="wrapperCol">
+        <a-row :gutter="24">
+          <a-col :lg="6">
+            <a-form-item name="name">
+              <template #label><span title="姓名">姓名</span></template>
+              <JInput v-model:value="queryParam.name" placeholder="请输入姓名" />
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6">
+            <a-form-item name="paramsTime">
+              <template #label><span title="申请日期">申请日期</span></template>
+              <a-date-picker v-model:value="queryParam.paramsTime" placeholder="请选择申请日期" value-format="YYYY-MM-DD"
+                allow-clear />
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6">
+            <a-form-item name="status">
+              <template #label><span title="审核状态">审核状态</span></template>
+              <a-select v-model:value="queryParam.status" placeholder="请选择审核状态" style="width: 200px" :disabled="false">
+                <a-select-option value="1">待确认</a-select-option>
+                <a-select-option value="2">申请通过</a-select-option>
+                <a-select-option value="3">申请驳回</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
+              <a-col :lg="6">
+                <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
+                <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset"
+                  style="margin-left: 8px">重置</a-button>
+              </a-col>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!--引用表格-->
+    <BasicTable @register="registerTable">
+      <!--插槽:table标题-->
+      <template #tableTitle>
+        <!-- <a-button type="primary" v-auth="'employeesapply:nu_biz_employees_apply:add'"  @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button> -->
+      </template>
+      <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" />
+      </template>
+      <template v-slot:bodyCell="{ column, record, index, text }">
+        <template v-if="column.dataIndex === 'dateOfBirth'">
+          <span>{{ handleComputedAge(text) }}</span>
+        </template>
+        <template v-if="column.dataIndex === 'status'">
+          <span v-if="record.status == '1'">待确认</span>
+          <span v-else-if="record.status == '2'">申请通过</span>
+          <span v-else-if="record.status == '3'">申请驳回</span>
+          <span v-else></span>
+        </template>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <EmployeesApplyModal ref="registerModal" @success="handleSuccess"></EmployeesApplyModal>
+  </div>
+</template>
+
+<script lang="ts" name="employeesinfoup-employeesInfoUp" setup>
+import { ref, reactive } from 'vue';
+import { BasicTable, useTable, TableAction } from '/@/components/Table';
+import { useListPage } from '/@/hooks/system/useListPage';
+import { columns, superQuerySchema } from './EmployeesApply.data';
+import { list, getModifyInfo, getImportUrl, getExportUrl } from './EmployeesApply.api';
+import { downloadFile } from '/@/utils/common/renderUtils';
+import EmployeesApplyModal from './components/EmployeesApplyModal.vue'
+import { useUserStore } from '/@/store/modules/user';
+import JInput from "/@/components/Form/src/jeecg/components/JInput.vue";
+
+const formRef = ref();
+const queryParam = reactive<any>({});
+const toggleSearchStatus = ref<boolean>(false);
+const registerModal = ref();
+const userStore = useUserStore();
+//注册table数据
+const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
+  tableProps: {
+    title: '员工申请',
+    api: list,
+    columns,
+    canResize: false,
+    useSearchForm: false,
+    actionColumn: {
+      width: 120,
+      fixed: 'right',
+    },
+    scroll: { y: '58vh' },
+    pagination: {
+      current: 1,
+      pageSize: 15,
+      pageSizeOptions: ['15', '50', '70', '100'],
+    },
+    beforeFetch: async (params) => {
+      queryParam.applyType = '2'//信息变更
+      queryParam.modifyStatus = '1'//待审核
+      return Object.assign(params, queryParam);
+    },
+  },
+  exportConfig: {
+    name: "员工申请",
+    url: getExportUrl,
+    params: queryParam,
+  },
+  importConfig: {
+    url: getImportUrl,
+    success: handleSuccess
+  },
+});
+const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
+const labelCol = reactive({
+  xs: 24,
+  sm: 4,
+  xl: 6,
+  xxl: 4
+});
+const wrapperCol = reactive({
+  xs: 24,
+  sm: 20,
+});
+
+/**
+ * 新增事件
+ */
+function handleAdd() {
+  registerModal.value.disableSubmit = false;
+  registerModal.value.add();
+}
+
+/**
+ * 编辑事件
+ */
+function handleEdit(record: Recordable) {
+  registerModal.value.disableSubmit = false;
+  registerModal.value.edit(record);
+}
+
+/**
+ * 详情
+ */
+function handleUpEdit(record: Recordable) {
+  registerModal.value.disableSubmit = true;
+  registerModal.value.upInfoEdit(record);
+}
+
+/**
+ * 成功回调
+ */
+function handleSuccess() {
+  (selectedRowKeys.value = []) && reload();
+}
+
+/**
+ * 操作栏
+ */
+function getTableAction(record) {
+  return [
+    // {
+    //   label: '详情',
+    //   onClick: handleDetail.bind(null, record),
+    // },
+    {
+      label: '审核',
+      onClick: handleUpEdit.bind(null, record),
+      ifShow: record.modifyStatus == '1'
+    },
+  ];
+}
+
+
+/**
+ * 查询
+ */
+function searchQuery() {
+  reload();
+}
+
+/**
+ * 重置
+ */
+function searchReset() {
+  formRef.value.resetFields();
+  selectedRowKeys.value = [];
+  //刷新数据
+  reload();
+}
+
+
+function handleComputedAge(ageText) {
+  // 检查输入是否有效
+  if (!ageText || typeof ageText !== 'string') {
+    return NaN;
+  }
+
+  // 解析日期字符串
+  const birthDate = new Date(ageText);
+
+  // 检查日期是否合法（例如防止 '2025-99-99' 这类无效日期）
+  if (isNaN(birthDate.getTime())) {
+    return NaN;
+  }
+
+  const today = new Date();
+  let age = today.getFullYear() - birthDate.getFullYear();
+  const monthDiff = today.getMonth() - birthDate.getMonth();
+  const dayDiff = today.getDate() - birthDate.getDate();
+
+  // 如果还没到生日，则年龄减1
+  if (monthDiff < 0 || (monthDiff === 0 && dayDiff < 0)) {
+    age--;
+  }
+
+  return age >= 0 ? age : 0; // 防止返回负数
+}
+
+</script>
+
+<style lang="less" scoped>
+.jeecg-basic-table-form-container {
+  padding: 0;
+  margin-bottom: 14px;
+
+  .table-page-search-submitButtons {
+    display: block;
+    margin-bottom: 14px;
+    white-space: nowrap;
+  }
+
+  .query-group-cust {
+    min-width: 100px !important;
+  }
+
+  .query-group-split-cust {
+    width: 30px;
+    display: inline-block;
+    text-align: center
+  }
+
+  .ant-form-item:not(.ant-form-item-with-help) {
+    margin-bottom: 14px;
+    height: 32px;
+  }
+
+  :deep(.ant-picker),
+  :deep(.ant-input-number) {
+    width: 100%;
+  }
+}
+</style>
diff --git a/src/views/admin/employeesapply/EmployeesInvidedList.vue b/src/views/admin/employeesapply/EmployeesInvidedList.vue
index b6e5607..e7f40db 100644
--- a/src/views/admin/employeesapply/EmployeesInvidedList.vue
+++ b/src/views/admin/employeesapply/EmployeesInvidedList.vue
@@ -101,7 +101,7 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
       pageSizeOptions: ['15', '50', '70', '100'],
     },
     beforeFetch: async (params) => {
-      queryParam.isInvited = '0'
+      queryParam.applyType = '0'
       return Object.assign(params, queryParam);
     },
   },
diff --git a/src/views/admin/employeesapply/components/EmployeesApplyForm.vue b/src/views/admin/employeesapply/components/EmployeesApplyForm.vue
index 9e1319a..11b583a 100644
--- a/src/views/admin/employeesapply/components/EmployeesApplyForm.vue
+++ b/src/views/admin/employeesapply/components/EmployeesApplyForm.vue
@@ -227,24 +227,25 @@
               </a-tabs>
             </a-col>
             <a-col :span="24">
-              <div v-if="formData.isInvited == 0">
-              <SectionDivider :title="'邀请结果'" />
+              <div v-if="formData.applyType == 0">
+                <SectionDivider :title="'邀请结果'" />
               </div>
-              <div v-if="formData.isInvited == 1">
-              <SectionDivider :title="'申请审核'" />
+              <div v-if="formData.applyType == 1">
+                <SectionDivider :title="'申请审核'" />
               </div>
             </a-col>
             <a-col :span="12">
-              <a-form-item :label="formData.isInvited == 0?'邀请意见':'审核意见'" v-bind="validateInfos.status" id="EmployeesApplyForm-status" name="status">
+              <a-form-item :label="formData.applyType == 0 ? '邀请意见' : '审核意见'" v-bind="validateInfos.status"
+                id="EmployeesApplyForm-status" name="status">
                 <div v-if="disabled">
                   <!-- 被邀请 -->
-                  <div v-if="formData.isInvited == 0">
+                  <div v-if="formData.applyType == 0">
                     <span v-if="formData.status == 1">待确认</span>
                     <span v-if="formData.status == 2">已接受</span>
                     <span v-if="formData.status == 3">已拒绝</span>
                   </div>
                   <!-- 主动申请 -->
-                  <div v-if="formData.isInvited == 1">
+                  <div v-if="formData.applyType == 1">
                     <span v-if="formData.status == 1">待审核</span>
                     <span v-if="formData.status == 2">申请通过</span>
                     <span v-if="formData.status == 3">申请驳回</span>
@@ -256,18 +257,18 @@
                 </a-select>
               </a-form-item>
             </a-col>
-            <a-col :span="12" v-show="formData.auditContent">
-                  <!-- 被邀请 -->
-              <div v-if="formData.isInvited == 0">
+            <a-col :span="12" v-show="formData.auditContent || statusVal == 'auditFaild'">
+              <!-- 被邀请 -->
+              <div v-if="formData.applyType == 0">
                 <a-form-item label="拒绝原因" v-bind="validateInfos.auditContent" id="EmployeesApplyForm-auditContent"
                   name="auditContent">
                   <a-textarea v-if="!disabled" :autosize="{ minRows: 3 }" maxlength="50" show-count
-                    v-model:value="formData.auditContent" allow-clear ></a-textarea>
+                    v-model:value="formData.auditContent" allow-clear></a-textarea>
                   <span v-else>{{ formData.auditContent }} </span>
                 </a-form-item>
               </div>
-                  <!-- 主动申请 -->
-              <div v-if="formData.isInvited == 1">
+              <!-- 主动申请 -->
+              <div v-if="formData.applyType == 1">
                 <a-form-item label="驳回原因" v-bind="validateInfos.auditContent" id="EmployeesApplyForm-auditContent"
                   name="auditContent">
                   <a-textarea v-if="!disabled" :autosize="{ minRows: 3 }" maxlength="50" show-count
@@ -275,7 +276,6 @@
                   <span v-else>{{ formData.auditContent }} </span>
                 </a-form-item>
               </div>
-              
             </a-col>
           </a-row>
         </a-form>
@@ -337,7 +337,7 @@ const formData = reactive<Record<string, any>>({
   createTime: '',
   status: '',
   auditContent: '',
-  isInvited:'',
+  applyType: '',
 });
 const statusVal = ref('')
 const { createMessage } = useMessage();
diff --git a/src/views/admin/employeesapply/components/EmployeesApplyModal.vue b/src/views/admin/employeesapply/components/EmployeesApplyModal.vue
index f47db5e..5cd8204 100644
--- a/src/views/admin/employeesapply/components/EmployeesApplyModal.vue
+++ b/src/views/admin/employeesapply/components/EmployeesApplyModal.vue
@@ -15,7 +15,17 @@
     <template #footer>
       <a-button type="primary" style="margin-right: 8px" @click="handleInvidedCancel">关闭</a-button>
     </template>
-    <NuEmployeesAdvisoryInfoList v-if="invidedVisible" ref="invidedRef" @reload="submitCallback"/>
+    <NuEmployeesAdvisoryInfoList v-if="invidedVisible" ref="invidedRef" @reload="submitCallback" />
+  </a-drawer>
+  <!-- 员工信息变更审核 -->
+  <a-drawer :title="title" width="70vw" :visible="upInfoVisible" :closable="true" :footer-style="{ textAlign: 'right' }"
+    @close="handleUpInfoCancel">
+    <template #footer>
+      <a-button type="primary" style="margin-right: 8px" @click="handleUpInfoCancel">关闭</a-button>
+      <a-button type="primary" @click="handleUpInfoOk">确认</a-button>
+    </template>
+    <EmployeesUpInfoForm v-if="upInfoVisible" ref="upInfoForm" @ok="handleUpInfoCancel" :formBpm="false">
+    </EmployeesUpInfoForm>
   </a-drawer>
 </template>
 
@@ -24,13 +34,17 @@ import { ref, nextTick, defineExpose } from 'vue';
 import EmployeesApplyForm from './EmployeesApplyForm.vue'
 import JModal from '/@/components/Modal/src/JModal/JModal.vue';
 import NuEmployeesAdvisoryInfoList from '/@/views/admin/employeesadvisoryinfo/NuEmployeesAdvisoryInfoList.vue'
+import EmployeesUpInfoForm from '/@/views/admin/employeesapply/components/EmployeesUpInfoForm.vue'
+
 
 const title = ref<string>('');
 const width = ref<number>(800);
 const visible = ref<boolean>(false);
 const disableSubmit = ref<boolean>(false);
 const registerForm = ref();
+const upInfoForm = ref();
 const invidedVisible = ref<boolean>(false);
+const upInfoVisible = ref<boolean>(false);
 const invidedRef = ref();
 const emit = defineEmits(['register', 'success']);
 /**
@@ -56,6 +70,18 @@ function edit(record) {
   });
 }
 
+/**
+ * 编辑
+ * @param record
+ */
+function upInfoEdit(record) {
+  title.value = disableSubmit.value ? '详情' : '审核';
+  upInfoVisible.value = true;
+  nextTick(() => {
+    upInfoForm.value.show(record);
+  });
+}
+
 /**
  * 确定按钮点击事件
  */
@@ -86,9 +112,26 @@ function openInvidedList() {
   invidedVisible.value = true
 }
 
+/**
+ * 员工信息变更-关闭
+ */
+function handleUpInfoCancel() {
+  console.log(123123)
+  upInfoVisible.value = false
+  emit('success');
+}
+
+/**
+ * 员工信息变更确认
+ */
+function handleUpInfoOk() {
+  upInfoForm.value.submitForm();
+}
+
 defineExpose({
   add,
   edit,
+  upInfoEdit,
   disableSubmit,
   openInvidedList,
 });
diff --git a/src/views/admin/employeesapply/components/EmployeesUpInfoForm.vue b/src/views/admin/employeesapply/components/EmployeesUpInfoForm.vue
new file mode 100644
index 0000000..ff3f9cf
--- /dev/null
+++ b/src/views/admin/employeesapply/components/EmployeesUpInfoForm.vue
@@ -0,0 +1,269 @@
+<template>
+  <div class="container2">
+    <a-form ref="formRef" layout="horizontal" :model="formData" :label-col="labelCol" :wrapper-col="wrapperCol">
+      <a-row :gutter="16">
+        <a-col :span="12">
+          <a-form-item label="审核结果" name="status" v-bind="validateInfos.status">
+            <a-select v-model:value="formData.status" style="width: 200px" placeholder="请选择审核结果">
+              <a-select-option value="modifyPass">审核通过</a-select-option>
+              <a-select-option value="modifyFail">审核驳回</a-select-option>
+            </a-select>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12" v-if="formData.status == 'modifyFail'">
+          <a-form-item label="驳回原因" name="auditContent" v-bind="validateInfos.auditContent">
+            <a-textarea :maxlength="50" show-count v-model:value="formData.auditContent" placeholder="请输入驳回原因（如驳回）"
+              style="width: 100%" />
+          </a-form-item>
+        </a-col>
+      </a-row>
+    </a-form>
+
+    <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">
+          <template #bodyCell="{ column, record }">
+            <template v-if="column.dataIndex === 'd1'">
+              <span>{{ applyObj[record.d1] }}</span>
+            </template>
+            <template v-if="column.dataIndex === 'd2' && isImg(record.d1)">
+              <JImageUpload :fileMax="1" v-model:value="record.d2" disabled></JImageUpload>
+            </template>
+            <template v-if="column.dataIndex === 'd3' && isImg(record.d1)">
+              <JImageUpload :fileMax="1" v-model:value="record.d3" disabled></JImageUpload>
+            </template>
+            <template
+              v-if="column.dataIndex === 'd2' && (record.d1 == 'orgProvince' || record.d1 == 'orgCity' || record.d1 == 'orgDistrict')">
+              <span>{{ provinceOptions[record.d2] }}</span>
+            </template>
+            <template
+              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'">
+              <span>{{ record.d2 }}㎡</span>
+            </template>
+            <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>
+    </a-row>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, computed, onMounted } from 'vue';
+import { Table as ATable, Input, Row, Col, Form } from 'ant-design-vue';
+import { applyObj } from '../EmployeesApply.data'
+import JImageUpload from '/@/components/Form/src/jeecg/components/JImageUpload.vue';
+import { getModifyInfo, auditSubmit } from '../EmployeesApply.api';
+import { useMessage } from '/@/hooks/web/useMessage';
+import { initDictOptions } from '/@/utils/dict';
+
+const formRef = ref();
+const AForm = Form;
+const AFormItem = Form.Item;
+const useForm = Form.useForm;
+const { createMessage } = useMessage();
+// 表单标签布局配置
+const labelCol = { span: 4 };  // 标签宽度
+const wrapperCol = { span: 18 }; // 控件宽度
+const isImg = (v_) => {
+  return v_ == 'idCardPositive' || v_ == 'idCardNegative' || v_ == 'healthCertificatePositive' || v_ == 'bankPositive' || v_ == 'bankNegative' || v_ == 'qualification' || v_ == 'noCrimeCertificate'
+}
+const provinceOptions = ref({})
+const formData = reactive<Record<string, any>>({
+  status: undefined,
+  auditContent: '',
+  id: '',
+  pkId: ''
+});
+const validatorRules = reactive({
+  status: [{ required: true, message: '请选择审核结果!' },],
+  auditContent: [
+    {
+      validator: async (_rule, value) => {
+        if (formData.status === 'modifyFail' && !value) {
+          return Promise.reject('请输入驳回原因!');
+        }
+        return Promise.resolve();
+      },
+    },
+  ],
+})
+const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
+const tableData = ref([]);
+const emit = defineEmits(['ok']);
+// 计算属性，过滤掉不需要显示的字段
+const filteredTableData = computed(() => {
+  return tableData.value.filter(item =>
+    item.d1 !== 'id'
+    && item.d1 !== 'openId'
+    && item.d1 !== 'address'
+    && item.d1 !== 'isSmoking'
+    && item.d1 !== 'healthCertificateNegative'
+    && item.d1 !== 'regional'
+    && item.d1 !== 'createTime'
+    && item.d1 !== 'updateBy'
+    && item.d1 !== 'updateTime'
+    && item.d1 !== 'modifyStatus'
+
+  );
+});
+
+const columns = [
+  {
+    title: '名称',
+    dataIndex: 'd1',
+    key: 'd1',
+    width: 150,
+    ellipsis: true
+  },
+  {
+    title: '变更前',
+    dataIndex: 'd2',
+    key: 'd2',
+    ellipsis: true
+  },
+  {
+    title: '变更后',
+    dataIndex: 'd3',
+    key: 'd3',
+    ellipsis: true
+  }
+];
+
+// 设置行类名
+const setRowClassName = (record) => {
+  return record.d2 !== record.d3 && record.d1 !== 'createTime' ? 'highlight-row' : '';
+};
+
+const fieldMap = {
+  id: 'id',
+  openId: 'openId',
+  employeeId: 'employeeId',
+  name: 'name',
+  sex: 'sex',
+  national: 'national',
+  idCard: 'idCard',
+  tel: 'tel',
+  dateOfBirth: 'dateOfBirth',
+  marriedOrNot: 'marriedOrNot',
+  height: 'height',
+  weight: 'weight',
+  address: 'address',
+  isSmoking: 'isSmoking',
+  healthStatus: 'healthStatus',
+  houseAddress: 'houseAddress',
+  politicalAppearance: 'politicalAppearance',
+  emergencyContact: 'emergencyContact',
+  emergencyTel: 'emergencyTel',
+  emergencyRelationship: 'emergencyRelationship',
+  hukouNature: 'hukouNature',
+  idCardPositive: 'idCardPositive',
+  idCardNegative: 'idCardNegative',
+  healthCertificatePositive: 'healthCertificatePositive',
+  healthCertificateNegative: 'healthCertificateNegative',
+  bankPositive: 'bankPositive',
+  bankNegative: 'bankNegative',
+  openingBank: 'openingBank',
+  bankCard: 'bankCard',
+  qualification: 'qualification',
+  noCrimeCertificate: 'noCrimeCertificate',
+  regional: 'regional',
+};
+
+async function show(record) {
+  console.log("🌊 ~ show ~ record:", record)
+  let data = await getModifyInfo({ employeeId: record.employeeId })
+  console.log("🌊 ~ show ~ data:", data)
+
+  formData.employeeId = record.employeeId
+  // 存储id和pkId到formData
+  Object.keys(fieldMap).forEach(fieldName => {
+    const record = data.find(item => item.d1 === fieldName);
+    if (record) {
+      formData[fieldName] = record.d3;
+    }
+  });
+
+  tableData.value = data.map(item => ({
+    ...item,
+    // 处理null/undefined显示为空字符串
+    d2: item.d2 ?? '',
+    d3: item.d3 ?? ''
+  }));
+}
+
+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);
+  }
+  auditSubmit(formData)
+    .then((res) => {
+      emit('ok');
+    })
+}
+
+// 初始化numberValues
+onMounted(async () => {
+  const dictData = await initDictOptions('sys_category,name,id,first_letter is not null order by code asc', '');
+  dictData.reduce((prev, next) => {
+    if (next) {
+      provinceOptions.value[next['value']] = next['text'] || next['label']
+    }
+    return prev;
+  }, []);
+});
+
+defineExpose({
+  show,
+  submitForm
+});
+</script>
+
+<style lang="less" scoped>
+.container2 {
+  padding: 16px;
+}
+
+.antd-modal-form {
+  padding: 14px;
+}
+
+:deep(.ant-table-cell) {
+  padding: 8px 12px !important;
+}
+
+// 高亮行样式
+:deep(.highlight-row) {
+  background-color: #fff1f0 !important; // 浅红色背景
+}
+
+// 表单样式调整
+:deep(.ant-form-item) {
+  margin-bottom: 16px;
+}
+
+:deep(.ant-table-cell-row-hover) {
+  // border: 1px solid red;
+}
+</style>
\ No newline at end of file