From e184decf6e1301bce684cfc095c94dee767a50a5 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Mon, 8 Sep 2025 15:45:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=91=98=E5=B7=A5=E5=85=A5?=
 =?UTF-8?q?=E9=A9=BB=E5=B1=95=E7=A4=BA=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/OrgCard/OrgCardEmployess.vue   | 174 ++++++++++++++++++
 .../NuEmployeesAdvisoryInfo.data.ts           | 103 +----------
 .../NuEmployeesAdvisoryInfoList.vue           |  36 ++--
 .../components/EmployeesOrgList.vue           |  49 +++++
 .../components/EmployeesOrgListModal.vue      |  65 +++++++
 .../NuEmployeesAdvisoryInfoForm.vue           |  77 ++++----
 .../NuEmployeesAdvisoryInfoModal.vue          |  10 +-
 7 files changed, 362 insertions(+), 152 deletions(-)
 create mode 100644 src/components/OrgCard/OrgCardEmployess.vue
 create mode 100644 src/views/biz/nuEmployeesAdvisoryInfo/components/EmployeesOrgList.vue
 create mode 100644 src/views/biz/nuEmployeesAdvisoryInfo/components/EmployeesOrgListModal.vue

diff --git a/src/components/OrgCard/OrgCardEmployess.vue b/src/components/OrgCard/OrgCardEmployess.vue
new file mode 100644
index 0000000..b4e1031
--- /dev/null
+++ b/src/components/OrgCard/OrgCardEmployess.vue
@@ -0,0 +1,174 @@
+<template>
+  <a-card :class="{
+    'selected-card': orgInfo.izOnline== 1,
+    'directive-selected-card': isDirectiveSelected,
+    'org-card': true
+  }" style="width: 100%; border-radius: 8px;" :style="{ cursor: clickable ? 'pointer' : 'default' }"
+    :bodyStyle="{ padding: '24px 24px 0 24px' }" @click="handleClick">
+    <template #title>
+      <a-row style="font-weight: normal; ">
+        <a-col :span="existTagFunc() ? 16 : 21">
+          <div>
+            <span class="ellipsis-one-lines1" :title="orgInfo.departName" style="font-size: 17px; font-weight: bold;">{{
+              orgInfo.departName
+              }}</span>
+          </div>
+        </a-col>
+        <a-col :span="existTagFunc() ? 8 : 3" style="text-align: right;">
+          <div style="display: flex; align-items: center; justify-content: flex-end; gap: 8px;">
+            <span v-if="isDirectiveMain"
+              style="color: #909399; font-size: 12px; font-weight: bold; white-space: nowrap;">
+              标准指令库
+            </span>
+            <span v-if="isElderTagMain"
+              style="color: #909399; font-size: 12px; font-weight: bold; white-space: nowrap;">
+              标准标签库
+            </span>
+            <div class="zxClass" :class="{ 'zxbkClass': existTagFunc() }" style="min-width: 35px;">{{ orgInfo.orgCode
+            }}
+            </div>
+          </div>
+        </a-col>
+      </a-row>
+    </template>
+
+    
+    <div style="position: relative;">
+      <div>
+        <div><span style="color: #909399;">机构负责人：</span>{{ orgInfo.orgLeader }}</div>
+        <div><span style="color: #909399;">负责人电话：</span>{{ orgInfo.orgLeaderPhone }}</div>
+      </div>
+      <div class="org-address">
+        <span class="ellipsis-one-lines2" :title="orgInfo.comRegisterAddress">{{ orgInfo.comRegisterAddress }}</span>
+      </div>
+      <div
+        style="font-size: 12px; display: flex; justify-content: space-between; align-items: center; margin-top: 12px;">
+        <span style="color: #909399;">入职时间：{{ orgInfo.entryTime?.substring(0, 10) }}</span>
+      </div>
+    </div>
+  </a-card>
+</template>
+
+<script setup lang="ts">
+import { defineProps, defineEmits } from 'vue'
+
+const props = defineProps({
+  orgInfo: { type: Object, required: true },
+  layout: { type: String, default: 'full' },
+  isSelected: { type: Boolean, default: false },
+  isDirectiveSelected: { type: Boolean, default: false },
+  isDirectiveMain: { type: Boolean, default: false },//标准指令库
+  isElderTagMain: { type: Boolean, default: false },//标准标签库
+  showDetail: { type: Boolean, default: false },
+  clickable: { type: Boolean, default: false }
+})
+
+const emit = defineEmits(['click', 'detail'])
+
+const existTagFunc = () => {
+  return props.isDirectiveMain || props.isElderTagMain
+}
+
+const handleClick = () => {
+  emit('click', props.orgInfo)
+}
+
+const handleDetail = () => {
+  emit('detail', props.orgInfo)
+}
+</script>
+
+<style lang="less" scoped>
+.zxClass {
+  font-size: 12px;
+  background: linear-gradient(to right, #1ea0fa, #017de9);
+  border-radius: 8px;
+  height: 25px;
+  color: white;
+  line-height: 25px;
+  padding: 0 10px;
+}
+
+.zxbkClass {
+  background-color: #F5F7FF;
+}
+
+.selected-card {
+  border: 2px solid #1890ff;
+  box-shadow: 0 0 8px rgba(24, 144, 255, 0.3);
+}
+
+.directive-selected-card {
+  border: 2px solid #1890FF;
+  box-shadow: 0 0 8px rgba(37, 149, 255, 0.3);
+}
+
+
+.org-card {
+  margin-bottom: 16px;
+  border-radius: 8px;
+  // box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+  transition: all 0.3s ease;
+  height: 100%;
+
+  &:hover {
+    transform: translateY(-4px);
+    // box-shadow: 0 6px 16px rgba(0, 0, 0, 0.15);
+    // background: radial-gradient(circle at center, #c7e6ff 0%, #d4eeff 70%, #e4f0ff 100%);
+  }
+
+  :deep(.ant-card-head) {
+    border-bottom: 1px solid #f0f0f0;
+    padding: 0 16px;
+    min-height: 48px;
+
+    .ant-card-head-title {
+      padding: 12px 0;
+      font-weight: 500;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+  }
+}
+
+
+:deep .ant-divider {
+  margin: 0 0 8px 0;
+}
+
+.org-address {
+  width: 100%;
+  height: 65px;
+  background-color: #f8fbff;
+  background-image: url('./orgaddressbk.png');
+  background-repeat: no-repeat;
+  background-position: center;
+  background-size: cover;
+  padding: 13px;
+  padding-right: 100px;
+  color: #696c7f;
+  display: flex;
+  align-items: center;
+  margin-top: 10px;
+  border-radius: 10px;
+  font-size: 12.5px;
+}
+
+.ellipsis-one-lines1 {
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 1;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.ellipsis-one-lines2 {
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  line-height: 1.8;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/biz/nuEmployeesAdvisoryInfo/NuEmployeesAdvisoryInfo.data.ts b/src/views/biz/nuEmployeesAdvisoryInfo/NuEmployeesAdvisoryInfo.data.ts
index 75011a9..d190c6a 100644
--- a/src/views/biz/nuEmployeesAdvisoryInfo/NuEmployeesAdvisoryInfo.data.ts
+++ b/src/views/biz/nuEmployeesAdvisoryInfo/NuEmployeesAdvisoryInfo.data.ts
@@ -7,7 +7,7 @@ import {JVxeTypes, JVxeColumn, JVxeTableInstance} from '/@/components/jeecg/JVxe
 //列表数据
 export const columns: BasicColumn[] = [
   {
-    title: '咨询人姓名',
+    title: '姓名',
     align: "center",
     dataIndex: 'name'
   },
@@ -16,11 +16,11 @@ export const columns: BasicColumn[] = [
     align: "center",
     dataIndex: 'tel'
   },
-  // {
-  //   title: '机构是否入驻',
-  //   align: "center",
-  //   dataIndex: 'izEntry'
-  // },
+  {
+    title: '入驻时间',
+    align: "center",
+    dataIndex: 'createTime'
+  },
   {
     title: '性别',
     align: "center",
@@ -53,46 +53,6 @@ export const columns: BasicColumn[] = [
     align: "center",
     dataIndex: 'idCard'
   },
-  {
-    title: '签发机关',
-    align: "center",
-    dataIndex: 'issuingAuthority',
-    defaultHidden: true,
-  },
-  {
-    title: '有效开始日期',
-    align: "center",
-    dataIndex: 'startTime',
-    customRender:({text}) =>{
-      text = !text ? "" : (text.length > 10 ? text.substr(0,10) : text);
-      return text;
-    },
-    defaultHidden: true,
-  },
-  {
-    title: '有效结束日期',
-    align: "center",
-    dataIndex: 'endTime',
-    customRender:({text}) =>{
-      text = !text ? "" : (text.length > 10 ? text.substr(0,10) : text);
-      return text;
-    },
-    defaultHidden: true,
-  },
-  {
-    title: '身份证正面',
-    align: "center",
-    dataIndex: 'cardZmPath',
-    customRender: render.renderImage,
-    defaultHidden: true,
-  },
-  {
-    title: '身份证反面',
-    align: "center",
-    dataIndex: 'cardFmPath',
-    customRender: render.renderImage,
-    defaultHidden: true,
-  },
   {
     title: '婚否',
     align: "center",
@@ -132,55 +92,6 @@ export const columns: BasicColumn[] = [
     align: "center",
     dataIndex: 'contactTel'
   },
-  {
-    title: '紧急联系人与本人关系',
-    align: "center",
-    dataIndex: 'contactRelationship',
-    defaultHidden: true,
-  },
-  {
-    title: '状态',
-    align: "center",
-    dataIndex: 'status_dictText',
-  },
-  {
-    title: '审核备注',
-    align: "center",
-    dataIndex: 'content',
-    defaultHidden: true,
-  },
-  {
-    title: '户口性质',
-    align: "center",
-    dataIndex: 'hukouType',
-    defaultHidden: true,
-  },
-  {
-    title: '银行卡正面',
-    align: "center",
-    dataIndex: 'bankZmPath',
-    customRender: render.renderImage,
-    defaultHidden: true,
-  },
-  {
-    title: '银行卡反面',
-    align: "center",
-    dataIndex: 'bankFmPath',
-    customRender: render.renderImage,
-    defaultHidden: true,
-  },
-  {
-    title: '开户行',
-    align: "center",
-    dataIndex: 'openingBank',
-    defaultHidden: true,
-  },
-  {
-    title: '银行卡号',
-    align: "center",
-    dataIndex: 'bankCard',
-    defaultHidden: true,
-  },
   {
     title: '健康证正面',
     align: "center",
@@ -196,7 +107,7 @@ export const columns: BasicColumn[] = [
     defaultHidden: true,
   },
   {
-    title: '资质证(可多张)',
+    title: '资质证',
     align: "center",
     dataIndex: 'qualificationPath',
     customRender: render.renderImage,
diff --git a/src/views/biz/nuEmployeesAdvisoryInfo/NuEmployeesAdvisoryInfoList.vue b/src/views/biz/nuEmployeesAdvisoryInfo/NuEmployeesAdvisoryInfoList.vue
index 7928e63..ab4228f 100644
--- a/src/views/biz/nuEmployeesAdvisoryInfo/NuEmployeesAdvisoryInfoList.vue
+++ b/src/views/biz/nuEmployeesAdvisoryInfo/NuEmployeesAdvisoryInfoList.vue
@@ -16,19 +16,6 @@
               <JInput v-model:value="queryParam.tel" />
             </a-form-item>
           </a-col>
-          <a-col :lg="6">
-            <a-form-item name="status">
-              <template #label><span title="审核状态">审核状态</span></template>
-              <j-dict-select-tag type="list" v-model:value="queryParam.status" dictCode="org_apply_status"
-                placeholder="请选择审核状态" allow-clear />
-            </a-form-item>
-          </a-col>
-          <a-col :lg="6">
-            <a-form-item name="orgBuildingArea">
-              <template #label><span title="建筑面积">建筑面积</span></template>
-              <JRangeNumber v-model:value="queryParam.orgBuildingArea" class="query-group-cust"></JRangeNumber>
-            </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">
@@ -45,7 +32,6 @@
     <BasicTable @register="registerTable" >
       <!--插槽:table标题-->
       <template #tableTitle>
-        <a-button type="primary"  @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
       </template>
       <!--操作栏-->
       <template #action="{ record }">
@@ -56,6 +42,7 @@
     </BasicTable>
     <!-- 表单区域 -->
     <NuEmployeesAdvisoryInfoModal ref="registerModal" @success="handleSuccess"></NuEmployeesAdvisoryInfoModal>
+    <EmployeesOrgListModal ref="registerOrgModal" @success="handleSuccess"></EmployeesOrgListModal>
   </div>
 </template>
 
@@ -67,6 +54,7 @@
   import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './NuEmployeesAdvisoryInfo.api';
   import { downloadFile } from '/@/utils/common/renderUtils';
   import NuEmployeesAdvisoryInfoModal from './components/NuEmployeesAdvisoryInfoModal.vue'
+  import EmployeesOrgListModal from './components/EmployeesOrgListModal.vue'
   import { useUserStore } from '/@/store/modules/user';
 import JInput from "/@/components/Form/src/jeecg/components/JInput.vue";
 
@@ -74,6 +62,7 @@ import JInput from "/@/components/Form/src/jeecg/components/JInput.vue";
   const queryParam = reactive<any>({});
   const toggleSearchStatus = ref<boolean>(false);
   const registerModal = ref();
+  const registerOrgModal = ref();
   const userStore = useUserStore();
   //注册table数据
   const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
@@ -149,6 +138,11 @@ import JInput from "/@/components/Form/src/jeecg/components/JInput.vue";
     registerModal.value.disableSubmit = true;
     registerModal.value.edit(record);
   }
+
+  function handleOrgDetail(record) {
+    registerOrgModal.value.disableSubmit = true;
+    registerOrgModal.value.edit(record);
+  }
    
   /**
    * 删除事件
@@ -176,14 +170,18 @@ import JInput from "/@/components/Form/src/jeecg/components/JInput.vue";
    */
   function getTableAction(record) {
     return [
-      {
-        label: '审核',
-        onClick: handleEdit.bind(null, record),
-        ifShow: record.status == '1' 
-      },
+      // {
+      //   label: '审核',
+      //   onClick: handleEdit.bind(null, record),
+      //   ifShow: record.status == '1' 
+      // },
       {
         label: '详情',
         onClick: handleDetail.bind(null, record),
+      },
+      {
+        label: '入驻机构',
+        onClick: handleOrgDetail.bind(null, record),
       }
     ];
   }
diff --git a/src/views/biz/nuEmployeesAdvisoryInfo/components/EmployeesOrgList.vue b/src/views/biz/nuEmployeesAdvisoryInfo/components/EmployeesOrgList.vue
new file mode 100644
index 0000000..f81e672
--- /dev/null
+++ b/src/views/biz/nuEmployeesAdvisoryInfo/components/EmployeesOrgList.vue
@@ -0,0 +1,49 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <a-row>
+      <a-col v-for="(item, index) in orgTableList" :key="item.id"  :xs="24" :sm="24" :md="12" :lg="12" :xl="8" :xxl="8"
+        :style="{ 'padding-right': ((index + 1) % 4 != 0) ? '14px' : '0px', 'padding-bottom': '14px' }">
+        <OrgCard :orgInfo="item" />
+      </a-col>
+      <a-col v-if="orgTableList.length == 0">
+        <div style="margin: 30px auto;">
+          <a-empty />
+        </div>
+      </a-col>
+    </a-row>
+  </a-spin>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, defineExpose, nextTick, defineProps, computed, onMounted } from 'vue';
+  import { defHttp } from '/@/utils/http/axios';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { saveOrUpdate } from '../NuEmployeesAdvisoryInfo.api';
+import { def } from 'node_modules/@vue/shared/dist/shared';
+import OrgCard from '/@/components/OrgCard/OrgCardEmployess.vue'
+  const { createMessage } = useMessage();
+  const confirmLoading = ref<boolean>(false);
+
+const orgTableList = ref<any>({ records: [], total: 0 })
+
+  /**
+   * 编辑
+   */
+  function edit(record) {
+    defHttp.get({ url: '/admin/orgapplyinfo/orgApplyInfo/getOrgByOpenId', params: { openId: record.openId } }).then((res) => {
+      console.log("🚀 ~ edit ~ res:", res)
+      orgTableList.value = res.records
+    });
+  }
+
+
+  defineExpose({
+    edit,
+  });
+</script>
+
+<style lang="less" scoped>
+  .antd-modal-form {
+    padding: 14px;
+  }
+</style>
diff --git a/src/views/biz/nuEmployeesAdvisoryInfo/components/EmployeesOrgListModal.vue b/src/views/biz/nuEmployeesAdvisoryInfo/components/EmployeesOrgListModal.vue
new file mode 100644
index 0000000..d24ea40
--- /dev/null
+++ b/src/views/biz/nuEmployeesAdvisoryInfo/components/EmployeesOrgListModal.vue
@@ -0,0 +1,65 @@
+<template>
+  
+  <a-drawer :title="title" :width="`70vw`"  v-model:visible="visible" :closable="true"
+    :footer-style="{ textAlign: 'right' }" @close="handleCancel">
+    <EmployeesOrgList ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></EmployeesOrgList>
+    <template #footer>
+      <a-button type="primary" style="margin-right: 8px" @click="handleCancel">关闭</a-button>
+    </template>
+  </a-drawer>
+</template>
+
+<script lang="ts" setup>
+  import { ref, nextTick, defineExpose } from 'vue';
+  import EmployeesOrgList from './EmployeesOrgList.vue'
+  import JModal from '/@/components/Modal/src/JModal/JModal.vue';
+  
+  const title = ref<string>('');
+  const width = ref<string>('70vw');
+  const visible = ref<boolean>(false);
+  const disableSubmit = ref<boolean>(false);
+  const registerForm = ref();
+  const emit = defineEmits(['register', 'success']);
+
+  
+  /**
+   * 编辑
+   * @param record
+   */
+  function edit(record) {
+    title.value = '入驻机构' ;
+    visible.value = true;
+    nextTick(() => {
+      registerForm.value.edit(record);
+    });
+  }
+  
+
+  /**
+   * form保存回调事件
+   */
+  function submitCallback() {
+    handleCancel();
+    emit('success');
+  }
+
+  /**
+   * 取消按钮回调事件
+   */
+  function handleCancel() {
+    visible.value = false;
+  }
+
+  defineExpose({
+    edit,
+    disableSubmit,
+  });
+</script>
+
+<style lang="less">
+  /**隐藏样式-modal确定按钮 */
+  .jee-hidden {
+    display: none !important;
+  }
+</style>
+<style lang="less" scoped></style>
diff --git a/src/views/biz/nuEmployeesAdvisoryInfo/components/NuEmployeesAdvisoryInfoForm.vue b/src/views/biz/nuEmployeesAdvisoryInfo/components/NuEmployeesAdvisoryInfoForm.vue
index ea31ae6..99fc5ba 100644
--- a/src/views/biz/nuEmployeesAdvisoryInfo/components/NuEmployeesAdvisoryInfoForm.vue
+++ b/src/views/biz/nuEmployeesAdvisoryInfo/components/NuEmployeesAdvisoryInfoForm.vue
@@ -4,20 +4,6 @@
       <template #detail>
         <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" name="NuEmployeesAdvisoryInfoForm">
           <a-row>
-            <a-col :span="24">
-              <SectionDivider :title="'入驻审核'" />
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="审核" v-bind="validateInfos.status" id="OrgApplyInfoForm-status" name="status">
-                <j-dict-select-tag type="radio" v-model:value="formData.status" dictCode="org_apply_status" placeholder="请选择审核结果"
-                  allow-clear />
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="审核备注" v-bind="validateInfos.content" id="OrgApplyInfoForm-content" name="content">
-                <a-input v-model:value="formData.content" placeholder="请输入审核备注" allow-clear></a-input>
-              </a-form-item>
-            </a-col>
             <a-col :span="24">
               <SectionDivider :title="'基本信息'" />
             </a-col>
@@ -33,52 +19,62 @@
 						</a-col>
 						<a-col :span="12">
 							<a-form-item label="咨询人姓名" v-bind="validateInfos.name" id="NuEmployeesAdvisoryInfoForm-name" name="name">
-								<a-input v-model:value="formData.name" placeholder="请输入咨询人姓名"  allow-clear disabled  ></a-input>
+								<!-- <a-input v-model:value="formData.name" placeholder="请输入咨询人姓名"  allow-clear disabled  ></a-input> -->
+                {{formData.name}}
 							</a-form-item>
 						</a-col>
 						<a-col :span="12">
 							<a-form-item label="性别" v-bind="validateInfos.sex" id="NuEmployeesAdvisoryInfoForm-sex" name="sex">
-								<a-input v-model:value="formData.sex" placeholder="请输入性别"  allow-clear disabled  ></a-input>
+								<!-- <a-input v-model:value="formData.sex" placeholder="请输入性别"  allow-clear disabled  ></a-input> -->
+                {{formData.sex}}
 							</a-form-item>
 						</a-col>
 						<a-col :span="12">
 							<a-form-item label="民族" v-bind="validateInfos.national" id="NuEmployeesAdvisoryInfoForm-national" name="national">
-								<a-input v-model:value="formData.national" placeholder="请输入民族"  allow-clear disabled  ></a-input>
+								<!-- <a-input v-model:value="formData.national" placeholder="请输入民族"  allow-clear disabled  ></a-input> -->
+                {{formData.national}}
 							</a-form-item>
 						</a-col>
 						<a-col :span="12">
 							<a-form-item label="出生日期" v-bind="validateInfos.birthDate" id="NuEmployeesAdvisoryInfoForm-birthDate" name="birthDate">
-								<a-date-picker placeholder="请选择出生日期"  v-model:value="formData.birthDate" disabled  value-format="YYYY-MM-DD"  style="width: 100%"  allow-clear />
+								<!-- <a-date-picker placeholder="请选择出生日期"  v-model:value="formData.birthDate" disabled  value-format="YYYY-MM-DD"  style="width: 100%"  allow-clear /> -->
+                {{formData.birthDate}}
 							</a-form-item>
 						</a-col>
 						<a-col :span="12">
 							<a-form-item label="住址" v-bind="validateInfos.idCardAddress" id="NuEmployeesAdvisoryInfoForm-idCardAddress" name="idCardAddress">
-								<a-input v-model:value="formData.idCardAddress" placeholder="请输入住址"  allow-clear disabled  ></a-input>
+								<!-- <a-input v-model:value="formData.idCardAddress" placeholder="请输入住址"  allow-clear disabled  ></a-input> -->
+                {{formData.idCardAddress}}
 							</a-form-item>
 						</a-col>
 						<a-col :span="12">
 							<a-form-item label="身份证号" v-bind="validateInfos.idCard" id="NuEmployeesAdvisoryInfoForm-idCard" name="idCard">
-								<a-input v-model:value="formData.idCard" placeholder="请输入身份证号"  allow-clear disabled  ></a-input>
+								<!-- <a-input v-model:value="formData.idCard" placeholder="请输入身份证号"  allow-clear disabled  ></a-input> -->
+                {{formData.idCard}}
 							</a-form-item>
 						</a-col>
 						<a-col :span="12">
 							<a-form-item label="签发机关" v-bind="validateInfos.issuingAuthority" id="NuEmployeesAdvisoryInfoForm-issuingAuthority" name="issuingAuthority">
-								<a-input v-model:value="formData.issuingAuthority" placeholder="请输入签发机关"  allow-clear disabled  ></a-input>
+								<!-- <a-input v-model:value="formData.issuingAuthority" placeholder="请输入签发机关"  allow-clear disabled  ></a-input> -->
+                {{formData.issuingAuthority}}
 							</a-form-item>
 						</a-col>
 						<a-col :span="12">
 							<a-form-item label="有效开始日期" v-bind="validateInfos.startTime" id="NuEmployeesAdvisoryInfoForm-startTime" name="startTime">
-								<a-date-picker placeholder="请选择有效开始日期"  v-model:value="formData.startTime" disabled  value-format="YYYY-MM-DD"  style="width: 100%"  allow-clear />
+								<!-- <a-date-picker placeholder="请选择有效开始日期"  v-model:value="formData.startTime" disabled  value-format="YYYY-MM-DD"  style="width: 100%"  allow-clear /> -->
+                {{formData.startTime}}
 							</a-form-item>
 						</a-col>
 						<a-col :span="12">
 							<a-form-item label="有效结束日期" v-bind="validateInfos.endTime" id="NuEmployeesAdvisoryInfoForm-endTime" name="endTime">
-								<a-date-picker placeholder="请选择有效结束日期"  v-model:value="formData.endTime" disabled  value-format="YYYY-MM-DD"  style="width: 100%"  allow-clear />
+								<!-- <a-date-picker placeholder="请选择有效结束日期"  v-model:value="formData.endTime" disabled  value-format="YYYY-MM-DD"  style="width: 100%"  allow-clear /> -->
+                {{formData.endTime}}
 							</a-form-item>
 						</a-col>
 						<a-col :span="12">
 							<a-form-item label="联系电话" v-bind="validateInfos.tel" id="NuEmployeesAdvisoryInfoForm-tel" name="tel">
-								<a-input v-model:value="formData.tel" placeholder="请输入联系电话"  allow-clear  disabled ></a-input>
+								<!-- <a-input v-model:value="formData.tel" placeholder="请输入联系电话"  allow-clear  disabled ></a-input> -->
+                {{formData.tel}}
 							</a-form-item>
 						</a-col>
             <a-col :span="24">
@@ -86,32 +82,38 @@
             </a-col>
 						<a-col :span="12">
 							<a-form-item label="婚否" v-bind="validateInfos.maritalStatus" id="NuEmployeesAdvisoryInfoForm-maritalStatus" name="maritalStatus">
-								<a-input v-model:value="formData.maritalStatus" placeholder="请输入婚否"  allow-clear  disabled ></a-input>
+								<!-- <a-input v-model:value="formData.maritalStatus" placeholder="请输入婚否"  allow-clear  disabled ></a-input> -->
+                {{formData.maritalStatus}}
 							</a-form-item>
 						</a-col>
 						<a-col :span="12">
 							<a-form-item label="身高" v-bind="validateInfos.height" id="NuEmployeesAdvisoryInfoForm-height" name="height">
-								<a-input v-model:value="formData.height" placeholder="请输入身高"  allow-clear  disabled ></a-input>
+								<!-- <a-input v-model:value="formData.height" placeholder="请输入身高"  allow-clear  disabled ></a-input> -->
+                {{formData.height}}
 							</a-form-item>
 						</a-col>
 						<a-col :span="12">
 							<a-form-item label="体重" v-bind="validateInfos.weight" id="NuEmployeesAdvisoryInfoForm-weight" name="weight">
-								<a-input v-model:value="formData.weight" placeholder="请输入体重"  allow-clear  disabled ></a-input>
+								<!-- <a-input v-model:value="formData.weight" placeholder="请输入体重"  allow-clear  disabled ></a-input> -->
+                {{formData.weight}}
 							</a-form-item>
 						</a-col>
 						<a-col :span="12">
 							<a-form-item label="健康状况" v-bind="validateInfos.healthStatus" id="NuEmployeesAdvisoryInfoForm-healthStatus" name="healthStatus">
-								<a-input v-model:value="formData.healthStatus" placeholder="请输入健康状况"  allow-clear  disabled ></a-input>
+								<!-- <a-input v-model:value="formData.healthStatus" placeholder="请输入健康状况"  allow-clear  disabled ></a-input> -->
+                {{formData.healthStatus}}
 							</a-form-item>
 						</a-col>
 						<a-col :span="12">
 							<a-form-item label="政治面貌" v-bind="validateInfos.politicalAppearance" id="NuEmployeesAdvisoryInfoForm-politicalAppearance" name="politicalAppearance">
-								<a-input v-model:value="formData.politicalAppearance" placeholder="请输入政治面貌"  allow-clear disabled  ></a-input>
+								<!-- <a-input v-model:value="formData.politicalAppearance" placeholder="请输入政治面貌"  allow-clear disabled  ></a-input> -->
+                {{formData.politicalAppearance}}
 							</a-form-item>
 						</a-col>
 						<a-col :span="12">
 							<a-form-item label="户口性质" v-bind="validateInfos.hukouType" id="NuEmployeesAdvisoryInfoForm-hukouType" name="hukouType">
-								<a-input v-model:value="formData.hukouType" placeholder="请输入户口性质"  allow-clear disabled  ></a-input>
+								<!-- <a-input v-model:value="formData.hukouType" placeholder="请输入户口性质"  allow-clear disabled  ></a-input> -->
+                {{formData.hukouType}}
 							</a-form-item>
 						</a-col>
             
@@ -120,17 +122,20 @@
             </a-col>
 						<a-col :span="12">
 							<a-form-item label="紧急联系人姓名" v-bind="validateInfos.contactName" id="NuEmployeesAdvisoryInfoForm-contactName" name="contactName">
-								<a-input v-model:value="formData.contactName" placeholder="请输入紧急联系人姓名"  allow-clear disabled  ></a-input>
+								<!-- <a-input v-model:value="formData.contactName" placeholder="请输入紧急联系人姓名"  allow-clear disabled  ></a-input> -->
+                {{formData.contactName}}
 							</a-form-item>
 						</a-col>
 						<a-col :span="12">
 							<a-form-item label="紧急联系人电话" v-bind="validateInfos.contactTel" id="NuEmployeesAdvisoryInfoForm-contactTel" name="contactTel">
-								<a-input v-model:value="formData.contactTel" placeholder="请输入紧急联系人电话"  allow-clear disabled  ></a-input>
+								<!-- <a-input v-model:value="formData.contactTel" placeholder="请输入紧急联系人电话"  allow-clear disabled  ></a-input> -->
+                {{formData.contactTel}}
 							</a-form-item>
 						</a-col>
 						<a-col :span="12">
 							<a-form-item label="与本人关系" v-bind="validateInfos.contactRelationship" id="NuEmployeesAdvisoryInfoForm-contactRelationship" name="contactRelationship">
-								<a-input v-model:value="formData.contactRelationship" placeholder="请输入紧急联系人与本人关系"  allow-clear disabled  ></a-input>
+								<!-- <a-input v-model:value="formData.contactRelationship" placeholder="请输入紧急联系人与本人关系"  allow-clear disabled  ></a-input> -->
+                {{formData.contactRelationship}}
 							</a-form-item>
 						</a-col>
             <a-col :span="24">
@@ -148,12 +153,14 @@
 						</a-col>
 						<a-col :span="12">
 							<a-form-item label="开户行" v-bind="validateInfos.openingBank" id="NuEmployeesAdvisoryInfoForm-openingBank" name="openingBank">
-								<a-input v-model:value="formData.openingBank" placeholder="请输入开户行"  allow-clear disabled  ></a-input>
+								<!-- <a-input v-model:value="formData.openingBank" placeholder="请输入开户行"  allow-clear disabled  ></a-input> -->
+                {{formData.openingBank}}
 							</a-form-item>
 						</a-col>
 						<a-col :span="12">
 							<a-form-item label="银行卡号" v-bind="validateInfos.bankCard" id="NuEmployeesAdvisoryInfoForm-bankCard" name="bankCard">
-								<a-input v-model:value="formData.bankCard" placeholder="请输入银行卡号"  allow-clear disabled  ></a-input>
+								<!-- <a-input v-model:value="formData.bankCard" placeholder="请输入银行卡号"  allow-clear disabled  ></a-input> -->
+                {{formData.bankCard}}
 							</a-form-item>
 						</a-col>
             <a-col :span="24">
diff --git a/src/views/biz/nuEmployeesAdvisoryInfo/components/NuEmployeesAdvisoryInfoModal.vue b/src/views/biz/nuEmployeesAdvisoryInfo/components/NuEmployeesAdvisoryInfoModal.vue
index a591fcf..312d5fd 100644
--- a/src/views/biz/nuEmployeesAdvisoryInfo/components/NuEmployeesAdvisoryInfoModal.vue
+++ b/src/views/biz/nuEmployeesAdvisoryInfo/components/NuEmployeesAdvisoryInfoModal.vue
@@ -1,7 +1,13 @@
 <template>
-  <j-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+  
+  <a-drawer :title="title" :width="`70vw`"  v-model:visible="visible" :closable="true"
+    :footer-style="{ textAlign: 'right' }" @close="handleCancel">
     <NuEmployeesAdvisoryInfoForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></NuEmployeesAdvisoryInfoForm>
-  </j-modal>
+    <template #footer>
+      <a-button type="primary" style="margin-right: 8px" @click="handleCancel">关闭</a-button>
+      <a-button type="primary" @click="handleOk" v-if="!disableSubmit">确认</a-button>
+    </template>
+  </a-drawer>
 </template>
 
 <script lang="ts" setup>