Переглянути джерело

[bug]修复展示数据非空的问题

Neo 2 роки тому
батько
коміт
19afe92af5
1 змінених файлів з 22 додано та 9 видалено
  1. 22 9
      src/views/pharmacyManagement/business/deploy/index.vue

+ 22 - 9
src/views/pharmacyManagement/business/deploy/index.vue

@@ -313,7 +313,7 @@
               v-if="detailData && detailData[item.key] && detailData[item.key].length>0"
               :key="item.id"
               class="mx-1"
-              :effect="item.key===currentDepoly?'dark':'plain'"
+              :effect="item.key==currentDepoly?'dark':'plain'"
               @click.native="handleDeploy(item)"
             >
               {{ item.name }}
@@ -327,16 +327,19 @@
             <div class="content">
               <div class="title body">操作时间:</div>
               <div class="body"  v-if="depolyStatusObj.createTime">{{ depolyStatusObj.createTime }}</div>
+              <div class="body" v-else> </div>
             </div>
             <div class="content" v-if="depolyStatusObj.operateType && currentDepoly">
               <div class="title body">操作模式:</div>
               <div class="body" v-if="depolyStatusObj.operateType">{{ (currentDepoly == 'audited' || currentDepoly == 'reviewed' || currentDepoly == 'cooked')?'人工':depolyStatusObj.operateType=='0'?'自动化':'人工' }}</div>
+              <div class="body" v-else> </div>
             </div>
             <div class="content" v-if="(currentDepoly == 'audited' || currentDepoly == 'reviewed' || currentDepoly == 'cooked') || depolyStatusObj.operateType!=='0'">
               <div class="title body">操作人:</div>
-              <div class="body">{{ depolyStatusObj.createBy }}</div>
+              <div class="body" v-if="depolyStatusObj.createBy">{{ depolyStatusObj.createBy }}</div>
+              <div class="body" v-else> </div>
             </div>
-            <div class="content" style="justify-content: flex-start;"  v-if="(currentDepoly == 'reviewed') && depolyStatusObj.operateType=='0'">
+            <div class="content" style="justify-content: flex-start;"  v-if="(currentDepoly == 'reviewed')">
               <div class="title body">复核重量:</div>
               <div class="body" v-if="depolyStatusObj.dosage">{{ depolyStatusObj.dosage }}</div>
               <div class="body" v-else> </div>
@@ -349,24 +352,27 @@
             <div class="content"  v-if="(currentDepoly == 'audited' || currentDepoly == 'allocated' || currentDepoly == 'reviewed' || currentDepoly == 'soaked' || currentDepoly == 'cooked') || depolyStatusObj.operateType!=='0'">
               <div class="title body">备注信息:</div>
               <div class="body" v-if="depolyStatusObj.remarks">{{ depolyStatusObj.remarks }}</div>
+              <div class="body" v-else> </div>
             </div>
             <div class="content"  v-if="depolyStatusObj.dosage && depolyStatusObj.operateType=='0' && currentDepoly == 'startedConcentration'">
               <div class="title body">开始浓缩药液量:</div>
               <div class="body" v-if="depolyStatusObj.dosage">{{ depolyStatusObj.dosage }}</div>
+              <div class="body" v-else> </div>
             </div>
             <div class="content"  v-if="depolyStatusObj.dosage && depolyStatusObj.operateType=='0' && currentDepoly == 'finishedConcentration'">
               <div class="title body">结束浓缩药液量:</div>
               <div class="body" v-if="depolyStatusObj.dosage">{{ depolyStatusObj.dosage }}</div>
+              <div class="body" v-else> </div>
             </div>
           </div>
 
          <div class="deploy" style="justify-content:flex-start;"> <!-- v-if="depolyStatusObj&&depolyStatusObj.prescriptionFiles&&depolyStatusObj.prescriptionFiles.length>0"-->
             <div class="content">
               <div class="title body">照片:</div>
-              <div class="body" style="height: 100px!important;" v-if="depolyStatusObj&&depolyStatusObj.prescriptionFiles&&depolyStatusObj.prescriptionFiles.length>0&&depolyStatusObj.prescriptionFiles[0].url.length>4">
-                <el-image v-for="img in depolyStatusObj.prescriptionFiles"
+              <div class="body" style="height: 100px!important;" v-if="depolyStatusObj">
+                <el-image v-for="img in depolyStatusObj.imgs"
                           style="width: 100px; height: 100px; padding-right: 10px;"
-                          :src="img.url.length>4?$baseUrl+'/'+img.url:''"
+                          :src="img"
                           fit="fill"></el-image>
               </div>
             </div>
@@ -562,13 +568,13 @@ export default {
         createTime:'',
         operate:'',
         createBy:'',
-        prescriptionFiles:[],
+        urls:'',
         remarks:'',
         deviceNo:'',
         dosage:''
       },
       effectStatus:'plain',
-      currentDepoly:'',
+      currentDepoly:'audited',
       // 遮罩层
       loading: true,
       // 导出遮罩层
@@ -654,6 +660,7 @@ export default {
         this.prescriptionCoreList = response.rows;
         this.total = response.total;
         this.loading = false;
+
       });
     },
     getListMedicalMechanism() {
@@ -813,7 +820,13 @@ export default {
       console.log('item.key',item.key)
       this.currentDepoly = item.key
       this.depolyStatusObj = this.detailData[this.currentDepoly][0] ||{}
-      console.log('depolyStatusObj',this.depolyStatusObj)
+      if(this.detailData[this.currentDepoly][0]&&this.detailData[this.currentDepoly][0].urls) {
+        const urlss = this.detailData[this.currentDepoly][0].urls
+        if( urlss){
+          this.depolyStatusObj.imgs=urlss.split(',')
+        }
+      }
+      console.log('depolyStatusObj.imgs',this.depolyStatusObj.imgs)
       // this.depolyStatusObj.deployState =
       // test code
       // this.depolyStatusObj.remarks = this.depolyStatusObj?.remarks? + this.currentDepoly