From 49038e5d1e24f16dafed5672ddd6e23e719318c3 Mon Sep 17 00:00:00 2001
From: xiepeng <xiepeng@zcloudchina.com>
Date: Thu, 23 May 2024 10:33:11 +0800
Subject: [PATCH] =?UTF-8?q?BUG=E4=BC=98=E5=8C=96=20=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E4=B8=8D=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../user_practitioner/details.vue             | 30 +++++++++++++++++--
 .../user_practitioner/edit.vue                |  9 ++++++
 2 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/src/views/enterprise_management/user_practitioner/details.vue b/src/views/enterprise_management/user_practitioner/details.vue
index 4c3defe..81568b2 100644
--- a/src/views/enterprise_management/user_practitioner/details.vue
+++ b/src/views/enterprise_management/user_practitioner/details.vue
@@ -1,6 +1,24 @@
 <template>
   <layout-card>
-    <el-divider content-position="left"> {{data.statusInfo.REVIEW_RESULT === "-1" ? "打回" : "通过"}}详情 </el-divider>
+    <div v-if="data.statusInfo.APPLY_TYPE !== '0' && data.statusInfo.APPLY_STATUS !== '0'">
+      <el-divider content-position="left">
+        {{data.statusInfo.REVIEW_RESULT === "-1" ? "打回" : "通过"}}详情
+      </el-divider>
+      <el-descriptions :column="3" border>
+        <el-descriptions-item label="申请类别">
+          <template v-if="data.statusInfo.APPLY_TYPE === '1'">入职申请</template>
+          <template v-else-if="data.statusInfo.APPLY_TYPE === '2'">企业入职</template>
+          <template v-else-if="data.statusInfo.APPLY_TYPE === '3'">离职申请</template>
+          <template v-else-if="data.statusInfo.APPLY_TYPE === '4'">企业解聘</template>
+        </el-descriptions-item>
+        <el-descriptions-item label="备注">
+          {{ data.statusInfo.REVIEW_COMMENTS }}
+        </el-descriptions-item>
+        <el-descriptions-item :label="data.dispose">
+          {{ data.statusInfo.AUDIT_DATE }}
+        </el-descriptions-item>
+      </el-descriptions>
+    </div>
     <el-divider content-position="left">基本信息</el-divider>
     <el-descriptions :column="2" border>
       <el-descriptions-item label="姓名">
@@ -172,12 +190,13 @@ const data = reactive({
   info: {},
   certificateList: [],
   statusInfo: {},
+  dispose: ""
 });
 const fnGetData = async () => {
   if (!USER_ID) return;
   const resData = await getPractitionerInfo({ USER_ID });
   data.info = resData.pd;
-  data.statusInfo = resData.statusInfo
+  data.statusInfo = resData.statusInfo;
   resData.certificateList.forEach((item) => {
     item.ID_PHOTO_FRONT = FILE_URL + item.ID_PHOTO_FRONT;
     if (item.ID_PHOTO_BACK) {
@@ -197,7 +216,12 @@ const fnGetData = async () => {
     if(!item.ALLOW_QUALIFICATION || item.ALLOW_QUALIFICATION.includes("null")) {
       item.ALLOW_QUALIFICATION = null;
     }
-  })
+  });
+  if (data.statusInfo.APPLY_TYPE === "1" || data.statusInfo.APPLY_TYPE === '3') {
+    data.dispose = '审核时间';
+  }else{
+    data.dispose = '确认时间';
+  }
 };
 fnGetData();
 </script>
diff --git a/src/views/enterprise_management/user_practitioner/edit.vue b/src/views/enterprise_management/user_practitioner/edit.vue
index a693802..3dc01fb 100644
--- a/src/views/enterprise_management/user_practitioner/edit.vue
+++ b/src/views/enterprise_management/user_practitioner/edit.vue
@@ -950,6 +950,7 @@ const fnGetData = async () => {
   if (!USER_ID) return;
   const resData = await getPractitionerForEdit({ USER_ID });
   const form = resData.pd;
+  console.log(resData);
   form.PASSWORD = "Aa@123456";
   form.periodStr = resData.periodStr;
   form.ISSTUDENT = resData.pd.ISSTUDENT.toString();
@@ -1011,6 +1012,13 @@ const fnGetData = async () => {
     }
   });
   data.form = { ...data.form, ...form };
+  if(!data.form.DUTIES_NAME || !data.form.DUTIES_NAME === '') {
+    data.form.DUTIES = '';
+  }
+  if(!data.form.TITLE_NAME || !data.form.TITLE_NAME === '') {
+    data.form.TITLE = '';
+  }
+  console.log(data.form);
 };
 fnGetData();
 const fnGetUserRole = async () => {
@@ -1050,6 +1058,7 @@ const fnChangeSchedulingTwo = () => {
 const fnGetUserCurrentShiftList = async (SHIFTWORKRULES_ID) => {
   const resData = await getUserCurrentShiftList({ SHIFTWORKRULES_ID });
   data.periodList = resData.varList;
+  console.log(data.periodList);
 };
 const fnChangePeriod = (event) => {
   for (let i = 0; i < data.periodList.length; i++) {