Merge branch 'master' of http://git.dashitech.com/seimin/zy-wechat

pages/newDrug/list.vue

@@ -15,7 +15,7 @@
 						  <view class="name">种类数：{{item.drugsTypeCount}}</view>
 						  <view class="value">总数：{{item.drugsCount}}</view>
 						</view>
-            <view class="bodyColumn" v-if="config.showDrugsBagTypeCount == 1">
+            <view class="bodyColumn">
               <view class="name">发药科室：{{item.launch ? item.launch.dept : ''}}</view>
               <view class="value">打印时间：{{item.creatTime}}</view>
             </view>