From 6bcf7f6b1e6e6146a9ec5da0986d0b2b8bc886ee Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Thu, 28 Apr 2022 12:01:02 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=AE=B6=E5=BA=AD=E6=88=90?=
 =?UTF-8?q?=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/AppMonitoringObject/Add.vue | 50 ++++++++++++++++++++--------
 1 file changed, 37 insertions(+), 13 deletions(-)

diff --git a/src/apps/AppMonitoringObject/Add.vue b/src/apps/AppMonitoringObject/Add.vue
index c4757bf3..84ffca46 100644
--- a/src/apps/AppMonitoringObject/Add.vue
+++ b/src/apps/AppMonitoringObject/Add.vue
@@ -16,6 +16,17 @@
             </div>
           </div>
         </div>
+        <div class="form-item" v-if="id">
+          <div class="form-item__wrapper">
+            <div class="left">
+              <i style="width: 8px;">*</i>
+              <span>与户主关系</span>
+            </div>
+            <div class="right">
+              <AiSelect dict="fpRelationship" v-model="form.relationship"></AiSelect>
+            </div>
+          </div>
+        </div>
         <div class="form-item">
           <div class="form-item__wrapper">
             <div class="left">
@@ -32,6 +43,21 @@
           </div>
         </div>
         <div class="form-item">
+          <div class="form-item__wrapper">
+            <div class="left">
+              <i style="width: 8px;"></i>
+              <span>成员姓名</span>
+            </div>
+            <div class="right">
+              <AiPagePicker class="select" :selected.sync="userList">
+                <span v-if="!userList.length">请选择</span>
+                <span v-if="userList.length" style="color: #333;">{{ userList[0].name }}</span>
+                <u-icon name="arrow-right" color="#DDD" size="28"></u-icon>
+              </AiPagePicker>
+            </div>
+          </div>
+        </div>
+        <div class="form-item" v-if="!id">
           <div class="form-item__wrapper">
             <div class="left">
               <i>*</i>
@@ -136,7 +162,7 @@
         <div class="form-item">
           <div class="form-item__wrapper">
             <div class="left">
-              <i style="opacity: 0;">*</i>
+              <i style="width: 8px;"></i>
               <span>文化程度</span>
             </div>
             <div class="right">
@@ -165,8 +191,8 @@
       <div class="form-item">
         <div class="form-item__wrapper">
           <div class="left">
-            <i style="opacity: 0;">*</i>
-            <span>在校情况</span>
+            <i style="width: 8px;"></i>
+            <span>在校生状况</span>
           </div>
           <div class="right">
             <AiSelect dict="fpStudentsInSchool" v-model="form.schoolStatus"></AiSelect>
@@ -194,15 +220,13 @@
     <!-- 残疾类别 -->
     <div class="form-group">
       <div class="form-item">
-        <div class="form-item__wrappers">
-          <div class="top">
-            <i style="opacity: 0;">*</i>
-            <span>残疾类别(可多选)</span>
+        <div class="form-item__wrapper">
+          <div class="left">
+            <i style="width: 8px;"></i>
+            <span>残疾类别</span>
           </div>
-          <div class="bottoms">
-            <div class="cards" v-for="(e, index) in helthList" :key="index">
-              <div :style="{color:e.checked == true ? '#1174FE' : '#333'}" @click="userClick(e, index)"  >{{ e.dictName }}</div>
-            </div>
+          <div class="right">
+            <AiSelect dict="fpStudentsInSchool" v-model="form.schoolStatus"></AiSelect>
           </div>
         </div>
       </div>
@@ -363,7 +387,7 @@
     </div>
     <!-- <div style="height: 8px; width: 100%;background: #f3f4f5;"></div> -->
 
-    <div class="form-group" v-if="flag">
+    <div class="form-group" v-if="flag && !id">
       <div class="form-item">
         <div class="form-item__wrapper">
           <div class="left">
@@ -452,7 +476,7 @@
    
     
     <div class="btn" hover-class="text" @click="nextStep" v-if="current == 0">下一步</div>
-    <div class="btn" hover-class="text" @click="submit" v-if="current == 0 || id">保存</div>
+    <div class="btn" hover-class="text" @click="submit" v-if="current == 0 && id">保存</div>
     <div class="btn" hover-class="text" @click="submit" v-if="current == 1"> {{ girdInfo.checkType == 2 ? '保存' : '申请纳入监测' }}</div>
   </div>
 </template>