From 8f01e046e07e699d2b6850871880d2be3c667933 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Mon, 18 Apr 2022 09:30:36 +0800
Subject: [PATCH] BUG 29148

---
 .../components/approvalDetail.vue             | 28 ++++++-------------
 1 file changed, 8 insertions(+), 20 deletions(-)

diff --git a/project/xiushan/apps/processManagement/approvalManage/components/approvalDetail.vue b/project/xiushan/apps/processManagement/approvalManage/components/approvalDetail.vue
index 12b306bb..2ed6e026 100644
--- a/project/xiushan/apps/processManagement/approvalManage/components/approvalDetail.vue
+++ b/project/xiushan/apps/processManagement/approvalManage/components/approvalDetail.vue
@@ -56,12 +56,13 @@
                 <el-form label-suffix="：" label-width="180px" size="small">
                   <div class="border-wrap">
                     <div v-for="(item, index) in applyForm" :key="index">
-                      <ai-title :title="index"></ai-title>
+                      <ai-title :title="index"/>
                       <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 && 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-input :value="getAreaName(e)" readonly style="width: 100%;"
+                                  v-else-if="e.fieldDataType==10"/>
+                        <el-checkbox-group v-else 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>
@@ -237,28 +238,15 @@
             </el-radio-group>
 
             <el-date-picker
-                v-if="op.fieldDataType=='8'"
+                v-if="op.fieldDataType==3"
                 v-model.trim="op.fieldValue"
                 format="yyyy年MM月dd日"
                 value-format="yyyy年MM月dd日"
                 type="date"
                 placeholder="请选择">
             </el-date-picker>
-
-            <el-select
-                v-if="op.fieldDataType=='9'"
-                size="small"
-                v-model="op.fieldValue"
-                placeholder="请选择"
-                clearable>
-              <el-option
-                  v-for="(k,m) in dict.getDict(op.dictionaryCode)"
-                  :key="m"
-                  :label="k.dictName"
-                  :value="k.dictValue"
-              />
-            </el-select>
-
+            <ai-select v-if="op.fieldDataType=='9'" v-model="op.fieldValue"
+                       :selectList="dict.getDict(op.dictionaryCode)"/>
           </el-form-item>
           <el-form-item label="审批意见" prop="opinion" :rules="[{ required: true, message: '请输入审批意见', trigger: 'blur' }]"
                         v-if="titleType=='审批拒绝'">
@@ -404,7 +392,7 @@ export default {
       return e.dictionaryCode && this.dict.getLabel(e.dictionaryCode, val)
     },
     getFieldValue(e) {
-      return e.dictionaryCode ? this.dict.getLabel(e.dictionaryCode, e.fieldValue) : e.fieldValue
+      return !!e.dictionaryCode ? this.dict.getLabel(e.dictionaryCode, e.fieldValue) : e.fieldValue
     },
     getAreaName(e) {
       return e.areaValue