From 6960e4f5b1fc18254bfcf09f923a5fcb1a611eb6 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Wed, 1 Jun 2022 18:43:12 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E8=B0=83=E6=95=B4=E5=AE=8C?=
 =?UTF-8?q?=E6=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppGridManagement/selectGridMember.vue    |  11 +-
 src/project/grid/AppHandSnapshot/AddSet.vue   |   5 -
 src/project/grid/AppHandSnapshot/Content.vue  |  49 +--
 .../grid/AppHandSnapshot/SelectUser.vue       | 339 ------------------
 .../grid/AppHandSnapshot/Statistics.vue       |   7 -
 .../AppSpecialPeople/AppSpecialPeople.vue     |   8 +-
 src/project/grid/AppSpecialPeople/add.vue     |   4 +-
 7 files changed, 34 insertions(+), 389 deletions(-)
 delete mode 100644 src/project/grid/AppHandSnapshot/SelectUser.vue

diff --git a/src/project/grid/AppGridManagement/selectGridMember.vue b/src/project/grid/AppGridManagement/selectGridMember.vue
index 59633a6a..9ece478b 100644
--- a/src/project/grid/AppGridManagement/selectGridMember.vue
+++ b/src/project/grid/AppGridManagement/selectGridMember.vue
@@ -7,10 +7,8 @@
       </div>
       <div class="cards" v-for="(item, index) in treeList" :key="item.id" @click="itemClick(item)">
         <div class="imges">
-          <img src="./components/img/xzh.png" alt="" class="imgselect" v-if="item.isChecked"
-               @click.stop="girdClick(item, index)"/>
-          <img src="./components/img/xz.png" alt="" class="imgselect" v-else
-               @click.stop="girdClick(item, index)"/>
+          <img src="./components/img/xzh.png" alt="" class="imgselect" v-if="item.isChecked" @click.stop="girdClick(item, index)"/>
+          <img src="./components/img/xz.png" alt="" class="imgselect" v-else @click.stop="girdClick(item, index)"/>
           <img src="./components/img/gird--select-icon.png" alt="" class="avatras"/>
         </div>
         <div class="rightes">
@@ -25,9 +23,7 @@
           <img src="./components/img/tx@2x.png" alt="" class="avatras"/>
         </div>
         <div class="rights fill">
-          <div class="applicationNames">
-            <AiOpenData v-if="e.name" type="userName" :openid="e.name" style="display: block;"/>
-          </div>
+          <div class="applicationNames" v-text="e.name"/>
           <div class="idNumbers">{{ e.phone }}</div>
         </div>
       </div>
@@ -36,7 +32,6 @@
     <div class="subBtn" @click="submit">
       <div>确定选择</div>
     </div>
-
   </section>
 </template>
 
diff --git a/src/project/grid/AppHandSnapshot/AddSet.vue b/src/project/grid/AppHandSnapshot/AddSet.vue
index 8368f651..d623628a 100644
--- a/src/project/grid/AppHandSnapshot/AddSet.vue
+++ b/src/project/grid/AppHandSnapshot/AddSet.vue
@@ -84,11 +84,6 @@ export default {
         }
       })
     },
-
-    toSelectUser() {
-      console.log(123)
-      uni.navigateTo({ url: './SelectUser' })
-    },
   },
 }
 </script>
diff --git a/src/project/grid/AppHandSnapshot/Content.vue b/src/project/grid/AppHandSnapshot/Content.vue
index 4e7f1344..81d603da 100644
--- a/src/project/grid/AppHandSnapshot/Content.vue
+++ b/src/project/grid/AppHandSnapshot/Content.vue
@@ -3,17 +3,18 @@
     <div class="contents">
       <u-form :model="forms" ref="uForm" label-width="auto" :border-bottom="false">
         <u-form-item label="转交给" prop="status" required :border-bottom="false" right-icon="arrow-right" class="first-form" v-if="status == 1">
-          <u-input v-model="forms.name" placeholder="请选择转交对象" @click="toSelectUser" disabled />
+          <u-input v-model="forms.name" placeholder="请选择转交对象" @click="toSelectUser" disabled/>
         </u-form-item>
         <u-form-item label="事件分类" prop="groupName" required :border-bottom="false" right-icon="arrow-right" v-if="status != 1">
           <!-- <u-input v-model="forms.groupName" placeholder="请选择事件分类"  /> -->
-          <span @click="show = true" class="right-span" :style="forms.groupName ? '' : 'color:#999;'">{{forms.groupName || '请选择事件分类'}}</span>
+          <span @click="show = true" class="right-span" :style="forms.groupName ? '' : 'color:#999;'">{{ forms.groupName || '请选择事件分类' }}</span>
 
           <u-select v-model="show" :list="myList" value-name="id" label-name="groupName" @confirm="selectStatus"></u-select>
         </u-form-item>
 
-        <u-form-item :label="status == 3 ? '办结意见' : status == 2 ? '拒绝受理意见' : '办理意见'" prop="content" required :border-bottom="false" label-position="top" class="contents">
-          <u-input v-model="forms.content" :placeholder="status == 2 ? '请写下拒绝受理意见…' : '请写下你的办结意见...'" type="textarea" auto-height height="100" maxlength="500" />
+        <u-form-item :label="status == 3 ? '办结意见' : status == 2 ? '拒绝受理意见' : '办理意见'" prop="content" required :border-bottom="false" label-position="top"
+                     class="contents">
+          <u-input v-model="forms.content" :placeholder="status == 2 ? '请写下拒绝受理意见…' : '请写下你的办结意见...'" type="textarea" auto-height height="100" maxlength="500"/>
         </u-form-item>
 
         <div class="line"></div>
@@ -68,17 +69,16 @@ export default {
     this.forms.groupId = option.groupId
     this.forms.groupName = option.groupName
     this.typeList()
-    uni.$on('goback', (res) => {
+    uni.$on('pagePicker:custom', (res) => {
       this.selectUser = res
-      if(res.name) {
+      if (res.name) {
         this.forms.name = res.name
-      }else{
+      } else {
         this.forms.name = res.girdName
       }
     })
   },
   onShow() {
-    console.log(this.titleList[this.status])
     document.title = this.titleList[this.status]
   },
   methods: {
@@ -98,20 +98,20 @@ export default {
     },
 
     confirm() {
-      if(this.status == 1 && !this.forms.name) {
+      if (this.status == 1 && !this.forms.name) {
         return this.$u.toast('请选择转交对象')
       }
-      if(this.status != 1 && !this.forms.groupName) {
+      if (this.status != 1 && !this.forms.groupName) {
         return this.$u.toast('请选择分类')
       }
-      if(this.status != 1 && !this.forms.content) {
+      if (this.status != 1 && !this.forms.content) {
         return this.$u.toast('请输入意见')
       }
       this.submit()
     },
     submit() {  //status 1转交  2拒绝受理  3我已办结
-      var url = '', successText= '', params= ''
-      if(this.status == 1) {
+      var url = '', successText = '', params = ''
+      if (this.status == 1) {
         url = `/app/appclapeventinfo/transfer`
         successText = '转交成功'
         params = {
@@ -119,18 +119,18 @@ export default {
           girdId: this.selectUser.id,
           girdName: this.selectUser.girdName,
         }
-        if(this.selectUser.name) { //选择的网格员
+        if (this.selectUser.name) { //选择的网格员
           params.girdId = this.selectUser.girdId
           params.girdMemberId = this.selectUser.id
           params.girdMemberName = this.selectUser.name
         }
       }
-      if(this.status == 2) {
+      if (this.status == 2) {
         url = `/app/appclapeventinfo/refuse`
         successText = '拒绝成功'
         params = {...this.forms}
       }
-      if(this.status == 3) {
+      if (this.status == 3) {
         url = `/app/appclapeventinfo/finishByGirdMember`
         successText = '办结成功'
         params = {...this.forms}
@@ -142,12 +142,12 @@ export default {
           uni.$emit('updateDeatil')
           uni.$emit('getListInit')
           setTimeout(() => {
-            if(this.status == 1) {
+            if (this.status == 1) {
               uni.navigateBack({delta: 2})
-            }else {
+            } else {
               uni.navigateBack()
             }
-          },600)
+          }, 600)
         }
       })
     },
@@ -156,7 +156,7 @@ export default {
       this.forms.groupId = e[0].value
     },
     toSelectUser() {
-      uni.navigateTo({ url: './SelectUser' })
+      uni.navigateTo({url: '../AppGridManagement/selectGridMember'})
     },
   },
 }
@@ -165,14 +165,18 @@ export default {
 <style scoped lang="scss">
 .Transfer {
   height: 100%;
+
   .contents {
     padding-bottom: 140px;
+
     ::v-deep .u-form {
       .u-form-item {
         padding: 0 45px !important;
+
         .u-form-item__body {
           .u-form-item--right__content__slot {
             padding-bottom: 0;
+
             .u-input {
               text-align: right !important;
             }
@@ -193,6 +197,7 @@ export default {
 
       .contents {
         padding-bottom: 20px !important;
+
         .u-form-item__body {
           .u-form-item--right__content__slot {
             .u-input {
@@ -204,6 +209,7 @@ export default {
 
       .avatars {
         padding-bottom: 20px !important;
+
         .u-form-item__body {
           .default {
             width: 160px;
@@ -226,7 +232,8 @@ export default {
     font-weight: 500;
     color: #ffffff;
   }
-  .right-span{
+
+  .right-span {
     display: inline-block;
     width: 100%;
     text-align: right;
diff --git a/src/project/grid/AppHandSnapshot/SelectUser.vue b/src/project/grid/AppHandSnapshot/SelectUser.vue
deleted file mode 100644
index 1385cd20..00000000
--- a/src/project/grid/AppHandSnapshot/SelectUser.vue
+++ /dev/null
@@ -1,339 +0,0 @@
-<template>
-  <div class="SelectUser">
-    <div class="header-middle">
-      <div class="hint">
-        <span v-for="(item, index) in slectList" :key="index"><span v-if="index" style="margin:0 4px;">/</span><span style="color:#3F8DF5" @click="girdNameClick(item, index)">{{item.girdName}}</span></span>
-      </div>
-
-      <div class="showTypes" v-if="!userList.length">
-        <div v-if="treeList.length > 0">
-          <div class="cards" v-for="(item, index) in treeList" :key="index" @click="itemClick(item)">
-            <div class="imges">
-              <span v-if="item.girdLevel == 2">
-                <img src="./components/img/xzh.png" alt="" class="imgselect" v-if="item.isChecked" @click.stop="girdClick(item, index)" />
-                <img src="./components/img/xz.png" alt="" class="imgselect" v-else @click.stop="girdClick(item, index)" />
-              </span>
-              <img src="./components/img/gird--select-icon.png" alt="" class="avatras" />
-            </div>
-            <div class="rightes">
-              <div class="applicationNames">{{ item.girdName }}</div>
-              <img src="./components/img/right-icon.png" alt="" class="imgs" />
-            </div>
-          </div>
-        </div>
-
-        <AiEmpty description="暂无数据" class="emptyWrap" v-else></AiEmpty>
-      </div>
-
-      <div class="showUsers" v-else>
-        <div v-if="userList.length > 0">
-          <div class="cards" v-for="(e, index) in userList" :key="index">
-            <div class="imges">
-              <img src="./components/img/xzh.png" alt="" class="imgselect" v-if="e.isChecked" @click="userClick(e, index)" />
-              <img src="./components/img/xz.png" alt="" class="imgselect" v-else @click="userClick(e, index)" />
-
-              <img src="./components/img/tx@2x.png" alt="" class="avatras" />
-            </div>
-
-            <div class="rights">
-              <div class="applicationNames">{{ e.name }}</div>
-              <div class="idNumbers">{{ e.phone }}</div>
-            </div>
-          </div>
-        </div>
-
-        <AiEmpty description="暂无数据" class="emptyWrap" v-else></AiEmpty>
-      </div>
-    </div>
-
-    <div class="subBtn" @click="submit">
-      <div>确定选择</div>
-    </div>
-
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'SelectUser',
-  data() {
-    return {
-      selectUser: {},
-      allData: null,
-      treeList: [],
-      slectList: [],
-      userList: [],
-    }
-  },
-  onLoad() {
-    this.getTree()
-  },
-  onShow() {
-    document.title = '选择人员'
-  },
-  methods: {
-    getTree() {
-      this.slectList = []
-      this.$http.post('/app/appgirdinfo/listAllByTop').then((res) => {
-        if (res?.data) {
-          this.allData = res.data
-          this.treeInit()
-        }
-      })
-    },
-
-    treeInit() {
-      if(this.allData[0].girdLevel == 2) {
-        if(this.allData[0].girdMemberList && this.allData[0].girdMemberList.length) {
-            this.userList = this.allData[0].girdMemberList
-            this.userList.map((item) => {
-            item.isChecked = false
-          })
-        }
-      }else {
-        this.treeList = this.allData[0].girdList
-      }
-      var obj = {
-        girdName: this.allData[0].girdName,
-        id: this.allData[0].id,
-        girdLevel: this.allData[0].girdLevel
-      }
-      this.slectList.push(obj)
-    },
-
-    itemClick(row) {
-      console.log(row)
-      var obj = {
-        girdName: row.girdName,
-        id: row.id,
-        girdLevel: row.girdLevel
-      }
-      this.slectList.push(obj)
-      this.searckGird(row)
-    },
-
-    searckGird(row) {
-      this.treeList = []
-      if(row.girdLevel != 2) { //查网格
-        this.$http.post(`/app/appgirdinfo/list?parentGirdId=${row.id}&size=999`).then((res) => {
-          if (res?.data) {
-            this.treeList = res.data.records
-          }
-        })
-      }else { //查网格员
-        this.userList = []
-        this.$http.post(`/app/appgirdmemberinfo/listByGirdIdByThree?girdId=${row.id}`).then((res) => {
-          if (res?.data) {
-            this.userList = res.data
-            this.userList.map((item) => {
-              item.isChecked = false
-            })
-          }
-        })
-      }
-    },
-
-    girdNameClick(row, index) {
-      this.userList = []
-      if(!index) { //第一级别
-        this.slectList = []
-        this.treeInit()
-      }else {
-        var list = []
-        this.slectList.map((item, i) => {
-          if(i <= index) {
-            list.push(item)
-          }
-        })
-        this.slectList = list
-        this.searckGird(row)
-      }
-    },
-
-
-    girdClick(row, index) {
-      if (this.treeList[index].isChecked) {//取消
-        this.treeList[index].isChecked = false
-        this.selectUser = {}
-      } else {
-        this.treeList.map((item) => {
-          item.isChecked = false
-        })
-        this.treeList[index].isChecked = true
-        this.selectUser = row
-      }
-      this.$forceUpdate()
-    },
-
-    userClick(row, index) {
-      if (this.userList[index].isChecked) {//取消
-        this.userList[index].isChecked = false
-        this.selectUser = {}
-      } else {
-        this.userList.map((item) => {
-          item.isChecked = false
-        })
-        this.userList[index].isChecked = true
-        this.selectUser = row
-      }
-      this.$forceUpdate()
-    },
-
-    submit() {
-      if (this.selectUser.id != null) {
-        uni.$emit('goback', this.selectUser)
-        uni.navigateBack()
-      } else {
-        return this.$u.toast('请选择网格或网格员')
-      }
-    },
-  }
-}
-</script>
-
-<style scoped lang="scss">
-.SelectUser {
-  height: 100%;
-  background: #fff;
-  .header-top {
-    background: #fff;
-    padding: 20px 32px;
-  }
-
-  .header-middle {
-    padding-bottom: 140px;
-    .hint {
-      padding: 28px 20px 28px 32px;
-      line-height: 56px;
-      box-shadow: 0px 1px 0px 0px #e4e5e6;
-      font-size: 30px;
-      font-weight: 500;
-      word-break: break-all;
-    }
-
-    .showTypes {
-      .empty-div {
-        height: 16px;
-        background: #f5f5f5;
-      }
-
-      .cards {
-        display: flex;
-        align-items: center;
-        height: 120px;
-        line-height: 120px;
-        // background: pink;
-        padding: 0 0 0 32px;
-
-        .imges {
-          display: flex;
-          align-items: center;
-          // width: 200px;
-          .imgselect {
-            width: 48px;
-            height: 48px;
-            vertical-align: middle;
-          }
-
-          .avatras {
-            width: 74px;
-            height: 74px;
-            border-radius: 8px;
-            margin-left: 36px;
-          }
-        }
-        img {
-          width: 74px;
-          height: 74px;
-          border-radius: 8px;
-        }
-        .rightes {
-          width: 100%;
-          display: flex;
-          justify-content: space-between;
-          align-items: center;
-          margin-left: 32px;
-          border-bottom: 1px solid #e4e5e6;
-          .applicationNames {
-            font-size: 36px;
-            font-weight: 500;
-            color: #333333;
-          }
-          .imgs {
-            width: 40px;
-            height: 40px;
-            margin-right: 20px;
-          }
-        }
-      }
-    }
-
-    .showUsers {
-      .cards {
-        display: flex;
-        align-items: center;
-        height: 120px;
-        line-height: 120px;
-        // background: pink;
-        padding: 0 0 0 32px;
-
-        .imges {
-          display: flex;
-          align-items: center;
-          width: 200px;
-          .imgselect {
-            width: 48px;
-            height: 48px;
-          }
-
-          .avatras {
-            width: 74px;
-            height: 74px;
-            border-radius: 8px;
-            margin-left: 36px;
-          }
-        }
-
-        .rights {
-          width: 100%;
-          display: flex;
-          justify-content: space-between;
-          align-items: center;
-          margin-left: 32px;
-          border-bottom: 1px solid #e4e5e6;
-          padding-right: 40px;
-          .applicationNames {
-            font-size: 36px;
-            font-weight: 500;
-            color: #333333;
-          }
-          .idNumbers {
-            color: #666;
-          }
-        }
-      }
-    }
-  }
-
-  .subBtn {
-    position: fixed;
-    bottom: 0;
-    left: 0;
-    width: 100%;
-    height: 118px;
-    background: #f4f8fb;
-    div {
-      width: 192px;
-      height: 80px;
-      line-height: 80px;
-      text-align: center;
-      background: #1365dd;
-      border-radius: 4px;
-      font-size: 32px;
-      color: #fff;
-      margin: 20px 34px 0 0;
-      float: right;
-    }
-  }
-}
-</style>
diff --git a/src/project/grid/AppHandSnapshot/Statistics.vue b/src/project/grid/AppHandSnapshot/Statistics.vue
index 3be9524b..f0b87bc5 100644
--- a/src/project/grid/AppHandSnapshot/Statistics.vue
+++ b/src/project/grid/AppHandSnapshot/Statistics.vue
@@ -1,11 +1,5 @@
 <template>
   <div class="statistics" v-if="pageShow">
-    <!-- <div class="gird-select">
-      <img src="./components/img/gird-icon.png" alt="">
-      <span>{{girdName}}</span>
-      <img src="./components/img/down-icon.png" alt="">
-    </div>
-    <u-select v-model="showSelect" :list="myGirdList" value-name="id" label-name="girdName" @confirm="confirm"></u-select> -->
     <div class="info-content">
       <div class="title">今日概况</div>
       <div class="el-row">
@@ -80,7 +74,6 @@ export default {
       todayList: [],
       info: {},
       pageShow: false,
-      myGirdList: [],
       showSelect: false,
       myGirdList: [],
       girdName: '全部网格'
diff --git a/src/project/grid/AppSpecialPeople/AppSpecialPeople.vue b/src/project/grid/AppSpecialPeople/AppSpecialPeople.vue
index fc64e71c..1f56371b 100644
--- a/src/project/grid/AppSpecialPeople/AppSpecialPeople.vue
+++ b/src/project/grid/AppSpecialPeople/AppSpecialPeople.vue
@@ -8,15 +8,9 @@
       <div class="area-select">
         <div class="select-content">
           <div class="area-content fill">
-            <AiPagePicker type="gird" isMyGird @select="handleGridSelect">
+            <AiPagePicker type="custom" @select="handleGridSelect" self :ops="{url:'./SelectGird',label: 'girdName'}">
               <AiMore v-model="gridName" placeholder="选择网格"/>
             </AiPagePicker>
-            <!--          <AiAreaPicker :areaId="user.areaId" v-model="areaId" @select="areaSelect" :name.sync="areaName">-->
-            <!--            <img src="./img/local-icon.png" alt=""/>-->
-            <!--            <span class="label" v-if="areaName">{{ areaName }}</span>-->
-            <!--            <span v-else>请选择</span>-->
-            <!--            <u-icon name="arrow-down" color="#666" size="24"/>-->
-            <!--          </AiAreaPicker>-->
           </div>
           <div class="search-input" v-if="tabIndex">
             <img src="./img/search-icon.png" alt=""/>
diff --git a/src/project/grid/AppSpecialPeople/add.vue b/src/project/grid/AppSpecialPeople/add.vue
index ef0f104b..c47bea1d 100644
--- a/src/project/grid/AppSpecialPeople/add.vue
+++ b/src/project/grid/AppSpecialPeople/add.vue
@@ -151,7 +151,7 @@
           <div class="item" v-else-if="item.type == 'gird'">
             <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>
+              <AiPagePicker type="custom" @select="v=>handleSelectGird(v,item)" self :ops="{url:'./SelectGird',label: 'girdName'}">
                 <AiMore v-model="formData[item.fieldDbName + '_name']" :placeholder="item.fieldTips"/>
               </AiPagePicker>
             </div>
@@ -411,7 +411,7 @@ export default {
           }
           if (items.type == 'upload') { //附件 只传id
             let files = [];
-            [form[items.fieldDbName]]?.flat()?.map(item => item?.url&&files.push(item.url))
+            [form[items.fieldDbName]]?.flat()?.map(item => item?.url && files.push(item.url))
             form[items.fieldDbName] = files?.toString()
           }
           // if (items.type == 'onOff') { //开关