核酸采样，社区管理

src/project/pingchang/AppCheckpointRegistration/AppCheckpointRegistration.vue

@@ -20,7 +20,7 @@
         <div class="item" :class="tabIndex ? 'active' : ''" @click="tabClick(1)">异常人员<span></span></div>
       </div>
       <div class="top-search">
-        <u-search v-model="keyword" :clearabled="true" placeholder="请输入姓名" :show-action="false" bg-color="#F5F5F5" 
+        <u-search v-model="keyword" :clearabled="true" placeholder="请输入姓名/手机号/身份证号" :show-action="false" bg-color="#F5F5F5" 
           search-icon-color="#999" color="#333" height="58" @search="getListInit" @clear="getListInit">
         </u-search>
       </div>

src/project/pingchang/AppCommunityManagement/Add.vue

@@ -2,11 +2,11 @@
   <div class="Add">
     <div class="item mar-b16">
       <div class="label">
-        <span class="tips">*</span>区域选择
+        <span class="tips"></span>区域选择
       </div>
       <div class="value">
-        <AiAreaPicker v-model="areaId" :areaId="user.areaId" @select="areaSelect" :name.sync="areaName" style="color: #666" selectRoot>
+        <AiAreaPicker v-model="form.areaId" :areaId="user.areaId" @select="areaSelect" :name.sync="form.areaName" style="color: #666" selectRoot>
-          <span style="margin-left: 4px" v-if="areaName">{{ areaName }}</span>
+          <span style="margin-left: 4px" v-if="areaName">{{ form.areaName }}</span>
           <span v-else class="color-999">请选择</span>
           <u-icon name="arrow-right" color="#999" size="16" style="margin-left: 4px" />
         </AiAreaPicker>
@@ -17,26 +17,26 @@
         <div class="label">
           <span class="tips">*</span>管控对象
         </div>
-        <div class="value">自动获取</div>
+        <div class="value">{{form.name}}</div>
       </div>
       <div class="item solid">
         <div class="label">
           <span class="tips">*</span>手机号
         </div>
-        <div class="value">自动获取</div>
+        <div class="value">{{form.phone}}</div>
       </div>
       <div class="item solid">
         <div class="label">
           <span class="tips">*</span>身份证号
         </div>
-        <div class="value">自动获取</div>
+        <div class="value">{{form.idNumber}}</div>
       </div>
       <div class="item solid">
         <div class="label">
           <span class="tips">*</span>居家状态
         </div>
-        <div class="value">
+        <div class="value" @click="dictSelectClick('EP_homeStatus2', 'homeStatus')">
-          <span class="color-999">请选择</span>
+          <span :class="form.homeStatus === '' ? 'color-999' : ''">{{ $dict.getLabel('EP_homeStatus2', form.homeStatus) || '请选择'}}</span>
           <u-icon name="arrow-right" color="#999" size="16" style="margin-left: 4px" />
         </div>
       </div>
@@ -44,8 +44,9 @@
         <div class="label">
           <span class="tips">*</span>隔离时间
         </div>
-        <div class="value">
+        <div class="value" @click="showDateSelect=true">
-          <span class="color-999">请选择</span>
+          <span class="color-999" v-if="!form.quarantineBeginTime">请选择</span>
+          <span v-else>{{form.quarantineBeginTime}}至{{form.quarantineEndTime}}</span>
           <u-icon name="arrow-right" color="#999" size="16" style="margin-left: 4px" />
         </div>
       </div>
@@ -53,8 +54,8 @@
         <div class="label">
           <span class="tips">*</span>隔离策略
         </div>
-        <div class="value">
+        <div class="value" @click="dictSelectClick('EP_quarantineStrategy', 'quarantineStrategy')">
-          <span class="color-999">请选择</span>
+          <span :class="form.quarantineStrategy === '' ? 'color-999' : ''">{{ $dict.getLabel('EP_quarantineStrategy', form.quarantineStrategy) || '请选择'}}</span>
           <u-icon name="arrow-right" color="#999" size="16" style="margin-left: 4px" />
         </div>
       </div>
@@ -64,20 +65,24 @@
         <div class="label">
           <span class="tips">*</span>管控人
         </div>
-        <div class="value">自动获取</div>
+        <div class="value">
+          <u-input placeholder="请输入" input-align="right" height="32" maxlength="6" v-model="form.controllerUserName" />
+        </div>
       </div>
       <div class="item solid">
         <div class="label">
           <span class="tips">*</span>联系方式
         </div>
-        <div class="value">自动获取</div>
+        <div class="value">
+          <u-input placeholder="请输入" type="number" input-align="right" height="32" maxlength="11" v-model="form.controllerUserPhone" />
+        </div>
       </div>
       <div class="item">
         <div class="label">
-          <span class="tips">*</span>管控内容
+          <span class="tips"></span>管控内容
         </div>
       </div>
-      <textarea placeholder="请输入详细描述信息"></textarea>
+      <textarea placeholder="请输入详细描述信息" v-model="form.controllerContent"></textarea>
     </div>
     <div class="info" style="padding-bottom: 24px;">
       <div class="item">
@@ -86,14 +91,16 @@
         </div>
       </div>
       <div>
-        <AiUploader :def.sync="files" multiple placeholder="上传图片" :limit="9" action="/admin/file/add2"></AiUploader>
+        <AiUploader :def.sync="form.fileList" multiple placeholder="上传图片" :limit="9" action="/admin/file/add2"></AiUploader>
       </div>
     </div>
     <div class="btn-height"></div>
     <div class="footer">
-      <div class="cancel">解除管理</div>
+      <div class="cancel" @click="submit('2')">解除管理</div>
-      <div class="confirm">保存</div>
+      <div class="confirm" @click="submit('')">保存</div>
     </div>
+    <u-calendar v-model="showDateSelect" mode="range" min-year="2020" max-date="2050-12-31" @change="dateConfirm"></u-calendar>
+    <u-select v-model="showDictSelect" :list="$dict.getDict(selectDictName)" label-name="dictName" value-name="dictValue" @confirm="dictConfirm"></u-select>
   </div>
 </template>
 
@@ -105,22 +112,91 @@ export default {
     return {
       areaId: '',
       areaName: '',
-      files: []
+      files: [],
+
+      id: '',
+      form: {
+        homeStatus: '',
+        quarantineBeginTime: '',
+        quarantineStrategy: ''
+      },
+      showDateSelect: false,
+      showDictSelect: false,
+      selectDictName: '',
+      selectFormName: '',
     }
   },
   computed: {
     ...mapState(['user']),
   },
-  onLoad() {
+  onLoad(option) {
-    this.areaId = this.user.areaId
+    this.id = option.id
-    this.areaName = this.user.areaName
+    this.$dict.load('EP_homeStatus2', 'EP_quarantineStrategy').then(() => {
+      this.id = option.id
+      this.getDetail()
+    })
   },
   onShow() {
-    document.title = '返乡排查'
+    document.title = '排查管理'
   },
   methods: {
+    submit(status) {
+      if(this.form.homeStatus === '') {
+        return this.$u.toast('请选择居家状态')
+      }
+      if(!this.form.quarantineBeginTime) {
+        return this.$u.toast('请选择隔离时间')
+      }
+      if(this.form.quarantineStrategy === '') {
+        return this.$u.toast('请选择隔离策略')
+      }
+      if(!this.form.controllerUserName) {
+        return this.$u.toast('请输入管控人姓名')
+      }
+      if(!this.form.controllerUserPhone) {
+        return this.$u.toast('请输入联系方式')
+      }
+      if(this.form.controllerUserPhone &&  !/^1[0-9]{10,10}$/.test(this.form.controllerUserPhone)) {
+        return this.$u.toast("请输入正确的手机号码");
+      }
+      if( !this.form.fileList.length) {
+        return this.$u.toast('请上传图片')
+      }
+      this.form.status = status
+      this.form.id = this.id
+
+      this.$http.post(`/app/appepidemicpreventionregisterinfo/riskDisposal`, this.form).then((res) => {
+        if (res.code == 0) {
+          this.$u.toast('提交成功')
+          uni.$emit('updateDetail')
+          uni.$emit('updateList')
+          uni.navigateBack()
+        }
+      })
+      
+
+    },
+    getDetail() {
+      this.$http.post(`/app/appepidemicpreventioncommunitymanagement/queryDetailById?id=${this.id}`).then((res) => {
+        if (res.code == 0) {
+          this.form = res.data
+        }
+      })
+    },
+    dateConfirm(e) {
+      this.form.quarantineBeginTime = e.startDate
+      this.form.quarantineEndTime = e.endDate
+    },
+    dictSelectClick(dictName, formName) {
+      this.selectDictName = dictName
+      this.selectFormName = formName
+      this.showDictSelect = true
+    },
+    dictConfirm(e) {
+      this.form[this.selectFormName] = e[0].value
+    },
     areaSelect(e) {
-      this.areaId = e
+      this.form.areaId = e
     },
   },
 }

src/project/pingchang/AppCommunityManagement/AppCommunityManagement.vue

@@ -5,7 +5,7 @@
         inactive-color="#A1C1E8" :bar-style="barStyle" :active-item-style="activeStyle" active-color="#ffffff " @change="change">
       </u-tabs>
       <div class="top-search">
-        <u-search v-model="keyword" :clearabled="true" placeholder="请输入姓名" :show-action="false" bg-color="#F5F5F5" 
+        <u-search v-model="keyword" :clearabled="true" placeholder="请输入姓名/手机号/身份证号" :show-action="false" bg-color="#F5F5F5" 
           search-icon-color="#999" color="#999" height="58" @search="getListInit" @clear="getListInit">
         </u-search>
       </div>
@@ -13,37 +13,43 @@
         <div class="item">
           <AiAreaPicker v-model="areaId" :areaId="user.areaId" @select="areaSelect" :name.sync="areaName" style="color: #666" selectRoot>
             <span style="margin-left: 4px" v-if="areaName">{{ areaName }}</span>
-            <span v-else>地区选择</span>
+            <span v-else style="color:#999;">地区选择</span>
             <u-icon name="arrow-down" color="#666" size="28" style="margin-left: 4px" />
           </AiAreaPicker>
         </div>
-        <div class="item">
+        <div class="item" @click="showTypeSelect=true">
-          <span>数据类型</span>
+          <span v-if="infoType === ''" style="color:#999;">数据类型</span>
+          <span v-else>{{ $dict.getLabel('EP_registerInfoType', infoType) }}</span>
           <u-icon name="arrow-down" color="#666" size="28" style="margin-left: 4px" />
         </div>
       </div>
     </AiTopFixed>
-    <div class="data-list">
+    <div class="data-list" v-if="list && list.length">
-      <div class="item">
+      <div class="item" v-for="(item, index) in list" :key="index" @click="toDetail(item.id)">
         <div class="top">
           <div class="title">
             <div class="name">
-              李主任
+              {{item.name}}
-              <span class="type">返乡登记</span>
+              <span class="type">{{$dict.getLabel('EP_registerInfoType', item.infoType)}}</span>
+            </div>
+            <div class="status" :class="'status'+item.queryType">
+              <span class="cir"></span>
+              <span v-if="item.queryType == 1">核酸采样{{item.nucleicAcidSamplingCount}}次</span>
+              <span v-else>核酸未采样</span>
             </div>
-            <div class="status status0"><span></span>核酸待采样</div>
           </div>
-          <p>429012********2341</p>
+          <p> {{item.idNumberText}}</p>
-          <p>1834912340</p>
+          <p> {{item.phone}}</p>
-          <div class="btn" @click="toAdd()">排查</div>
+          <div class="btn" v-if="item.status != 2" @click="toEdit(item.id)">排查</div>
-          <!-- <img src="./components/img/status-img.png" alt="" class="status-img"> -->
+          <img src="./components/img/status-img.png" alt="" class="status-img" v-else>
         </div>
         <div class="bottom">
-          <div class="text">管控人：<span>李在</span>2023-05-04 09:23</div>
+          <div class="text">管控人：<span> {{item.controllerUserName}}</span> {{item.createTime}}</div>
         </div>
       </div>
     </div>
-    <!-- <AiEmpty description="暂无数据" class="emptyWrap" v-else></AiEmpty> -->
+    <AiEmpty description="暂无数据" class="emptyWrap" v-else></AiEmpty>
+    <u-select v-model="showTypeSelect" :list="$dict.getDict('EP_registerInfoType')" label-name="dictName" value-name="dictValue" @confirm="typeConfirm"></u-select>
   </div>
 </template>
 
@@ -54,9 +60,13 @@ export default {
  appName: '社区管理',
   data() {
     return {
+      areaId: '',
+      areaName: '',
       current: 1,
       keyword: '',
       currentTabs: 0,
+      infoType: '',
+      showTypeSelect: false,
       tabList: [
         {
           name: '待管理',
@@ -76,16 +86,22 @@ export default {
       },
       activeStyle: {
         'font-weight' : '400',
-      }
+      },
+      list: []
     }
   },
   computed: {
     ...mapState(['user']),
   },
-  watch: {},
   onLoad() {
     this.areaId = this.user.areaId
     this.areaName = this.user.areaName
+    this.$dict.load('EP_CM_status', 'EP_registerInfoType').then(() => {
+      this.getListInit()
+    })
+     uni.$on('updateList', () => {
+      this.getListInit()
+    })
   },
   onShow() {
     document.title = '社区管理'
@@ -93,29 +109,40 @@ export default {
   methods: {
     getListInit() {
       this.current = 1
-      this.data = []
+      this.list = []
       this.getList()
     },
     getList() {
       this.$http.post('/app/appepidemicpreventioncommunitymanagement/list', null, {
-        params: { size: 10, current: this.current, status: this.currentTabs, areaId: this.areaId, name: this.keyword },
+        params: { size: 10, current: this.current, status: this.currentTabs, areaId: this.areaId, name: this.keyword, infoType: this.infoType },
       }).then((res) => {
         if (res.code == 0) {
-          this.data = this.current > 1 ? [...this.data, ...res.data.records] : res.data.records
+          res.data.records.map((item) => {
+            item.idNumberText = item.idNumber.replace(/(.{6}).*(.{4})/,"$1********$2")
+          })
+          this.list = this.current > 1 ? [...this.list, ...res.data.records] : res.data.records
         }
       })
     },
-    toAdd() {
+    toDetail(id) {
-      uni.navigateTo({url: './Add'})
+      uni.navigateTo({url: `./Detail?id=${id}`})
+    },
+    toEdit(id) {
+      uni.navigateTo({url: `./Add?id=${id}`})
     },
     change(index) {
       this.keyword = ''
       this.currentTabs = index
+      this.getListInit()
     },
     areaSelect(e) {
       this.areaId = e
       this.getListInit()
     },
+    typeConfirm(e) {
+      this.infoType = e[0].value
+      this.getListInit()
+    }
   },
   onReachBottom() {
     this.current++
@@ -193,7 +220,7 @@ export default {
             line-height: 20px;
             font-family: PingFangSC-Regular;
             font-size: 28px;
-            span {
+            .cir {
               display: inline-block;
               width: 8px;
               height: 8px;
@@ -203,13 +230,13 @@ export default {
           }
           .status0 {
             color: #FFA938;
-            span {
+            .cir {
               background-color: #FFA938;
             }
           }
           .status0 {
             color: #1CCEB0;
-            span {
+            .cir {
               background-color: #1CCEB0;
             }
           }

src/project/pingchang/AppCommunityManagement/Detail.vue

@@ -0,0 +1,236 @@
+<template>
+  <div class="Detail">
+    <div class="info">
+      <div class="title">基本信息</div>
+      <div class="item-flex">
+        <div class="label">管理区域</div>
+        <div class="value">{{info.areaName}}</div>
+      </div>
+      <div class="item-flex">
+        <div class="label">管理对象</div>
+        <div class="value">{{info.name}}</div>
+      </div>
+      <div class="item-flex">
+        <div class="label">身份证号</div>
+        <div class="value">{{info.idNumberText}}</div>
+      </div>
+      <div class="item-flex">
+        <div class="label">手机号码</div>
+        <div class="value" style="color:#4181FF;" @click="callPhone(info.phone)">
+          <img :src="$cdn + 'common/phone.png'" alt="" class="phone-icon" >
+          {{info.phone}}</div>
+      </div>
+      <div class="item-flex">
+        <div class="label">居家状态</div>
+        <div class="value">{{$dict.getLabel('EP_homeStatus2', info.homeStatus)}}</div>
+      </div>
+      <div class="item-flex">
+        <div class="label">隔离时间</div>
+        <div class="value">{{info.quarantineBeginTime}}至{{info.quarantineEndTime}}</div>
+      </div>
+      <div class="item-flex">
+        <div class="label">隔离策略</div>
+        <div class="value">{{$dict.getLabel('EP_quarantineStrategy', info.quarantineStrategy)}}</div>
+      </div>
+    </div>
+    <div class="line-bg"></div>
+    <div class="info">
+      <div class="item-flex">
+        <div class="label">管控内容</div>
+      </div>
+      <p style="padding-bottom: 12px;">{{info.controllerContent}}</p>
+      <div class="img-list" v-for="(item, index) in info.fileList" :key="index">
+        <img :src="item.accessUrl" alt="" @click="previewImage(info.fileList, item.accessUrl)">
+      </div>
+    </div>
+
+    <div class="footer" v-if="info.status != 2">
+      <div class="cancel" @click="toEdit()">编辑</div>
+      <div class="confirm" @click="changeStatus()">解除管理</div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+
+export default {
+  data() {
+    return {
+      id: '',
+      info: {},
+    }
+  },
+  computed: { ...mapState(['user']) },
+  onShow() {
+    document.title = '管理信息'
+  },
+  onLoad(option) {
+    this.$dict.load('EP_homeStatus2', 'EP_quarantineStrategy').then(() => {
+      this.id = option.id
+      this.getDetail()
+    })
+    uni.$on('updateDetail', () => {
+      this.getDetail()
+    })
+  },
+  methods: {
+    getDetail() {
+      this.$http.post(`/app/appepidemicpreventioncommunitymanagement/queryDetailById?id=${this.id}`).then((res) => {
+        if (res.code == 0) {
+          this.info = res.data
+          this.info.idNumberText = res.data.idNumber.replace(/(.{6}).*(.{4})/,"$1********$2")
+        }
+      })
+    },
+    changeStatus() {
+      this.info.status = 2
+      this.$http.post(`/app/appepidemicpreventioncommunitymanagement/troubleshooting`, this.info).then((res) => {
+        if (res.code == 0) {
+          this.$u.toast('提交成功')
+          uni.$emit('updateList')
+          this.getDetail()
+        }
+      })
+    },
+    callPhone(phone) {
+      uni.makePhoneCall({phoneNumber: phone})
+    },
+    previewImage(images, img) {
+      uni.previewImage({
+        urls: images.map(v => v.url),
+        current: img
+      })
+    },
+    toEdit() {
+      uni.navigateTo({url: `./Add?id=${this.id}`})
+    }
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.Detail {
+  .info{
+    background-color: #fff;
+    padding: 0 32px;
+    .title{
+      line-height: 116px;
+      background: #FFF;
+      font-size: 38px;
+      font-family: PingFangSC-Semibold, PingFang SC;
+      font-weight: 600;
+      color: #333;
+    }
+    .item-flex{
+      padding: 34px 0;
+      border-bottom: 1px solid #ddd;
+      display: flex;
+      justify-content: space-between;
+      line-height: 44px;
+      font-size: 32px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      .label{
+        width: 206px;
+        color: #999;
+      }
+      .value{
+        width: calc(100% - 206px);
+        word-break: break-all;
+        color: #333;
+        text-align: right;
+        .phone-icon{
+          width: 40px;
+          height: 40px;
+          vertical-align: middle;
+          margin-right: 8px;
+        }
+      }
+      .color-0{
+        color: #42D784;
+      }
+      .color-1{
+        color: #f46;
+      }
+      .color-2{
+        color: #1365DD;
+      }
+    }
+    .img-list{
+      padding-bottom: 32px;
+      img{
+        width: 320px;
+        height: 320px;
+      }
+    }
+    .item-flex:nth-last-of-type(1){
+      border-bottom: 0;
+    }
+    .error-list {
+      padding-bottom: 48px;
+      .item {
+        width: 100%;
+        background: #f4f7fe;
+        border-radius: 8px;
+        padding: 24px 24px 18px 24px;
+        box-sizing: border-box;
+        margin-bottom: 16px;
+        color: #343d65;
+        font-size: 28px;
+        font-family: PingFangSC-Regular, PingFang SC;
+        line-height: 40px;
+        div {
+          display: flex;
+          justify-content: space-between;
+          margin-bottom: 16px;
+        }
+      }
+    }
+    .text-p{
+      line-height: 44px;
+      color: #333;
+      padding-bottom: 16px;
+    }
+  }
+  .line-bg{
+    width: 100%;
+    height: 24px;
+    background-color: #F3F6F9;
+  }
+  .footer {
+    width: 100%;
+    height: 128px;
+    background: #FFF;
+    box-shadow: inset 0 0 0 0 #D4D4D4;
+    padding: 24px 32px;
+    box-sizing: border-box;
+    display: flex;
+    position: fixed;
+    bottom: 0;
+    div {
+      flex: 1;
+      height: 80px;
+      line-height: 80px;
+      background: #FFF;
+      border-radius: 8px;
+      font-family: PingFangSC-Regular;
+      font-size: 32px;
+      text-align: center;
+    }
+    .cancel {
+      color: #333;
+      line-height: 76px;
+      border: 1px solid #CCCCCC;
+      box-sizing: border-box;
+      margin-right: 32px;
+    }
+    .confirm {
+      background-color: #1365DD;
+      color: #fff;
+    }
+  }
+  .border-none{
+    border-bottom: 0!important;
+  }
+}
+</style>

src/project/pingchang/AppNucleicAcidSampling/Add.vue

@@ -1,63 +1,48 @@
 <template>
   <div class="Add">
-    <p class="title">已采样<span class="num">3</span>次</p>
+    <p class="title">已采样<span class="num">{{info.nucleicAcidSamplingCount}}</span>次</p>
     <div class="item mar-b16">
       <div class="label">
         <span class="tips">*</span>管理区域
       </div>
-      <div class="value">
+      <div class="value">{{info.areaName}}</div>
-        <AiAreaPicker v-model="areaId" :areaId="user.areaId" @select="areaSelect" :name.sync="areaName" style="color: #666" selectRoot>
-          <span style="margin-left: 4px" v-if="areaName">{{ areaName }}</span>
-          <span v-else class="color-999">请选择</span>
-          <u-icon name="arrow-right" color="#999" size="16" style="margin-left: 4px" />
-        </AiAreaPicker>
-      </div>
     </div>
     <div class="info mar-b16">
       <div class="item solid">
         <div class="label">
           <span class="tips">*</span>管理对象
         </div>
-        <div class="value">自动获取</div>
+        <div class="value">{{info.name}}</div>
       </div>
       <div class="item solid">
         <div class="label">
           <span class="tips">*</span>身份证号
         </div>
-        <div class="value">自动获取</div>
+        <div class="value">{{info.idNumber}}</div>
       </div>
       <div class="item solid">
         <div class="label">
           <span class="tips">*</span>手机号码
         </div>
-        <div class="value">自动获取</div>
+        <div class="value">{{info.phone}}</div>
       </div>
       <div class="item solid">
         <div class="label">
           <span class="tips">*</span>居家状态
         </div>
-        <div class="value">
+        <div class="value">{{ $dict.getLabel('EP_homeStatus2', info.homeStatus)}}</div>
-          <span class="color-999">请选择</span>
-          <u-icon name="arrow-right" color="#999" size="16" style="margin-left: 4px" />
-        </div>
       </div>
       <div class="item solid">
         <div class="label">
           <span class="tips">*</span>隔离时间
         </div>
-        <div class="value">
+        <div class="value">{{info.quarantineBeginTime}}至{{info.quarantineEndTime}}</div>
-          <span class="color-999">请选择</span>
-          <u-icon name="arrow-right" color="#999" size="16" style="margin-left: 4px" />
-        </div>
       </div>
       <div class="item">
         <div class="label">
           <span class="tips">*</span>隔离策略
         </div>
-        <div class="value">
+        <div class="value">{{ $dict.getLabel('EP_quarantineStrategy', info.quarantineStrategy)}}</div>
-          <span class="color-999">请选择</span>
-          <u-icon name="arrow-right" color="#999" size="16" style="margin-left: 4px" />
-        </div>
       </div>
     </div>
     <div class="info mar-b16">
@@ -65,25 +50,33 @@
         <div class="label">
           <span class="tips">*</span>采样人员
         </div>
-        <div class="value">自动获取</div>
+        <div class="value">
+          <u-input placeholder="请输入" input-align="right" height="32" maxlength="6" v-model="form.createUserName" />
+        </div>
       </div>
       <div class="item solid">
         <div class="label">
           <span class="tips">*</span>联系方式
         </div>
-        <div class="value">自动获取</div>
+        <div class="value">
+          <u-input placeholder="请输入" type="number" input-align="right" height="32" maxlength="11" v-model="form.createUserPhone" />
+        </div>
       </div>
-      <div class="item solid">
+      <div class="item">
         <div class="label">
           <span class="tips">*</span>采样时间
         </div>
-        <div class="value">自动获取</div>
+        <div class="value" @click="selectTime(form.createTime)">
+          <span :class="form.createTime === '' ? 'color-999' : ''">{{form.createTime || '请选择'}}</span>
+          <u-icon name="arrow-right" color="#cccccc" size="24"/>
+        </div>
       </div>
     </div>
     <div class="btn-height"></div>
     <div class="footer">
-      <div class="confirm">保存</div>
+      <div class="confirm" @click="submit">保存</div>
     </div>
+    <u-picker mode="time" v-model="dateShow" :params="deteParams" start-year="2020" @confirm="dateConfirm"></u-picker>
   </div>
 </template>
 
@@ -91,26 +84,72 @@
 import { mapState } from 'vuex'
 
 export default {
-  data() {
+   data() {
     return {
-      areaId: '',
+      id: '',
-      areaName: '',
+      info: {},
-      files: []
+      form: {
+        createUserName: '',
+        createUserPhone: '',
+        createTime: ''
+      },
+      dateShow: false,
+      deteParams: {year: true, month: true, day: true, hour: true, minute: true, second: true},
     }
   },
   computed: {
     ...mapState(['user']),
   },
-  onLoad() {
+  onLoad(option) {
-    this.areaId = this.user.areaId
+    this.id = option.id
-    this.areaName = this.user.areaName
+    this.$dict.load('EP_homeStatus2', 'EP_quarantineStrategy').then(() => {
+      this.id = option.id
+      this.getDetail()
+    })
+    var myDate = new Date();
+    this.form.createTime = `${myDate.getFullYear()}-${myDate.getMonth()+1}-${myDate.getDate()} ${myDate.getHours()}:${myDate.getMinutes()}:${myDate.getSeconds()}`
   },
   onShow() {
     document.title = '核酸采样'
   },
   methods: {
-    areaSelect(e) {
+    submit() {
-      this.areaId = e
+      if(!this.form.createUserName) {
+        return this.$u.toast('请输入采样人员')
+      }
+      if(!this.form.createUserPhone) {
+        return this.$u.toast('请输入联系方式')
+      }
+      if(this.form.createUserPhone &&  !/^1[0-9]{10,10}$/.test(this.form.createUserPhone)) {
+        return this.$u.toast("请输入正确的手机号码");
+      }
+      if(!this.form.createTime) {
+        return this.$u.toast('请输入采样时间')
+      }
+      this.form.cmId = this.id
+
+      this.$http.post(`/app/appepidemicpreventioncommunitymanagement/nucleicAcidSamplin`, this.form).then((res) => {
+        if (res.code == 0) {
+          this.$u.toast('提交成功')
+          uni.$emit('updateDetail')
+          uni.$emit('updateList')
+          uni.navigateBack()
+        }
+      })
+      
+    },
+    selectTime() {
+      this.dateShow = true
+    },
+    dateConfirm(e) {
+      this.form.createTime = `${e.year}-${e.month}-${e.day} ${e.hour}:${e.minute}:${e.second}`
+    },
+    getDetail() {
+      this.$http.post(`/app/appepidemicpreventioncommunitymanagement/queryDetailById?id=${this.id}`).then((res) => {
+        if (res.code == 0) {
+          this.info = res.data
+        }
+      })
     },
   },
 }

src/project/pingchang/AppNucleicAcidSampling/AppNucleicAcidSampling.vue

@@ -13,29 +13,32 @@
             <u-icon name="arrow-down" color="#666" size="28" style="margin-left: 4px" />
           </AiAreaPicker>
         </div>
-        <u-search v-model="keyword" :clearabled="true" placeholder="请输入名称、类型或电话" :show-action="false" bg-color="#F5F5F5" 
+        <u-search v-model="keyword" :clearabled="true" placeholder="请输入姓名/手机号/身份证号" :show-action="false" bg-color="#F5F5F5" 
-          search-icon-color="#999" color="#999" height="58" @search="handerSearch" @clear="handerClear">
+          search-icon-color="#999" color="#999" height="58" @search="getListInit" @clear="getListInit">
         </u-search>
       </div>
     </AiTopFixed>
-    <div class="data-list">
+    <div class="data-list" v-if="list && list.length">
-      <div class="item" @click="toDetail()">
+      <div class="item" v-for="(item, index) in list" :key="index" @click="toDetail(item.id)">
         <div class="top">
           <div class="title">
             <div class="name">
-              李主任
+              {{item.name}}
-              <span class="type">返乡登记</span>
+              <span class="type">{{$dict.getLabel('EP_registerInfoType', item.infoType)}}</span>
+            </div>
+             <div class="status" :class="item.nucleicAcidSamplingCount >0 ? 'status1' : 'status0'">
+              <span class="cir"></span>
+              <span v-if="item.nucleicAcidSamplingCount >0">核酸采样{{item.nucleicAcidSamplingCount}}次</span>
+              <span v-else>核酸未采样</span>
             </div>
-            <div class="status status0"><span></span>核酸待采样</div>
           </div>
-          <p>429012********2341</p>
+           <p> {{item.idNumberText}}</p>
-          <p>1834912340</p>
+          <p> {{item.phone}}</p>
-          <div class="btn" @click="toAdd()">采样</div>
+          <div class="btn" @click="toAdd()" v-if="item.status != 2">采样</div>
-          <!-- <img src="./components/img/status-img.png" alt="" class="status-img"> -->
         </div>
       </div>
     </div>
-    <!-- <AiEmpty description="暂无数据" class="emptyWrap" v-else></AiEmpty> -->
+    <AiEmpty description="暂无数据" class="emptyWrap" v-else></AiEmpty>
   </div>
 </template>
 
@@ -46,6 +49,9 @@ export default {
  appName: '核酸采样',
   data() {
     return {
+      areaId: '',
+      areaName: '',
+      current: 1,
       keyword: '',
       currentTabs: 0,
       tabList: [
@@ -64,57 +70,63 @@ export default {
       },
       activeStyle: {
         'font-weight' : '400',
-      }
+      },
+      list: []
     }
   },
   computed: {
     ...mapState(['user']),
   },
-  watch: {},
   onLoad() {
     this.areaId = this.user.areaId
     this.areaName = this.user.areaName
+    this.$dict.load('EP_CM_status', 'EP_registerInfoType').then(() => {
+      this.getListInit()
+    })
+     uni.$on('updateList', () => {
+      this.getListInit()
+    })
   },
   onShow() {
     document.title = '核酸采样'
   },
   methods: {
+    getListInit() {
+      this.current = 1
+      this.list = []
+      this.getList()
+    },
     getList() {
-      this.$http.post('/app/appepidemicreportmember/list', null, {
+      this.$http.post('/app/appepidemicpreventioncommunitymanagement/list', null, {
-        params: { size: this.size, current: this.current, status: this.currentTabs == 1 ? '0' : '', areaId: this.areaId, name: this.keyword },
+        params: { size: 10, current: this.current, queryType: this.currentTabs, areaId: this.areaId, name: this.keyword},
       }).then((res) => {
         if (res.code == 0) {
-          this.data = this.current > 1 ? [...this.data, ...res.data.records] : res.data.records
+          res.data.records.map((item) => {
+            item.idNumberText = item.idNumber.replace(/(.{6}).*(.{4})/,"$1********$2")
+          })
+          this.list = this.current > 1 ? [...this.list, ...res.data.records] : res.data.records
         }
       })
     },
-
+    toDetail(id) {
-    toDetail() {
+      uni.navigateTo({url: `./Detail?id=${id}`})
-      uni.navigateTo({url: './Detail'})
     },
-    toAdd() {
+    toEdit(id) {
-      uni.navigateTo({url: './Add'})
+      uni.navigateTo({url: `./Add?id=${id}`})
     },
     change(index) {
       this.keyword = ''
       this.currentTabs = index
+      this.getListInit()
     },
     areaSelect(e) {
       this.areaId = e
-      this.getList()
+      this.getListInit()
-    },
-
-    handerSearch(e) {
-      this.keyword = e
-      this.current = 1
-      this.getList()
-    },
-
-    handerClear() {
-      this.keyword = ''
-      this.current = 1
-      this.getList()
     },
+    typeConfirm(e) {
+      this.infoType = e[0].value
+      this.getListInit()
+    }
   },
   onReachBottom() {
     this.current++
@@ -179,7 +191,7 @@ export default {
             line-height: 20px;
             font-family: PingFangSC-Regular;
             font-size: 28px;
-            span {
+            .cir {
               display: inline-block;
               width: 8px;
               height: 8px;
@@ -189,13 +201,13 @@ export default {
           }
           .status0 {
             color: #FFA938;
-            span {
+            .cir  {
               background-color: #FFA938;
             }
           }
           .status0 {
             color: #1CCEB0;
-            span {
+            .cir  {
               background-color: #1CCEB0;
             }
           }

src/project/pingchang/AppNucleicAcidSampling/Detail.vue

@@ -4,15 +4,15 @@
       <div class="title">基本信息</div>
       <div class="item-flex">
         <div class="label">管理区域</div>
-        <div class="value">{{info.name}}</div>
+        <div class="value">{{info.areaName}}</div>
       </div>
       <div class="item-flex">
         <div class="label">管理对象</div>
-        <div class="value">{{info.idNumber}}</div>
+        <div class="value">{{info.name}}</div>
       </div>
       <div class="item-flex">
         <div class="label">身份证号</div>
-        <div class="value">{{info.idNumber}}</div>
+        <div class="value">{{info.idNumberText}}</div>
       </div>
       <div class="item-flex">
         <div class="label">手机号码</div>
@@ -22,30 +22,31 @@
       </div>
       <div class="item-flex">
         <div class="label">居家状态</div>
-        <div class="value">{{info.idNumber}}</div>
+        <div class="value">{{$dict.getLabel('EP_homeStatus2', info.homeStatus)}}</div>
       </div>
       <div class="item-flex">
         <div class="label">隔离时间</div>
-        <div class="value">{{info.idNumber}}</div>
+        <div class="value">{{info.quarantineBeginTime}}至{{info.quarantineEndTime}}</div>
       </div>
       <div class="item-flex">
         <div class="label">隔离策略</div>
-        <div class="value">{{info.idNumber}}</div>
+        <div class="value">{{$dict.getLabel('EP_quarantineStrategy', info.quarantineStrategy)}}</div>
       </div>
     </div>
     <div class="line-bg"></div>
-    <div class="info">
+    <div class="info" v-if="info.nucleicAcidSamplingCount>0">
-      <div class="title">核酸采集信息（已采样<span style="color:#f46;">3</span>次）</div>
+      <div class="title">核酸采集信息（已采样<span style="color:#f46;">{{info.nucleicAcidSamplingCount}}</span>次）</div>
       <div class="error-list">
-        <div class="item">
+        <div class="item" v-for="(item, index) in info.nucleicAcidSamplingList" :key="index">
           <div>
-            <span>采样人：张三</span>
+            <span>采样人：{{item.createUserName}}</span>
-            <span>联系方式：18164065622</span>
+            <span>联系方式：{{item.createUserPhone}}</span>
           </div>
-          <p>采样时间：2022-09-22 16:06:59</p>
+          <p>采样时间：{{item.createTime}}</p>
         </div>
       </div>
     </div>
+    <div class="footer" v-if="info.status != 0" @click="toAdd">采样</div>
   </div>
 </template>
 
@@ -57,7 +58,6 @@ export default {
     return {
       id: '',
       info: {},
-      list: []
     }
   },
   computed: { ...mapState(['user']) },
@@ -65,36 +65,25 @@ export default {
     document.title = '采样信息'
   },
   onLoad(option) {
-    // this.$dict.load('epidemicRecentPersonType', 'epidemicRecentTravel', 'epidemicTouchInFourteen', 'epidemicRecentTestResult', 'epidemicRecentHealth').then(() => {
+    this.$dict.load('EP_homeStatus2', 'EP_quarantineStrategy').then(() => {
-    //   this.id = option.id
+      this.id = option.id
-    //   this.getDetail()
+      this.getDetail()
-    //   this.getList()
+    })
-    // })
+    uni.$on('updateDetail', () => {
-    // uni.$on('updateDetail', () => {
+      this.getDetail()
-    //   this.getList()
+    })
-    //   this.getDetail()
-    // })
   },
   methods: {
-    getList() {
+    getDetail() {
-      this.$http.post(`/app/appepidemicunusuallog/list?recordId=${this.id}`).then((res) => {
+      this.$http.post(`/app/appepidemicpreventioncommunitymanagement/queryDetailById?id=${this.id}`).then((res) => {
         if (res.code == 0) {
-          this.list = res.data.records
+          this.info = res.data
+          this.info.idNumberText = res.data.idNumber.replace(/(.{6}).*(.{4})/,"$1********$2")
         }
       })
     },
-    getDetail() {
+    toAdd() {
-      this.$http.post(`/app/appepidemicbackhomerecord/queryDetailById?id=${this.id}`).then((res) => {
+      uni.navigateTo({ url: `./Add?id=${this.id}` })
-        if (res.code == 0) {
-          if(res.data.checkTime) {
-            res.data.checkTime = res.data.checkTime.substring(0, 10)
-          }
-          this.info = res.data
-          this.info.checkPhoto = JSON.parse(this.info.checkPhoto)
-          this.info.health = this.info.health.split(',')
-          this.info.idNumber = res.data.idNumber.replace(/(.{6}).*(.{4})/,"$1********$2")
-        }
-      })
     },
     callPhone(phone) {
       uni.makePhoneCall({phoneNumber: phone})
@@ -105,8 +94,8 @@ export default {
         current: img
       })
     },
-    toError() {
+    toEdit() {
-      uni.navigateTo({url: `./ErrorInfo?id=${this.id}`})
+      uni.navigateTo({url: `./Add?id=${this.id}`})
     }
   },
 }