Merge remote-tracking branch 'origin/dev' into dev

src/project/pingchang/AppCheckpointRegistration/AppCheckpointRegistration.vue

@@ -32,26 +32,37 @@
             <u-icon name="arrow-down" color="#666" size="28" style="margin-left: 4px" />
           </AiAreaPicker>
         </div>
-        <div class="item">
-          <span @click="showGateSelect=true">{{gatewayName || '卡口选择'}}</span>
-          <u-icon name="arrow-down" color="#666" size="28" style="margin-left: 4px" />
+        <div class="item gateway-type" @click="showGateSelect=true">
+          <div v-if="gatewayId" class="gateway-name">{{gatewayName || '卡口选择'}}</div>
+          <u-icon name="arrow-down" color="#666" size="28" style="margin-left: 4px" v-if="gatewayId" />
+          <span v-else>卡口选择<u-icon name="arrow-down" color="#666" size="28" style="margin-left: 4px" /></span>
         </div>
       </div>
     </AiTopFixed>
     <div class="user-list">
-      <div class="item" @click="toUser(item)" v-for="(item,index) in list" :key="index">
-        <div class="top">
-          <h2 class="name">{{item.name}}<span class="status" :class="'status'+item.riskLevel">{{ $dict.getLabel('EP_riskLevel', item.riskLevel) }}</span></h2>
-          <p class="color-999">{{item.idNumber}}</p>
-          <p><img src="./components/img/org-icon.png" alt=""><span class="start-name">{{item.startAreaName}}</span></p>
-          <p><img src="./components/img/blue-icon.png" alt=""><span class="start-name">{{item.arriveAreaName}}</span></p>
-          <p><img src="./components/img/time-icon.png" alt="">{{item.arriveTime}}</p>
-          <img :src="statusImgList[item.handleType]" alt="" class="status-img">
+      <u-swipe-action style="margin-bottom: 12px;"
+        :show="item.show"
+        :index="index"
+        v-for="(item,index) in list"
+        :key="item.id"
+        @click="onClick"
+        @open="onOpen"
+        @content-click="toUser(item)"
+        :options="options">
+        <div class="item">
+          <div class="top">
+            <h2 class="name">{{item.name}}<span class="status" :class="'status'+item.riskLevel">{{ $dict.getLabel('EP_riskLevel', item.riskLevel) }}</span></h2>
+            <p class="color-999">{{item.idNumber}}</p>
+            <p><img src="./components/img/org-icon.png" alt=""><span class="start-name">{{item.startAreaName}}</span></p>
+            <p><img src="./components/img/blue-icon.png" alt=""><span class="start-name">{{item.arriveAreaName}}</span></p>
+            <p><img src="./components/img/time-icon.png" alt="">{{item.arriveTime}}</p>
+            <img :src="statusImgList[item.handleType]" alt="" class="status-img">
+          </div>
+          <div class="bottom" v-if="item.handleType>0">
+            <div class="text">处置人：<span>{{item.handleUserName}}</span></div>
+          </div>
         </div>
-        <div class="bottom" v-if="item.handleType>0">
-          <div class="text">管控人：<span>{{item.handleUserName}}</span></div>
-        </div>
-      </div>
+      </u-swipe-action>
     </div>
     <AiEmpty v-if="!list.length"></AiEmpty>
     <u-select v-model="showGateSelect" :list="gateList" label-name="name" value-name="id" @confirm="gatewayconfirm"></u-select>
@@ -85,13 +96,21 @@ export default {
         require('./components/img/status4.png'), 
         require('./components/img/status5.png'), 
         require('./components/img/status6.png'), 
+      ],
+      options: [
+        {
+          text: '删除',
+          style: {
+            backgroundColor: '#dd524d'
+          }
+        }
       ]
     }
   },
   computed: { ...mapState(['user']) },
   created() {
-    // this.areaId = this.user.areaId
-    // this.areaName = this.user.areaName
+    this.areaId = this.user.areaId
+    this.areaName = this.user.areaName
     this.getGatewayList()
     this.$dict.load(['EP_handleType', 'EP_riskLevel']).then(() => {
       this.getList()
@@ -111,7 +130,7 @@ export default {
       this.getList()
     },
     getList() {
-      this.$http.post(`/app/appepidemicpreventionregisterinfo/list?infoType=0&current=${this.current}&size=10&listType=${this.tabIndex}&gatewayId=${this.gatewayId}&name=${this.keyword}&startAreaId=${this.areaId}`)
+      this.$http.post(`/app/appepidemicpreventionregisterinfo/list?infoType=0&current=${this.current}&size=10&listType=${this.tabIndex}&gatewayId=${this.gatewayId}&name=${this.keyword}&arriveAreaId=${this.areaId}`)
       .then((res) => {
         if (res.code == 0) {
           res.data.records.map((item) => {
@@ -121,6 +140,20 @@ export default {
         }
       })
     },
+    del(id) {
+      this.$confirm(`确认删除该数据`).then(() => {
+        this.$http.post(`/app/appepidemicpreventionregisterinfo/delete?id=${id}`).then((res) => {
+          if (res.code == 0) {
+            this.$u.toast('删除成功')
+            this.getListInit()
+          }else {
+            this.$u.toast(res.msg)
+          }
+        }).catch((err) => {
+          this.$u.toast(err)
+        })
+      })
+    },
     getTotal() {
       this.$http.post(`/app/appepidemicpreventionregisterinfo/listStatistics?areaId=${this.areaId}`).then((res) => {
         if (res.code == 0) {
@@ -132,6 +165,7 @@ export default {
       this.$http.post(`/app/appepidemicpreventiongateway/list?size=300&status=0`).then((res) => {
         if (res.code == 0) {
           this.gateList = res.data.records
+          this.gateList.unshift({name: '全部', id: ''})
         }
       })
     },
@@ -154,6 +188,22 @@ export default {
     toUser(row) {
       uni.navigateTo({url: `./UserInfo?id=${row.id}`})
     },
+    clearGateway() {
+      this.gatewayName = ''
+      this.gatewayId = ''
+      this.getListInit()
+    },
+    onClick(index) {
+      this.del(this.list[index].id)
+    },
+    onOpen(index) {
+      this.list[index].show = true
+      this.list.map((val, i) => {
+        if(index != i) {
+          this.list[i].show = false
+        }
+      })
+    },
   },
   onReachBottom() {
     this.current ++
@@ -261,7 +311,6 @@ export default {
     padding: 32px 32px 0;
     .item{
       background-color: #fff;
-      margin-bottom: 24px;
       border-radius: 16px;
       .top {
         padding: 32px 32px 24px;
@@ -352,5 +401,23 @@ export default {
       }
     }
   }
+  .gateway-name {  
+    width: calc(100% - 48px);
+    word-break: break-all;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
+    font-family: PingFangSC-Medium;
+    font-weight: 500;
+    font-size: 28px;
+    color: #666;
+    line-height: 40px;
+  }
+  .gateway-type {
+    display: flex;
+    justify-content: center;
+  }
 }
 </style>

src/project/pingchang/AppCheckpointRegistration/ManagementContent.vue

@@ -86,7 +86,17 @@
           <span class="tips"></span>备注
         </div>
       </div>
-      <textarea placeholder="请输入备注" v-model="form.remarks" maxlength="500"></textarea>
+      <div class="solid">
+        <textarea placeholder="请输入备注" v-model="form.remarks" maxlength="500"></textarea>
+      </div>
+      <div class="item">
+        <div class="label">
+          <span class="tips"></span>图片
+        </div>
+      </div>
+      <div style="padding: 0 16px 24px 0;">
+        <AiUploader :def.sync="form.fileList" multiple placeholder="上传图片" :limit="9" action="/admin/file/add2"></AiUploader>
+      </div>
     </div>
     <div class="info mar-b16" v-if="form.handleType == 6">
       <div class="item solid">
@@ -112,7 +122,7 @@
           <span class="tips">*</span>交接人姓名
         </div>
         <div class="value">
-          <u-input placeholder="请输入" input-align="right" height="32" maxlength="6" v-model="form.handoverPersonName" />
+          <u-input placeholder="请输入" input-align="right" height="32" maxlength="6" v-model="form.handoverPersonName" :custom-style="{'font-size': '17px'}" />
         </div>
       </div>
       <div class="item solid">
@@ -120,7 +130,7 @@
           <span class="tips"></span>手机号码
         </div>
         <div class="value">
-          <u-input placeholder="请输入" type="number" input-align="right" height="32" maxlength="11" v-model="form.handoverPersonPhone" />
+          <u-input placeholder="请输入" type="number" input-align="right" height="32" maxlength="11" v-model="form.handoverPersonPhone" :custom-style="{'font-size': '17px'}" />
         </div>
       </div>
       <div class="item">
@@ -128,7 +138,7 @@
           <span class="tips">*</span>交接图片
         </div>
       </div>
-      <div style="padding-bottom: 24px;">
+      <div style="padding: 0 16px 24px 0;">
         <AiUploader :def.sync="form.fileList" multiple placeholder="上传图片" :limit="9" action="/admin/file/add2"></AiUploader>
       </div>
     </div>
@@ -223,13 +233,19 @@ export default {
       }
 
       if(this.form.handleType == 1 || this.form.handleType == 4 || this.form.handleType == 5) {
-        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()
-          }
+        this.$confirm(`确认`+this.$dict.getLabel('EP_handleType', this.form.handleType)+`操作`).then(() => {
+          this.form.quarantineBeginTime = null
+          this.form.quarantineEndTime = null
+          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()
+            }
+          }).catch((err) => {
+            this.$u.toast(err)
+          })
         })
       }else {
         uni.setStorageSync('checkPointContent', this.form)

src/project/pingchang/AppCheckpointRegistration/ManagementHistory.vue

@@ -42,10 +42,16 @@
           <div class="label">管控方式</div>
           <div class="value">{{ $dict.getLabel('EP_controlMethod', item.controlMethod) }}</div>
         </div>
-        <div class="item-flex border-none">
+        <div class="item-flex">
           <div style="color:#999;">备注</div>
         </div>
         <p style="padding-bottom: 12px;">{{item.remarks}}</p>
+        <div class="item-flex border-none" v-if="item.fileList && item.fileList.length" style="border-top:1px solid #ddd">
+          <div style="color:#999;">图片</div>
+        </div>
+        <div class="img-list">
+          <img :src="items.url" alt="" v-for="(items, indexs) in item.fileList" :key="indexs" @click="previewImage(item.fileList, items.url)">
+        </div>
       </div>
 
       <div class="info" v-if="item.handleType == 6">
@@ -114,6 +120,10 @@ export default {
   },
   methods: {
     submit(status) {
+      if(this.form.handleType == 6) {
+        this.form.quarantineBeginTime = null
+        this.form.quarantineEndTime = null
+      }
       this.form.homeQuarantineOperation = status
       this.$http.post(`/app/appepidemicpreventionregisterinfo/riskDisposal?homeQuarantineOperation=${this.form.homeQuarantineOperation}`, this.form).then((res) => {
         if (res.code == 0) {
@@ -122,6 +132,8 @@ export default {
           uni.$emit('updateList')
           uni.navigateBack({ delta: 2 })
         }
+      }).catch((err) => {
+        this.$u.toast(err)
       })
     },
     getDetail() {

src/project/pingchang/AppCheckpointRegistration/RiskContent.vue

@@ -30,6 +30,10 @@
           <div class="label">人员类别</div>
           <div class="value">{{$dict.getLabel('EP_registerPersonType', info.type)}}</div>
         </div>
+        <div class="item-flex">
+          <div class="label">高危行业</div>
+          <div class="value">{{$dict.getLabel('EP_highRiskIndustries', info.highRiskIndustries)}}</div>
+        </div>
       </div>
       <div class="line-bg"></div>
       <div class="info">
@@ -61,15 +65,15 @@
           <div class="value">{{info.description}}</div>
         </div>
         <div class="item-flex">
-          <div class="label">抵达时间</div>
+          <div class="label">抵平时间</div>
           <div class="value" v-if="info.arriveTime">{{info.arriveTime.substring(0, 16)}}</div>
         </div>
         <div class="item-flex">
-          <div class="label">返乡地区</div>
+          <div class="label">到达地区</div>
           <div class="value">{{info.arriveAreaName}}</div>
         </div>
         <div class="item-flex">
-          <div class="label">返乡地址</div>
+          <div class="label">到达地址</div>
           <div class="value">{{info.arriveAddress}}</div>
         </div>
       </div>
@@ -152,7 +156,7 @@
             <span class="tips"></span>附件上传
           </div>
         </div>
-        <div style="padding-bottom: 24px;" class="solid">
+        <div style="padding: 0 16px 24px 0;" class="solid">
           <AiUploader :def.sync="form.fileList" multiple placeholder="上传图片" :limit="9" action="/admin/file/add2"></AiUploader>
         </div>
         <div class="item">
@@ -236,6 +240,8 @@ export default {
           uni.$emit('updateList')
           uni.navigateBack()
         }
+      }).catch((err) => {
+        this.$u.toast(err)
       })
 
     },

src/project/pingchang/AppCheckpointRegistration/UserInfo.vue

@@ -29,6 +29,10 @@
         <div class="label">人员类别</div>
         <div class="value">{{$dict.getLabel('EP_registerPersonType', info.type)}}</div>
       </div>
+      <div class="item-flex">
+        <div class="label">高危行业</div>
+        <div class="value">{{$dict.getLabel('EP_highRiskIndustries', info.highRiskIndustries)}}</div>
+      </div>
     </div>
     <div class="line-bg"></div>
     <div class="info">
@@ -45,7 +49,7 @@
       <p class="line-text" v-if="info.trainNo">{{info.trainNo}}</p>
       <div class="item-flex">
         <div class="label">出发时间</div>
-        <div class="value">{{info.startTime.substring(0, 16)}}</div>
+        <div class="value" v-if="info.startTime">{{info.startTime.substring(0, 16)}}</div>
       </div>
       <div class="item-flex">
         <div class="label">出发地区</div>
@@ -60,15 +64,15 @@
         <div class="value">{{info.description}}</div>
       </div>
       <div class="item-flex">
-        <div class="label">抵达时间</div>
-        <div class="value">{{info.arriveTime.substring(0, 16)}}</div>
+        <div class="label">抵平时间</div>
+        <div class="value" v-if="info.arriveTime">{{info.arriveTime.substring(0, 16)}}</div>
       </div>
       <div class="item-flex">
-        <div class="label">返乡地区</div>
+        <div class="label">到达地区</div>
         <div class="value">{{info.arriveAreaName}}</div>
       </div>
       <div class="item-flex">
-        <div class="label">返乡地址</div>
+        <div class="label">到达地址</div>
         <div class="value">{{info.arriveAddress}}</div>
       </div>
     </div>
@@ -77,7 +81,8 @@
       <div class="title">健康状况</div>
       <div class="item-flex">
         <div class="label">是否有风险旅居史</div>
-        <div class="value" :style="info.fromHighRiskArea == 1 ? 'color:#f46;' : ''">{{$dict.getLabel('yesOrNo', info.fromHighRiskArea)}}</div>
+        <div class="value" v-if="info.fromHighRiskArea != 1">否</div>
+        <div class="value" style="color:#f46;" v-else>{{info.highRiskAreaName}}</div>
       </div>
       <div class="item-flex">
         <div class="label" style="width:360px;">7天内是否接触新冠确诊或疑似患者</div>
@@ -105,6 +110,89 @@
         </div>
       </div>
     </div>
+    <div class="line-bg"></div>
+    <div class="info" v-if="info.handleType != 0">
+      <div class="title">处置意见</div>
+      <div v-for="(item, index) in info.riskDisposalList" :key="index">
+        <div class="item-flex">
+          <div class="label">处置意见</div>
+          <div class="value">{{ $dict.getLabel('EP_handleType', item.handleType) }}</div>
+        </div>
+        <div v-if="item.handleType == 2">
+          <div class="item-flex">
+            <div class="label">集中隔离地</div>
+            <div class="value">{{ $dict.getLabel('EP_quarantineAddress', item.quarantineAddress) }}</div>
+          </div>
+          <div class="item-flex">
+            <div class="label">隔离时间</div>
+            <div class="value">{{item.quarantineBeginTime}}至{{item.quarantineEndTime}}</div>
+          </div>
+          <div class="item-flex">
+            <div class="label">隔离策略</div>
+            <div class="value">{{ $dict.getLabel('EP_quarantineStrategy', item.quarantineStrategy) }}</div>
+          </div>
+        </div>
+
+        <div v-if="item.handleType == 3">
+          <div class="item-flex">
+            <div class="label">居家状态</div>
+            <div class="value">{{ $dict.getLabel('EP_homeStatus', item.homeStatus) }}</div>
+          </div>
+          <div class="item-flex">
+            <div class="label">隔离时间</div>
+            <div class="value">{{item.quarantineBeginTime}}至{{item.quarantineEndTime}}</div>
+          </div>
+          <div class="item-flex">
+            <div class="label">隔离策略</div>
+            <div class="value">{{ $dict.getLabel('EP_quarantineStrategy', item.quarantineStrategy) }}</div>
+          </div>
+          <div class="item-flex">
+            <div class="label">管控方式</div>
+            <div class="value">{{ $dict.getLabel('EP_controlMethod', item.controlMethod) }}</div>
+          </div>
+          <div class="item-flex border-none">
+            <div style="color:#999;">备注</div>
+          </div>
+          <p style="padding-bottom: 12px;">{{item.remarks}}</p>
+          <div class="item-flex border-none" v-if="item.fileList && item.fileList.length" style="border-top:1px solid #ddd">
+            <div style="color:#999;">图片</div>
+          </div>
+          <div class="img-list">
+            <img :src="items.url" alt="" v-for="(items, indexs) in item.fileList" :key="indexs" @click="previewImage(item.fileList, items.url)">
+          </div>
+        </div>
+
+        <div v-if="item.handleType == 6">
+          <div class="item-flex">
+            <div class="label">移交对象</div>
+            <div class="value">{{ $dict.getLabel('EP_handoverObject', item.handoverObject) }}</div>
+          </div>
+          <div class="item-flex">
+            <div class="label">移交方式</div>
+            <div class="value">{{ $dict.getLabel('EP_handoverMethod', item.handoverMethod) }}</div>
+          </div>
+          <div class="item-flex">
+            <div class="label">交接人姓名</div>
+            <div class="value">{{item.handoverPersonName}}</div>
+          </div>
+          <div class="item-flex">
+            <div class="label">手机号</div>
+            <div class="value" style="color:#4181FF;" @click="callPhone(item.handoverPersonPhone)">
+              <img :src="$cdn + 'common/phone.png'" alt="" class="phone-icon" >
+              {{item.handoverPersonPhone}}</div>
+          </div>
+          <div class="item-flex border-none" v-if="item.fileList && item.fileList.length">
+            <div style="color:#999;">交接图片</div>
+          </div>
+          <div class="img-list">
+            <img :src="items.url" alt="" v-for="(items, indexs) in item.fileList" :key="indexs" @click="previewImage(item.fileList, items.url)">
+          </div>
+        </div>
+      </div>
+    </div>
+   
+
+
     <div class="line-bg" style="padding-bottom: 56px;"></div>
     <div class="footer" v-if="info.handleType == 0" @click="toContent">风险处置</div>
   </div>
@@ -126,7 +214,8 @@ export default {
     document.title = '卡口登记详情'
   },
   onLoad(option) {
-    this.$dict.load('yesOrNo', 'EP_registerPersonType', 'EP_travelType', 'EP_abnormalType', 'epidemicTouchInFourteen').then(() => {
+    this.$dict.load('yesOrNo', 'EP_registerPersonType', 'EP_travelType', 'EP_abnormalType', 'epidemicTouchInFourteen', 'EP_highRiskIndustries', 'EP_handleType',
+    'EP_quarantineAddress', 'EP_homeStatus', 'EP_quarantineStrategy', 'EP_controlMethod', 'EP_handoverObject', 'EP_handoverMethod').then(() => {
       this.id = option.id
       // this.haveHomeQuarantineBtn = option.operation == 'reDisposal' ? true : false
       this.getDetail()

src/project/pingchang/AppCommunityManagement/Add.vue

@@ -66,7 +66,12 @@
           <span class="tips">*</span>管控人
         </div>
         <div class="value">
-          <u-input placeholder="请输入" input-align="right" height="32" maxlength="6" v-model="form.controllerUserName" :custom-style="{'font-size': '17px'}" />
+          <AiPagePicker type="sysUser" single :selected.sync="form.controllerList" action="/app/wxcp/wxuser/list?status=1" nodeKey="id" @select="handleSelectUser">
+            <span style="margin-left: 4px" v-if="form.controllerList && form.controllerList.length">{{ form.controllerList[0].name }}</span>
+            <span v-else class="color-999">请选择</span>
+            <u-icon name="arrow-right" color="#999" size="16" style="margin-left: 4px" />
+          </AiPagePicker>
+          <!-- <u-input placeholder="请输入" input-align="right" height="32" maxlength="6" v-model="form.controllerUserName" :custom-style="{'font-size': '17px'}" /> -->
         </div>
       </div>
       <div class="item solid">
@@ -92,7 +97,7 @@
           <span class="tips">*</span>图片
         </div>
       </div>
-      <div>
+      <div style="padding-right: 16px;">
         <AiUploader :def.sync="form.fileList" multiple placeholder="上传图片" :limit="9" action="/admin/file/add2"></AiUploader>
       </div>
     </div>
@@ -120,7 +125,8 @@ export default {
       form: {
         homeStatus: '',
         quarantineBeginTime: '',
-        quarantineStrategy: ''
+        quarantineStrategy: '',
+        controllerList: []
       },
       showDateSelect: false,
       showDictSelect: false,
@@ -164,6 +170,12 @@ export default {
       if( !this.form.fileList.length) {
         return this.$u.toast('请上传图片')
       }
+
+      this.$confirm(status == 2 ? '确认解除管理该记录' : '确认保存该记录').then(() => {
+        this.confirmSubmit(status)
+      })
+    },
+    confirmSubmit(status) {
       this.form.status = status
       this.form.id = this.id
 
@@ -175,13 +187,23 @@ export default {
           uni.navigateBack()
         }
       })
-      
-
     },
     getDetail() {
       this.$http.post(`/app/appepidemicpreventioncommunitymanagement/queryDetailById?id=${this.id}`).then((res) => {
         if (res.code == 0) {
-          this.form = res.data
+          this.form = {...res.data}
+          this.form.controllerList = []
+          if(!this.form.controllerUserName) {
+            this.form.controllerUserName = this.user.name
+            this.form.controllerUserId = this.user.id
+            this.form.controllerUserPhone = this.user.phone
+          }
+          var info = {
+            name: this.form.controllerUserName,
+            id: this.form.controllerUserId,
+            mobile: this.form.controllerUserPhone
+          }
+          this.form.controllerList.push(info)
           if(this.form.homeStatus === null) {
             this.form.homeStatus = ''
           }
@@ -203,6 +225,12 @@ export default {
     areaSelect(e) {
       this.form.areaId = e
     },
+    handleSelectUser(e) {
+      console.log(e)
+      this.form.controllerUserPhone = e[0].mobile
+      this.form.controllerUserName = e[0].name
+      this.form.controllerUserId = e[0].id
+    }
   },
 }
 </script>
@@ -211,6 +239,7 @@ export default {
 .Add {
   background-color: #F3F6F9;
   padding-top: 16px;
+  overflow-x: hidden;
   .item {
     width: 100%;
     background-color: #fff;

src/project/pingchang/AppCommunityManagement/AppCommunityManagement.vue

@@ -49,7 +49,7 @@
       </div>
     </div>
     <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>
+    <u-select v-model="showTypeSelect" :list="registerTypeList" label-name="dictName" value-name="dictValue" @confirm="typeConfirm"></u-select>
   </div>
 </template>
 
@@ -87,7 +87,8 @@ export default {
       activeStyle: {
         'font-weight' : '400',
       },
-      list: []
+      list: [],
+      registerTypeList: []
     }
   },
   computed: {
@@ -97,6 +98,8 @@ export default {
     this.areaId = this.user.areaId
     this.areaName = this.user.areaName
     this.$dict.load('EP_CM_status', 'EP_registerInfoType').then(() => {
+      this.registerTypeList = this.$dict.getDict('EP_registerInfoType')
+      this.registerTypeList.unshift({dictValue: '', dictName: '全部'})
       this.getListInit()
     })
      uni.$on('updateList', () => {
@@ -193,6 +196,7 @@ export default {
       width: 100%;
       background: #FFF;
       border-radius: 16px;
+      margin-bottom: 24px;
       .top {
         padding: 32px 32px 24px 32px;
         position: relative;

src/project/pingchang/AppCommunityManagement/Detail.vue

@@ -26,28 +26,40 @@
       </div>
       <div class="item-flex">
         <div class="label">隔离时间</div>
-        <div class="value">{{info.quarantineBeginTime.substring(0, 10)}} 至 {{info.quarantineEndTime.substring(0, 10)}}</div>
+        <div class="value" v-if="info.quarantineBeginTime">{{info.quarantineBeginTime.substring(0, 10)}} 至 {{info.quarantineEndTime.substring(0, 10)}}</div>
       </div>
       <div class="item-flex">
         <div class="label">隔离策略</div>
         <div class="value">{{$dict.getLabel('EP_quarantineStrategy', info.quarantineStrategy)}}</div>
       </div>
+      <div class="item-flex" v-if="info.status != 0">
+        <div class="label">管控人</div>
+        <div class="value">{{info.controllerUserName}}</div>
+      </div>
+      <div class="item-flex" v-if="info.status != 0">
+        <div class="label">联系方式</div>
+        <div class="value">{{info.controllerUserPhone}}</div>
+      </div>
     </div>
     <div class="line-bg"></div>
-    <div class="info">
-      <div class="item-flex border-none">
-        <div class="label">管控内容</div>
+    <div class="info" v-if="info.status != 0">
+      <div  v-if="info.controllerContent"> 
+        <div class="item-flex border-none">
+          <div class="label">管控内容</div>
+        </div>
+        <p style="padding-bottom: 24px;">{{info.controllerContent}}</p>
       </div>
-      <p style="padding-bottom: 24px;">{{info.controllerContent}}</p>
-      <div class="item-flex border-none">
-        <div class="label">图片</div>
-      </div>
-      <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 v-if="info.fileList && info.fileList.length">
+        <div class="item-flex border-none" >
+          <div class="label">图片</div>
+        </div>
+        <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>
-    <div class="line-bg" style="padding-bottom: 56px;"></div>
-    <div class="footer" v-if="info.status != 2">
+    <div class="line-bg" style="padding-bottom: 56px;" v-if="info.status == 1"></div>
+    <div class="footer" v-if="info.status == 1">
       <div class="cancel" @click="toEdit()">编辑</div>
       <div class="confirm" @click="changeStatus()">解除管理</div>
     </div>
@@ -109,7 +121,7 @@ export default {
       uni.navigateTo({url: `./Add?id=${this.id}`})
     },
     toNucleAcidDetail() {
-      uni.navigateTo({url: `../AppNucleicAcidSampling/Detail?id=${this.id}`})
+      uni.navigateTo({url: `../AppNucleicAcidSampling/Detail?id=${this.id}&isHideBtn=1`})
     },
   },
 }

src/project/pingchang/AppCommunityManagement/Statistics.vue

@@ -6,7 +6,7 @@
         <div class="title">
           <div>
             <span v-if="beginDate" @click="showDateSelect=true">{{ beginDate }} 至 {{ endDate }}</span>
-            <span v-else @click="showDateSelect=true">时间选择</span>
+            <span v-else @click="showDateSelect=true">日期选择</span>
             <u-icon name="arrow-down" color="#666" size="28" style="margin-left: 4px"  v-if="!beginDate" @click="showDateSelect=true"/>
             <u-icon name="close-circle" color="#666" size="34" style="margin-left: 4px"  v-else @click="clearDate" />
           </div>

src/project/pingchang/AppNucleicAcidSampling/Add.vue

@@ -36,7 +36,7 @@
         <div class="label">
           <span class="tips">*</span>隔离时间
         </div>
-        <div class="value color-999">{{info.quarantineBeginTime.substring(0, 10)}}至{{info.quarantineEndTime.substring(0, 10)}}</div>
+        <div class="value color-999" v-if="info.quarantineBeginTime">{{info.quarantineBeginTime.substring(0, 10)}}至{{info.quarantineEndTime.substring(0, 10)}}</div>
       </div>
       <div class="item">
         <div class="label">
@@ -106,14 +106,12 @@ export default {
       this.id = option.id
       this.getDetail()
     })
-    var myDate = new Date();
-    var month = myDate.getMonth()+1
-    if(month < 10) {
-      month = '0'+`${month}`
-    }
+
     this.form.createUserName = this.user.name
     this.form.createUserPhone = this.user.phone
-    this.form.createTime = `${myDate.getFullYear()}-${month}-${myDate.getDate()} ${myDate.getHours()}:${myDate.getMinutes()}:${myDate.getSeconds()}`
+
+    var myDate = new Date();
+    this.form.createTime = `${myDate.getFullYear()}-${this.isNum(myDate.getMonth()+1)}-${this.isNum(myDate.getDate())} ${this.isNum(myDate.getHours())}:${this.isNum(myDate.getMinutes())}:${this.isNum(myDate.getSeconds())}`
   },
   onShow() {
     document.title = '核酸采样'
@@ -136,10 +134,12 @@ export default {
       this.form.registerId = this.info.registerId
       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()
+          this.$u.toast('提交成功')
+          setTimeout(() => {
+            uni.navigateBack()
+          }, 600);
         }
       })
       
@@ -157,6 +157,12 @@ export default {
         }
       })
     },
+    isNum(num) {
+      if(num < 10) {
+        num = '0'+`${num}`
+      }
+      return num
+    },
   },
 }
 </script>

src/project/pingchang/AppNucleicAcidSampling/AppNucleicAcidSampling.vue

@@ -164,6 +164,7 @@ export default {
       width: 100%;
       background: #FFF;
       border-radius: 16px;
+      margin-bottom: 24px;
       .top {
         padding: 32px 32px 24px 32px;
         position: relative;

src/project/pingchang/AppNucleicAcidSampling/Detail.vue

@@ -26,7 +26,7 @@
       </div>
       <div class="item-flex">
         <div class="label">隔离时间</div>
-        <div class="value">{{info.quarantineBeginTime}}至{{info.quarantineEndTime}}</div>
+        <div class="value" v-if="info.quarantineBeginTime">{{info.quarantineBeginTime.substring(0, 10)}}至{{info.quarantineEndTime.substring(0, 10)}}</div>
       </div>
       <div class="item-flex">
         <div class="label">隔离策略</div>
@@ -47,7 +47,7 @@
       </div>
     </div>
     <div class="btn-height"></div>
-    <div class="footer" v-if="info.status != 2" @click="toAdd">采样</div>
+    <div class="footer" v-if="info.status != 2 && isHideBtn != 1" @click="toAdd">采样</div>
   </div>
 </template>
 
@@ -59,6 +59,7 @@ export default {
     return {
       id: '',
       info: {},
+      isHideBtn: 0
     }
   },
   computed: { ...mapState(['user']) },
@@ -73,6 +74,7 @@ export default {
     uni.$on('updateDetail', () => {
       this.getDetail()
     })
+    this.isHideBtn = option.isHideBtn || 0
   },
   methods: {
     getDetail() {