From f78ddf18dc83583fe4d313f544d2ba0229918fed Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 15 Mar 2022 15:36:19 +0800
Subject: [PATCH] BUG 28232 28235

---
 src/apps/AppSpecialPeople/add.vue | 50 +++++++------------------------
 src/components/AiAreaPicker.vue   |  6 ++--
 src/components/AiMore.vue         | 32 ++++++++++++++++++++
 3 files changed, 46 insertions(+), 42 deletions(-)
 create mode 100644 src/components/AiMore.vue

diff --git a/src/apps/AppSpecialPeople/add.vue b/src/apps/AppSpecialPeople/add.vue
index 4225be2a..034adec3 100644
--- a/src/apps/AppSpecialPeople/add.vue
+++ b/src/apps/AppSpecialPeople/add.vue
@@ -4,8 +4,7 @@
       <div class="item" v-if="!isEdit">
         <span class="label"><span class="tips">*</span>类型</span>
         <div class="value" @click="showType=true">
-          <span :class="appId ? '' : 'color-999'">{{ appName }}</span>
-          <u-icon name="arrow-right" color="#cccccc"/>
+          <AiMore v-model="appName"/>
         </div>
       </div>
       <div class="info-content" v-for="(items, indexs) in formDataList" :key="indexs">
@@ -62,11 +61,7 @@
           <div class="item" v-else-if="item.type == 'dict'">
             <span class="label"><span class="tips">{{ item.mustFill == 1 ? '*' : '' }}</span>{{ item.fieldName }}</span>
             <div class="value" @click="selectClick(item.fieldDbName, item.dict)">
-              <span
-                  :class="formData[item.fieldDbName] ? '' : 'color-999'">{{
-                  $dict.getLabel(item.dict, formData[item.fieldDbName]) || '请选择'
-                }}</span>
-              <u-icon name="arrow-right area-icon" color="#cccccc"></u-icon>
+              <AiMore :value="$dict.getLabel(item.dict, formData[item.fieldDbName])"/>
             </div>
           </div>
           <!-- 单选radio -->
@@ -112,12 +107,11 @@
             </div>
           </div>
           <!-- 地区选择 -->
-          <div class="item area" v-else-if="item.type == 'area'">
+          <div class="item" v-else-if="item.type == 'area'">
             <span class="label"><span class="tips">{{ item.mustFill == 1 ? '*' : '' }}</span>{{ item.fieldName }}</span>
-            <div class="value">
+            <div class="value" flex>
               <AiAreaPicker @select="v=>formData[item.fieldDbName]=v" :name.sync="formData[item.fieldDbName+'_name']"
-                            :areaId="user.areaId" all :value="formData[item.fieldDbName]" :valueLevel="item.areaPattern"/>
-              <u-icon name="arrow-right area-icon" color="#cccccc"></u-icon>
+                            all :value="formData[item.fieldDbName]" :valueLevel="item.areaPattern" isForm/>
             </div>
           </div>
           <!-- 人员选择 -->
@@ -132,18 +126,14 @@
                   formData[item.fieldDbName].length
                 }}</em>人
               </template>
-              <u-icon name="arrow-right" color="#cccccc"></u-icon>
+              <u-icon name="arrow-right" color="#ddd"></u-icon>
             </div>
           </div>
           <!-- 日期选择 / 日期带时分秒选择 / 时间-时分秒选择 -->
           <div class="item" v-else-if="item.type == 'date' || item.type == 'datetime' || item.type == 'time'">
             <span class="label"><span class="tips">{{ item.mustFill == 1 ? '*' : '' }}</span>{{ item.fieldName }}</span>
-            <div class="value" @click="dateClick(indexs, index)">
-              <span
-                  :class="formData[item.fieldDbName] ? '' : 'color-999'">{{
-                  formData[item.fieldDbName] || '请选择'
-                }}</span>
-              <u-icon name="arrow-right area-icon" color="#cccccc"></u-icon>
+            <div class="value" @click="dateClick(indexs, index)" flex>
+              <AiMore v-model="formData[item.fieldDbName]"/>
             </div>
           </div>
           <!-- 居民档案选择 -->
@@ -151,8 +141,7 @@
             <span class="label"><span class="tips">{{ item.mustFill == 1 ? '*' : '' }}</span>{{ item.fieldName }}</span>
             <div class="value" flex>
               <AiPagePicker @select="v=>handleSelectResident(v,item)" single>
-                <u-icon :label="formData[item.fieldDbName + '_name'] || item.fieldTips || '从居民档案中选择' "
-                        name="arrow-right" label-pos="left" color="#ccc"/>
+                <AiMore v-model="formData[item.fieldDbName + '_name']" :placeholder="item.fieldTips"/>
               </AiPagePicker>
             </div>
           </div>
@@ -161,8 +150,7 @@
             <span class="label"><span class="tips">{{ item.mustFill == 1 ? '*' : '' }}</span>{{ item.fieldName }}</span>
             <div class="value" flex>
               <AiPagePicker type="gird" @select="v=>handleSelectGird(v,item)" isMyGird>
-                <u-icon :label="formData[item.fieldDbName + '_name'] || item.fieldTips || '选择网格' "
-                        name="arrow-right" label-pos="left" color="#ccc"/>
+                <AiMore v-model="formData[item.fieldDbName + '_name']" :placeholder="item.fieldTips"/>
               </AiPagePicker>
             </div>
           </div>
@@ -187,7 +175,7 @@ export default {
   data() {
     return {
       appId: '',
-      appName: '请选择',
+      appName: '',
       showType: false,
       typeList: [],
       formDataList: [],
@@ -596,22 +584,6 @@ export default {
     height: 160px !important;
   }
 
-  .area {
-    padding: 16px 54px 16px 0;
-
-    .label {
-      display: inline-block;
-      line-height: 78px !important;
-    }
-
-    .u-icon {
-      vertical-align: super;
-      position: absolute;
-      top: 42px;
-      right: 16px;
-    }
-  }
-
   .area-icon {
     vertical-align: super;
     position: absolute;
diff --git a/src/components/AiAreaPicker.vue b/src/components/AiAreaPicker.vue
index 25a0867d..3164a77b 100644
--- a/src/components/AiAreaPicker.vue
+++ b/src/components/AiAreaPicker.vue
@@ -4,7 +4,7 @@
       <div slot="btn" @tap="handleInit">
         <slot v-if="$slots.default"/>
         <div v-else-if="isForm">
-          <u-icon name="arrow-right" :label="areaName||'请选择'" label-pos="left" color="#ddd"/>
+          <ai-more v-model="areaName"/>
         </div>
         <div v-else class="areaSelector">
           <image :src="locationIcon" class="location"/>
@@ -49,12 +49,12 @@
 
 <script>
 import AiSearchPopup from './AiSearchPopup'
-import AiCell from './AiCell.vue'
 import {mapState} from 'vuex'
+import AiMore from "./AiMore";
 
 export default {
   name: 'AiAreaPicker',
-  components: {AiCell, AiSearchPopup},
+  components: {AiMore, AiSearchPopup},
   props: {
     areaId: {default: ''},
     name: {default: ''},
diff --git a/src/components/AiMore.vue b/src/components/AiMore.vue
new file mode 100644
index 00000000..6f819560
--- /dev/null
+++ b/src/components/AiMore.vue
@@ -0,0 +1,32 @@
+<template>
+  <section class="AiMore">
+    <u-icon name="arrow-right" color="#ddd" :label="value||placeholder" label-pos="left" :label-color="labelColor" label-size="32"/>
+  </section>
+</template>
+
+<script>
+export default {
+  name: "AiMore",
+  model: {
+    prop: "value",
+    event: "change"
+  },
+  props: {
+    placeholder: {default: "请选择"},
+    value: String
+  },
+  computed: {
+    isEmpty() {
+      return !this.value
+    },
+    labelColor() {
+      return this.isEmpty ? "#999" : "#333"
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.AiMore {
+}
+</style>