bug

src/project/pingchang/AppReturnHomeReporting/AppReturnHomeReporting.vue

@@ -48,7 +48,7 @@
           <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" v-if="item.handleType == 5">
+          <img :src="statusImgList[item.lastCommunityHandleType]" alt="" class="status-img" v-if="item.lastCommunityHandleType != null">
         </div>
         <div class="bottom" v-if="item.handleUserName">
           <div class="text">处置人：<span>{{item.handleUserName}}</span></div>
@@ -85,10 +85,6 @@ export default {
         require('./components/img/status0.png'), 
         require('./components/img/status1.png'), 
         require('./components/img/status2.png'), 
-        require('./components/img/status3.png'), 
-        require('./components/img/status4.png'), 
-        require('./components/img/status5.png'), 
-        require('./components/img/status6.png'), 
       ],
       options: [
         {

src/project/pingchang/AppReturnHomeReporting/RiskContent.vue

@@ -73,7 +73,7 @@
           </div>
         </div>
         <div style="padding: 0 16px 24px 0;" class="solid">
-          <AiUploader :def.sync="form.fileList" multiple placeholder="上传核酸阴性证明" :limit="1" action="/admin/file/add2"></AiUploader>
+          <AiUploader :def.sync="form.proveFileList" multiple placeholder="上传核酸阴性证明" :limit="1" action="/admin/file/add2"></AiUploader>
         </div>
       </div>
     </div>
@@ -100,7 +100,8 @@ export default {
         quarantineEndTime: '',
         quarantineStrategy: '',
         fileList: [],
-        remarks: ''
+        remarks: '',
+        proveFileList: []
       },
       handleTypeList: [],
       showDateSelect: false,
@@ -142,7 +143,7 @@ export default {
         return this.$u.toast('请选择隔离策略')
       }
 
-      if(this.form.communityHandleType == 2 && !this.form.fileList.length) {
+      if(this.form.communityHandleType == 2 && !this.form.proveFileList && !this.form.proveFileList.length) {
         return this.$u.toast('请上传核酸证明图片')
       }
 
@@ -177,11 +178,12 @@ export default {
           this.info.travelTypeList = this.info.travelType.split(',')
           this.info.idNumberText = res.data.idNumber.replace(/(.{6}).*(.{4})/,"$1********$2")
 
-          if(res.data.riskDisposalList && res.data.riskDisposalList.length) {
+          if(res.data.cmAdvanceDisposal && res.data.cmAdvanceDisposal.homeStatus) {
-            this.form = {...res.data.riskDisposalList[0]}
+            this.form = {...res.data.cmAdvanceDisposal}
-            this.form.quarantineBeginTime = res.data.riskDisposalList[0].quarantineBeginTime.substring(0, 10)
+            this.form.quarantineBeginTime = res.data.cmAdvanceDisposal.quarantineBeginTime.substring(0, 10)
-            this.form.quarantineEndTime = res.data.riskDisposalList[0].quarantineEndTime.substring(0, 10)
+            this.form.quarantineEndTime = res.data.cmAdvanceDisposal.quarantineEndTime.substring(0, 10)
           }
+
         }
       })
     },

src/project/pingchang/AppReturnHomeReporting/UserInfo.vue

@@ -113,7 +113,7 @@
         </div>
       </div>
     </div>
-    <div class="line-bg"></div>
+    <div class="line-bg" v-if="info.handleType != 0 && info.riskDisposalList && info.riskDisposalList.length"></div>
     <div class="info" v-if="info.handleType != 0 && info.riskDisposalList && info.riskDisposalList.length">
       <div class="title">风险处置记录</div>
       <div class="error-list">
@@ -126,8 +126,55 @@
       </div>
       <div style="height:16px;"></div>
     </div>
+
+    <div class="line-bg" v-if="info.cmAdvanceDisposal"></div>
+    <div class="info" v-if="info.cmAdvanceDisposal">
+      <div class="title">社区初排</div>
+      <div class="item-flex" :class="info.cmAdvanceDisposal.communityHandleType == 0 ? 'border-none' : ''">
+        <div class="label">处置意见</div>
+        <div class="value">{{$dict.getLabel('EP_communityHandleType', info.cmAdvanceDisposal.communityHandleType)}}</div>
+      </div>
+
+      <div v-if="info.cmAdvanceDisposal.communityHandleType == 1">
+        <div class="item-flex">
+          <div class="label">居家状态</div>
+          <div class="value">{{ $dict.getLabel('EP_homeStatus', info.cmAdvanceDisposal.homeStatus) }}</div>
+        </div>
+        <div class="item-flex">
+          <div class="label">隔离时间</div>
+          <div class="value">{{info.cmAdvanceDisposal.quarantineBeginTime.substring(0, 10)}}至{{info.cmAdvanceDisposal.quarantineEndTime.substring(0, 10)}}</div>
+        </div>
+        <div class="item-flex">
+          <div class="label">隔离策略</div>
+          <div class="value">{{ $dict.getLabel('EP_quarantineStrategy', info.cmAdvanceDisposal.quarantineStrategy) }}</div>
+        </div>
+        <div class="item-flex">
+          <div class="label">管控方式</div>
+          <div class="value">{{ $dict.getLabel('EP_controlMethod', info.cmAdvanceDisposal.controlMethod) }}</div>
+        </div>
+        <div class="item-flex border-none" v-if="info.cmAdvanceDisposal.fileList && info.cmAdvanceDisposal.fileList.length">
+          <div style="color:#999;">附件</div>
+        </div>
+        <div class="img-list solid">
+          <img :src="items.url" alt="" v-for="(items, indexs) in info.cmAdvanceDisposal.fileList" :key="indexs" @click="previewImage(info.cmAdvanceDisposal.fileList, items.url)">
+        </div>
+        <div class="item-flex border-none">
+          <div style="color:#999;">备注</div>
+        </div>
+        <p style="padding-bottom: 12px;">{{info.cmAdvanceDisposal.remarks}}</p>
+      </div>
+
+      <div v-if="info.cmAdvanceDisposal.communityHandleType == 2">
+        <div class="item-flex border-none">
+          <div style="color:#999;">核酸阴性证明图片</div>
+        </div>
+        <div class="img-list">
+          <img :src="items.url" alt="" v-for="(items, indexs) in info.cmAdvanceDisposal.proveFileList" :key="indexs" @click="previewImage(info.cmAdvanceDisposal.proveFileList, items.url)">
+        </div>
+      </div>
+    </div>
     <div class="line-bg" style="padding-bottom: 56px;"></div>
-    <div class="footer" v-if="info.handleType != 5" @click="toError">风险处置</div>
+    <div class="footer" v-if="info.riskStatus != 2" @click="toError">风险处置</div>
   </div>
 </template>
 
@@ -147,7 +194,7 @@ export default {
   },
   onLoad(option) {
     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(() => {
+    'EP_quarantineAddress', 'EP_homeStatus', 'EP_quarantineStrategy', 'EP_controlMethod', 'EP_handoverObject', 'EP_handoverMethod', 'EP_communityHandleType').then(() => {
       this.id = option.id
       this.getDetail()
     })
@@ -379,5 +426,8 @@ export default {
     font-size: 32px;
     color: #333;
   }
+  .solid {
+    border-bottom: 1px solid #ddd;
+  }
 }
 </style>