Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_wxcp_app into dev

src/apps/AppHelpEffect/AppHelpEffect.vue

@@ -1,128 +1,91 @@
 <template>
   <div class="AppHelpEffect">
     <AiTopFixed>
-      <div class="search"><u-search placeholder="请输入姓名、身份证号" @clear="name='',getList()" clearable v-model="name" :show-action="false" @search="search"></u-search></div>
+      <u-tabs :list="tabs" :is-scroll="false" :current="currentTab" height="96" bar-width="150" @change="v=>{currentTab=v,current=1}"/>
+      <div class="search">
+        <u-search placeholder="请输入姓名、身份证号" @clear="con='',getList()" clearable v-model="con" :show-action="false" @search="search"></u-search>
+      </div>
       <div class="select">
-        <div class="left">
+        <AiAreaPicker class="fill" v-model="areaId" :area-id="user.areaId" :name.sync="areaName" @select="areaSelect" selectRoot>
-          <AiAreaPicker v-model="areaId" :area-id="user.areaId" :name.sync="areaName" @select="areaSelect" selectRoot>
+          <div flex class="center">
-            <div>
+            <u-icon name="map-fill" size="32" color="#999" class="mar-r8"/>
-              <u-icon name="map-fill" color="#999" size="24" style="margin-left: 4px;width: 14px;display:inline-block;margin-top:18px"></u-icon>
+            <AiMore icon="arrow-down" v-model="areaName" placeholder="所在地区"/>
-              <span v-if="areaId" style="color:#333;fontSize: 14px;" class="areaName">{{ areaName }}</span>
-              <span v-else style="color: #999;fontSize: 14px;" class="areaName">所在地区</span>
-              <u-icon name="arrow-down" color="#999" size="24" style="margin-left: 4px;width: 14px;display:inline-block;margin-top:18px" @select="areaSelect"></u-icon>
           </div>
         </AiAreaPicker>
-        </div>
+        <AiSelect v-if="currentTab=='0'" class="fill center" flex v-model="houseType" :list="typeList" @data="typeSelect">
-        <div class="right">
+          <AiMore class="fill" icon="arrow-down" v-model="$dict.getLabel('fpHouseType', houseType)" placeholder="户类型"/>
-          <AiSelect v-model="houseType" :list="typeList" @data="typeSelect">
-            <span v-if="!houseType" style="color: #999;">户类型</span>
-            <span v-else>{{ $dict.getLabel('fpHouseType', houseType) }}</span>
-            <u-icon name="arrow-down" color="#999" size="24" style="margin-left: 4px;width: 14px;display:inline-block;"></u-icon>
         </AiSelect>
       </div>
-      </div>
     </AiTopFixed>
-
     <div class="cardList">
-      <div v-if="list.length">
+      <component ref="List" :is="currentPage.list" v-bind="{current,search:{areaId,houseType,con}}"/>
-        <div class="card" v-for="(item,index) in list" :key="index" @click="toDetail(item.id)">
-          <p class="user">
-            <span class="name">{{ item.name }}</span>
-            <span :style="{color: item.houseType==1? '#FF6300': '#00D25D'}">{{ $dict.getLabel('fpHouseType', item.houseType) }}</span>
-          </p>
-          <div class="idCard">{{ item.idNumber.replace(/(.{6}).*(.{4})/, '$1********$2') }}</div>
-          <div class="tel"><img src="./images/dh@2x.png" alt="">{{ item.phone}}</div>
-          <div class="address"><img src="./images/dz@2x.png" alt="">
-            {{ item.countyName + item.townName + item.villageName }}{{ item.currentAddress || '' }}
     </div>
   </div>
-      </div>
-      <AiEmpty v-else description="暂无数据"></AiEmpty>
-    </div>
- 
-  </div>
 </template>
 
 <script>
 import {mapState} from 'vuex'
+import HelpedResidentList from "./helpedResidentList";
+import NormalFarmerList from "./normalFarmerList";
+
 export default {
   name: "AppHelpEffect",
+  components: {NormalFarmerList, HelpedResidentList},
   appName: '帮扶成效',
   data() {
     return {
-      name: "",
+      con: "",
       current: 1,
-      declareReason: "",
-      areaList: [],
       typeList: [],
-      houseType: 1,
-      list: [],
       areaId: '',
       areaName: '',
       houseType: '',
+      currentTab: '0'
     }
   },
   computed: {
-    ...mapState(['user'])
+    ...mapState(['user']),
+    tabs: () => [
+      {name: "监测对象", list: HelpedResidentList},
+      {name: "一般农户", list: NormalFarmerList}
+    ],
+    currentPage: v => v.tabs[v.currentTab] || {}
   },
-
   methods: {
     areaSelect(e) {
       this.areaId = e
+      this.refreshList()
+    },
+    typeSelect(v) {
+      this.houseType = v?.[0].value
+      this.refreshList()
+    },
+    search(value) {
+      this.name = value
+      this.refreshList()
+    },
+    refreshList() {
       this.current = 1
-      this.list = []
+      this.$nextTick(() => this.$refs.List.getList(true))
-      this.getList()
+    }
   },
   onLoad() {
+    this.areaId = this.user.areaId
     this.$dict.load('fpHouseType').then(() => {
-        this.typeList = this.$dict.getDict('fpHouseType').map((item) =>{
+      this.typeList = this.$dict.getDict('fpHouseType').map((item) => {
         return {
           label: item.dictName,
           value: item.dictValue
         }
       })
-        this.typeList.unshift({ label: '全部类型', value: ''})
+      this.typeList.unshift({label: '全部类型', value: ''})
-        this.areaId = this.user.areaId
-        this.getList()
     })
-      
-    },
-    typeSelect(v) {
-      this.current = 1
-      this.list = []
-      this.houseType = v?.[0].value
-      this.getList()
-    },
-    search(value) {
-      this.name = value
-      this.list = []
-      this.current= 1
-      this.getList()
-    },
-    getList() {
-      this.$http.post('/app/apppreventionreturntopoverty/list', null, {
-        params: {
-          current: this.current,
-          con: this.name,
-          areaId: this.areaId,
-          houseType: this.houseType
-        },
-      }).then((res) => {
-        if (res?.data) {
-          this.list = this.current > 1 ? [...this.list, ...res.data.records] : res.data.records
-        }
-      })
-    },
-    toDetail(id) {
-      uni.navigateTo({url: `./helpDetail?id=${id}`})
-    },
-    onReachBottom() {
-      this.current ++
-      this.getList()
-    }
   },
   onShow() {
     document.title = '帮扶成效'
+  },
+  onReachBottom() {
+    this.current++
   }
 }
 </script>
@@ -133,57 +96,60 @@ export default {
     height: 100px;
     line-height: 100px;
   }
+
+  .center {
+    justify-content: center;
+    text-align: center;
+  }
+
   .select {
     width: 100%;
     display: flex;
     height: 86px;
     line-height: 86px;
     text-align: center;
-
-    ::v-deep .AiSelect .display {
-      justify-content: center;
   }
 
-    .left,
+  ::v-deep .cardList {
-    .right {
-      flex: 1;
-    }
-  }
-  .cardList {
     padding: 32px;
     box-sizing: border-box;
+
     .card {
       padding: 32px;
       box-sizing: border-box;
       margin-bottom: 32px;
       background: #FFF;
-      box-shadow: 0px 0px 8px 0px rgba(0,0,0,0.0200);
+      box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.0200);
       border-radius: 16px;
+
       .user {
         display: flex;
         justify-content: space-between;
+
         .name {
           font-size: 36px;
           font-weight: 600;
         }
       }
+
       .idCard,
       .tel,
       .address {
         margin-top: 8px;
         color: #999999;
+
         img {
           margin-right: 16px;
           width: 28px;
           height: 28px;
         }
       }
+
       .tel,
       .address {
         color: #333;
       }
     }
   }
-
 }
 </style>

src/apps/AppHelpEffect/addLog.vue

@@ -1,35 +1,53 @@
 <template>
   <div class="addLog">
-    <div class="help" v-if="type == 1">
+    <AiGroup v-if="isBangFu">
-      <div><span style="color: #FF4466;">*</span>帮扶类型</div>
+      <AiItem label="帮扶类型" required>
-      <AiSelect dict="fpAssistanceMeasures" v-model="operationDesc"></AiSelect>
+        <AiSelect dict="fpAssistanceMeasures" v-model="form.operationDesc"/>
-    </div>
+      </AiItem>
-    <div class="form-item form-item__textarea">
+    </AiGroup>
-      <div class="form-item__title">
+    <AiGroup v-else-if="isNormalFarmer">
-        <em v-if="type==0">*</em>
+      <AiItem label="走访对象" required>
-        <h2>{{type == 1 ? '帮扶内容' : '走访内容'}}</h2>
+        <input v-model="form.name"/>
-      </div>
+      </AiItem>
-      <textarea maxlength="500" v-model="detail" :placeholder="type == 1 ? '请输入帮扶内容' : '请输入走访内容'"></textarea>
+      <AiItem label="现住址" required>
-      <div class="hint">{{ detail.length }}/500</div>
+        <AiAreaPicker v-model="form.areaId" :name.sync="areaName">
-    </div>
+          <AiMore v-model="form.areaName"/>
-    <div class="form-item form-item__imgs">
+        </AiAreaPicker>
-      <div class="form-item__title">
+      </AiItem>
-        <h2>图片</h2>
+      <AiItem label="走访日期" required>
-        <i>（最多9张）</i>
+        <AiDate v-model="form.visitDate"/>
-      </div>
+      </AiItem>
-      <div>
+    </AiGroup>
-        <AiUploader :def.sync="files" multiple placeholder="上传图片" :limit="9" action="/admin/file/add2"></AiUploader>
+    <!--走访日志-->
-      </div>
+    <AiGroup v-else>
-    </div>
+      <AiItem label="走访日期" required>
+        <AiDate v-model="form.visitDate"/>
+      </AiItem>
+    </AiGroup>
+    <AiGroup>
+      <AiItem :label="isBangFu ? '帮扶内容' : '走访内容'" required topLabel>
+        <textarea maxlength="500" v-model="form.detail" :placeholder="isBangFu ? '请输入帮扶内容' : '请输入走访内容'"></textarea>
+        <div class="hint">{{ form.detail.length || 0 }}/500</div>
+      </AiItem>
+    </AiGroup>
+    <AiGroup>
+      <AiItem label="图片" topLabel>
+        <span slot="sub" class="color-999" v-text="`（最多9张）`"/>
+        <AiUploader :def.sync="form.files" multiple placeholder="上传图片" :limit="9"
+                    action="/admin/file/add2"></AiUploader>
+      </AiItem>
+    </AiGroup>
     <div class="btn" @click="submit">提交</div>
   </div>
 </template>
 
 <script>
-
 export default {
   data() {
     return {
+      name: null,
+      areaId: null,
+      areaName: null,
       detail: '',
       pid: '',
       files: [],
@@ -37,57 +55,59 @@ export default {
       type: '',
       operationDesc: '',
       flag: false,
+      form: {detail: ""}
     }
   },
+  computed: {
+    isBangFu: v => v.type == 1,
+    isNormalFarmer: v => v.type == 2
+  },
   onLoad(query) {
     this.$dict.load('fpAssistanceMeasures')
     this.pid = query.pid
     this.type = query.type
-    if(query.id) {
+    this.visitDate = this.$dateFormat(this.$dayjs())
+    if (query.id) {
       this.id = query.id
       this.getInfo()
     }
   },
   onShow() {
-    if(this.type == 1) {
+    this.pageTitle()
-      document.title = this.id ? '编辑帮扶措施' : '添加帮扶措施'
-    }else {
-      document.title = this.id ? '编辑走访日志' : '添加走访日志'
-    }
-
   },
   methods: {
+    pageTitle() {
+      const action = this.id ? '编辑' : '添加', app = this.type == 1 ? '帮扶措施' : this.type == 2 ? '一般农户走访日志' : '走访日志'
+      document.title = action + app
+    },
     getInfo() {
       this.$http.post(`/app/apppreventionreturntopovertylog/queryDetailById?id=${this.id}`).then(res => {
-        if (res.code == 0) {
+        if (res?.data) {
-          this.operationDesc = res.data.operationDesc
+          this.form = res.data
-          this.detail = res.data.detail
-          this.files = res.data.files || []
         }
       })
     },
     submit() {
-      if(this.flag) return
+      if (this.flag) return
-      if(this.type == 1) {
+      if (this.type == 1) {
-        if (!this.operationDesc) {
+        if (!this.form.operationDesc) {
           return this.$u.toast('请选择帮扶类型')
         }
+      } else if (this.type == 2) {
+        if (!this.form.areaId) {
+          return this.$u.toast('请选择现住址')
+        }
+        if (!this.form.name) {
+          return this.$u.toast('请输入走访对象')
+        }
       } else {
-        if (!this.detail) {
+        if (!this.form.detail) {
           return this.$u.toast('请输入走访内容')
         }
       }
-
       this.flag = true
-      this.$http.post('/app/apppreventionreturntopovertylog/addOrUpdate', {
+      this.$http.post('/app/apppreventionreturntopovertylog/addOrUpdate', this.form).then(res => {
-        detail: this.detail,
+        if (res.code == 0) {
-        files: this.files,
-        pid: this.pid,
-        id: this.id,
-        type: this.type,
-        operationDesc: this.operationDesc
-      }).then(res => {
-        if (res.code === 0) {
           this.$u.toast('提交成功')
           uni.$emit('reload')
           setTimeout(() => {
@@ -95,7 +115,6 @@ export default {
               delta: 1
             })
           }, 300)
-
         }
       })
     }
@@ -184,7 +203,7 @@ export default {
     background: #3192F4;
   }
 
-  .hint{
+  .hint {
     text-align: right;
     color: #999;
   }

src/apps/AppHelpEffect/helpedResidentList.vue

@@ -0,0 +1,65 @@
+<template>
+  <section class="helpedResidentList">
+    <div v-if="list.length">
+      <div class="card" v-for="(item,index) in list" :key="index" @click="toDetail(item.id)">
+        <p class="user">
+          <span class="name">{{ item.name }}</span>
+          <span :style="{color: item.houseType==1? '#FF6300': '#00D25D'}">{{ $dict.getLabel('fpHouseType', item.houseType) }}</span>
+        </p>
+        <div class="idCard">{{ item.idNumber.replace(/(.{6}).*(.{4})/, '$1********$2') }}</div>
+        <div class="tel"><img src="./images/dh@2x.png" alt="">{{ item.phone }}</div>
+        <div class="address"><img src="./images/dz@2x.png" alt="">
+          {{ item.countyName + item.townName + item.villageName }}{{ item.currentAddress || '' }}
+        </div>
+      </div>
+    </div>
+    <AiEmpty v-else description="暂无数据"/>
+  </section>
+</template>
+
+<script>
+export default {
+  name: "helpedResidentList",
+  props: {
+    current: {default: 1},
+    search: {default: () => ({})}
+  },
+  data() {
+    return {
+      list: [],
+      total: 0
+    }
+  },
+  methods: {
+    getList(must) {
+      if (must || this.total == 0 || this.list.length < this.total) {
+        const {current, search} = this.$props
+        this.$http.post('/app/apppreventionreturntopoverty/list', null, {
+          params: {...search, current},
+        }).then((res) => {
+          if (res?.data) {
+            this.list = [current == 1 ? [] : this.list, res.data.records].flat().filter(Boolean)
+            this.total = res.data.total
+          }
+        })
+      }
+    },
+    toDetail(id) {
+      uni.navigateTo({url: `./helpDetail?id=${id}`})
+    },
+  },
+  watch: {
+    current: {
+      handler() {
+        this.$u.throttle(this.getList)
+      },
+      immediate: true
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.helpedResidentList {
+}
+</style>

src/apps/AppHelpEffect/normalFarmerList.vue

@@ -0,0 +1,208 @@
+<template>
+  <section class="normalFarmerList">
+    <div v-if="list.length">
+      <div class="log-item" v-for="(item, index) in list" :key="index">
+        <div class="log-item__wrapper">
+          <div class="log-item__user">
+            <div class="left">
+              <h2>{{ item.name }}</h2>
+            </div>
+            <div class="right">
+              <span class="mar-r8">{{ item.visitDate }}</span>
+              <u-icon name="list" color="#999" size="28" @click="edit(item.id, 2)" v-if="item.createUserId == user.id"/>
+            </div>
+          </div>
+          <p v-text="item.detail"/>
+          <div class="imgs" v-if="item.files && item.files.length">
+            <image :src="img.url" @click="prevImg(item.files, img.url)" v-for="(img, index) in item.files" :key="index"/>
+          </div>
+        </div>
+      </div>
+    </div>
+    <AiEmpty v-else description="暂无数据"/>
+    <AiFixedBtn>
+      <div class="addBtn iconfont iconfont-iconfangda" @tap="toAddLog()"></div>
+    </AiFixedBtn>
+  </section>
+</template>
+
+<script>
+import {mapState} from 'vuex'
+
+export default {
+  name: "normalFarmerList",
+  props: {
+    current: {default: 1},
+    search: {default: () => ({})}
+  },
+  data() {
+    return {
+      list: [],
+      total: 0
+    }
+  },
+  computed: {
+    ...mapState(['user'])
+  },
+  methods: {
+    getList(must) {
+      if (must || this.total == 0 || this.list.length < this.total) {
+        const {current, search} = this.$props
+        this.$http.post('/app/apppreventionreturntopovertylog/list', null, {
+          params: {...search, current, type: 2},
+        }).then((res) => {
+          if (res?.data) {
+            this.list = [current == 1 ? [] : this.list, res.data.records].flat().filter(Boolean)
+            this.total = res.data.total
+          }
+        })
+      }
+    },
+    toDetail(id) {
+      uni.navigateTo({url: `./helpDetail?id=${id}`})
+    },
+    toAddLog(pid) {
+      uni.navigateTo({
+        url: `./addLog?pid=${pid || ''}&type=2`
+      })
+    },
+    prevImg(urls, img) {
+      const imgs = urls.map(v => v.url)
+      uni.previewImage({
+        urls: imgs,
+        current: img
+      })
+    },
+    edit(id, type) {
+      uni.showActionSheet({
+        itemList: ['编辑', '删除'],
+        success: res => {
+          if (res?.tapIndex === 0) {
+            uni.navigateTo({
+              url: `./addLog?pid=${this.id}&id=${id}&type=${type}`
+            })
+          } else if (res?.tapIndex == 1) {
+            this.$confirm('确定删除该数据？').then(() => {
+              uni.showLoading()
+              this.$http.post(`/app/apppreventionreturntopovertylog/delete?ids=${id}`).then(ret => {
+                if (ret?.code == 0) {
+                  this.$u.toast('删除成功')
+                  this.getList()
+                }
+              }).finally(() => uni.hideLoading())
+            }).catch(() => 0)
+          }
+        }
+      })
+    },
+  },
+  watch: {
+    current: {
+      handler() {
+        this.getList()
+      },
+      immediate: true
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.normalFarmerList {
+  .log-item {
+    padding: 0 0 0 32px;
+    background: #fff;
+
+    &:first-child {
+      margin-top: 16px;
+    }
+
+    &:last-child {
+      .log-item__wrapper {
+        border: none !important;
+      }
+    }
+
+    .log-item__wrapper {
+      padding: 32px 32px 32px 0;
+      border-bottom: 1px solid #E4E5E6;
+
+      .log-item__user {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+
+        & > div {
+          display: flex;
+          align-items: center;
+        }
+
+        .left {
+          .user, image {
+            width: 80px;
+            height: 80px;
+            line-height: 80px;
+            margin-right: 16px;
+            text-align: center;
+            border-radius: 50%;
+            background: #2266FF;
+
+            span {
+              color: #fff;
+              font-size: 28px;
+            }
+          }
+
+          h2 {
+            color: #333;
+            font-size: 32px;
+          }
+        }
+
+        .right {
+          image {
+            width: 32px;
+            height: 32px;
+          }
+
+          span {
+            margin-right: 6px;
+            color: #999999;
+            font-size: 28px;
+          }
+        }
+      }
+
+      p {
+        margin: 4px 0 16px 0;
+        color: #343D65;
+        font-size: 28px;
+      }
+
+      .imgs {
+
+        image {
+          width: 136px;
+          height: 136px;
+          margin-right: 8px;
+          margin-bottom: 8px;
+        }
+      }
+    }
+  }
+
+  .addBtn {
+    width: 96px;
+    height: 96px;
+    flex-shrink: 0;
+    background: $uni-color-primary;
+    box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2);
+    font-size: 48px;
+    color: #fff;
+    border-radius: 50%;
+    justify-content: center;
+    align-items: center;
+    display: flex;
+  }
+}
+</style>

src/apps/AppMonitoringObject/Add.vue

@@ -16,17 +16,17 @@
             </div>
           </div>
         </div> -->
-        <div class="form-item" v-if="!isEdit">
+<!--        <div class="form-item" v-if="!isEdit">-->
-          <div class="form-item__wrapper">
+<!--          <div class="form-item__wrapper">-->
-            <div class="left">
+<!--            <div class="left">-->
-              <i>*</i>
+<!--              <i>*</i>-->
-              <span>监测对象类型</span>
+<!--              <span>监测对象类型</span>-->
-            </div>
+<!--            </div>-->
-            <div class="right">
+<!--            <div class="right">-->
-              <AiSelect dict="fpType" v-model="form.objectType"></AiSelect>
+<!--              <AiSelect dict="fpType" v-model="form.objectType"></AiSelect>-->
-            </div>
+<!--            </div>-->
-          </div>
+<!--          </div>-->
-        </div>
+<!--        </div>-->
         <div class="form-item" v-if="isEdit">
           <div class="form-item__wrapper">
             <div class="left">

src/apps/AppMonitoringObject/AppMonitoringObject.vue

@@ -6,7 +6,7 @@
         <div class="search-obj">
           <div class="selectBox" @click="showType = true">
             <span v-if="!status">全部类型</span>
-            <span v-else>{{ $dict.getLabel('fpPrtpStatus', status)}}</span>
+            <span v-else>{{ $dict.getLabel('fpPrtpStatus', status) }}</span>
             <u-icon name="arrow-down"></u-icon>
           </div>
           <u-search v-model="keyword" :clearabled="true" placeholder="请输入姓名/身份证号" :show-action="false" bg-color="#F5F5F5"
@@ -71,8 +71,6 @@ export default {
       currentTabs: 0,
       areaId: '',
       areaName: '',
-      isAdmin: false,
-      checkType: '',
       showType: false,
       typelist: [],
       status: ''
@@ -80,15 +78,17 @@ export default {
   },
   computed: {
     ...mapState(['user']),
+    checkType: v => v.user.girdCheckType,
+    isAdmin: v => v.user.girdCheckType > 0
   },
   onShow() {
     document.title = '监测对象'
     this.areaId = this.user.areaId
     this.areaName = this.user.areaName
     this.$dict.load('fpPrtpStatus').then(() => {
-      this.isGirdUser()
+      this.isAdmin && this.getList()
       this.typelist = this.$dict.getDict('fpPrtpStatus').filter((e) => e.dictValue != 5)
-      this.typelist.unshift({ dictName: '全部类型', dictValue: ''})
+      this.typelist.unshift({dictName: '全部类型', dictValue: ''})
     })
 
     uni.$on('reload', () => {
@@ -96,22 +96,9 @@ export default {
     })
   },
   methods: {
-    isGirdUser() {
-      this.isAdmin = false
-      this.$http.post('/app/appgirdmemberinfo/checkLogOnUser').then((res) => {
-        if (res?.data) {
-          if (res.data.checkType != '0') {
-            this.isAdmin = true
-            this.checkType = res.data.checkType
-            this.getList()
-          }
-        }
-      })
-    },
-
     confirmTypeSelect(val) {
       this.status = val?.[0].value
-      this.$nextTick(()=>{
+      this.$nextTick(() => {
         this.current = 1,
             this.list = []
         this.getList()
@@ -148,12 +135,12 @@ export default {
 
     change(index) {
       this.currentTabs = index
-      if(this.currentTabs == 1) {
+      if (this.currentTabs == 1) {
         this.typelist = this.$dict.getDict('fpPrtpStatus')
-        this.typelist.unshift({ dictName: '全部类型', dictValue: ''})
+        this.typelist.unshift({dictName: '全部类型', dictValue: ''})
       } else if (this.currentTabs == 0) {
         this.typelist = this.$dict.getDict('fpPrtpStatus').filter((e) => e.dictValue != 5)
-        this.typelist.unshift({ dictName: '全部类型', dictValue: ''})
+        this.typelist.unshift({dictName: '全部类型', dictValue: ''})
       }
       this.status = ''
       this.getListInit()
@@ -233,6 +220,7 @@ export default {
     border-top: 2px solid #f5f5f5;
     padding: 20px 32px;
     background: #fff;
+
     .selectBox {
       margin-right: 30px;
     }

src/apps/AppMonitoringObject/Detail.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="detail" v-if="pageShow" :class="[isFrom ? 'active' : '']">
+  <div class="detail" v-if="pageShow" :class="{active:isFrom}">
     <!-- <div class="tab" v-if="!isFrom">
       <span @click="changeTab(0)" :class="[currIndex === 0 ? 'active' : '']">基本信息</span>
       <span @click="changeTab(1)" :class="[currIndex === 1 ? 'active' : '']">走访日志</span>
@@ -10,35 +10,28 @@
           <div class="item-header item-avatar">
             <div class="left">
               <!-- <img :src="info.photo" alt="" v-if="info.photo" /> -->
-              <img :src="$cdn + 'avatar.png'" />
+              <img :src="$cdn + 'avatar.png'"/>
               <div class="left-right">
                 <h2>{{ info.name }}</h2>
-                <p style="color: #2979ff;" @click="callPhone(info.phone)"><u-icon name="phone" color="#2979ff" size="28"></u-icon>{{ info.phone }}</p>
+                <p style="color: #2979ff;" @click="callPhone(info.phone)">
+                  <u-icon name="phone" color="#2979ff" size="28"></u-icon>
+                  {{ info.phone }}
+                </p>
               </div>
             </div>
             <span @click="linkTo(`./residentDetail?id=${info.id}`)">详情</span>
           </div>
+          <AiItem label="现住地址">{{ info.countyName + info.townName + info.villageName }}</AiItem>
+          <AiItem label="详细地址">{{ info.currentAddress }}</AiItem>
           <div class="item-info">
             <label>现住地址</label>
-            <span>{{ info.countyName  +  info.townName + info.villageName }}</span>
+            <span></span>
           </div>
           <div class="item-info">
             <label>详细地址</label>
             <span>{{ info.currentAddress }}</span>
           </div>
         </div>
-        <!-- <div class="item-wrapper">
-          <div class="item-header">
-            <div class="left">
-              <h2>帮扶措施</h2>
-            </div>
-            <span @click="toLogList()" v-if="$permissions('app_apppreventionreturntopovertylog_detail')">查看</span>
-          </div>
-          <div class="item-info">
-            <label>采取措施</label>
-            <span>{{ info.helpLog? $dict.getLabel('fpAssistanceMeasures',info.helpLog.operationDesc): '-' }}</span>
-          </div>
-        </div> -->
         <div class="item-wrapper">
           <div class="item-header">
             <div class="left">
@@ -66,7 +59,8 @@
                   isFamilySituation ? '已填写' : '未填写'
                 }})</i>
             </div>
-            <span @click="linkTo(`./MonitorFamilySituation?id=${info.id}&girdId=${girdInfo.girdId}&girdName=${girdInfo.girdName}`)">编辑</span>
+            <span
+                @click="linkTo(`./MonitorFamilySituation?id=${info.id}&girdId=${girdInfo.girdId}&girdName=${girdInfo.girdName}`)">编辑</span>
           </div>
           <div class="item-info">
             <label>是否危房</label>
@@ -100,7 +94,8 @@
               <h2>家庭收支情况</h2>
               <i :style="{color: familyIncome ? '#2EA222' : '#FF4466'}">({{ familyIncome ? '已填写' : '未填写' }})</i>
             </div>
-            <span @click="linkTo(`./MonitorIncome?id=${info.id}&girdId=${girdInfo.girdId}&girdName=${girdInfo.girdName}`)">编辑</span>
+            <span
+                @click="linkTo(`./MonitorIncome?id=${info.id}&girdId=${girdInfo.girdId}&girdName=${girdInfo.girdName}`)">编辑</span>
           </div>
           <div class="item-info">
             <label>家庭纯收入</label>
@@ -112,14 +107,14 @@
           </div>
         </div>
         <!-- 风险解除 -->
-        <!-- v-if="info.status == 3" -->
         <div class="item-wrapper" v-if="info.status == 3">
           <div class="item-header">
             <div class="left">
               <h2>风险解除跟踪</h2>
               <i :style="{color: moveRisk ? '#2EA222' : '#FF4466'}">({{ moveRisk ? '已填写' : '未填写' }})</i>
             </div>
-            <span @click="linkTo(`./MonitorPoorStatus?id=${info.id}&girdId=${girdInfo.girdId}&girdName=${girdInfo.girdName}`)">编辑</span>
+            <span
+                @click="linkTo(`./MonitorPoorStatus?id=${info.id}&girdId=${girdInfo.girdId}&girdName=${girdInfo.girdName}`)">编辑</span>
           </div>
           <div class="item-info">
             <label>信息采集人</label>
@@ -131,7 +126,11 @@
           </div>
         </div>
       </div>
-
+      <div class="item-wrapper" v-if="info.status==4">
+        <AiItem label="审批人" :border="false">{{ info.auditUserName }}</AiItem>
+        <AiItem label="驳回日期" :border="false">{{ info.auditTime }}</AiItem>
+        <AiItem label="驳回理由" :border="false" top-label>{{ info.auditOpinion }}</AiItem>
+      </div>
       <!-- <div class="tab-content__item" v-show="currIndex === 1 && info.status!=5">
         <div class="log-item" v-for="(item, index) in list" :key="index">
           <div class="log-item__wrapper">
@@ -176,7 +175,6 @@
         <div class="confirm-btn" @click="toAddView('您确认要申请纳入此监测对象吗？', '')">申请纳入监测</div>
       </div>
     </div>
-
     <div v-if="checkType == 2 && currIndex != 1">  <!-- 网格长 -->
 
       <div class="footer-btn" v-if="info.status == 0 && userInfo != ''">
@@ -201,15 +199,15 @@
         <div class="confirm-btn" @click="toAddView('您确认要将此居民纳入监测对象吗？', 1)">纳入监测</div>
       </div>
     </div>
-
   </div>
+  <AiEmpty v-else/>
 </template>
 
 <script>
-import { mapState } from 'vuex'
+import {mapState} from 'vuex'
+
 export default {
   name: 'detail',
-
   data() {
     return {
       info: {},
@@ -262,7 +260,7 @@ export default {
         return false
       }
       return (this.info.income1 || this.info.income2 || this.info.income3 || this.info.income4
-       || this.info.income5|| this.info.income6|| this.info.income7|| this.info.income8 || this.info.income9 ||
+          || this.info.income5 || this.info.income6 || this.info.income7 || this.info.income8 || this.info.income9 ||
           this.info.income10 || this.info.income11 || this.info.income12 ||
           this.info.income13 || this.info.income14 || this.info.income15)
     },
@@ -282,7 +280,7 @@ export default {
       this.isFrom = true
     }
     this.$dict.load(['fpType', 'riskEliminationMethod', 'fpRiskType', 'fpYesOrNo', 'fpNation', 'fpEducation', 'fpStudentsInSchool', 'fpHealth',
-    'fpLaborSkills', 'fpPoliticalOutlook', 'fpIndustrialAssistance', 'fpHealthAssistance','fpAssistanceMeasures']).then(() => {
+      'fpLaborSkills', 'fpPoliticalOutlook', 'fpIndustrialAssistance', 'fpHealthAssistance', 'fpAssistanceMeasures']).then(() => {
       this.isGirdUser()
       this.getInfo()
     })
@@ -382,12 +380,11 @@ export default {
 
     getInfo() {
       this.$http.post(`/app/apppreventionreturntopoverty/queryDetailById?id=${this.id}`).then(res => {
-        if (res.code === 0) {
+        if (res?.data) {
           this.info = res.data
-
           let ylbxCount = 0
           let ylCount = 0
-          if(res.data.family && res.data.family.length) {
+          if (res.data.family && res.data.family.length) {
             res.data.family.forEach(item => {
               if (item.basicMedicalTreatment === '02') {
                 ylbxCount = ylbxCount + 1
@@ -399,7 +396,7 @@ export default {
             this.endNum = res.data.family.filter(item =>
                 (item.jcbxCxyiliao == '02' || '') && (item.jcbxCzyiliao == '02' || '')
             )
-            this.endNum = res.data.family.filter(v=>
+            this.endNum = res.data.family.filter(v =>
                 (v.jcbxCxyanglao == '02' || '') && (v.jcbxCzyanglao == '02' || '')
             )
           }
@@ -436,7 +433,7 @@ export default {
       })
     },
 
-    toRemove(text, pass,type) {
+    toRemove(text, pass, type) {
       this.$confirm('', text).then(() => {
         uni.navigateTo({url: `./MonitorRemoveView?pass=${pass}&id=${this.info.id}&status=${this.info.status}&type=${type}`})
       })
@@ -674,13 +671,15 @@ export default {
       }
     }
   }
-  .view-all{
+
+  .view-all {
     text-align: center;
     font-size: 32px;
     font-family: PingFangSC-Regular, PingFang SC;
     color: #3975C6;
     line-height: 44px;
-    img{
+
+    img {
       width: 32px;
       height: 32px;
       margin-left: 8px;
@@ -688,11 +687,13 @@ export default {
       transition: all 0.3s ease-in-out;
       vertical-align: middle;
     }
-    .img-active{
+
+    .img-active {
       transform: rotate(0deg);
     }
   }
-  .footer-btn{
+
+  .footer-btn {
     width: 100%;
     height: 112px;
     line-height: 112px;
@@ -702,7 +703,8 @@ export default {
     position: fixed;
     bottom: 0;
     left: 0;
-    div{
+
+    div {
       flex: 1;
       text-align: center;
       font-size: 32px;
@@ -710,10 +712,21 @@ export default {
       font-weight: 400;
       color: #333;
     }
-    .confirm-btn{
+
+    .confirm-btn {
       background-color: #3192F4;
       color: #fff;
     }
   }
+
+  ::v-deep.AiItem {
+    .normal {
+      padding-right: 0;
+    }
+
+    .label {
+      padding-left: 0;
+    }
+  }
 }
 </style>

src/apps/AppMonitoringObject/MonitorAddLog.vue

@@ -1,33 +1,35 @@
 <template>
-  <div class="form">
+  <div class="MonitorAddLog">
-    <div class="help" v-if="type == 1">
+    <AiGroup v-if="isBangFu">
-      <div><span style="color: #FF4466;">*</span>帮扶类型</div>
+      <AiItem label="帮扶类型" required>
-      <AiSelect dict="fpAssistanceMeasures" v-model="operationDesc"></AiSelect>
+        <AiSelect dict="fpAssistanceMeasures" v-model="operationDesc"/>
-    </div>
+      </AiItem>
-    <div class="form-item form-item__textarea">
+    </AiGroup>
-      <div class="form-item__title">
+    <!--走访日志-->
-        <em>*</em>
+    <AiGroup v-else>
-        <h2>{{type == 1 ? '帮扶内容' : '走访内容'}}</h2>
+      <AiItem label="走访日期" required>
-      </div>
+        <AiDate v-model="createDate"/>
-      <textarea maxlength="500" v-model="detail" :placeholder="type == 1 ? '请输入帮扶内容' : '请输入走访内容'"></textarea>
+      </AiItem>
+    </AiGroup>
+    <AiGroup>
+      <AiItem :label="isBangFu ? '帮扶内容' : '走访内容'" required topLabel>
+        <textarea maxlength="500" v-model="detail" :placeholder="isBangFu ? '请输入帮扶内容' : '请输入走访内容'"></textarea>
         <div class="hint">{{ detail.length }}/500</div>
-    </div>
+      </AiItem>
-    <div class="form-item form-item__imgs">
+    </AiGroup>
-      <div class="form-item__title">
+    <AiGroup>
-        <h2>图片</h2>
+      <AiItem label="图片" topLabel>
-        <i>（最多9张）</i>
+        <span slot="sub" class="color-999" v-text="`（最多9张）`"/>
-      </div>
-      <div>
         <AiUploader :def.sync="files" multiple placeholder="上传图片" :limit="9" action="/admin/file/add2"></AiUploader>
-      </div>
+      </AiItem>
-    </div>
+    </AiGroup>
     <div class="btn" @click="submit">提交</div>
   </div>
 </template>
 
 <script>
-
 export default {
+  name: "MonitorAddLog",
   data() {
     return {
       detail: '',
@@ -37,21 +39,27 @@ export default {
       type: '',
       operationDesc: '',
       flag: false,
+      createDate: ""
     }
   },
+  computed: {
+    isBangFu: v => v.type == 1
+  },
   onLoad(query) {
     this.$dict.load('fpAssistanceMeasures')
     this.pid = query.pid
     this.type = query.type
-    if(query.id) {
+    if (query.id) {
       this.id = query.id
       this.getInfo()
+    }else{
+      this.createDate = this.$dateFormat(this.$dayjs())
     }
   },
   onShow() {
-    if(this.type == 1) {
+    if (this.isBangFu) {
       document.title = this.id ? '编辑帮扶措施' : '添加帮扶措施'
-    }else {
+    } else {
       document.title = this.id ? '编辑走访日志' : '添加走访日志'
     }
 
@@ -67,8 +75,8 @@ export default {
       })
     },
     submit() {
-      if(this.flag) return
+      if (this.flag) return
-      if(this.type == 1) {
+      if (this.isBangFu) {
         if (!this.operationDesc) {
           return this.$u.toast('请选择帮扶类型')
         }
@@ -107,71 +115,9 @@ export default {
 </script>
 
 <style lang="scss">
-.form {
+.MonitorAddLog {
   padding-bottom: 120px;
 
-  .help {
-    padding: 32px;
-    box-sizing: border-box;
-    display: flex;
-    justify-content: space-between;
-    background: #fff;
-    margin-bottom: 16px;
-  }
-
-  .form-item {
-    padding: 32px;
-    background: #fff;
-    margin-bottom: 16px;
-
-    .form-item__title {
-      display: flex;
-      align-items: center;
-      margin-bottom: 34px;
-
-      em {
-        margin-right: 4px;
-        font-style: normal;
-        color: #FF4466;
-      }
-
-      h2 {
-        color: #333333;
-        font-weight: normal;
-        font-size: 32px;
-      }
-
-      i {
-        color: #999999;
-        font-size: 28px;
-        font-style: normal;
-      }
-    }
-
-    textarea {
-      width: 100%;
-    }
-  }
-
-  .form-type {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    height: 112px;
-    padding: 0 32px;
-
-    h2 {
-      font-weight: normal;
-      color: #333333;
-      font-size: 32px;
-    }
-
-    span {
-      color: #999999;
-      font-size: 28px;
-    }
-  }
-
   .btn {
     position: fixed;
     left: 0;
@@ -187,7 +133,7 @@ export default {
     background: #3192F4;
   }
 
-  .hint{
+  .hint {
     text-align: right;
     color: #999;
   }

src/apps/AppMonitoringObject/MonitorRemoveView.vue

@@ -10,8 +10,8 @@
         </div>
         <div class="item">
           <span>监测类型：</span>
-          <span v-if="info.operationType == 0">{{ $dict.getLabel('fpRiskType',info.bizDictValue) }}</span>
+          <span v-if="info.operationType == 0">{{ $dict.getLabel('fpRiskType', info.bizDictValue) }}</span>
-          <span v-if="info.operationType == 1">{{ $dict.getLabel('fpRiskEliminationMethod',info.bizDictValue) }}</span>
+          <span v-if="info.operationType == 1">{{ $dict.getLabel('fpRiskEliminationMethod', info.bizDictValue) }}</span>
         </div>
         <div class="item">
           <span>申请人：</span>
@@ -34,33 +34,26 @@
         </div>
       </div>
     </div>
-
     <div class="result">
       <div class="title">处理意见</div>
-      <div class="check">
+      <AiGroup>
-        <div class="left">
+        <AiItem label="审核结果" required>
-          <span style="color: #FF4466;">*</span>
+          <div class="check-item" :class="{active:form.pass==1}" @click="form.pass='1'">{{ type == 0 ? '纳入监测' : '解除风险' }}<img
-          <span>审核结果</span>
+              src="./components/img/check-icon.png" alt=""></div>
-        </div>
+          <div class="check-item" :class="{active:form.pass=='0'}" @click="form.pass='0'">驳回申请<img src="./components/img/check-icon.png"/></div>
-        <div class="right">
+        </AiItem>
-          <div class="check-item" :class="form.pass == '1' ? 'check-active' : '' " @click="form.pass='1'">{{ type == 0? '纳入监测': '解除风险'}}<img src="./components/img/check-icon.png" alt=""></div>
+        <AiItem label="监测对象类型">
-          <div class="check-item" :class="form.pass == '0' ? 'check-active' : '' " @click="form.pass='0'">驳回申请<img src="./components/img/check-icon.png" alt=""></div>
+          <AiSelect v-model="form.objectType" dict="fpType"/>
-        </div>
+        </AiItem>
-      </div>
+        <AiItem label="备注说明" topLabel>
-      <div class="item">
-        <div><span style="display: inline-block;width: 6px;"></span>备注说明</div>
-        <div>
           <u-input v-model="form.opinion" type="textarea" placeholder="请输入备注说明" height="200" :maxlength="500"></u-input>
-        </div>
+        </AiItem>
-      </div>
+        <AiItem label="图片" topLabel>
-      <div class="item">
+          <span slot="sub" class="color-999" v-text="`(最多9张)`"/>
-        <div><span style="width: 8px;"></span>图片<span style="color: #999;">(最多9张)</span></div>
-        <div style="margin-top: 20px; box-sizing: border-box;">
           <AiUploader :def.sync="files" multiple placeholder="上传图片" :limit="9" action="/admin/file/add2"></AiUploader>
+        </AiItem>
+      </AiGroup>
     </div>
-      </div>
-    </div>
-
     <div class="btn" @click="submit">提交</div>
 
   </div>
@@ -86,7 +79,7 @@ export default {
     }
   },
   onLoad(o) {
-    this.$dict.load('fpRiskType','fpRiskEliminationMethod')
+    this.$dict.load('fpRiskType', 'fpRiskEliminationMethod')
     this.pass = o.pass;
     this.id = o.id;
     this.status = o.status;
@@ -95,7 +88,7 @@ export default {
   },
   created() {
     this.getInfo()
-    document.title = this.type == 0? '纳入监测审核': '解除风险审核'
+    document.title = this.type == 0 ? '纳入监测审核' : '解除风险审核'
   },
   methods: {
     getInfo() {
@@ -121,7 +114,7 @@ export default {
       }
       if (this.type == 0) {   // 纳入审核
         url = `/app/apppreventionreturntopoverty/examine`
-      } else if (this.type == 1){     // 解除审核
+      } else if (this.type == 1) {     // 解除审核
         url = `/app/apppreventionreturntopoverty/relieve`
       }
 
@@ -130,15 +123,15 @@ export default {
         formData.append(key, params[key])
       }
 
-      this.$http.post(url,formData).then(res => {
+      this.$http.post(url, formData).then(res => {
         if (res.code == 0) {
           this.$u.toast('提交成功')
           uni.$emit('reload')
-          setTimeout(() =>{
+          setTimeout(() => {
             uni.navigateBack({
               delta: 2
             })
-          },600)
+          }, 600)
         }
       })
     }
@@ -150,28 +143,35 @@ export default {
 .MonitorRemoveView {
   .user-info {
     background: #FFF;
+
     .title {
       padding: 30px 32px;
       box-sizing: border-box;
       border-bottom: 1px solid #DDDDDD;
       font-weight: 600;
     }
+
     .info {
       padding: 30px 32px;
       box-sizing: border-box;
+
       .item {
         display: flex;
+
         span {
           padding: 12px 0;
         }
+
         span:first-child {
           width: 140px;
           color: #999999;
           text-align: right;
         }
+
         span:last-child {
           color: #343D65;
         }
+
         .imgs {
           image {
             width: 136px;
@@ -183,10 +183,12 @@ export default {
       }
     }
   }
+
   .result {
     margin-top: 16px;
     padding-bottom: 112px;
     box-sizing: border-box;
+
     .title {
       height: 112px;
       padding: 30px 32px;
@@ -195,16 +197,8 @@ export default {
       border-bottom: 1px solid #DDDDDD;
       background: #FFF;
     }
-    .check {
+
-      display: flex;
+    .check-item {
-      justify-content: space-between;
-      border-bottom: 1px solid #DDDDDD;
-      padding: 30px 32px;
-      box-sizing: border-box;
-      background: #FFF;
-      align-items: center;
-      border-bottom: 1px solid #DDDDDD;
-      .check-item{
       display: inline-block;
       width: 140px;
       height: 64px;
@@ -217,17 +211,12 @@ export default {
       font-weight: 500;
       color: #333;
       position: relative;
-        img{
+
-          display: none;
+      &.active {
-        }
-      }
-      .check-item:nth-of-type(1) {
-        margin-right: 36px;
-      }
-      .check-active{
         background: #E7F1FE;
         color: #1174FE;
-        img{
+
+        img {
           display: block;
           position: absolute;
           bottom: 0;
@@ -236,17 +225,22 @@ export default {
           height: 48px;
         }
       }
+
+      img {
+        display: none;
       }
-    .item {
+
-      border-bottom: 1px solid #DDDDDD;
+      &:nth-of-type(1) {
-      padding: 30px 32px;
+        margin-right: 36px;
-      background: #FFF;
       }
+    }
+
     ::v-deep .ai-uploader .fileList .default {
       width: 160px;
       height: 160px;
     }
   }
+
   .btn {
     width: 100%;
     height: 112px;
@@ -258,5 +252,9 @@ export default {
     bottom: 0;
     left: 0;
   }
+
+  .bg-fff {
+    background: #fff;
+  }
 }
 </style>

src/apps/AppPovertyHome/AppPovertyHome.vue

@@ -1,11 +1,11 @@
 <template>
   <div class="info">
     <div class="info-top">
-      <div class="info-top__item" @click="linkTo('../AppMonitoringObject/AppMonitoringObject')" v-if="$permissions('app_apppreventionreturntopoverty_detail')">
+      <div class="info-top__item" @click="linkTo('../AppMonitoringObject/AppMonitoringObject')">
         <image :src="$cdn + 'wdbf.png'"/>
         <h2>监测对象</h2>
       </div>
-      <div class="info-top__item" @click="linkTo('../AppHelpEffect/AppHelpEffect')" v-if="$permissions('app_apppreventionreturntopoverty_detail')">
+      <div class="info-top__item" @click="linkTo('../AppHelpEffect/AppHelpEffect')">
         <image :src="$cdn + 'bfcx.png'"/>
         <h2>帮扶成效</h2>
       </div>

src/components/AiItem.vue

@@ -44,7 +44,7 @@ export default {
 .AiItem {
   font-family: PingFangSC-Regular, PingFang SC;
 
-  .border {
+  &.border {
     .normal {
       border-bottom: 2px solid #ddd;
     }
@@ -62,6 +62,10 @@ export default {
 
     .flexContent {
       max-width: 62vw;
+
+      input {
+        text-align: right;
+      }
     }
   }
 

src/components/AiTopFixed.vue

@@ -55,6 +55,7 @@ export default {
     min-height: 100px;
     padding: 20px 32px;
     box-sizing: border-box;
+    box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.02);
 
     *:last-child {
       margin-bottom: 0 !important;
@@ -62,7 +63,6 @@ export default {
   }
 
   ::v-deep .u-search {
-    box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.02);
     margin-bottom: 32px !important;
   }
 }

src/pages/loading.vue

@@ -102,11 +102,12 @@ export default {
     margin-top: 16px;
 
     .item {
-      width: 100%;
+      width: 100vw;
       font-size: 28px;
       padding: 0 32px;
       height: 64px;
       border-bottom: 1px solid #ddd;
+      box-sizing: border-box;
 
       &:nth-of-type(2n) {
         background: rgba(#26f, .02);

src/project/saas/AppBuilding/components/gridMap.vue

@@ -10,12 +10,10 @@
         </div>
       </AiPagePicker>
       <div class="grid-input">
-        <img src="./img/back-icon.png" alt="" class="back-icon" v-if="name && show" @click="show=false">
+        <img src="./img/search-icon-w.png" class="search-icon">
-        <img src="./img/search-icon-w.png" alt="" class="search-icon" v-else>
+        <input class="input" placeholder="请输入网格名称" v-model="girdName" maxlength="20" confirm-type="search" @confirm="search"/>
-        <input type="text" class="input" placeholder="请输入姓名、房屋信息" v-model="name" maxlength="10" confirm-type="search"
-              @confirm="search"/>
         <div class="clear-btn">
-          <img src="./img/del-icon.png" alt="" class="del-icon" v-if="name" @click="clear">
+          <img src="./img/del-icon.png" class="del-icon" v-if="girdName" @click="girdName = ''">
         </div>
       </div>
     </div>
@@ -48,6 +46,20 @@
         </scroll-view>
       </div>
     </u-popup>
+    <u-popup v-model="isShowGrid" mode="bottom" border-radius="14" height="60%">
+      <div class="grid-wrapper">
+        <div class="title">请选择网格</div>
+        <scroll-view scroll-y="true" class="grid-info">
+          <div
+            class="grid-item"
+            v-for="(item, index) in girdList"
+            @click="form.girdName = item.girdName, getGridList(item.id)"
+            :key="index">
+            {{ item.girdName }}
+          </div>
+        </scroll-view>
+      </div>
+    </u-popup>
   </div>
 </template>
 
@@ -64,18 +76,20 @@ export default {
       show: false,
       form: {girdName: '', id: ''},
       treeList: [],
-      name: '',
+      girdName: '',
       showSelect: false,
       editor: null,
       polygons: [],
       labels: [],
-      latLngCenter: [], //中心点
+      latLngCenter: [],
+      isShowGrid: false,
+      girdList: []
     }
   },
   computed: {...mapState(['user'])},
   created() {
     this.areaId = this.user.areaId
-    this.getLeafNodes()
+
     uni.$on('goback', e => {
       this.form.girdName = e.girdName
       this.getGridList(e.id, true)
@@ -91,6 +105,21 @@ export default {
         url: './SelectGird?isFormMap=1'
       })
     },
+
+    search () {
+      this.$loading()
+      this.$http.post(`/app/appgirdinfo/list?size=100&girdName=${this.girdName}`).then((res) => {
+        if (res.code === 0) {
+          if (res.data.records.length) {
+            this.girdList = res.data.records
+            this.isShowGrid = true
+          } else {
+            this.$u.toast('未查询到网格')
+          }
+        }
+      })
+    },
+
     getLeafNodes() {
       this.$http.post(`/app/appgirdinfo/queryGirdMemberGirdsById`).then((res) => {
         if (res?.data) {
@@ -112,7 +141,6 @@ export default {
     getGridList(id) {
       this.$loading()
       this.$http.post(`/app/appgirdinfo/queryChildGirdInfoByGirdId?girdId=${id}`).then((res) => {
-        this.$hideLoading()
         if (res?.data) {
           const arr = []
           res.data.map(v => {
@@ -135,6 +163,7 @@ export default {
           if (!arr.filter(v => v.points).length) {
             return this.$u.toast('该网格还未标会')
           }
+          this.isShowGrid = false
 
           this.renderGridMap(arr.filter(v => v.points))
         }
@@ -285,6 +314,46 @@ export default {
     box-sizing: border-box;
   }
 
+  .grid-wrapper {
+    height: 100%;
+    overflow: hidden;
+
+    .title {
+      height: 80px;
+      line-height: 80px;
+      text-align: center;
+      color: #333;
+      font-size: 32px;
+      font-weight: 800;
+    }
+
+    scroll-view {
+      height: calc(100% - 80px);
+    }
+
+    .grid-item {
+      height: 80px;
+      line-height: 80px;
+      padding: 0 24px;
+      text-align: center;
+      color: #333;
+      font-size: 28px;
+      font-weight: 500;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      border-bottom: 1px solid #eee;
+
+      &:last-child {
+        border: none;
+      }
+
+      &:active {
+        background: #eee;
+      }
+    }
+  }
+
   .top {
     display: flex;
     position: fixed;

src/project/saas/AppBuilding/components/searchMap.vue

@@ -1,14 +1,6 @@
 <template>
   <div class="searchMap">
     <div class="top">
-      <AiPagePicker class="left" type="custom" @select="handleSelectGird"
-                    :ops="{url:'./SelectGird',label: 'girdName'}">
-        <div class="gird-content">
-          <image src="./img/gird--select-icon.png" class="avatras"/>
-          <div class="label">{{ form.girdName || '网格选择' }}</div>
-          <u-icon name="arrow-right" color="#cccccc" size="26" style="margin-left:4px;"></u-icon>
-        </div>
-      </AiPagePicker>
       <div class="grid-input">
         <img src="./img/back-icon.png" alt="" class="back-icon" v-if="name && show" @click="show=false">
         <img src="./img/search-icon-w.png" alt="" class="search-icon" v-else>
@@ -19,18 +11,6 @@
         </div>
       </div>
     </div>
-    <div class="search-list" v-if="show">
-      <div class="title border">
-        <img src="./img/search-icon.png" alt="" class="search-icon">{{ name }}
-      </div>
-      <div class="item border" v-for="(item, index) in buildList" :key="index" @click="getBuildingInfo(item)">
-        <img src="./img/user-icon.png" alt="" class="search-icon user-icon">
-        <div class="item-content">
-          <h3>{{ item.residentName }}</h3>
-          <p>{{ item.areaName || '' }}{{ item.createAddress }}</p>
-        </div>
-      </div>
-    </div>
     <div class="build-btn" @click="toList()">
       <img src="./img/build-icon.png" alt=""> 楼栋<br/>列表
     </div>
@@ -120,6 +100,24 @@
       </div>
       <div class="popup-btn" @click="toDetail(building.id)">查看楼栋模型</div>
     </u-popup>
+    <u-popup v-model="show" mode="bottom" border-radius="14" height="70%">
+      <div class="grid-wrapper">
+        <div class="title">请选择居民</div>
+        <scroll-view scroll-y="true" class="grid-info">
+          <div
+            class="grid-item"
+            v-for="(item, index) in buildList"
+            @click="getBuildingInfo(item)"
+            :key="index">
+            <image src="./img/user-icon.png" />
+            <div class="right">
+              <h3>{{ item.residentName }}</h3>
+              <p>{{ item.areaName || '' }}{{ item.createAddress }}</p>
+            </div>
+          </div>
+        </scroll-view>
+      </div>
+    </u-popup>
   </div>
 </template>
 
@@ -149,6 +147,7 @@ export default {
       showPop: false,
       retryMapCount: 0,
       building: {},
+      isShowGrid: false,
       buildPopup: false
     }
   },
@@ -318,7 +317,8 @@ export default {
     },
     search() {
       this.buildList = []
-      this.$http.post('/app/appcommunityhouseinfo/queryHouseByName', null, {
+      this.$loading()
+      this.$http.post('/app/appcommunityhouseinfo/queryHouseByNameBySize', null, {
         params: {
           current: 1,
           size: 20,
@@ -353,8 +353,7 @@ export default {
 
           this.detailInfo = {...res.data}
 
-          console.log(this.detailInfo)
+          if(this.detailInfo.build.appGirdInfo && this.detailInfo.build.appGirdInfo.girdMemberNames && this.detailInfo.build.appGirdInfo.girdMemberNames) {
-          if(this.detailInfo.build.appGirdInfo.girdMemberNames && this.detailInfo.build.appGirdInfo.girdMemberNames) {
             this.detailInfo.build.appGirdInfo.girdMemberNames = this.detailInfo.build.appGirdInfo.girdMemberNames.split(',')
           }
           this.show = false
@@ -383,6 +382,72 @@ export default {
     box-sizing: border-box;
   }
 
+  .grid-wrapper {
+    height: 100%;
+    overflow: hidden;
+
+    .title {
+      height: 80px;
+      line-height: 80px;
+      text-align: center;
+      color: #333;
+      font-size: 32px;
+      font-weight: 800;
+    }
+
+    scroll-view {
+      height: calc(100% - 80px);
+    }
+
+    .grid-item {
+      display: flex;
+      align-items: center;
+      padding: 20px 24px;
+      color: #333;
+      font-size: 28px;
+      font-weight: 500;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      border-bottom: 1px solid #eee;
+
+      image {
+        width: 50px;
+        height: 50px;
+        margin-right: 16px;
+      }
+
+      .right {
+        flex: 1;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+
+        h2 {
+          margin-bottom: 12px;
+          color: #333;
+          font-size: 30px;
+          font-weight: 600;
+        }
+
+        p {
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          color: #666;
+        }
+      }
+
+      &:last-child {
+        border: none;
+      }
+
+      &:active {
+        background: #eee;
+      }
+    }
+  }
+
   .top {
     display: flex;
     position: fixed;
@@ -425,7 +490,7 @@ export default {
   .grid-input {
     display: flex;
     align-items: center;
-    width: 460px;
+    width: 100%;
     height: 64px;
     background: #F5F5F5;
     border-radius: 32px;

src/project/saas/AppBuilding/detail.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="detail">
+  <div class="detail" v-if="pageShow">
     <AiTopFixed>
       <div class="select-flex" @click="showSelect=true">
         <span class="name" v-text="cellName"/>
@@ -148,6 +148,7 @@ export default {
         renter: [],
         live: []
       },
+      pageShow: false,
       numInfo: {},
       showSelect: false,
       selectList: [],
@@ -166,8 +167,9 @@ export default {
   onShow() {
     document.title = "楼栋模型"
     this.$dict.load('householdRelation', 'houselivingStatus', 'houseLeaseSituation', 'houseUseStatus',
-        'isFilingCertificateStatus', 'communityBuildingType', 'yesOrNo', 'BulidResidentType')
+        'isFilingCertificateStatus', 'communityBuildingType', 'yesOrNo', 'BulidResidentType').then(() => {
       this.getBuilding()
+    })
     uni.$on('changeHouseInfo', res => {
       this.getHouseDetail(this.houseInfo.id)
     })
@@ -196,6 +198,7 @@ export default {
     },
     getBuilding() {
       //获取楼栋信息
+      this.$loading()
       let {id} = this.$route.query
       this.$http.post(`/app/appcommunitybuildinginfo/queryDetailById`, null, {
         params: {id}
@@ -203,6 +206,8 @@ export default {
         if (res?.data) {
           this.detail = res.data
           this.getSelectList(res.data.communityId)
+
+          this.pageShow = true
         }
       })
     },

src/project/saas/AppResidentDocument/Add.vue

@@ -84,7 +84,7 @@
       <div class="border">
         <span class="label">现住址</span>
         <span class="value">
-          <AiAreaPicker ref="address" class="aiArea" :fullName.sync="form.currentAreaName" :value="form.currentAreaId" mode="custom" all @select="onCurrentAreaChange">
+          <AiAreaPicker ref="address" :fullName.sync="form.currentAreaName" :value="form.currentAreaId" mode="custom" all @select="onCurrentAreaChange">
             <div class="aiArea">
               <span class="label" v-if="form.currentAreaName">{{ form.currentAreaName }}</span>
               <span v-else class="color-999">请选择</span>
@@ -94,20 +94,6 @@
         </span>
       </div>
     </div>
-    <div class="item">
-      <span class="tips">*</span>
-      <div class="border">
-      <!-- <div class="border item-right"> -->
-        <span class="label">居民标签</span>
-        <span class="value" @click="toChooseTags">
-          <span class="color-999">请选择</span>
-          <img src="./components/img/right-icon.png" alt="">
-        </span>
-        <!-- <div class="tag-list" @click="toChooseTags">
-          <div class="tag" v-for="(item, index) in 10" :key="index">残疾人</div>
-        </div> -->
-      </div>
-    </div>
     <div class="item mar-b0">
       <span class="tips"></span>
       <div class="border not-border">
@@ -122,7 +108,7 @@
       <div class="border">
         <span class="label">户籍地址</span>
         <span class="value">
-          <AiAreaPicker ref="address" class="aiArea" :fullName.sync="form.householdAreaName" :value="form.householdAreaId" mode="custom" all @select="onHouseAreaChange">
+          <AiAreaPicker ref="address" :fullName.sync="form.householdAreaName" :value="form.householdAreaId" mode="custom" all @select="onHouseAreaChange">
             <div class="aiArea">
               <span class="label" v-if="form.householdAreaName">{{ form.householdAreaName }}</span>
               <span v-else class="color-999">请选择</span>
@@ -141,6 +127,19 @@
     <div class="text-area">
       <textarea placeholder="请输入" maxlength="30" v-model="form.householdAddress"></textarea>
     </div>
+    <div class="item">
+      <div class="border" :class="[form.residentLabelList.length ? 'item-right' : '']">
+      <!-- <div class="border item-right"> -->
+        <span class="label">居民标签</span>
+        <div class="tag-list" @click="toChooseTags" v-if="form.residentLabelList.length">
+          <div class="tag" v-for="(item, index) in form.residentLabelList" :key="index">{{ item.labelName }}</div>
+        </div>
+        <span class="value" @click="toChooseTags" v-else>
+          <span class="color-999">请选择</span>
+          <img src="./components/img/right-icon.png" alt="">
+        </span>
+      </div>
+    </div>
     <div class="pad-b152"></div>
     <div class="add-btn" @click="submit">
       <div>保存</div>
@@ -174,7 +173,8 @@ export default {
         householdAreaName: '',
         householdAddress: '',
         residentType: '',
-        age: ''
+        age: '',
+        residentLabelList: []
       },
       showSelect: false,
       formName: '',
@@ -191,6 +191,16 @@ export default {
       this.form.residentType = options.type
     }
     this.$dict.load('yesOrNo', 'sex', 'householdRelation', 'nation', 'education', 'maritalStatus', 'politicsStatus', 'militaryStatus', 'faithType')
+
+    uni.$on('onChecked', e => {
+      console.log(e)
+      this.form.residentLabelList = e.map(v => {
+        return {
+          labelId: v.id,
+          labelName: v.labelName
+        }
+      })
+    })
   },
   computed: {
     ...mapState(['user']),
@@ -246,7 +256,9 @@ export default {
     },
 
     toChooseTags () {
-      uni.navigateTo({url: `./Tags`})
+      uni.navigateTo({
+        url: `./Tags?ids=${this.form.residentLabelList.map(v => v.labelId).join(',')}`
+      })
     },
 
     confirmSelect(e) {
@@ -302,6 +314,15 @@ export default {
 
 <style scoped lang="scss">
 .add {
+  ::v-deep .aiArea {
+    display: flex;
+    align-items: center;
+    justify-content: flex-end;
+    .label {
+      width: 100%!important;
+    }
+  }
+
   .item{
     width: 100%;
     padding-left: 14px;

src/project/saas/AppResidentDocument/AppResidentDocument.vue

@@ -24,8 +24,8 @@
         <div class="right">
           <div class="rightTop">
             <span class="name">{{ item.name }}</span>
-            <!-- <span class="btn" v-if="item.doRight == 1"> -->
+            <span class="btn" v-if="item.doRight == 1">
-            <span class="btn">
+            <!-- <span class="btn"> -->
               <img src="./components/img/edit-icon.png" alt="" @click.stop="edit(item.id)">
               <img src="./components/img/del-icon.png" alt="" @click.stop="del(item.id)">
             </span>

src/project/saas/AppResidentDocument/DetailCard.vue

@@ -7,18 +7,12 @@
         <div class="top-right__top">
           <div class="left">
             <h2>{{ resident.name }}</h2>
-            <i>已注销</i>
+            <i v-if="resident.fileStatus === '1'">已注销</i>
           </div>
-          <span>户主</span>
+          <span v-if="resident.householdName === '1'">户主</span>
         </div>
-        <div class="top-right__bottom">
+        <div class="top-right__bottom" v-if="resident.residentLabelList">
-          <span>退役军人</span>
+          <span v-for="(item, index) in resident.residentLabelList" :key="index">{{ item.labelName }}</span>
-          <span>退役军人</span>
-          <span>退役军人</span>
-          <span>退役军人</span>
-          <span>退役军人</span>
-          <span>退役军人</span>
-          <span>退役军人</span>
         </div>
       </div>
     </div>

src/project/saas/AppResidentDocument/DetailPeople.vue

@@ -7,18 +7,12 @@
         <div class="top-right__top">
           <div class="left">
             <h2>{{ resident.name }}</h2>
-            <i>已注销</i>
+            <i v-if="resident.fileStatus === '1'">已注销</i>
           </div>
-          <span>户主</span>
+          <span v-if="resident.householdName === '1'">户主</span>
         </div>
-        <div class="top-right__bottom">
+        <div class="top-right__bottom" v-if="resident.residentLabelList">
-          <span>退役军人</span>
+          <span v-for="(item, index) in resident.residentLabelList" :key="index">{{ item.labelName }}</span>
-          <span>退役军人</span>
-          <span>退役军人</span>
-          <span>退役军人</span>
-          <span>退役军人</span>
-          <span>退役军人</span>
-          <span>退役军人</span>
         </div>
       </div>
     </div>

src/project/saas/AppResidentDocument/Tags.vue

@@ -1,9 +1,15 @@
 <template>
   <div class="tags">
-    <div class="tags-group" v-for="(label, i) in 2" :key="i">
+    <div class="tags-group">
-      <h2>年龄段</h2>
+      <h2>标签列表</h2>
       <div class="tags-list">
-        <div class="item" v-for="(item, index) in 20" :class="[currIndex === index ? 'active' : '']" :key="index">婴儿</div>
+        <div class="item"
+          v-for="(item, index) in list"
+          :class="[checked.includes(item.id) ? 'active' : '']"
+          :key="index"
+          @click="onClick(item.id)">
+          {{ item.labelName }}
+        </div>
       </div>
     </div>
     <div class="add-btn" @click="submit">
@@ -18,16 +24,53 @@
 
     data () {
       return {
-        currIndex: 0
+        currIndex: 0,
+        list: [],
+        checked: []
       }
     },
 
-    onLoad () {
+    onLoad (query) {
+      this.getList()
 
+      if (query.ids) {
+        this.checked = query.ids.split(',')
+      }
     },
 
     methods: {
+      getList() {
+        this.$loading()
+        this.$http.post('/app/appresidentlabelinfo/list?size=1000').then((res) => {
+          if (res.code == 0) {
+            this.list = res.data.records
+          }
+        })
+      },
 
+      onClick (id) {
+        const index = this.checked.indexOf(id)
+
+        if (index === -1) {
+          this.checked.push(id)
+        } else {
+          this.checked.splice(index, 1)
+        }
+      },
+
+      submit () {
+        if (!this.checked.length) {
+          return this.$u.toast('请选择标签')
+        }
+
+        const list = this.list.filter(v => {
+          return this.checked.includes(v.id)
+        })
+
+        uni.$emit('onChecked', list)
+
+        uni.navigateBack()
+      }
     }
   }
 </script>