增加药包类型

main.js

@@ -4,7 +4,7 @@ import App from './App'
 import wx from 'weixin-jsapi'
 // import VConsole from 'vconsole';
 // new VConsole();
-console.info('v2.4.21');
+console.info('v2.4.22');
 Vue.prototype.wx = wx //声明扫码
 Vue.prototype.audios = [] //待播放的语音集合
 // #endif

pages/scanning_Result/scanning_Result.vue

@@ -81,7 +81,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> 药包类型 : {{(infoDATA.packType && infoDATA.packType !== 0) ? 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')">

pages/scanning_djInfo/scanning_djInfo.vue

@@ -86,7 +86,7 @@
         (res.status == 200 && type == 'drugsBag') ||
         (res.status == 200 && type == 'jPBag')
       ">
-      <view> 药包类型 : {{infoDATA.data.packType ? DRUGSBAG_TYPE[infoDATA.data.packType] : "-"}} </view>
+      <view> 药包类型 : {{(infoDATA.data.packType && infoDATA.data.packType !== 0) ? 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>

pages/scanning_drug/scanning_drug.vue

@@ -21,7 +21,7 @@
               <text>药包类型</text>
               <text class="text_big">
                 <text>
-                  {{drugsBagDto.packType ? DRUGSBAG_TYPE[drugsBagDto.packType] : "-"}}
+                  {{(drugsBagDto.packType && drugsBagDto.packType !== 0) ? DRUGSBAG_TYPE[drugsBagDto.packType] : "-"}}
                 </text>
               </text>
             </view>

tools/enum.drugsbagType.js

@@ -1,7 +1,11 @@
 import {
   createEnum
 } from './createEnum.js';
-let data = [{
+let data = [
+  {
+    name: '处方药',
+    value: '0'
+  },{
     name: '摆药',
     value: '1'
   },