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

src/common/modules.js

@@ -26,7 +26,7 @@ export const config = {
         if (!!params?.action) {
           action = params.action
           delete params.action
-        } else if (!!params.suiteId) {
+        } else if (!!params?.suiteId) {
           action = "/app/wxcptp/portal/agentSign"
         }
         return http.post(action, null, {

src/project/police/AppMessageNotification/chooseUser.vue

@@ -10,22 +10,15 @@
         </AiAreaPicker>
       </div>
       <div class="area-flex">
-        <p class="title">部门</p>
+        <p class="title">部门/人员</p>
-        <div class="value">
+        <AiPagePicker type="custom" :selected.sync="deptUserList" nodeKey="id" :ops="{url:'./selectDeptUser',label:'name'}" valueObj>
-          <AiPagePicker type="dept" :selected.sync="deptList" nodeKey="id" :isRequire="0">
+          <!-- <div class="item active" v-for="item in deptUserList" :key="item.id">{{ item.name }}</div>
-            <AiMore v-model="moreTextDept"/>
+          <AiMore v-if="deptUserList.length==0" class="right"/> -->
-          </AiPagePicker>
+          <span class="label" v-if="deptUserList.length">已选择</span>
-        </div>
+          <span v-else style="color:#999;">请选择</span>
+          <u-icon name="arrow-right" color="#999" size="24" style="margin-left:8px;"/>
+        </AiPagePicker>
       </div>
-      <div class="area-flex">
-        <p class="title">人员</p>
-        <div class="value">
-          <AiPagePicker type="sysUser" :selected.sync="userList" action="/app/wxcp/wxuser/list?status=1" nodeKey="id" :isRequire="0">
-            <AiMore v-model="moreText"/>
-          </AiPagePicker>
-        </div>
-      </div>
-
       <div class="type-content">
         <div class="type-list" v-for="(item, index) in tagList" :key="index">
           <p>{{ item.name }}</p>
@@ -48,6 +41,7 @@ import {mapState} from 'vuex'
 
 export default {
   name: "chooseUser",
+  appName: "条件选择",
   data() {
     return {
       value: '',
@@ -62,23 +56,27 @@ export default {
   },
   computed: {
     ...mapState(['user']),
-    moreText() {
+    deptUserList: {
-      if (this.userList.length) return '已选择'
+      set(v) {
-    },
+        this.userList = v.filter(e => e.kind == 'user')
-    moreTextDept() {
+        this.deptList = v.filter(e => e.kind == 'dept')
-      if (this.deptList.length) return '已选择'
+      },
-    },
+      get() {
+        let {userList, deptList} = this
+        return [userList, deptList].flat()
+      }
+    }
   },
   methods: {
+    toSelectDept() {
+      uni.navigateTo({url: `./selectDeptUser`})
+    },
     getTagList() {
       this.$http.post("/app/wxcp/wxcorptag/listAll?size=100").then(res => {
         if (res?.code == 0) {
           res.data.records.map((item) => {
             item.tagList.map((items) => {
-              items.isCheck = false
+              items.isCheck = this.tagIdList.includes(items.id);
-              if (this.tagIdList.includes(items.id)) {
-                items.isCheck = true
-              }
             })
           })
           this.tagList = res.data.records
@@ -281,5 +279,8 @@ export default {
     font-size: 28px !important;
   }
 
+  .right {
+    float: right;
+  }
 }
 </style>

src/project/police/AppMessageNotification/selectDeptUser.vue

@@ -0,0 +1,281 @@
+<template>
+  <section class="selectDeptUser">
+    <div class="header-middle">
+      <div class="hint">
+        <span v-for="(item, index) in selectDeptPath" :key="index">
+          <span v-if="index>0" class="mar-h4">/</span>
+          <span class="color-3F8DF5" @click="deptNameClick(item, index)">{{ item.name }}</span>
+        </span>
+      </div>
+      <div class="cards" v-for="item in treeList" :key="item.id" @click="itemClick(item)">
+        <div class="imges">
+          <div class="imgselect" :class="{checked:item.isChecked}" @click.stop="itemCheck(item, 'dept')"/>
+          <img src="./components/img/gird--select-icon.png" alt="" class="avatras"/>
+        </div>
+        <div class="rightes">
+          <div class="applicationNames">{{ item.name }}</div>
+          <img src="./components/img/right-icon.png" alt="" class="imgs"/>
+        </div>
+      </div>
+      <div class="userCards" v-for="e in userList" :key="e.id">
+        <div class="imges">
+          <div class="imgselect" :class="{checked:e.isChecked}" @click.stop="itemCheck(e, 'user')"/>
+          <img src="./components/img/tx@2x.png" alt="" class="avatras"/>
+        </div>
+        <div class="rights fill">
+          <div class="applicationNames" v-text="e.name"/>
+          <div class="idNumbers">{{ e.phone }}</div>
+        </div>
+      </div>
+      <AiEmpty description="暂无数据" v-if="!hasData"/>
+    </div>
+    <div class="subBtn" @click="submit">
+      <div>确定选择</div>
+    </div>
+  </section>
+</template>
+
+<script>
+export default {
+  name: "selectDeptUser",
+  appName: "选择部门/人员",
+  data() {
+    return {
+      selected: [],
+      allData: null,
+      treeList: [],
+      selectDeptPath: [],
+      userList: [],
+    }
+  },
+  computed: {
+    hasData() {
+      return this.treeList?.length > 0 || this.userList?.length > 0
+    }
+  },
+  onLoad() {
+    this.selected = this.$route.query.selected?.map(id => ({id})) || []
+    this.getAllDepts()
+  },
+  methods: {
+    isSelected(id) {
+      return !!this.selected.find(e => e.id == id)
+    },
+    getAllDepts() {
+      this.$http.post('/app/wxcp/wxdepartment/listAll').then((res) => {
+        if (res?.data) {
+          let parents = res.data.map(e => e.parentid)
+          this.allData = res.data.map(e => ({...e, hasChildren: parents.includes(e.id), isChecked: this.isSelected(e.id)}))
+          this.deptInit()
+        }
+      })
+    },
+    deptInit() {
+      this.treeList = this.allData.filter(e => !e.parentid)
+      this.selectDeptPath = [{name: "可选范围", id: ''}]
+    },
+    itemClick({id, name}) {
+      let index = this.selectDeptPath.findIndex(e => e.id == id)
+      if (index == -1) {
+        this.selectDeptPath.push({name, id})
+        this.getDeptsAndUsersByParent(id)
+      }
+    },
+    getDeptsAndUsersByParent(departmentId) {
+      this.treeList = this.allData.filter(e => e.parentid == departmentId)
+      this.userList = []
+      this.$http.post(`/app/wxcp/wxuser/listByDeptId`, null, {
+        params: {departmentId, status: 1}
+      }).then(res => {
+        if (res?.data) {
+          this.userList = res.data.map(e => ({...e, isChecked: this.isSelected(e.id)}))
+        }
+      })
+    },
+    deptNameClick(row, index) {
+      this.userList = []
+      if (!index) { //第一级别
+        this.deptInit()
+      } else {
+        let length = this.selectDeptPath.length - index
+        this.selectDeptPath.splice(index + 1, length)
+        this.getDeptsAndUsersByParent(row.id)
+      }
+    },
+    itemCheck(row, kind) {
+      row.isChecked = !row.isChecked
+      if (row.isChecked) {
+        this.selected.push({...row, kind})
+      } else {
+        let index = this.selected.findIndex(e => e.id == row.id)
+        this.selected.splice(index, 1)
+      }
+      this.$forceUpdate()
+    },
+    submit() {
+      uni.navigateBack({
+        success: () => {
+          uni.$emit("pagePicker:custom", [this.selected].flat())
+        }
+      })
+    },
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.selectDeptUser {
+  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: 0 1px 0 0 #e4e5e6;
+      font-size: 30px;
+      font-weight: 500;
+      word-break: break-all;
+    }
+
+    .empty-div {
+      height: 16px;
+      background: #f5f5f5;
+    }
+
+    .imges {
+      display: flex;
+      align-items: center;
+
+      .imgselect {
+        width: 48px;
+        height: 48px;
+        vertical-align: middle;
+        background-image: url("./components/img/xz.png");
+        background-position: center;
+        background-size: 100% 100%;
+
+        &.checked {
+          background-image: url("./components/img/xzh.png");
+        }
+      }
+
+      .avatras {
+        width: 74px;
+        height: 74px;
+        border-radius: 8px;
+        margin-left: 36px;
+      }
+    }
+
+    .cards {
+      display: flex;
+      align-items: center;
+      height: 120px;
+      line-height: 120px;
+      padding: 0 0 0 32px;
+
+
+      img {
+        width: 74px;
+        height: 74px;
+        border-radius: 8px;
+      }
+
+      .rightes {
+        width: calc(100% - 160px);
+        display: flex;
+        align-items: center;
+        margin-left: 32px;
+        border-bottom: 1px solid #e4e5e6;
+
+        .applicationNames {
+          flex: 1;
+          min-width: 0;
+          font-size: 36px;
+          font-weight: 500;
+          color: #333333;
+          overflow: hidden;
+          white-space: nowrap;
+          text-overflow: ellipsis;
+        }
+
+        .imgs {
+          flex-shrink: 0;
+          width: 40px;
+          height: 40px;
+          margin-right: 20px;
+        }
+      }
+    }
+
+    .userCards {
+      display: flex;
+      align-items: center;
+      height: 120px;
+      line-height: 120px;
+      padding: 0 0 0 32px;
+
+      .rights {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        margin-left: 32px;
+        border-bottom: 1px solid #e4e5e6;
+        padding-right: 40px;
+        height: inherit;
+
+        .applicationNames {
+          font-size: 36px;
+          font-weight: 500;
+          color: #333333;
+          overflow: hidden;
+          white-space: nowrap;
+          text-overflow: ellipsis;
+        }
+
+        .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;
+    }
+  }
+
+  .color-3F8DF5 {
+    color: #3F8DF5;
+  }
+
+  .mar-h4 {
+    margin: 0 4px;
+  }
+}
+</style>

src/project/police/AppPeopleList/Add.vue

@@ -47,7 +47,7 @@
       <div class="border">
         <span class="label">姓名</span>
         <span class="value">
-          <input type="text" placeholder="请输入" v-model="form.name" maxlength="10" :disabled="this.form.id ? true : false">
+          <input type="text" placeholder="请输入" v-model="form.name" maxlength="10">
         </span>
       </div>
     </div>
@@ -56,7 +56,7 @@
       <div class="border">
         <span class="label">身份证号</span>
         <span class="value">
-          <input type="idcard" placeholder="请输入" v-model="form.idNumber" maxlength="18" :disabled="this.form.id ? true : false">
+          <input type="idcard" placeholder="请输入" v-model="form.idNumber" maxlength="18">
         </span>
       </div>
     </div>
@@ -100,7 +100,7 @@
       </div>
     </div>
     <div class="item">
-      <span class="tips"></span>
+      <span class="tips">*</span>
       <div class="border">
         <span class="label">现住址</span>
         <span class="value">
@@ -115,7 +115,7 @@
       </div>
     </div>
     <div class="item">
-      <span class="tips"></span>
+      <span class="tips">*</span>
       <div class="border">
         <span class="label">组</span>
         <span class="value">
@@ -124,7 +124,7 @@
       </div>
     </div>
     <div class="item">
-      <span class="tips"></span>
+      <span class="tips">*</span>
       <div class="border">
         <span class="label">户</span>
         <span class="value">
@@ -249,18 +249,18 @@ export default {
       // if(!this.form.birthDate) {
       //   return this.$u.toast('请选择出生日期')
       // }
-      // if(!this.form.currentAreaId) {
+      if(!this.form.currentAreaId) {
-      //   return this.$u.toast('请选择现住址')
+        return this.$u.toast('请选择现住址')
-      // }
+      }
-      // if(!/[^0]0{0,2}$/.test(this.form.currentAreaId)) {
+      if(!/[^0]0{0,2}$/.test(this.form.currentAreaId)) {
-      //   return this.$u.toast('现住址必须选到村级')
+        return this.$u.toast('现住址必须选到村级')
-      // }
+      }
-      // if(!this.form.currentAddressGroup) {
+      if(!this.form.currentAddressGroup) {
-      //   return this.$u.toast('请输入组')
+        return this.$u.toast('请输入组')
-      // }
+      }
-      // if(!this.form.currentAddressNo) {
+      if(!this.form.currentAddressNo) {
-      //   return this.$u.toast('请输入户')
+        return this.$u.toast('请输入户')
-      // }
+      }
       // if(this.form.householdAreaId && !/[^0]0{0,2}$/.test(this.form.householdAreaId)) {
       //   return this.$u.toast('户籍地必须选到村级')
       // }
@@ -322,9 +322,9 @@ export default {
       this.$http.post(`/app/appresident/detail?id=${this.form.id}`).then(res => {
         if (res.code === 0) {
           this.form = {...res.data.resident}
-          var info = this.$idCardNoUtil.getIdCardInfo(this.form.idNumber)
+          // var info = this.$idCardNoUtil.getIdCardInfo(this.form.idNumber)
-          this.form.birthDate = info.birthday
+          // this.form.birthDate = info.birthday
-          this.form.sex = info.gender
+          // this.form.sex = info.gender
         }
       })
     }

src/project/police/AppPeopleList/AppPeopleList.vue

@@ -127,7 +127,7 @@ export default {
     },
 
     toDetailCard(item) {
-      uni.navigateTo({url: `./DetailCard?id=${item.id}`})
+      uni.navigateTo({url: `./DetailPeople?id=${item.id}`})
     },
 
     changeArea(e) {

src/project/police/AppPeopleList/DetailCard.vue

@@ -1,222 +0,0 @@
-<template>
-  <div class="DetailCard">
-    <div class="top"></div>
-
-    <div class="middle">
-      <div class="hint">家庭地址</div>
-
-      <div class="areaHint">
-        <u-icon name="map-fill" color="#73ABFF"></u-icon>
-        <span style="margin-left: 4px;">{{resident.currentAreaName}}
-          <span v-if="resident.currentAddressGroup">{{resident.currentAddressGroup}}组</span>
-          <span v-if="resident.currentAddressNo">{{resident.currentAddressNo}}户</span>
-        </span>
-      </div>
-    </div>
-
-    <div class="bottom">
-      <div class="hints">家庭成员 {{ data.family && data.family.length }}人</div>
-
-      <div v-if="data.family && data.family.length > 0">
-        <div class="card" v-for="(item, i) in data.family" :key="i" @click="toDetailPeople(item)">
-          <div class="photos">
-            <img :src="item.photo" alt="" v-if="item.photo" />
-            <img src="./components/img/44.png" alt="" v-else />
-          </div>
-
-          <div class="right">
-            <div class="rightTop">
-              <div class="rightTop-lefts">
-                <span class="names">{{ item.name }}</span>
-                <span class="fileStatuss" v-if="item.fileStatus == 1"> 已注销</span>
-                <span class="householdNames" v-if="item.householdName == 1">户主</span>
-                <span class="householdNames" v-else>
-                  {{ $dict.getLabel('householdRelation', item.householdRelation) }}
-                </span>
-              </div>
-
-              <div class="rightTop-rights">
-                <u-section :show-line="false" sub-title="详情"></u-section>
-              </div>
-            </div>
-
-            <div class="rightBottom">
-              <span>身份证号：</span>
-              <span>{{ item.idNumber.replace(/^(\w{6})\w{8}(.*)$/, '$1********$2') }}</span>
-            </div>
-            <!-- <div class="spacial" v-if="item.idNumber == data.resident.idNumber">
-              <span v-for="(e,index) in spacialList" :key="index">{{e.applicationName}}</span>
-            </div> -->
-          </div>
-        </div>
-      </div>
-
-      <AiEmpty v-else></AiEmpty>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'DetailCard',
-  components: {},
-  props: {},
-  data() {
-    return {
-      id: '',
-      data: [],
-      resident: {},
-      // spacialList: [],
-    }
-  },
-  computed: {},
-  watch: {},
-  onLoad(o) {
-    this.id = o.id
-    this.$dict.load('householdRelation', 'fileStatus').then(() => {
-      this.getDetail()
-    })
-  },
-  onShow() {
-    document.title = '居民档案'
-  },
-  methods: {
-    getDetail() {
-      this.$http.post(`/app/appresident/detail?id=${this.id}`).then((res) => {
-        if (res.code == 0) {
-          this.data = res.data
-          this.$forceUpdate()
-          this.$nextTick(() => {
-            this.resident = res.data.resident
-            // this.spacialList = res.data.resident.tsrqInfos
-            this.$forceUpdate()
-          })
-        }
-      })
-    },
-
-    toDetailPeople(item) {
-      uni.navigateTo({ url: `./DetailPeople?id=${item.id}&type=0` })
-    },
-  },
-}
-</script>
-
-<style scoped lang="scss">
-.DetailCard {
-  height: 100%;
-  .top {
-    height: 112px;
-    background: #3975c6;
-  }
-
-  .middle {
-    margin: -80px 32px 0 32px;
-    padding: 38px 30px 78px 28px;
-    background: #ffffff;
-    box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.02);
-    border-radius: 16px;
-    z-index: 999;
-    .hint {
-      font-size: 32px;
-      font-weight: 500;
-      color: #333333;
-    }
-    .areaHint {
-      margin-top: 38px;
-    }
-  }
-
-  .bottom {
-    margin: 32px 30px 48px 30px;
-    background: #fff;
-    padding: 38px 30px 30px 30px;
-    .hints {
-      margin-bottom: 38px;
-    }
-    .card {
-      display: flex;
-      box-shadow: 0 4px 10px 0 rgba(0, 0, 0, 0.08);
-      border-radius: 16px;
-      padding: 48px 32px;
-      margin-bottom: 32px;
-      .photos {
-        img {
-          width: 96px;
-          height: 96px;
-          border-radius: 50%;
-        }
-      }
-
-      .right {
-        display: flex;
-        flex-direction: column;
-        margin-left: 40px;
-        width: 100%;
-        .rightTop {
-          display: flex;
-          justify-content: space-between;
-          .rightTop-lefts {
-            .names {
-              font-size: 32px;
-              font-weight: 600;
-            }
-            .householdNames {
-              margin-left: 30px;
-              font-size: 26px;
-              font-weight: 500;
-              color: #5aad6a;
-            }
-            .fileStatuss {
-              display: inline-block;
-              margin-left: 30px;
-              color: #ff4466;
-              background: #ffecef;
-              border-radius: 8px;
-              width: 88px;
-              height: 40px;
-              line-height: 40px;
-              text-align: center;
-            }
-          }
-          .rightTop-rights {
-            ::v-deep .u-section {
-              .u-section__right-info {
-                color: #3975c6 !important;
-                .u-section__right-info__icon-arrow {
-                  .u-icon {
-                    .u-icon__icon {
-                      color: #3975c6 !important;
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-        .rightBottom {
-          margin-top: 20px;
-        }
-        // .spacial {
-        //   margin-top: 10px;
-        //   white-space: wrap;
-        //   span {
-        //     margin-right: 10px;
-        //     color: #ff4466;
-        //   }
-        // }
-      }
-    }
-    .card:nth-child(2n-1) {
-      // background: royalblue;
-      background: url(http://respub.sinoecare.net/20211222/装饰-20211222162743.png) no-repeat;
-      background-size: 100% 100%;
-    }
-    .card:nth-child(2n) {
-      // background: pink;
-      background: url(http://respub.sinoecare.net/20211222/装饰2-20211222162934.png) no-repeat;
-      background-size: 100% 100%;
-    }
-  }
-}
-</style>

src/project/police/AppPeopleList/DetailPeople.vue

@@ -10,33 +10,12 @@
       <div class="right">
         <div class="rightTop">
           <span class="names">{{ data.resident && data.resident.name }}<span v-if="data.resident.fileStatus == 1" class="fileStatuss"> 已注销 </span></span>
-          <span class="householdNames" v-if="data.resident && data.resident.householdName == 1">户主</span>
-          <span class="householdNames" v-else>
-            {{ $dict.getLabel('householdRelation', data.resident && data.resident.householdRelation) }}
-          </span>
         </div>
-
         <div class="rightBottom" v-if="data.resident && data.resident.phone">{{ data.resident.phone }}</div>
       </div>
     </div>
 
     <div class="line"></div>
-
-    <div class="tab-list">
-      <div v-for="(item, index) in tabList" :key="index" :class="tabIndex == index ? 'tab-item active' : 'tab-item' " @click="tabIndex=index">
-        <div v-if="index == 0">
-          <img :src="item.activeIcon" alt="" v-if="tabIndex==0">
-          <img :src=" item.icon" alt="" v-if="tabIndex!=0">
-        </div>
-        <div v-if="index != 0">
-          <img src="./components/img/tsrq备份@2x.png" alt="" v-if="tabIndex==index && index != 0">
-          <img src="./components/img/tsrq@2x.png" alt="" v-if="tabIndex!=index && index != 0">
-        </div>
-        
-        <p v-if="index==0">{{item.name}}</p>
-        <p v-else class="type">{{item.applicationName}}</p>
-      </div>
-    </div>
     <!-- 基本信息 -->
     <div v-if="tabIndex == 0">
       <div class="middle">
@@ -50,7 +29,22 @@
 
         <div class="item">
           <span>身份证号</span>
-          <span>{{ data.resident && data.resident.idNumber.replace(/^(\w{6})\w{8}(.*)$/, '$1********$2') }}</span>
+          <span>{{ data.resident.idNumber}}</span>
+        </div>
+
+        <div class="item">
+          <span>性别</span>
+          <span v-if="data.resident && data.resident.sex"> {{ $dict.getLabel('sex', data.resident.sex) }}</span>
+        </div>
+
+        <div class="item">
+          <span>出生日期</span>
+          <span v-if="data.resident && data.resident.birthDate"> {{ data.resident.birthDate }}</span>
+        </div>
+
+        <div class="item">
+          <span>年龄</span>
+          <span v-if="data.resident && data.resident.age"> {{ data.resident.age }}</span>
         </div>
 
         <div class="item">
@@ -111,16 +105,6 @@
           <span class="value" v-if="data.resident && data.resident.currentAddressGroup">{{ data.resident.currentAddressGroup }}组{{ data.resident.currentAddressNo }}户</span>
         </div>
 
-        <div class="item">
-          <span class="label">户籍地址</span>
-          <span class="value" v-if="data.resident && data.resident.householdAreaName">{{ data.resident.householdAreaName }}</span>
-        </div>
-
-        <div class="item">
-          <span class="label">户籍详细地址</span>
-          <span class="value" v-if="data.resident && data.resident.householdAddress">{{ data.resident.householdAddress }}</span>
-        </div>
-
         <div class="item" v-if="type == 1 && data.resident.auditStatus != 0">
           <span class="label">处理结果</span>
           <span class="value">{{ data.resident.auditStatus == 1 ? '通过' : '不通过' }}</span>
@@ -167,8 +151,6 @@ export default {
       tabIndex: 0,
     }
   },
-  computed: {},
-  watch: {},
   onLoad(o) {
     this.id = o.id
     this.type = o.type
@@ -180,7 +162,7 @@ export default {
     })
   },
   onShow() {
-    document.title = '家庭成员信息'
+    document.title = '居民详情'
   },
   methods: {
     getDetail() {

src/project/police/AppPeopleList/ExamineList.vue

@@ -1,276 +0,0 @@
-<template>
-  <div class="ExamineList">
-    <AiTopFixed>
-      <u-tabs :list="tabList" :is-scroll="false" :current="currentTabs" height="96" bg-color="#3975C6" inactive-color="#CDDCF0" bar-width="48" active-color="#fff " @change="change"></u-tabs>
-      <div class="middle">
-        <div class="left">
-          <AiAreaPicker v-model="areaId" :areaId="user.areaId" @select="areaSelect" :name.sync="areaName" style="color: #666">
-            <u-icon name="map-fill" color="#3192F4" size="20px" style="vertical-align: text-bottom"></u-icon>
-            <span style="margin-left: 4px" v-if="areaName">{{ areaName }}</span>
-            <span v-else>请选择</span>
-            <u-icon name="arrow-down" color="#666" size="28" style="margin-left: 4px" />
-          </AiAreaPicker>
-        </div>
-        <u-search v-model="keyword" :clearabled="true" placeholder="姓名/联系方式/身份证后6位" :show-action="false" bg-color="#F5F5F5" search-icon-color="#999" color="#999" height="58" @search="handerSearch" @clear="handerClear"></u-search>
-      </div>
-    </AiTopFixed>
-    <div v-if="datas && datas.length > 0" class="list-content">
-      <div class="card" v-for="(item, i) in datas" :key="i" @click="toDetailPeople(item)">
-        <div class="photos">
-          <img :src="item.photo" alt="" v-if="item.photo" />
-          <img src="./components/img/44.png" alt="" v-else />
-        </div>
-        <div class="right">
-          <div class="rightTop">
-            <div class="rightTop-lefts">
-              <span class="names">{{ item.name }}</span>
-              <span class="fileStatuss" v-if="item.fileStatus == 1"> {{ $dict.getLabel('fileStatus', item.fileStatus) }}</span>
-              <span class="householdNames" v-if="item.householdName == 1">户主</span>
-              <span class="householdNames" v-else>非户主</span>
-              <span class="audit-status" :class="'status'+item.auditStatus">{{ $dict.getLabel('auditStatus', item.auditStatus) }}</span>
-            </div>
-
-            <div class="rightTop-rights">
-              <u-section :show-line="false" sub-title="详情"></u-section>
-            </div>
-          </div>
-
-          <div class="rightBottom">
-            <span>身份证号：</span>
-            <span>{{ item.idNumber.replace(/^(\w{6})\w{8}(.*)$/, '$1********$2') }}</span>
-          </div>
-        </div>
-      </div>
-    </div>
-
-    <AiEmpty v-else></AiEmpty>
-  </div>
-</template>
-
-<script>
-import { mapState } from 'vuex'
-export default {
-  name: 'ExamineList',
-  components: {},
-  props: {},
-  data() {
-    return {
-      id: '',
-      datas: [],
-      resident: {},
-      areaId: '',
-      areaName: '',
-      tabList: [
-        {
-          name: '待处理',
-        },
-        {
-          name: '已处理',
-        },
-      ],
-      currentTabs: 0,
-      keyword: ''
-    }
-  },
-  computed: {
-    ...mapState(['user']),
-  },
-  onLoad() {
-    this.areaId = this.user.areaId
-    this.areaName = this.user.areaName
-    this.$dict.load('householdRelation', 'auditStatus').then(() => {
-      this.getList()
-    })
-    uni.$on('updatePeople', () => {
-      this.getListInit()
-    })
-  },
-  onShow() {
-    document.title = '居民档案审核'
-  },
-  methods: {
-    getListInit() {
-      this.current = 1
-      this.datas = []
-      this.getList()
-    },
-    getList() {
-      var auditType = 0 // 0待处理; 2已处理
-      if(this.currentTabs == 1) {
-        auditType = 2
-      }
-      this.$http.post('/app/appresident/list', null, {
-        params: {
-          size: 10,
-          current: this.current,
-          con: this.keyword,
-          areaId: this.areaId,
-          auditType,
-          source: 1
-        },
-      })
-      .then((res) => {
-        if (res.code == 0) {
-          this.datas = this.current > 1 ? [...this.datas, ...res.data.records] : res.data.records
-
-          this.pages = res.data.pages
-        }
-      })
-    },
-
-    change(index) {
-      this.currentTabs = index
-      this.getListInit()
-    },
-
-    toDetailPeople(item) {
-      uni.navigateTo({ url: `./DetailPeople?id=${item.id}&type=1` })
-    },
-
-    areaSelect(e) {
-      this.areaId = e
-      this.getListInit()
-    },
-
-    handerSearch(e) {
-      this.keyword = e
-      this.getListInit()
-    },
-
-    handerClear() {
-      this.keyword = ''
-      this.getListInit()
-    },
-  },
-  onReachBottom() {
-    this.current = this.current + 1
-    this.getList()
-  },
-}
-</script>
-
-<style scoped lang="scss">
-.ExamineList {
-  height: 100%;
-  .list-content{
-    padding: 0 60px;
-    background-color: #fff;
-  }
-  .card {
-    display: flex;
-    box-shadow: 0 4px 10px 0 rgba(0, 0, 0, 0.08);
-    border-radius: 16px;
-    padding: 48px 32px;
-    margin-bottom: 32px;
-    background: url(http://respub.sinoecare.net/20211222/装饰2-20211222162934.png) no-repeat;
-    background-size: 100% 100%;
-    .photos {
-      img {
-        width: 96px;
-        height: 96px;
-        border-radius: 50%;
-      }
-    }
-
-    .right {
-      display: flex;
-      flex-direction: column;
-      margin-left: 40px;
-      width: 100%;
-      .rightTop {
-        display: flex;
-        justify-content: space-between;
-        .rightTop-lefts {
-          width: calc(100% - 100px);
-          .names {
-            font-size: 32px;
-            font-weight: 600;
-            word-break: break-all;
-          }
-          .householdNames {
-            margin-left: 30px;
-            font-size: 26px;
-            font-weight: 500;
-            color: #5aad6a;
-            display: inline-block;
-            width: 100px;
-          }
-          .fileStatuss {
-            display: inline-block;
-            margin-left: 30px;
-            color: #ff4466;
-            background: #ffecef;
-            border-radius: 8px;
-            width: 88px;
-            height: 40px;
-            line-height: 40px;
-            text-align: center;
-          }
-        }
-        .rightTop-rights {
-          width: 100px;
-          ::v-deep .u-section {
-            .u-section__right-info {
-              color: #3975c6 !important;
-              .u-section__right-info__icon-arrow {
-                .u-icon {
-                  .u-icon__icon {
-                    color: #3975c6 !important;
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-      .rightBottom {
-        margin-top: 20px;
-      }
-    }
-  }
-  .middle {
-    display: flex;
-    padding: 24px 32px;
-    .left {
-      width: 220px;
-      display: flex;
-      align-items: center;
-
-      img {
-        width: 48px;
-        height: 48px;
-      }
-    }
-    .u-search {
-      margin-bottom: 0 !important;
-    }
-  }
-
-  ::v-deep .content{
-    padding: 0;
-  }
-
-  .audit-status{
-    display: inline-block;
-    padding: 0 8px;
-    line-height: 40px;
-    background: #EAF0FE;
-    border-radius: 8px;
-    font-size: 24px;
-    font-family: PingFangSC-Regular, PingFang SC;
-  }
-  .status1{
-    color: #3E95FF;
-    background-color: #EAF0FE;
-  }
-  .status0{
-    color: #5AAD6A;
-    background-color: #E9FFED;
-  }
-  .status2{
-    color: #f46;
-    background-color: #FFECEF;
-  }
-
-}
-</style>

src/project/police/AppPeopleList/PeopleList.vue

@@ -1,320 +0,0 @@
-<template>
-  <div class="PeopleList">
-    <AiTopFixed>
-      <div class="areatop">
-        <!-- <div>区域选择</div>
-        <AiAreaPicker v-model="areaId" :areaId="user.areaId" @select="seachObj"></AiAreaPicker>
-        <u-icon name="photo"></u-icon> -->
-        <!-- @select="areaSelect" -->
-        <u-form label-width="auto">
-          <u-form-item label="区域选择" right-icon="arrow-right" class="areaIds">
-            <AiAreaPicker v-model="areaId" :areaId="user.areaId" @input="seachObj" :name.sync="areaName" selectRoot/>
-          </u-form-item>
-        </u-form>
-      </div>
-
-      <div class="line"></div>
-
-      <u-tabs :list="tabList" :is-scroll="false" :current="currentTabs" height="96" @change="change"></u-tabs>
-
-      <div class="seachObjs">
-        <u-search v-model="keyword" :clearabled="true" placeholder="姓名/联系方式/身份证后6位" :show-action="false"
-                  bg-color="#F5F5F5" search-icon-color="#E2E8F1" color="#666" height="58" @search="handerSearch"
-                  @clear="handerClear"></u-search>
-      </div>
-    </AiTopFixed>
-    <div class="dataes" v-if="datas.length > 0">
-      <div class="datass" v-for="(item, iindex) in datas" :key="iindex" @click="toDetailCard(item)">
-        <div class="left">
-          <img :src="item.photo" alt="" v-if="item.photo"/>
-          <img src="./components/img/4.png" alt="" v-else/>
-        </div>
-
-        <div class="right">
-          <div class="rightTop">
-            <span class="name">{{ item.name }}</span>
-            <span class="btn" v-if="user.id == item.createUserId">
-              <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>
-          </div>
-          <div class="rightBottom">
-            <span>{{ item.idNumber.replace(/^(\w{6})\w{8}(.*)$/, '$1********$2') }}</span>
-
-            <span>{{ item.phone }}</span>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="empty" v-else>
-      <img src="https://cdn.cunwuyun.cn/dvcp/h5/no-data.png" alt="">
-      <p>暂无居民信息<br/>点击<span @click="edit('')">新增按钮</span>新增居民信息,也可在管理系统批量导入</p>
-    </div>
-    <!-- <AiEmpty class="emptyWrap" v-else></AiEmpty> -->
-    <div style="height: 60px"></div>
-    <div class="addBtn" @click="edit('')">新增居民</div>
-  </div>
-</template>
-
-<script>
-import {mapState} from 'vuex'
-
-export default {
-  name: 'PeopleList',
-  props: {},
-  data() {
-    return {
-      keyword: '',
-      datas: [],
-      current: 1,
-      size: 10,
-      tabList: [
-        {
-          name: '全部居民',
-        },
-        {
-          name: '本地居民',
-        },
-        {
-          name: '流动人员',
-        },
-      ],
-      currentTabs: 0,
-      areaId: '',
-      areaName: '',
-    }
-  },
-  computed: {
-    ...mapState(['user']),
-  },
-  watch: {},
-  onLoad() {
-    this.areaId = this.user.areaId
-    this.areaName = this.user.areaName
-    uni.$on('reload', () => {
-      this.current = 1
-      this.getList()
-    })
-    this.getList()
-  },
-  onShow() {
-    document.title = '查看居民档案'
-  },
-  methods: {
-    getList() {
-      var residentType = ['', 0, 1][this.currentTabs]
-      this.$http
-      .post('/app/appresident/list', null, {
-        params: {
-          size: 20,
-          current: this.current,
-          con: this.keyword,
-          areaId: this.areaId,
-          residentType: residentType,
-          auditStatus: 1
-        },
-      })
-      .then((res) => {
-        if (res.code == 0) {
-          this.datas = this.current > 1 ? [...this.datas, ...res.data.records] : res.data.records
-
-          this.pages = res.data.pages
-        }
-      })
-    },
-
-    change(index) {
-      this.currentTabs = index
-      this.current = 1
-      this.datas = []
-      this.getList()
-    },
-
-    toDetailCard(item) {
-      uni.navigateTo({url: `./DetailCard?id=${item.id}`})
-    },
-
-    seachObj(e) {
-      this.areaId = e
-      this.current = 1
-      this.getList()
-    },
-
-    handerSearch(e) {
-      this.keyword = e
-      this.current = 1
-      this.getList()
-    },
-
-    handerClear() {
-      this.keyword = ''
-      this.current = 1
-      this.getList()
-    },
-    edit(id) {
-      var residentType = ['', 0, 1][this.currentTabs]
-      uni.navigateTo({url: `./Add?id=${id}&type=${residentType}`})
-    },
-    del(id) {
-      this.$confirm('确定删除该数据?').then(() => {
-        uni.showLoading()
-        this.$http.post(`/app/appresident/delete?ids=${id}`).then((res) => {
-          if (res.code == 0) {
-            this.$u.toast('删除成功！')
-            this.current = 1
-            this.getList()
-          }
-          uni.hideLoading()
-        })
-      }).catch(() => {
-      })
-    }
-  },
-  onReachBottom() {
-    this.current = this.current + 1
-    this.getList()
-  },
-}
-</script>
-
-<style scoped lang="scss">
-.PeopleList {
-  height: 100%;
-
-  .areatop {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-  }
-
-  .line {
-    height: 16px;
-    background: #f5f5f5;
-  }
-
-  .seachObjs {
-    border-bottom: 2px solid #f5f5f5;
-    border-top: 2px solid #f5f5f5;
-    padding: 20px 32px;
-    background: #fff;
-  }
-
-  ::v-deep .u-form {
-    width: 100%;
-
-    .areaIds {
-      .u-form-item__body {
-        .u-form-item--right {
-          .u-form-item--right__content {
-            display: flex;
-            align-items: center;
-
-            .u-form-item--right__content__slot {
-              .AiAreaPicker {
-                width: 100%;
-                display: flex;
-                justify-content: flex-end;
-
-                .areaSelector {
-                  .location {
-                    opacity: 0;
-                  }
-                }
-              }
-            }
-
-            .u-form-item--right__content__icon {
-              margin-bottom: 8px;
-            }
-          }
-        }
-      }
-    }
-  }
-
-  .dataes {
-    background: #fff;
-
-    .datass {
-      display: flex;
-      padding: 24px 32px;
-
-      .left {
-        img {
-          width: 80px;
-          height: 80px;
-          border-radius: 50%;
-        }
-      }
-
-      .right {
-        display: flex;
-        flex-direction: column;
-        margin-left: 32px;
-        width: 100%;
-
-        .rightTop {
-          font-size: 32px;
-          font-weight: 500;
-          color: #333333;
-          display: flex;
-          justify-content: space-between;
-
-          .btn {
-            img {
-              width: 48px;
-              height: 48px;
-              margin-left: 40px;
-            }
-          }
-        }
-
-        .rightBottom {
-          display: flex;
-          justify-content: space-between;
-          margin-top: 8px;
-        }
-      }
-    }
-  }
-
-  .emptyWrap {
-    background: #f5f5f5;
-    margin: 0;
-  }
-
-  .addBtn {
-    width: 100%;
-    height: 112px;
-    line-height: 112px;
-    background: #1365DD;
-    text-align: center;
-    color: #FFF;
-    font-size: 32px;
-    position: fixed;
-    bottom: 0;
-  }
-
-  .empty {
-    height: 100%;
-
-    img {
-      width: 282px;
-      height: 306px;
-      margin: 168px 0 0 234px;
-    }
-
-    p {
-      text-align: center;
-      font-size: 28px;
-      font-family: PingFangSC-Regular, PingFang SC;
-      color: #999;
-      line-height: 44px;
-
-      span {
-        color: #467DFE;
-      }
-    }
-  }
-}
-</style>

src/project/police/AppResidentFile/components/document.vue

@@ -6,8 +6,9 @@
         <div class="fill">
           <b>{{ top.detail.realName || top.detail.name }}</b>
           <u-row>
-            <span class="idNumber" v-html="IDObj.id" />
+            <span class="idNumber">{{resident.idNumber}}</span>
-            <a @tap="showID = !showID">{{ IDObj.btn }}</a>
+            <!-- <span class="idNumber" v-html="IDObj.id" />
+            <a @tap="showID = !showID">{{ IDObj.btn }}</a> -->
           </u-row>
         </div>
       </div>
@@ -30,7 +31,7 @@
         <span v-if="resident.currentAddressNo">{{resident.currentAddressNo}}户</span>
       </AiCell>
     </div>
-    <div class="card">
+    <!-- <div class="card">
       <AiCell title label="家庭信息" />
       <AiCell label="是否户主">{{ $dict.getLabel('householdName', resident.householdName) || '-' }}</AiCell>
       <AiCell label="与户主关系">{{ $dict.getLabel('householdRelation', resident.householdRelation) || '-' }}</AiCell>
@@ -39,7 +40,7 @@
     <div class="card">
       <AiCell title label="家庭成员" />
       <AiTable :data="family" :colConfigs="colConfigs" />
-    </div>
+    </div> -->
   </section>
 </template>