增加药包类型

pages/scanning_Result/scanning_Result.vue

@@ -73,6 +73,7 @@
       </view>
     </view>
     <view class="Scanning_cont" v-if="res.status == 200 && (type == 'drugsBag' || type == 'jPBag')">
+      <view> 药包类型 : {{infoDATA.packType ? DRUGSBAG_TYPE[infoDATA.packType] : "暂无"}} </view>
       <view v-if="type == 'drugsBag'"> 药包编码 : #{{ infoDATA.packid }} </view>
       <view
         v-if="type == 'drugsBag' && accountObj && (queryObj.type1 === 'drug-ddd-2' || queryObj.type1 === 'drug-dsd-2')">
@@ -237,9 +238,13 @@
   import {
     photographTool
   } from "../../tools/photograph.js";
+  import {
+    DRUGSBAG_TYPE
+  } from '../../tools/enum.drugsbagType.js';
   export default {
     data() {
       return {
+        DRUGSBAG_TYPE,
         currentCode: '', //当前小扫描的科室二维码
         // 手动查询标本弹窗model
         speModels: {

pages/scanning_djEnd/scanning_djEnd.vue

@@ -734,7 +734,7 @@
     padding: 0px 20rpx;
 
     .Scanning_top {
-      height: 270rpx;
+      min-height: 270rpx;
 
       .Scanning_top_icon {
         width: 140rpx;

pages/scanning_djInfo/scanning_djInfo.vue

@@ -71,8 +71,9 @@
         (res.status == 200 && type == 'drugsBag') ||
         (res.status == 200 && type == 'jPBag')
       ">
-      <view v-if="res.status == 200 && type == 'drugsBag'">药包编码 : #{{ infoDATA.data.packid }}</view>
-      <view v-if="res.status == 200 && type == 'jPBag'">静配编码 : #{{ infoDATA.data.packid }}</view>
+      <view> 药包类型 : {{infoDATA.data.packType ? DRUGSBAG_TYPE[infoDATA.data.packType] : "暂无"}} </view>
+      <view v-if="type == 'drugsBag'">药包编码 : #{{ infoDATA.data.packid }}</view>
+      <view v-if="type == 'jPBag'">静配编码 : #{{ infoDATA.data.packid }}</view>
       <view>所属科室 : {{ infoDATA.data.target.dept }}</view>
       <view v-if="
           accountObj && (infoType === 'drug-ddd-2' || infoType === 'drug-dsd-2')
@@ -150,9 +151,13 @@
     SM,
     webHandle
   } from "../../http/http.js";
+  import {
+    DRUGSBAG_TYPE
+  } from '../../tools/enum.drugsbagType.js';
   export default {
     data() {
       return {
+        DRUGSBAG_TYPE,
         currentCode: '', //当前小扫描的科室二维码
         // 手动查询标本弹窗model
         speModels: {

tools/createEnum.js

@@ -0,0 +1,8 @@
+// 简单的模拟枚举
+export function createEnum(arr = []) {
+  let obj = {}
+  arr.forEach(v => {
+    obj[obj[v.name] = v.value] = v.name;
+  })
+  return Object.freeze(obj);
+};

tools/enum.drugsbagType.js

@@ -0,0 +1,25 @@
+import {
+  createEnum
+} from './createEnum.js';
+let data = [{
+    name: '摆药',
+    value: '1'
+  },
+  {
+    name: '静配',
+    value: '2'
+  },
+  {
+    name: '针剂',
+    value: '3'
+  },
+  {
+    name: '毒麻',
+    value: '4'
+  },
+  {
+    name: '出院带药',
+    value: '5'
+  },
+]
+export const DRUGSBAG_TYPE = createEnum(data); //药包类型