药品种类，详情，数量开关

pages/newDrug/checkPage/checkPage.vue

@@ -11,14 +11,14 @@
     <view class="Scanning_cont">
       <view class="column head">
         <view class="value1">单号<text class="red">（{{drugsBagList.length}}）</text></view>
-        <view class="value2">种类数</view>
-        <view class="value3">总数</view>
+        <view class="value2" v-if="config.showDrugsBagTypeCount == 1">种类数</view>
+        <view class="value3" v-if="config.showDrugsBagTypeCount == 1">总数</view>
       </view>
       <scroll-view scroll-y class="scrollContent">
         <view class="column" v-for="item in drugsBagList" :key="item.id" @click="toDetail(item.id)">
           <view class="value1">{{item.packid}}</view>
-          <view class="value2">{{item.drugsTypeCount}}</view>
-          <view class="value3">{{item.drugsCount}}</view>
+          <view class="value2" v-if="config.showDrugsBagTypeCount == 1">{{item.drugsTypeCount}}</view>
+          <view class="value3" v-if="config.showDrugsBagTypeCount == 1">{{item.drugsCount}}</view>
         </view>
       </scroll-view>
     </view>

pages/newDrug/continueScanning/continueScanning.vue

@@ -20,11 +20,11 @@
           <view class="name">发药科室：</view>
           <view class="value">{{drugsBag.launch ? drugsBag.launch.dept : ''}}</view>
         </view>
-        <view class="column">
+        <view class="column" v-if="config.showDrugsBagTypeCount == 1">
           <view class="name">种类数：</view>
           <view class="value">{{drugsBag.drugsTypeCount}}</view>
         </view>
-        <view class="column">
+        <view class="column" v-if="config.showDrugsBagTypeCount == 1">
           <view class="name">药品数：</view>
           <view class="value">{{drugsBag.drugsCount}}</view>
         </view>
@@ -56,6 +56,8 @@
   export default {
     data() {
       return {
+        hosId: uni.getStorageSync('userData').user.currentHospital.id,
+        config: {}, //配置
         workOrder: {}, //工单信息
         drugsBag: {}, //药包信息
         queryObj: {}, //路由传递过来的数据
@@ -188,21 +190,50 @@
           title: "加载中",
           mask: true,
         });
-
-        post(`/transflow/scanInfo`, {type: this.queryObj.drugsBagType, id: +this.queryObj.drugsBagId, orderStateValue: this.queryObj.orderStateValue, orderId: +this.queryObj.orderId}).then(res => {
+        
+        let info$ = post(`/transflow/scanInfo`, {type: this.queryObj.drugsBagType, id: +this.queryObj.drugsBagId, orderStateValue: this.queryObj.orderStateValue, orderId: +this.queryObj.orderId});
+        let config$ = post(`/simple/data/fetchDataList/taskTypeConfig`, {
+            "idx": 0,
+            "sum": 1,
+            "taskTypeConfig": {
+                "taskTypeDTO": {
+                    "hosId": {
+                        "id": this.hosId
+                    },
+                    "ordinaryField": {
+                        "key": "ordinary_field",
+                        "value": this.queryObj.drugsBagType
+                    }
+                }
+            }
+        });
+        
+        Promise.all([info$, config$]).then(result => {
           uni.hideLoading();
-          if(res.state == 200){
-            if(res.data){
-              this.scanCount = res.data.scanCount;
-              this.drugsBag = res.data.dto || {};
-              let workOrder = res.data.workOrder || {};
+          let [info, config] = result || [];
+        
+          if(info.state == 200){
+            if(info.data){
+              this.scanCount = info.data.scanCount;
+              this.drugsBag = info.data.dto || {};
+              let workOrder = info.data.workOrder || {};
               workOrder.endDeptNames = workOrder.endDepts.map(v=>v.dept).toString();
               this.workOrder = workOrder;
             }
           }else{
             uni.showToast({
               icon: "none",
-              title: res.msg || "接口获取数据失败！",
+              title: info.msg || "接口获取数据失败！",
+            });
+          }
+        
+          if(config.status == 200){
+            let list  = config.list || [];
+            this.config = list.length ? list[0] : {};
+          }else{
+            uni.showToast({
+              icon: "none",
+              title: config.msg || "接口获取数据失败！",
             });
           }
         })

pages/newDrug/createOrder/createOrder.vue

@@ -20,11 +20,11 @@
           <view class="name">发药科室：</view>
           <view class="value">{{drugsBag.launch ? drugsBag.launch.dept : ''}}</view>
         </view>
-        <view class="column">
+        <view class="column" v-if="config.showDrugsBagTypeCount == 1">
           <view class="name">种类数：</view>
           <view class="value">{{drugsBag.drugsTypeCount}}</view>
         </view>
-        <view class="column">
+        <view class="column" v-if="config.showDrugsBagTypeCount == 1">
           <view class="name">药品数：</view>
           <view class="value">{{drugsBag.drugsCount}}</view>
         </view>

pages/newDrug/detail.vue

@@ -9,16 +9,18 @@
     </view>
 
     <view class="Scanning_cont">
-      <view class="column head">
-        <view class="value1">药品名称+规格<text class="red">（{{drugsList.length}}）</text></view>
-        <view class="value2">数量</view>
-      </view>
-      <scroll-view scroll-y class="scrollContent">
-        <view class="column" v-for="item in drugsList" :key="item.id">
-          <view class="value1">{{item.drugsInfo}} {{item.model}}</view>
-          <view class="value2">{{item.drugsNum}}</view>
+      <template v-if="config.showDrugsBagDetails == 1">
+        <view class="column head">
+          <view class="value1">药品名称+规格<text class="red">（{{drugsList.length}}）</text></view>
+          <view class="value2">数量</view>
         </view>
-      </scroll-view>
+        <scroll-view scroll-y class="scrollContent">
+          <view class="column" v-for="item in drugsList" :key="item.id">
+            <view class="value1">{{item.drugsInfo}} {{item.model}}</view>
+            <view class="value2">{{item.drugsNum}}</view>
+          </view>
+        </scroll-view>
+      </template>
     </view>
 
     <view class="foot_btn_spe">
@@ -73,38 +75,65 @@
           title: "加载中",
           mask: true,
         });
-
-        if(this.queryObj.drugsBagId){
-          // 根据药包id查询药品
-          this.getDrugsByDrugsBugId(this.queryObj.drugsBagId);
-        }else if(this.queryObj.orderId){
-          // 根据工单id查询药包,此时必是一单一码，即只有一个药包码
-          post(`/transflow/extra`, {type: this.queryObj.drugsBagType, extraType: 'orderInfo', orderId: +this.queryObj.orderId}).then(res => {
-            if(res.state == 200){
-              if(res.data){
-                let drugsBagList = res.data.drugsBagList || [];
-                let drugsBag = drugsBagList[0] || {};
-                if(drugsBag.id){
-                  this.getDrugsByDrugsBugId(drugsBag.id);
+        
+        post(`/simple/data/fetchDataList/taskTypeConfig`, {
+            "idx": 0,
+            "sum": 1,
+            "taskTypeConfig": {
+                "taskTypeDTO": {
+                    "hosId": {
+                        "id": this.hosId
+                    },
+                    "ordinaryField": {
+                        "key": "ordinary_field",
+                        "value": this.queryObj.drugsBagType
+                    }
+                }
+            }
+        }).then(res=> {
+          if(res.status == 200){
+            let list  = res.list || [];
+            this.config = list.length ? list[0] : {};
+            
+            if(this.queryObj.drugsBagId){
+              // 根据药包id查询药品
+              this.getDrugsByDrugsBugId(this.queryObj.drugsBagId);
+            }else if(this.queryObj.orderId){
+              // 根据工单id查询药包,此时必是一单一码，即只有一个药包码
+              post(`/transflow/extra`, {type: this.queryObj.drugsBagType, extraType: 'orderInfo', orderId: +this.queryObj.orderId}).then(res => {
+                if(res.state == 200){
+                  if(res.data){
+                    let drugsBagList = res.data.drugsBagList || [];
+                    let drugsBag = drugsBagList[0] || {};
+                    if(drugsBag.id){
+                      this.getDrugsByDrugsBugId(drugsBag.id);
+                    }else{
+                      uni.hideLoading();
+                      uni.showToast({
+                        icon: "none",
+                        title: "未查询到药品!",
+                      });
+                    }
+                  }else{
+                    uni.hideLoading();
+                  }
                 }else{
                   uni.hideLoading();
                   uni.showToast({
                     icon: "none",
-                    title: "未查询到药品!",
+                    title: res.msg || "接口获取数据失败！",
                   });
                 }
-              }else{
-                uni.hideLoading();
-              }
-            }else{
-              uni.hideLoading();
-              uni.showToast({
-                icon: "none",
-                title: res.msg || "接口获取数据失败！",
-              });
+              })
             }
-          })
-        }
+          }else{
+            uni.hideLoading();
+            uni.showToast({
+              icon: "none",
+              title: res.msg || "接口获取数据失败！",
+            });
+          }
+        })
       },
     },
     onLoad(options) {

pages/newDrug/list.vue

@@ -8,7 +8,7 @@
             <view class="value">{{item.drugsState ? item.drugsState.name : ''}}</view>
           </view>
           <view class="body">
-            <view class="bodyColumn">
+            <view class="bodyColumn" v-if="config.showDrugsBagTypeCount == 1">
               <view class="name">种类数：{{item.drugsTypeCount}}</view>
               <view class="value">总数：{{item.drugsCount}}</view>
             </view>
@@ -50,6 +50,9 @@
     methods: {
       // 详情
       toDetail(drugsBagId){
+        if(this.config.showDrugsBagDetails != 1){
+          return;
+        }
         uni.navigateTo({
           url: `/pages/newDrug/detail?drugsBagType=${this.queryObj.drugsBagType}&drugsBagId=${drugsBagId}`,
         });
@@ -60,18 +63,47 @@
           title: "加载中",
           mask: true,
         });
-
-        post(`/transflow/extra`, {type: this.queryObj.drugsBagType, extraType: 'orderInfo', orderId: +this.queryObj.orderId}).then(res => {
+        
+        let info$ = post(`/transflow/extra`, {type: this.queryObj.drugsBagType, extraType: 'orderInfo', orderId: +this.queryObj.orderId});
+        let config$ = post(`/simple/data/fetchDataList/taskTypeConfig`, {
+            "idx": 0,
+            "sum": 1,
+            "taskTypeConfig": {
+                "taskTypeDTO": {
+                    "hosId": {
+                        "id": this.hosId
+                    },
+                    "ordinaryField": {
+                        "key": "ordinary_field",
+                        "value": this.queryObj.drugsBagType
+                    }
+                }
+            }
+        });
+        
+        Promise.all([info$, config$]).then(result => {
           uni.hideLoading();
-          if(res.state == 200){
-            if(res.data){
-              this.drugsBagList = res.data.drugsBagList || [];
-              this.workOrder = res.data.workOrder || {};
+          let [info, config] = result || [];
+        
+          if(info.state == 200){
+            if(info.data){
+              this.drugsBagList = info.data.drugsBagList || [];
+              this.workOrder = info.data.workOrder || {};
             }
           }else{
             uni.showToast({
               icon: "none",
-              title: res.msg || "接口获取数据失败！",
+              title: info.msg || "接口获取数据失败！",
+            });
+          }
+        
+          if(config.status == 200){
+            let list  = config.list || [];
+            this.config = list.length ? list[0] : {};
+          }else{
+            uni.showToast({
+              icon: "none",
+              title: config.msg || "接口获取数据失败！",
             });
           }
         })

pages/newDrug/photoRetention/photoRetention.vue

@@ -31,7 +31,7 @@
             <view class="value">{{queryObj.accountName}}</view>
           </view>
           <template v-if="config.drugsModel === 1">
-            <view class="column">
+            <view class="column" v-if="config.showDrugsBagTypeCount == 1">
               <view class="name">药品数：</view>
               <view class="value">{{drugsBagList.length ? drugsBagList[0].drugsCount : ''}}</view>
             </view>