[dev]

1、修改溯源管理中tab状态和tabBody的呈现

.env.development

@@ -7,8 +7,10 @@ ENV = 'development'
 # 中药房管理系统/开发环境
 #VUE_APP_BASE_API = 'http://47.118.22.101:8005/'
 VUE_APP_BASE_API = 'http://zhongyao.fscuc.cn/'
-
+#VUE_APP_BASE_API = 'http://zyhg.fscuc.cn'
+#VUE_APP_BASE_API = 'http://192.168.3.146:8005'
 VUE_APP_BASE_API_V2 = 'http://zy-web.fscuc.cn'
+#VUE_APP_BASE_API_V2 = 'http://192.168.3.146:8006'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

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

@@ -171,20 +171,20 @@
           <h3>处方信息</h3>
           <div style="margin: 0 0 0 30px">处方号：{{detailData.preNo}}</div>
         </div>
-        <div style="display: flex; align-items: center;">
-          <h3>审核状态：</h3>
-          <span style="color:#fff" :class="detailData.checkState==0?'yellow-btn':detailData.checkState==1?'green-btn':detailData.checkState==2?'red-btn':''">{{detailData.checkState == 0
-              ? "待审核"
-              : detailData.checkState == 1
-              ? "审核通过"
-              : detailData.checkState == 2
-              ? "审核不通过"
-              : ""}}</span>
-          <h3 style="margin-left:50px">审核人：</h3>
-          <span>{{detailData.checkBy}}</span>
-          <h3 style="margin-left:50px">审核时间：</h3>
-          <span>{{detailData.checkTime}}</span>
-        </div>
+<!--        <div style="display: flex; align-items: center;">-->
+<!--          <h3>审核状态：</h3>-->
+<!--          <span style="color:#fff" :class="detailData.checkState==0?'yellow-btn':detailData.checkState==1?'green-btn':detailData.checkState==2?'red-btn':''">{{detailData.checkState == 0-->
+<!--              ? "待审核"-->
+<!--              : detailData.checkState == 1-->
+<!--              ? "审核通过"-->
+<!--              : detailData.checkState == 2-->
+<!--              ? "审核不通过"-->
+<!--              : ""}}</span>-->
+<!--          <h3 style="margin-left:50px">审核人：</h3>-->
+<!--          <span>{{detailData.checkBy}}</span>-->
+<!--          <h3 style="margin-left:50px">审核时间：</h3>-->
+<!--          <span>{{detailData.checkTime}}</span>-->
+<!--        </div>-->
         <el-divider></el-divider>
         <el-row :gutter="20">
           <el-col :span="24">
@@ -311,6 +311,7 @@
         <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
+              v-if="detailData && detailData[item.key] && detailData[item.key].length>0"
               :key="item.id"
               class="mx-1"
               :effect="item.key===currentDepoly?'dark':'plain'"
@@ -318,31 +319,46 @@
             >
               {{ item.name }}
             </el-tag>
-            <i v-if="item.id<16" class="el-icon-d-arrow-right el-icon--right" style="display:flex;align-items:center;"></i>
+            <i v-if="detailData && detailData[item.key] && detailData[item.key].length" class="el-icon-arrow-right el-icon--right" style="display:flex;align-items:center;"></i>
           </div>
         </div>
         <el-divider></el-divider>
-        <div class="deploy-record">
-          <div class="deploy">
-            <div class="title body">操作时间：</div>
-            <div class="title body">操作模式：</div>
-            <div class="title body">操作人：</div>
-            <div class="title body">备注信息：</div>
-          </div>
+        <div class="deploy-record" v-if="depolyStatusObj.createTime">
           <div class="deploy">
-            <div class="body">{{ depolyStatusObj.createTime }}</div>
-            <div class="body">{{ depolyStatusObj.operateType=='0'?'自动':'手动' }}</div>
-            <div class="body">{{ depolyStatusObj.createBy }}</div>
-            <div class="body">{{ depolyStatusObj.remarks }}</div>
+            <div class="content">
+              <div class="title body">操作时间：</div>
+              <div class="body">{{ depolyStatusObj.createTime }}</div>
+            </div>
+            <div class="content" v-if="depolyStatusObj.operateType">
+              <div class="title body">操作模式：</div>
+              <div class="body">{{ depolyStatusObj.operateType=='0'?'自动':'手动' }}</div>
+            </div>
+            <div class="content" v-if="depolyStatusObj.createBy">
+              <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="title body">设备编号：</div>
+              <div class="body">{{ depolyStatusObj.deviceNo }}</div>
+            </div>
+            <div class="content"  v-if="depolyStatusObj.dosage">
+              <div class="title body">开始浓缩药液量：</div>
+              <div class="body">{{ depolyStatusObj.dosage }}</div>
+            </div>
           </div>
-          <div class="deploy">
+
+          <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?process.env.VUE_APP_BASE_API+img.url:''"
+              :src="img.url.length>4?$baseUrl+'/'+img.url:''"
               fit="fill"></el-image>
             </div>
           </div>
@@ -515,23 +531,22 @@ export default {
         { name: "配送", id: 4 },
       ],
       deployStateArr: [
-        // { name: "抓药", id: 0, key: "zy" },
-        // { name: "复核", id: 1, key: "fh" },
-        // { name: "浸泡", id: 2, key: "jp" },
-        // { name: "煎煮", id: 3, key: "jz" },
-        // { name: "打包", id: 4, key: "db" },
-        { name: "已审核", id: 5, key: "audited" },
-        { name: "已调配", id: 6, key: "allocated" },
-        { name: "已复核", id: 7, key: "reviewed" },
-        { name: "已浸泡", id: 8, key: "soaked" },
-        { name: "已煎煮", id: 9, key: "cooked" },
-        { name: "已先煎", id: 10, key: "preCooked" },
-        { name: "已开始煎煮", id: 11, key: "startedCooking" },
-        { name: "已后下", id: 12, key: "lowered" },
-        { name: "已结束煎煮", id: 13, key: "finishedCooking" },
-        { name: "已开始浓缩", id: 14, key: "startedConcentration" },
-        { name: "已结束浓缩", id: 15, key: "finishedConcentration" },
-        { name: "已打包", id: 16, key: "packaged" },
+        { name: "已审核", id: 110, key: "audited" },
+        { name: "已审核不通过", id: 120, key: "---" },
+        { name: "已调配", id: 130, key: "allocated" },
+        { name: "已复核", id: 140, key: "reviewed" },
+        { name: "已浸泡", id: 150, key: "soaked" },
+        { name: "已煎煮", id: 160, key: "cooked" },
+        { name: "已先煎", id: 161, key: "preCooked" },
+        { name: "已开始煎煮", id: 162, key: "startedCooking" },
+        { name: "已后下", id: 163, key: "lowered" },
+        { name: "已结束煎煮", id: 164, key: "finishedCooking" },
+        { 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: "---" },
       ],
       depolyStatusObj:{
         type:'',
@@ -539,7 +554,9 @@ export default {
         operate:'',
         createBy:'',
         prescriptionFiles:[],
-        remarks:''
+        remarks:'',
+        deviceNo:'',
+        dosage:''
       },
       effectStatus:'plain',
       currentDepoly:'',
@@ -642,6 +659,11 @@ export default {
     },
     // 表单重置
     reset() {
+      this.detailData = {
+        oralPre: {
+          oralPreItemList: []
+        }
+      },
       this.form = {
         id: null,
         appId: null,
@@ -714,7 +736,8 @@ export default {
         this.open = true;
         this.activeName = 'first'
         this.title = "溯源详情";
-        //console.log(response);
+        this.handleDeploy({ name: "已审核", id: 1, key: "audited" })
+        console.log('$baseUrl', this.$baseUrl);
       });
     },
     /** 提交按钮 */
@@ -805,7 +828,9 @@ h3 {
   flex-direction:column;
   align-items:flex-end;
   justify-content:center;
-
+}
+.content{
+  display: flex;
 }
 .body{
   display: flex;
@@ -818,7 +843,7 @@ h3 {
   margin-bottom: 0;
   font-weight: bolder;
   justify-content: flex-end!important;
-  width: 90px!important;
+  width: 120px!important;
   /*justify-content:center;*/
 }