提交一波

src/project/pingchang/AppCheckpointRegistration/AppCheckpointRegistration.vue

@@ -50,7 +50,7 @@
           <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 class="text">处置人：<span>{{item.handleUserName}}</span></div>
         </div>
       </div>
     </div>

src/project/pingchang/AppCheckpointRegistration/UserInfo.vue

@@ -49,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>
@@ -65,7 +65,7 @@
       </div>
       <div class="item-flex">
         <div class="label">抵平时间</div>
-        <div class="value">{{info.arriveTime.substring(0, 16)}}</div>
+        <div class="value" v-if="info.arriveTime">{{info.arriveTime.substring(0, 16)}}</div>
       </div>
       <div class="item-flex">
         <div class="label">到达地区</div>
@@ -110,6 +110,91 @@
         </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.riskDisposalHistoryList" :key="index">
+        <div v-if="item.handleType == 2">
+          <div class="item-flex">
+            <div class="label">处置意见</div>
+            <div class="value">{{ $dict.getLabel('EP_handleType', item.handleType) }}</div>
+          </div>
+          <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_handleType', item.handleType) }}</div>
+          </div>
+          <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>
+
+        <div v-if="item.handleType == 6">
+          <div class="item-flex">
+            <div class="label">处置意见</div>
+            <div class="value">{{ $dict.getLabel('EP_handleType', item.handleType) }}</div>
+          </div>
+          <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>

src/project/pingchang/AppCommunityManagement/Detail.vue

@@ -26,7 +26,7 @@
       </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>
@@ -34,11 +34,14 @@
       </div>
     </div>
     <div class="line-bg"></div>
-    <div class="info">
+    <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>
+      <div v-if="info.fileList && info.fileList.length">
         <div class="item-flex border-none" >
           <div class="label">图片</div>
         </div>
@@ -46,8 +49,9 @@
           <img :src="item.accessUrl" alt="" @click="previewImage(info.fileList, item.accessUrl)">
         </div>
       </div>
-    <div class="line-bg" style="padding-bottom: 56px;"></div>
-    <div class="footer" v-if="info.status != 2">
+    </div>
+    <div class="line-bg" style="padding-bottom: 56px;" v-if="info.status == 0"></div>
+    <div class="footer" v-if="info.status == 0">
       <div class="cancel" @click="toEdit()">编辑</div>
       <div class="confirm" @click="changeStatus()">解除管理</div>
     </div>
@@ -109,7 +113,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/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,13 @@ 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 = '核酸采样'
@@ -157,6 +156,12 @@ export default {
         }
       })
     },
+    isNum(num) {
+      if(num < 10) {
+        num = '0'+`${num}`
+      }
+      return num
+    },
   },
 }
 </script>

src/project/pingchang/AppNucleicAcidSampling/Detail.vue

@@ -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() {