From d7cb903c179fc64c5d7149d897ca97f43dca55be Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Tue, 26 Apr 2022 11:20:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=9C=B0=E5=8C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/AppMonitoringObject/Add.vue  | 15 ++++++++++++---
 src/apps/AppMonitoringObject/List.vue | 10 +++++-----
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/apps/AppMonitoringObject/Add.vue b/src/apps/AppMonitoringObject/Add.vue
index a34dbf29..59b8e8ad 100644
--- a/src/apps/AppMonitoringObject/Add.vue
+++ b/src/apps/AppMonitoringObject/Add.vue
@@ -291,7 +291,7 @@
       <div class="remark">
         <p><span style="color: #FF4466;">*</span>备注说明</p>
         <div>
-          <u-input v-model="form.detail" type="textarea" height="150" :maxlength='500' clearable />
+          <u-input v-model="form.detail" type="textarea" height="150" placeholder="请输入备注说明" :maxlength='500' clearable />
         </div>
       </div>
       <div style="height: 8px; width: 100%;background: #f3f4f5;"></div>
@@ -429,17 +429,26 @@ export default {
       if(this.form.files.length) {
         this.form.photo = this.form.files[0].url
       }
-
+      if(this.photo.length) {
+        this.form.photo = this.photo[0].accessUrl
+      }
+      
       this.form.girdId = this.girdInfo.girdId
       this.form.girdName = this.girdInfo.girdName
       this.form.householdIdNumber = this.form.idNumber
       this.form.householdRelation = '01'
       this.form.isHousehold = 1
-      this.form.photo = this.photo[0].accessUrl
       this.current = 1
     },
 
     submit() {
+      if(!this.form.riskType) {
+        return this.$u.toast('请选择风险因素')
+      }
+
+      if(!this.form.detail) {
+        return this.$u.toast('请输入备注说明')
+      }
       
       this.$http.post('/app/apppreventionreturntopoverty/addByEwechat', {
         ...this.form,
diff --git a/src/apps/AppMonitoringObject/List.vue b/src/apps/AppMonitoringObject/List.vue
index 4263ed91..96c214cf 100644
--- a/src/apps/AppMonitoringObject/List.vue
+++ b/src/apps/AppMonitoringObject/List.vue
@@ -2,7 +2,7 @@
   <div class="List">
     <div v-if="isAdmin">
       <AiTopFixed>
-        <div class="area">
+        <!-- <div class="area">
           <i>可选范围</i>
           <span class="separat">/</span>
           <AiAreaPicker ref="area" class="aiArea" :value="areaId" :areaId="user.areaId" :name.sync="areaName" mode="custom"
@@ -11,7 +11,7 @@
             <i v-else>请选择</i>
           </AiAreaPicker>
         </div>
-        <div class="line"></div>
+        <div class="line"></div> -->
         <u-tabs :list="tabList" :is-scroll="false" :current="currentTabs" height="96" bar-width="150" @change="change"></u-tabs>
         <div class="seach-obj">
           <u-search v-model="keyword" :clearabled="true" placeholder="请输入姓名/身份证号" :show-action="false" bg-color="#F5F5F5" 
@@ -100,8 +100,8 @@ export default {
         if (res.code == 0) {
           if (res.data.checkType != '0') {
             this.isAdmin = true
-            // this.checkType = res.data.checkType
-            this.checkType = 1
+            this.checkType = res.data.checkType
+            // this.checkType = 1
             this.getList()
           }
         }
@@ -120,7 +120,7 @@ export default {
           current: this.current,
           size: 15,
           status: this.currentTabs,
-          addressAreaId: this.areaId,
+          // addressAreaId: this.areaId,
           name: this.keyword
         },
       })