From 41da9483a0bd103f8782e270af881cb1d1bce2df Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Mon, 14 Mar 2022 18:30:56 +0800
Subject: [PATCH 01/11] tabList

---
 src/apps/AppPeopleList/DetailPeople.vue | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/apps/AppPeopleList/DetailPeople.vue b/src/apps/AppPeopleList/DetailPeople.vue
index 82c8832f..0042c425 100644
--- a/src/apps/AppPeopleList/DetailPeople.vue
+++ b/src/apps/AppPeopleList/DetailPeople.vue
@@ -134,9 +134,8 @@
     </div>
     </div>
     <!-- 特殊人群 -->
-    <div v-if="tabIndex != 0 &&  data.resident.tsrqInfos &&  data.resident.tsrqInfos.length">
-      <!--   -->
-      <div v-for="(item,index) in data.resident.tsrqInfos" :key="index" class="spacial">
+    <div v-if="tabIndex != 0 &&  tabList &&  tabList.length">
+      <div v-for="(item,index) in tabList" :key="index" class="spacial">
         <div class="specialList" v-for="(t,indexs) in item.tableInfos" :key="indexs" v-if="item.tableInfos && item.tableInfos.length">
           <div class="spacial-row">
             <div>{{ t.fieldName }}</div>

From a26b43adff90d07ac6a88357c369dac7056acee7 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Mon, 14 Mar 2022 18:32:50 +0800
Subject: [PATCH 02/11] BUG 28178

---
 src/apps/AppSpecialPeople/add.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/apps/AppSpecialPeople/add.vue b/src/apps/AppSpecialPeople/add.vue
index c965456a..edc79cc2 100644
--- a/src/apps/AppSpecialPeople/add.vue
+++ b/src/apps/AppSpecialPeople/add.vue
@@ -222,7 +222,9 @@ export default {
       })
     },
     getType() {
-      this.$http.post(`/app/appapplicationinfo/queryApplicationListByType?type=0`).then((res) => {
+      this.$http.post(`/app/appapplicationinfo/queryApplicationListByType`, null, {
+        params: {type: 0, status: 1}
+      }).then((res) => {
         if (res?.data) {
           this.typeList = res.data
         }

From fd7f904de4e0ef935be03063aec0c8651de93ba2 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Mon, 14 Mar 2022 20:11:04 +0800
Subject: [PATCH 03/11] BUG 28180

---
 src/apps/AppSpecialPeople/add.vue             |  24 +++++++-
 .../AppSpecialPeople/components/detail.vue    |  55 ++++++++++++++++--
 src/apps/AppSpecialPeople/img/del-icon.png    | Bin 0 -> 1415 bytes
 src/apps/AppSpecialPeople/img/edit-icon.png   | Bin 0 -> 1352 bytes
 4 files changed, 70 insertions(+), 9 deletions(-)
 create mode 100644 src/apps/AppSpecialPeople/img/del-icon.png
 create mode 100644 src/apps/AppSpecialPeople/img/edit-icon.png

diff --git a/src/apps/AppSpecialPeople/add.vue b/src/apps/AppSpecialPeople/add.vue
index edc79cc2..29e693c4 100644
--- a/src/apps/AppSpecialPeople/add.vue
+++ b/src/apps/AppSpecialPeople/add.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="add">
     <div class="pad-l32">
-      <div class="item">
+      <div class="item" v-if="!isEdit">
         <span class="label"><span class="tips">*</span>类型</span>
         <div class="value" @click="showType=true">
           <span :class="appId ? '' : 'color-999'">{{ appName }}</span>
@@ -203,12 +203,19 @@ export default {
       id: ''
     }
   },
-  computed: {...mapState(['user'])},
+  computed: {
+    ...mapState(['user']),
+    isEdit() {
+      return !!this.$route.query.id
+    }
+  },
   created() {
     this.getType()
   },
   onShow() {
-    document.title = '新增人员'
+    document.title = this.isEdit ? "编辑人员" : '新增人员'
+
+    this.getDetail()
   },
   methods: {
     ...mapActions(['selectEnterpriseContact']),
@@ -464,6 +471,17 @@ export default {
       this.formData[item.fieldDbName] = [info.id, info.girdName].join("_")
       this.formData[item.fieldDbName + "_name"] = info.girdName
       this.$forceUpdate()
+    },
+    getDetail() {
+      let {id, appId} = this.$route.query
+      id && this.$http.post("/app/appapplicationinfo/queryDetailById", null, {
+        params: {id, appId}
+      }).then(res => {
+        if (res?.data) {
+          this.formData = res.data
+          this.appId = appId
+        }
+      })
     }
   }
 }
diff --git a/src/apps/AppSpecialPeople/components/detail.vue b/src/apps/AppSpecialPeople/components/detail.vue
index 1a9b3acf..284ea7c3 100644
--- a/src/apps/AppSpecialPeople/components/detail.vue
+++ b/src/apps/AppSpecialPeople/components/detail.vue
@@ -28,8 +28,8 @@
         <div class="title">特殊人群</div>
         <div class="num-content">
           <div class="num-item" v-for="(item, index) in statisticsList" :key="index">
-            <h3>{{ item.value }}</h3>
-            <p>{{ item.label }}</p>
+            <h3 v-text="item.value"/>
+            <p v-text="item.label"/>
           </div>
           <AiEmpty v-if="!statisticsList.length"/>
         </div>
@@ -57,7 +57,13 @@
               <img src="../img/user-img.png" alt=""/>
             </div>
             <div class="user-info">
-              <p class="name">{{ e.name }}</p>
+              <p class="name">{{ e.name }}
+                <!--<span class="btn-icon" v-if="gridType != 0 && user.wxUserId == e.createUserId">-->
+                <span class="btn-icon">
+                  <img src="../img/edit-icon.png" alt="" @click="toEdit(e,item.dictValue)">
+                  <img src="../img/del-icon.png" alt="" @click="del(e,item.dictValue)">
+                </span>
+              </p>
               <div class="phone">
                 <span>{{ idNumberInit(e.idNumber) }}</span>
                 <span>{{ e.phone }}</span>
@@ -89,6 +95,7 @@ export default {
       statisticsListMon: [],
       userList: [],
       name: '',
+      gridType: 0
     }
   },
   computed: {...mapState(['user'])},
@@ -109,9 +116,9 @@ export default {
   },
   onShow() {
     document.title = '特殊人群管理'
-    console.log(this.$dict.getDict('appSpecialTypeFive'))
+    this.$dict.getDict('appSpecialTypeFive')
+    this.isGirdUser()
   },
-
   methods: {
     areaSelect(e) {
       this.areaId = e
@@ -152,7 +159,7 @@ export default {
     },
     getUserList() {
       this.userList = []
-      this.$http.post(`/app/appapplicationinfo/queryPeople?areaId=${this.areaId}&type=0&name=${this.name}`).then((res) => {
+      this.$http.post(`/app/appapplicationinfo/queryPeople?areaId=${this.areaId}&type=0&status=1&name=${this.name}`).then((res) => {
         if (res.code == 0) {
           for (let i in res.data) {
             var obj = {
@@ -189,6 +196,31 @@ export default {
         this.userList[index].check = true
       }
     },
+    toEdit(row) {
+      uni.navigateTo({
+        url: `./add?id=${row.id}&appId=${row.appId}`
+      })
+    },
+    del(row) {
+      this.$confirm('确定删除该数据?').then(() => {
+        uni.showLoading()
+        this.$http.post("/app/appapplicationinfo/delete", null, {params: {ids: row.id}}).then((res) => {
+          if (res?.code == 0) {
+            this.$u.toast('删除成功！')
+            this.getUserList()
+          }
+          uni.hideLoading()
+        })
+      }).catch(() => {
+      })
+    },
+    isGirdUser() {
+      this.$http.post('/app/appgirdmemberinfo/checkLogOnUser').then((res) => {
+        if (res?.data) {
+          this.gridType = res.data.checkType
+        }
+      })
+    },
   },
 }
 </script>
@@ -398,6 +430,17 @@ export default {
             color: #333;
             line-height: 44px;
             margin-bottom: 8px;
+
+            .btn-icon {
+              float: right;
+
+              img {
+                width: 48px;
+                height: 48px;
+                margin-left: 20px;
+                vertical-align: baseline;
+              }
+            }
           }
 
           .phone {
diff --git a/src/apps/AppSpecialPeople/img/del-icon.png b/src/apps/AppSpecialPeople/img/del-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..0f536bfb4d1447fb8bb29932f26139be15ad7e82
GIT binary patch
literal 1415
zcmV;21$g?2P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px)K}keGRA@upnrUoQRTRg6_m#FF)G2M*6bRz57!YYh7R3)3Fz~@GRH+{js0NG>
zL$DYyge^pfvc-TAA}z=VQA<Qjgb1-FqAZfMBB;O!h9$DJFhdJ;p>xcAk0~=l%e<u)
z$NTZUv;E&W_bm55MGGvcs_IN#!zfV0LHZ%m2c<F*GEDJ`Dnx=PbsW@DkbR`3l&Xx3
z3trVLw*n*-%A$dn5t)d{P}59jOHk?nN^K^EPnFMi$r-yv?Nljp@oG1W8-+-C8qnU2
z(k6JWqKtKf+bma|+W+lDrfmRn@L(#v{WA&6e4v99B@Sq-G1OvC1XimdL+b7D*#aP;
zke_<_93<C{&=#O6Bh`3G`Fw#yvJwK2ip$Rfn}B;032Wi^SAa<>r{lIe$-N^0sSHj<
z<U=5(g^jZ-t^uXqP}!O5n`3AefN4B@gh)a!*|o+Mol*k4-W-S~jk_5(C3o@5$75{(
z@|p^#+W^RgP#=u&!MhOii5zr=urWk+_8pHVi~(S#%3l8ct(a{R86E$=jKBUI7M)^a
z0bB~sCM@qcmD;NGhI(6NWxgNL*$BX_u&VCZzgVPN3THKv);ChIZvm(btw6%FJZoua
zfZtBS4ZZK8R$3eA-wRS&AR{YdrONib)z}M}jahy8l;_^2rWRIw0>3s>KnMDv@D*sA
z?)5ueCDrJu8$i<oaw#;OaCnVvsoKylOQE*z7K;cR4#3$29rAsh;Nd=?qPAap8oV&d
z88E|`p|X5yEdZ6leTWRR4dCQinEQcka$AH;--HM5w?%3aDYai^XAW29Fj9Ntoa5H|
z@|9Q**jIf!rS?Ea$E}u--lnUP%HRY<wz$?`8G?FSo$u``(o!MI=UO#N<twQStwO>x
zT}e4`7*=j}#oEX;Ya$FC=uU<*R%;J@gUC2n623bC>$h60BL;yl1C9jX^m*%9Zhz?1
z5%!e9wHoNr1qS#bR0VqvSu|6}!&7=9b+MG%p`_xn?k)T-*x{F>u(Zfx{dfU%xCeIZ
zflXgq&sNQbZaJ`Q1C$?wNzcHzkx+dNURz|*%q@UN`nggM1hfY(B9h}u!kP0>xYA->
zJsY~_z|J3G<M!BR%Zi}<C`^79#y$b(Dq!Z#ZeaN==-$PZdX%bAQW2~HaaUQc*T9qo
zmhvStz~93jfWT>(ceCsiFM@V$-2p(=dIO-<PMHtaYhg|S4DM$SfcA#=O1pF@UhL9%
z&87i(2_Y?`a0Q&X05kGoWUf5`dQ-320^K{qa<ipzx2zEIu!*(WcQ?SHV=(zS82h+A
z06TwzjbFi_zVObg?u@s%%uVb*jcO6=N}%*-cySDjA8il7*4^;ME*SL~Ov`f*z)YiF
z3Yk`2vI|OfTiHct89P}>XDLmWHyZNBcmQA(GH<O!q?kRK3)A!M0a&{Qekk)+#LPXc
zTM4(#T;#h&irL`)FlUNA0LzM@{12~1%xdPe9gf@SXs1VtnZGA2nQjljytNQG1>TC7
z)lQoLoDMY60Q7KEun=@-sbjkAcQ|swqIi0QRh_qg55X!J&>M0evi3|}Jrpf;HpE2h
zjTvaXj+8~);M={<HlqetppRW$t=N&$3L}q0y`Iv7)%L8(?BHzrikBKc)SCd3{aD4?
z3rT#iWdbmd79ZTNM-h9m(CSooK3X(E{Fe`RQ;kRCZ*Bg6$Lo=xNa_oY7!b*N#ncEQ
znJ@VoL6{p`K5NB`k21o>g!tQ-rgEO`3%sPh=#EC7w7(j}yDw>f_Gl^&@8<6|{{WZs
Vg+*=VdDZ{`002ovPDHLkV1g%8p5_1m

literal 0
HcmV?d00001

diff --git a/src/apps/AppSpecialPeople/img/edit-icon.png b/src/apps/AppSpecialPeople/img/edit-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..3b6bb392b40894b4256f9b29b630a8a3d95d38e8
GIT binary patch
literal 1352
zcmV-O1-JT%P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px)0!c(cRA@upT3u`uRTTctOlP;Wlr7TMk`M@C5fe;GOZoAEMzkVo6%&jtCdLQ+
z0j=1GkWdm$eDFa8(O9Fz2f<kXqc3WFLLW?uX>9btL}(-;V!K<~9d@_vc02c&JF{DN
zx7+T_>~?XTr`^ms=YHS4=boQ?hfsiLD9m+=VQeR&tpKfK=CvTI22hnS9|m)Xh%Ny9
z8#DI_RXtl@MS*;WC$|Q4oo|RM*u#P!Vdl*MoZ4a{`jHfRUlaJy=c7?KSey=uV3e0*
z8qYI}CjnHt88nMdlt_68Wq7r=lKysL(>8(re%4m`MHd4v09fo~5C^gm0$%!KP&wJ$
zOmRDUwg~7t`(w<X0NiNDX#O%Z;3ay<=cB<~wsH~}9-DrEh)x4olFL|u-(O?qM{itO
z_T_wb=Oqvf@e>U3767%t;Ov?+2+C8n)pTkug*gdG@F0GhnRBj^T{Ldwh={?oZ!Qv9
z!6n@0v+FqXnOqHKelVLm%_0!cC)a|t{_EiLxfbXeDBfJ>E5DE`m_|T`%9VaTSG;JG
z3v=ds8n`q_TT(-88i8QQIK;p!PR$lmo`A!()#|b2m@@=qhUK_8zko?<hUf1?29A9`
zj`0}dz^+BuxJGj_2NBYgo01v(UjjNGXBN*nvE)Wpf<JmDitq%R>Y551?WjPr-#!T<
z<wUKI4oZEKfGo^nEG`wWw#mwk894ZE1m~|9Y45!naH_Kk%a$m1=OpSSWu+_tO#&lf
zep(pfO}pA|<o>#9;M<?3(6-5o?lVygjfpff$M-JAx)t{GrJ^dGHC5DO5(w&|kD0f)
z0cJ->f<N+J6r&NwosAmyw3Mfj*tTB7;oTJ=2Pu<?&ei&qtz<PLV#q~3ZwEV4!6y}V
zG<ndm%~}cnautVmFM_H#KyMjhp(^zh2yr_gKC*?zp-?vPNfSGpJb3svFMO5c27JN{
zcTi9_USmd=Lu@(4FJCp#op76M!nZeQ=(@iGitT+n+X@j*QcxFPGxOa!5jhaJJYwL;
z=_tk`R;bK;?r6~PY@XnyO(Ob+0wF`z7Jdi#<`vBazO_NafdYU}fEc8JE`ngLDFgvq
z;CEHP`F@=P9npv+FbQUFz65fD-;kJj$H8VEWJIxo5cqS%K=(X8-?|XstxaGO$jgNc
z0qpMy<H~4yW=+nUOkB_0S3tK(T@cfS^4P?&IOB(3<EUS%;KdK3n3zgm?ga&J4K<io
z7(M&T6i$3Gf&KTEV^y7Ml9)`8C<1sZjOLTbWLf<4#c6XY_T5vC)sjSS6fNsDbS{+J
zq%5+T$O571c7Pn062l>Z$6gO3HB~*nvm8xp%CKUY>ZmYt9|5_;burib-6VRykC|i3
zxZdP1!(B}t+<LS9#>72vQ`0Ku<S(b?v}{cFz7aONA?fR_8$777-;Csm+ftt?r{y1~
z4UHZZxHv4(u)3^Bt}>f*T0>K;ma-sIZy8B%DJ?g$-_!?nftNoW$M|ISYSS)I*@3lf
z@}O<Avr1-GQ*RP*aI6xF2=sh4f$^z42>{s9=t0XZ9=n{ST=ruXlSC;WY)Jwof3zq`
z{Fe`Ry`*f+ytVoN9j_;MQ%PTNq>?DvE2boglD_0ilCU<m=i}mCe9!=Bsy*{ICR?(w
z-C~#YMRzLmlKs>mbNNd4V~=cpXq|9lJCU&YxsB2%R21ZMn|}ajdxQs}H=gwX0000<
KMNUMnLSTZ-3VNde

literal 0
HcmV?d00001


From 9dc13a5faeee934f63f85b03ada8b46eef74ed0c Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Mon, 14 Mar 2022 20:15:06 +0800
Subject: [PATCH 04/11] BUG 28182

---
 src/apps/AppSpecialPeople/components/detail.vue | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/apps/AppSpecialPeople/components/detail.vue b/src/apps/AppSpecialPeople/components/detail.vue
index 284ea7c3..0264d6a4 100644
--- a/src/apps/AppSpecialPeople/components/detail.vue
+++ b/src/apps/AppSpecialPeople/components/detail.vue
@@ -52,16 +52,15 @@
           <img src="../img/down-icon.png" alt="" :class="item.check ? 'img-active' : ''"/>
         </div>
         <div class="user-list" v-if="item.check">
-          <div class="user-item" v-for="(e, indexs) in item.value" :key="indexs" v-if="item.value && item.value.length">
+          <div class="user-item" v-for="(e, indexs) in item.value" :key="indexs" @click="showDetail(e)">
             <div class="user-img">
               <img src="../img/user-img.png" alt=""/>
             </div>
             <div class="user-info">
               <p class="name">{{ e.name }}
-                <!--<span class="btn-icon" v-if="gridType != 0 && user.wxUserId == e.createUserId">-->
-                <span class="btn-icon">
-                  <img src="../img/edit-icon.png" alt="" @click="toEdit(e,item.dictValue)">
-                  <img src="../img/del-icon.png" alt="" @click="del(e,item.dictValue)">
+                <span class="btn-icon" v-if="gridType != 0 && user.wxUserId == e.createUserId">
+                  <img src="../img/edit-icon.png" alt="" @click.stop="toEdit(e,item.dictValue)">
+                  <img src="../img/del-icon.png" alt="" @click.stop="del(e,item.dictValue)">
                 </span>
               </p>
               <div class="phone">
@@ -221,6 +220,9 @@ export default {
         }
       })
     },
+    showDetail(e){
+      uni.navigateTo({url:`/mods/AppPeopleList/DetailCard?id=${e.id}`})
+    }
   },
 }
 </script>

From e5c0470c38271daeb2c58b6f1756673e5a5038c5 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Mon, 14 Mar 2022 20:17:14 +0800
Subject: [PATCH 05/11] BUG 28176

---
 src/apps/AppSpecialPeople/add.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/apps/AppSpecialPeople/add.vue b/src/apps/AppSpecialPeople/add.vue
index 29e693c4..1fea3dba 100644
--- a/src/apps/AppSpecialPeople/add.vue
+++ b/src/apps/AppSpecialPeople/add.vue
@@ -414,7 +414,7 @@ export default {
             }
             if (items.type == 'upload' && this.formData[items.fieldDbName]?.length) { //附件 只传id
               let files = []
-              this.formData[items.fieldDbName].map((item) => {
+                  [this.formData[items.fieldDbName]].flat().map((item) => {
                 files.push(item.url)
               })
               this.formData[items.fieldDbName] = files?.toString()

From e468bdca51a9fb6143f7022b26f3493e1ab42699 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Mon, 14 Mar 2022 20:23:00 +0800
Subject: [PATCH 06/11] BUG 28177

---
 src/apps/AppSpecialPeople/add.vue  | 14 +++++++++++---
 src/apps/AppWalkask/selectType.vue |  2 +-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/apps/AppSpecialPeople/add.vue b/src/apps/AppSpecialPeople/add.vue
index 1fea3dba..5525c626 100644
--- a/src/apps/AppSpecialPeople/add.vue
+++ b/src/apps/AppSpecialPeople/add.vue
@@ -213,9 +213,18 @@ export default {
     this.getType()
   },
   onShow() {
-    document.title = this.isEdit ? "编辑人员" : '新增人员'
+    this.appId = this.$route.query.appId
+    if (this.isEdit) {
+      document.title = "编辑人员"
+      this.getDetail()
+    } else {
+      document.title = '新增人员'
+      if (this.appId) {
+        this.typeConfirm([this.$route.query])
+      }
+    }
+
 
-    this.getDetail()
   },
   methods: {
     ...mapActions(['selectEnterpriseContact']),
@@ -479,7 +488,6 @@ export default {
       }).then(res => {
         if (res?.data) {
           this.formData = res.data
-          this.appId = appId
         }
       })
     }
diff --git a/src/apps/AppWalkask/selectType.vue b/src/apps/AppWalkask/selectType.vue
index dabce8ac..bd0496e0 100644
--- a/src/apps/AppWalkask/selectType.vue
+++ b/src/apps/AppWalkask/selectType.vue
@@ -174,7 +174,7 @@ export default {
       this.getUsers()
     },
     gotoSpecialPersion() {
-      uni.navigateTo({url: '/apps/AppSpecialPeople/add'})
+      uni.navigateTo({url: `/apps/AppSpecialPeople/add?appId=${this.appId}&appName=${this.applicationName}`})
     }
   },
 }

From 6be9eda1e153beb22a6e70cfc27f2f0944f6f865 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Mon, 14 Mar 2022 20:26:16 +0800
Subject: [PATCH 07/11] BUG 28179

---
 src/apps/AppSpecialPeople/add.vue  | 6 +++++-
 src/apps/AppWalkask/selectType.vue | 5 +++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/apps/AppSpecialPeople/add.vue b/src/apps/AppSpecialPeople/add.vue
index 5525c626..b164a516 100644
--- a/src/apps/AppSpecialPeople/add.vue
+++ b/src/apps/AppSpecialPeople/add.vue
@@ -460,7 +460,11 @@ export default {
           this.$u.toast('提交成功')
           uni.$emit('specialPeopleList')
           setTimeout(() => {
-            uni.navigateBack({})
+            uni.navigateBack({
+              success: () => {
+                uni.$emit("selectType")
+              }
+            })
           }, 600)
         }
       })
diff --git a/src/apps/AppWalkask/selectType.vue b/src/apps/AppWalkask/selectType.vue
index bd0496e0..b50139c2 100644
--- a/src/apps/AppWalkask/selectType.vue
+++ b/src/apps/AppWalkask/selectType.vue
@@ -82,8 +82,6 @@ export default {
   onLoad() {
     this.getTypeList()
   },
-  onShow() {
-  },
   methods: {
     userClick(row, index) {
       if (this.userList[index].isChecked) {
@@ -174,6 +172,9 @@ export default {
       this.getUsers()
     },
     gotoSpecialPersion() {
+      uni.$once("selectType", () => {
+        this.getUsers()
+      })
       uni.navigateTo({url: `/apps/AppSpecialPeople/add?appId=${this.appId}&appName=${this.applicationName}`})
     }
   },

From c7e3d118c0b6056128667a262d21383b17a29f4c Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Mon, 14 Mar 2022 20:35:00 +0800
Subject: [PATCH 08/11] BUG 28186

---
 src/components/AiAreaPicker.vue | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/components/AiAreaPicker.vue b/src/components/AiAreaPicker.vue
index 61363c9c..25a0867d 100644
--- a/src/components/AiAreaPicker.vue
+++ b/src/components/AiAreaPicker.vue
@@ -3,6 +3,9 @@
     <ai-search-popup mode="bottom" ref="areaSelector" length="85%">
       <div slot="btn" @tap="handleInit">
         <slot v-if="$slots.default"/>
+        <div v-else-if="isForm">
+          <u-icon name="arrow-right" :label="areaName||'请选择'" label-pos="left" color="#ddd"/>
+        </div>
         <div v-else class="areaSelector">
           <image :src="locationIcon" class="location"/>
           <div v-text="areaName"/>
@@ -57,7 +60,10 @@ export default {
     name: {default: ''},
     value: String,
     all: Boolean,
-    icon: {default: "location.svg"}
+    icon: {default: "location.svg"},
+    isForm: Boolean,
+    valueLevel: {default: 5},
+    fullName: {default: ''}
   },
   computed: {
     ...mapState(['user']),
@@ -102,9 +108,9 @@ export default {
       v && (this.getFullArea())
     },
 
-    value (v) {
+    value(v) {
       if (this.list.length && v) {
-        this.areaName = this.list.find((e) => e.id ==  this.value).name
+        this.areaName = this.list.find((e) => e.id == this.value).name
       }
     },
 
@@ -118,7 +124,7 @@ export default {
       }
     }
   },
-  mounted () {
+  mounted() {
     this.handleInit()
   },
   methods: {
@@ -126,7 +132,7 @@ export default {
       this.handleInit()
       this.$refs.areaSelector.showPopup()
     },
-    scrollHeight () {
+    scrollHeight() {
       this.height = document.querySelector('.areaSelector') && `calc(100% - ${document.querySelector('.areaSelector').offsetHeight}px)`
     },
     getFullArea() {
@@ -156,10 +162,10 @@ export default {
       }).then((res) => {
         if (res.data.length) {
           this.list = res.data
-          let self = this.fullArea.find((e) => e.id ==  this.areaId)
-          
+          let self = this.fullArea.find((e) => e.id == this.areaId)
+
           if (this.value && !this.areaName && this.value !== this.areaId) {
-            this.areaName = this.list.find((e) => e.id ==  this.value).name
+            this.areaName = this.list.find((e) => e.id == this.value).name
           }
           if (!this.areaName && this.value === this.areaId) {
             this.areaName = self.name
@@ -204,7 +210,7 @@ export default {
     },
     getChild(op) {
       if (op.id != this.index) {
-        if (op.type < 5 && (/0{3}$/g.test(this.index) || !this.index)) {
+        if (op.type <= this.valueLevel && op.type < 5 && (/0{3}$/g.test(this.index) || !this.index)) {
           this.fullArea.push(op)
           this.getChildAreas(op.id)
         }
@@ -213,7 +219,7 @@ export default {
       }
 
       this.$nextTick(() => {
-        
+
         this.scrollHeight()
       })
     },

From 9af707fa886d0f6f11435a4822777587d66e228b Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Tue, 15 Mar 2022 08:31:53 +0800
Subject: [PATCH 09/11] 28205

---
 src/apps/AppPeopleList/DetailCard.vue | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/apps/AppPeopleList/DetailCard.vue b/src/apps/AppPeopleList/DetailCard.vue
index 54cc041c..e7f5c2cc 100644
--- a/src/apps/AppPeopleList/DetailCard.vue
+++ b/src/apps/AppPeopleList/DetailCard.vue
@@ -199,9 +199,7 @@ export default {
         }
         .spacial {
           margin-top: 10px;
-          overflow:hidden;
-          text-overflow:ellipsis;
-          white-space:nowrap;
+          white-space: wrap;
           span {
             margin-right: 10px;
             color: #ff4466;

From d2776593c58afe009e25d5ea6f520cd1576f7514 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Tue, 15 Mar 2022 08:36:33 +0800
Subject: [PATCH 10/11] 28200

---
 src/apps/AppPeopleList/DetailPeople.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/apps/AppPeopleList/DetailPeople.vue b/src/apps/AppPeopleList/DetailPeople.vue
index 0042c425..0a571c9e 100644
--- a/src/apps/AppPeopleList/DetailPeople.vue
+++ b/src/apps/AppPeopleList/DetailPeople.vue
@@ -135,7 +135,7 @@
     </div>
     <!-- 特殊人群 -->
     <div v-if="tabIndex != 0 &&  tabList &&  tabList.length">
-      <div v-for="(item,index) in tabList" :key="index" class="spacial">
+      <div class="spacial" v-for="(item,index) in tabList" :key="index" v-if="tabIndex == index">
         <div class="specialList" v-for="(t,indexs) in item.tableInfos" :key="indexs" v-if="item.tableInfos && item.tableInfos.length">
           <div class="spacial-row">
             <div>{{ t.fieldName }}</div>

From 8d6a4ddfb5463b2bdb3951ac6d00f67be36be5cb Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 15 Mar 2022 09:11:46 +0800
Subject: [PATCH 11/11] BUG 28174

---
 src/apps/AppSpecialPeople/add.vue   | 2 +-
 src/components/pages/selectGird.vue | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/apps/AppSpecialPeople/add.vue b/src/apps/AppSpecialPeople/add.vue
index b164a516..55ac7217 100644
--- a/src/apps/AppSpecialPeople/add.vue
+++ b/src/apps/AppSpecialPeople/add.vue
@@ -160,7 +160,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)">
+              <AiPagePicker type="gird" @select="v=>handleSelectGird(v,item)" isMyGird>
                 <u-icon :label="formData[item.fieldDbName + '_name'] || item.fieldTips || '选择网格' "
                         name="arrow-right" label-pos="left" color="#ccc"/>
               </AiPagePicker>
diff --git a/src/components/pages/selectGird.vue b/src/components/pages/selectGird.vue
index 27c2e198..0d4d4ed3 100644
--- a/src/components/pages/selectGird.vue
+++ b/src/components/pages/selectGird.vue
@@ -73,7 +73,6 @@ export default {
     }
   },
   onLoad(params) {
-    console.log(params)
     if (params.girdLevel) {
       this.girdLevel = params.girdLevel
     }
@@ -85,7 +84,7 @@ export default {
       this.isDisabledOneGird = params.isDisabledOneGird
     }
     this.isGirdUser()
-    
+
   },
   methods: {
     isGirdUser() {
@@ -98,7 +97,6 @@ export default {
             } else {
               this.getTree()
             }
-
           } else {
             this.$u.toast('当前人员不是网格员或网格管理员')
           }
@@ -108,7 +106,7 @@ export default {
     getMyGird() {
       this.selectList = []
       this.$http.post('/app/appgirdmemberinfo/queryMyGirdListByLevel2AndUser').then((res) => {
-        if (res.code == 0) {
+        if (res?.data) {
           this.allData = res.data
           this.treeInit()
         }