社区管理，核酸采样

src/project/pingchang/AppCheckpointRegistration/ManagementHistory.vue

@@ -2,91 +2,89 @@
   <div class="ManagementHistory">
     <div class="title">最近处置历史</div>
     <div v-for="(item, index) in info.riskDisposalHistoryList" :key="index">
-      <div class="info">
+      <div class="info" v-if="item.handleType == 2">
         <div class="item-flex">
           <div class="label">处置意见</div>
-          <div class="value">{{info.name}}</div>
+          <div class="value">{{ $dict.getLabel('EP_handleType', item.handleType) }}</div>
         </div>
         <div class="item-flex">
           <div class="label">集中隔离地</div>
-          <div class="value">{{info.idNumber}}</div>
+          <div class="value">{{ $dict.getLabel('EP_quarantineAddress', item.quarantineAddress) }}</div>
         </div>
         <div class="item-flex">
           <div class="label">隔离时间</div>
-          <div class="value">{{info.idNumber}}</div>
+          <div class="value">{{item.quarantineBeginTime}}至{{item.quarantineEndTime}}</div>
         </div>
         <div class="item-flex">
           <div class="label">隔离策略</div>
-          <div class="value">{{info.idNumber}}</div>
+          <div class="value">{{ $dict.getLabel('EP_quarantineStrategy', item.quarantineStrategy) }}</div>
         </div>
       </div>
 
-      <div class="info">
+      <div class="info" v-if="item.handleType == 3">
         <div class="item-flex">
           <div class="label">处置意见</div>
-          <div class="value">{{info.name}}</div>
+          <div class="value">{{ $dict.getLabel('EP_handleType', item.handleType) }}</div>
         </div>
         <div class="item-flex">
-          <div class="label">集中隔离地</div>
-          <div class="value">{{info.idNumber}}</div>
+          <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">{{info.idNumber}}</div>
+          <div class="value">{{item.quarantineBeginTime}}至{{item.quarantineEndTime}}</div>
         </div>
         <div class="item-flex">
           <div class="label">隔离策略</div>
-          <div class="value">{{info.idNumber}}</div>
+          <div class="value">{{ $dict.getLabel('EP_quarantineStrategy', item.quarantineStrategy) }}</div>
         </div>
         <div class="item-flex">
           <div class="label">管控方式</div>
-          <div class="value">{{info.idNumber}}</div>
+          <div class="value">{{ $dict.getLabel('EP_controlMethod', item.controlMethod) }}</div>
         </div>
         <div class="item-flex border-none">
-          <div style="color:#999;">附件</div>
-        </div>
-        <div class="img-list">
-          <!-- <img :src="item.url" alt="" v-for="(item, index) in info.checkPhoto" :key="index" @click="previewImage(info.checkPhoto, item.url)"> -->
+          <div style="color:#999;">备注</div>
         </div>
+        <p style="padding-bottom: 12px;">{{item.remarks}}</p>
       </div>
 
-      <div class="info">
+      <div class="info" v-if="item.handleType == 6">
         <div class="item-flex">
           <div class="label">处置意见</div>
-          <div class="value">{{info.name}}</div>
+          <div class="value">{{ $dict.getLabel('EP_handleType', item.handleType) }}</div>
         </div>
         <div class="item-flex">
           <div class="label">移交对象</div>
-          <div class="value">{{info.name}}</div>
+          <div class="value">{{ $dict.getLabel('EP_handoverObject', item.handoverObject) }}</div>
         </div>
         <div class="item-flex">
           <div class="label">移交方式</div>
-          <div class="value">{{info.name}}</div>
+          <div class="value">{{ $dict.getLabel('EP_handoverMethod', item.handoverMethod) }}</div>
         </div>
         <div class="item-flex">
           <div class="label">交接人姓名</div>
-          <div class="value">{{info.name}}</div>
+          <div class="value">{{item.handoverPersonName}}</div>
         </div>
         <div class="item-flex">
           <div class="label">手机号</div>
-          <div class="value" style="color:#4181FF;" @click="callPhone(info.phone)">
+          <div class="value" style="color:#4181FF;" @click="callPhone(item.handoverPersonPhone)">
             <img :src="$cdn + 'common/phone.png'" alt="" class="phone-icon" >
-            {{info.phone}}</div>
+            {{item.handoverPersonPhone}}</div>
         </div>
-        <div class="item-flex border-none">
+        <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="item.url" alt="" v-for="(item, index) in info.checkPhoto" :key="index" @click="previewImage(info.checkPhoto, item.url)"> -->
+          <img :src="items.url" alt="" v-for="(items, indexs) in item.fileList" :key="indexs" @click="previewImage(item.fileList, items.url)">
         </div>
       </div>
     </div>
     <AiEmpty v-if="!info.riskDisposalHistoryList.length"></AiEmpty>
     
     <div class="btn-height"></div>
-    <div class="footer" v-if="this.form.handleType == 3">
-      <div @click="submit(1)">放行居家隔离</div>
-      <div @click="submit(0)">通知社区核实</div>
+    <div class="footer" v-if="form.handleType == 3">
+      <div @click="submit('1')">放行居家隔离</div>
+      <div @click="submit('0')">通知社区核实</div>
     </div>
     <div class="footer-btn" v-else @click="submit('')">提交</div>
   </div>
@@ -109,7 +107,7 @@ export default {
   },
   onLoad(option) {
     this.form = uni.getStorageSync('checkPointContent')
-    this.$dict.load('EP_handleType', 'EP_quarantineStrategy', 'EP_homeStatus', 'EP_controlMethod', 'EP_handoverObject', 'EP_handoverMethod').then(() => {
+    this.$dict.load('EP_handleType', 'EP_quarantineAddress', 'EP_quarantineStrategy', 'EP_homeStatus', 'EP_controlMethod', 'EP_handoverObject', 'EP_handoverMethod').then(() => {
       this.id = option.id
       this.getDetail()
     })
@@ -117,7 +115,7 @@ export default {
   methods: {
     submit(status) {
       this.form.homeQuarantineOperation = status
-      this.$http.post(`/app/appepidemicpreventionregisterinfo/riskDisposal`, this.form).then((res) => {
+      this.$http.post(`/app/appepidemicpreventionregisterinfo/riskDisposal?homeQuarantineOperation=${this.form.homeQuarantineOperation}`, this.form).then((res) => {
         if (res.code == 0) {
           this.$u.toast('提交成功')
           uni.$emit('updateDetail')
@@ -160,6 +158,7 @@ export default {
   .info{
     background-color: #fff;
     padding: 0 32px;
+    margin-bottom: 24px;
     .item-flex{
       padding: 34px 0;
       border-bottom: 1px solid #ddd;

src/project/pingchang/AppCheckpointRegistration/UserInfo.vue

@@ -118,6 +118,7 @@ export default {
     return {
       id: '',
       info: {},
+      // haveHomeQuarantineBtn: false, // 是否重新处置 true屏蔽居家两种隔离
     }
   },
   computed: { ...mapState(['user']) },
@@ -127,6 +128,7 @@ export default {
   onLoad(option) {
     this.$dict.load('yesOrNo', 'EP_registerPersonType', 'EP_travelType', 'EP_abnormalType').then(() => {
       this.id = option.id
+      // this.haveHomeQuarantineBtn = option.operation == 'reDisposal' ? true : false
       this.getDetail()
     })
     uni.$on('updateDetail', () => {
@@ -137,9 +139,6 @@ export default {
     getDetail() {
       this.$http.post(`/app/appepidemicpreventionregisterinfo/queryDetailById?id=${this.id}`).then((res) => {
         if (res.code == 0) {
-          if(res.data.checkTime) {
-            res.data.checkTime = res.data.checkTime.substring(0, 10)
-          }
           this.info = res.data
           this.info.travelTypeList = this.info.travelType.split(',')
           this.info.idNumberText = res.data.idNumber.replace(/(.{6}).*(.{4})/,"$1********$2")