Explorar el Código

[dev]
1、修改:溯源数据中,无数据连标题都不用显示

Neo hace 2 años
padre
commit
a0b4d877f0
Se han modificado 1 ficheros con 10 adiciones y 10 borrados
  1. 10 10
      src/views/pharmacyManagement/business/deploy/index.vue

+ 10 - 10
src/views/pharmacyManagement/business/deploy/index.vue

@@ -324,49 +324,49 @@
         <el-divider></el-divider>
         <div class="deploy-record" v-if="depolyStatusObj.createTime">
           <div class="deploy">
-            <div class="content">
+            <div class="content" v-if="depolyStatusObj.createTime">
               <div class="title body">操作时间:</div>
-              <div class="body"  v-if="depolyStatusObj.createTime">{{ depolyStatusObj.createTime }}</div>
-              <div class="body" v-else> </div>
+              <div class="body">{{ 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="content" v-if="(currentDepoly == 'audited' || currentDepoly == 'reviewed' || currentDepoly == 'cooked') || depolyStatusObj.operateType!=='0' && depolyStatusObj.createBy">
               <div class="title body">操作人:</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')">
+            <div class="content" style="justify-content: flex-start;"  v-if="currentDepoly == 'reviewed' && depolyStatusObj.dosage">
               <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" style="justify-content: flex-start;"  v-if="(currentDepoly !== 'audited' && currentDepoly !== 'reviewed' && currentDepoly !== 'cooked') && depolyStatusObj.operateType=='0'">
+            <div class="content" style="justify-content: flex-start;"  v-if="(currentDepoly !== 'audited' && currentDepoly !== 'reviewed' && currentDepoly !== 'cooked') && depolyStatusObj.operateType=='0' && depolyStatusObj.deviceNo">
               <div class="title body">设备编号:</div>
               <div class="body" v-if="depolyStatusObj.deviceNo">{{ depolyStatusObj.deviceNo }}</div>
               <div class="body" v-else> </div>
             </div>
-            <div class="content"  v-if="(currentDepoly == 'audited' || currentDepoly == 'allocated' || currentDepoly == 'reviewed' || currentDepoly == 'soaked' || currentDepoly == 'cooked') || depolyStatusObj.operateType!=='0'">
+            <div class="content"  v-if="(currentDepoly == 'audited' || currentDepoly == 'allocated' || currentDepoly == 'reviewed' || currentDepoly == 'soaked' || currentDepoly == 'cooked') || depolyStatusObj.operateType!=='0' && depolyStatusObj.remarks">
               <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="content"  v-if="depolyStatusObj.dosage && depolyStatusObj.operateType=='0' && currentDepoly == 'startedConcentration' && depolyStatusObj.dosage">
               <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="content"  v-if="depolyStatusObj.dosage && depolyStatusObj.operateType=='0' && currentDepoly == 'finishedConcentration' && depolyStatusObj.dosage">
               <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="deploy" v-if="depolyStatusObj&& depolyStatusObj.imgs &&depolyStatusObj.imgs.length>0" 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">