[dev]做了firefox浏览器兼容性适配

src/views/pharmacyManagement/business/deploy/index.vue

@@ -307,7 +307,6 @@
         </el-row>
 
         <h3 style="margin: 60px 0 0 0">溯源记录</h3>
-<!--        <div style="display:flex;align-items:center;margin-top:20px"><span style="color:#999;">当前状态：</span><dict-tag :options="deployStateArr" :value="detailData.deployState-1" /></div>-->
         <div style="display:flex;flex-wrap:wrap;align-items:center;margin-top:20px">
           <div style="display:flex;margin: 0 10px 5px 0" v-for="item in deployStateArr">
             <el-tag
@@ -323,43 +322,47 @@
           </div>
         </div>
         <el-divider></el-divider>
-        <div class="deploy-record" v-if="depolyStatusObj.createTime">
+        <div class="deploy-record">
           <div class="deploy">
             <div class="content">
               <div class="title body">操作时间：</div>
-              <div class="body">{{ depolyStatusObj.createTime }}</div>
+              <div class="body"  v-if="depolyStatusObj.createTime">{{ depolyStatusObj.createTime }}</div>
             </div>
-            <div class="content" v-if="depolyStatusObj.operateType">
+            <div class="content" v-if="depolyStatusObj.operateType && currentDepoly">
               <div class="title body">操作模式：</div>
-              <div class="body">{{ depolyStatusObj.operateType=='0'?'自动':'手动' }}</div>
+              <div class="body" v-if="depolyStatusObj.operateType">{{ (currentDepoly == 'audited' || currentDepoly == 'reviewed' || currentDepoly == 'cooked')?'人工':depolyStatusObj.operateType=='0'?'自动化':'手动' }}</div>
             </div>
-            <div class="content" v-if="depolyStatusObj.createBy">
+            <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>
-            <div class="content"  v-if="depolyStatusObj.remarks">
-              <div class="title body">备注信息：</div>
-              <div class="body">{{ depolyStatusObj.remarks }}</div>
-            </div>
-            <div class="content"  v-if="depolyStatusObj.deviceNo">
+            <div class="content" style="justify-content: flex-start;"  v-if="(currentDepoly !== 'audited' && currentDepoly !== 'reviewed' && currentDepoly !== 'cooked') && depolyStatusObj.operateType=='0'">
               <div class="title body">设备编号：</div>
-              <div class="body">{{ depolyStatusObj.deviceNo }}</div>
+              <div class="body" v-if="depolyStatusObj.deviceNo">{{ depolyStatusObj.deviceNo }}</div>
             </div>
-            <div class="content"  v-if="depolyStatusObj.dosage">
+            <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>
+            <div class="content"  v-if="depolyStatusObj.dosage && depolyStatusObj.operateType=='0' && currentDepoly == 'startedConcentration'">
               <div class="title body">开始浓缩药液量：</div>
-              <div class="body">{{ depolyStatusObj.dosage }}</div>
+              <div class="body" v-if="depolyStatusObj.dosage">{{ depolyStatusObj.dosage }}</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>
           </div>
 
-          <div class="deploy" v-if="depolyStatusObj&&depolyStatusObj.prescriptionFiles&&depolyStatusObj.prescriptionFiles.length>0">
-            <div class="title body">照片：</div>
-          </div>
-          <div class="deploy">
-            <div class="body" v-if="depolyStatusObj&&depolyStatusObj.prescriptionFiles&&depolyStatusObj.prescriptionFiles.length>0&&depolyStatusObj.prescriptionFiles[0].url.length>4">
-              <el-image v-for="img in depolyStatusObj.prescriptionFiles"
-              style="width: 100px; height: 100px"
-              :src="img.url.length>4?$baseUrl+'/'+img.url:''"
-              fit="fill"></el-image>
+         <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"
+                          style="width: 100px; height: 100px; padding-right: 10px;"
+                          :src="img.url.length>4?$baseUrl+'/'+img.url:''"
+                          fit="fill"></el-image>
+              </div>
             </div>
           </div>
         </div>
@@ -532,7 +535,7 @@ export default {
       ],
       deployStateArr: [
         { name: "已审核", id: 110, key: "audited" },
-        { name: "已审核不通过", id: 120, key: "---" },
+        // { name: "已审核不通过", id: 120, key: "---" },
         { name: "已调配", id: 130, key: "allocated" },
         { name: "已复核", id: 140, key: "reviewed" },
         { name: "已浸泡", id: 150, key: "soaked" },
@@ -544,9 +547,9 @@ export default {
         { name: "已开始浓缩", id: 165, key: "startedConcentration" },
         { name: "已结束浓缩", id: 166, key: "finishedConcentration" },
         { name: "已打包", id: 170, key: "packaged" },
-        { name: "已上架", id: 171, key: "---" },
-        { name: "已发药", id: 175, key: "---" },
-        { name: "煎药已作废", id: 999, key: "---" },
+        // { name: "已上架", id: 171, key: "---" },
+        // { name: "已发药", id: 175, key: "---" },
+        // { name: "煎药已作废", id: 999, key: "---" },
       ],
       depolyStatusObj:{
         type:'',
@@ -801,9 +804,11 @@ export default {
     },
     // 改变溯源记录的状态
     handleDeploy(item) {
-      console.log('item.name',item.name)
+      console.log('item.key',item.key)
       this.currentDepoly = item.key
       this.depolyStatusObj = this.detailData[this.currentDepoly][0] ||{}
+      console.log('depolyStatusObj',this.depolyStatusObj)
+      // this.depolyStatusObj.deployState =
       // test code
       // this.depolyStatusObj.remarks = this.depolyStatusObj?.remarks? + this.currentDepoly
     }
@@ -831,6 +836,8 @@ h3 {
 }
 .content{
   display: flex;
+  width: 320px;
+  justify-content:flex-start;
 }
 .body{
   display: flex;