From 4de7b17f579fd5eabe9b45d7549cafd359a10cb8 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Thu, 7 Apr 2022 21:12:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=8C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../approvalManage/components/approvalDetail.vue          | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/project/xiushan/apps/processManagement/approvalManage/components/approvalDetail.vue b/project/xiushan/apps/processManagement/approvalManage/components/approvalDetail.vue
index 5873f19b..da73a914 100644
--- a/project/xiushan/apps/processManagement/approvalManage/components/approvalDetail.vue
+++ b/project/xiushan/apps/processManagement/approvalManage/components/approvalDetail.vue
@@ -53,7 +53,8 @@
                     <div v-for="(item, index) in applyForm" :key="index">
                       <ai-title :title="index"></ai-title>
                       <el-form-item v-for="e in item" :key="e.id" :label="[e.fieldName,e.fieldNameSuffix].join('')">
-                        <el-input :value="getFieldValue(e)" readonly style="width: 100%;" v-if="e.fieldDataType!=5"/>
+                        <el-input :value="getFieldValue(e)" readonly style="width: 100%;" v-if="e.fieldDataType!=5 && e.fieldDataType!=10"/>
+                        <el-input :value="getAreaName(e)" readonly style="width: 100%;" v-if="e.fieldDataType==10"/>
                         <el-checkbox-group v-model="!e.fieldValue ? '' : String(e.fieldValue).split(',')">
                           <el-checkbox :label="val.dictValue" disabled
                                        v-for="(val,idx) in dict.getDict(e.dictionaryCode)" :key="idx">{{val.dictName}}</el-checkbox>
@@ -408,6 +409,9 @@ export default {
     getFieldValue(e) {
       return e.dictionaryCode ? this.dict.getLabel(e.dictionaryCode, e.fieldValue) : e.fieldValue
     },
+    getAreaName(e) {
+      return e.areaValue
+    },
     color(status) {
       return ['#2EA222', '#2EA222', '#FF4466', '#2EA222', '#FF8822', '#2EA222', '#2EA222', '#FF4466', '#FF8822', '#FF8822'][+status]
     },
@@ -648,7 +652,7 @@ export default {
   },
   created() {
     this.dict.load(['nodeType', 'approvalStatus', 'hbDepartment', 'sex', 'nation', 'marital', 'education', 'yesOrNo'])
-    this.areaId = this.user.info.areaId.substring(0, 6) + '000000'
+    // this.areaId = this.user.info.areaId.substring(0, 6) + '000000'
     this.searchDetail(this.detail.id);
     this.searchLog(this.currentMenu)
   },