药品录入,手动输入

components/bigScreen/bigScreen.vue

@@ -133,7 +133,7 @@
     position: fixed;
     left: 0;
     right: 0;
-    bottom: 0;
+    bottom: 30rpx;
     z-index: 999;
     height: 88rpx;
     display: flex;

components/uni-fab/uni-fab.vue

@@ -228,9 +228,9 @@
 
 	.uni-fab--leftBottom {
 		left: 5px;
-		bottom: 40px;
+		bottom: 55px;//oppp
 		/* #ifdef H5 */
-		bottom: calc(40px + var(--window-bottom));
+		bottom: calc(55px + var(--window-bottom));
 		/* #endif */
 		padding: 10px;
 	}
@@ -278,9 +278,9 @@
 
 	.uni-fab__circle--leftBottom {
 		left: 15px;
-		bottom: 50px;
+		bottom: 65px;
 		/* #ifdef H5 */
-		bottom: calc(50px + var(--window-bottom));
+		bottom: calc(65px + var(--window-bottom));
 		/* #endif */
 	}
 

pages/receiptpage/receiptpage.vue

@@ -240,6 +240,10 @@
     <handViewSpecimen v-if="speModels.disjunctor" :title="speModels.title" :disjunctor="speModels.disjunctor"
       @ok="speOk" @cancel="speCancel">
     </handViewSpecimen>
+    <!-- 手动查询药品弹窗 -->
+    <handViewDrugsBag v-if="drugbagModels.disjunctor" :title="drugbagModels.title" :disjunctor="drugbagModels.disjunctor"
+      @ok="drugbagOk" @cancel="drugbagCancel">
+    </handViewDrugsBag>
   </view>
 </template>
 <script>
@@ -265,6 +269,10 @@
         speModels: {
           disjunctor: false,
         },
+        // 手动查询药品弹窗model
+        drugbagModels: {
+          disjunctor: false,
+        },
         // 筛选条件
         array: [{
             id: 0,
@@ -358,6 +366,42 @@
       bigScreen,
     },
     methods: {
+      // 手动查询药品-确认
+      drugbagOk(data) {
+        console.log(data);
+        if (!data.id) {
+          //没有查询到药品
+          uni.showModal({
+            title: '提示',
+            content: "没有查询到发药单号！",
+            showCancel: false,
+            success: function(res) {
+              if (res.confirm) {
+                console.log('用户点击确定');
+              } else if (res.cancel) {
+                console.log('用户点击取消');
+              }
+            }
+          });
+          return;
+        }
+        this.drugbagModels.disjunctor = false;
+        uni.navigateTo({
+          url: `/pages/scanning_drug/scanning_drug?drugsBagId=${data.id}`,
+        });
+      },
+      // 手动查询药品-取消
+      drugbagCancel() {
+        this.drugbagModels.disjunctor = false;
+      },
+      // 手动查询药品弹窗
+      showHandViewDrugsbag() {
+        console.log(1)
+        this.drugbagModels = {
+          title: '填写发药单号',
+          disjunctor: true,
+        }
+      },
       // 手动查询标本-确认
       speOk(data) {
         console.log(data);
@@ -455,6 +499,10 @@
             this.content.push({
               text: "标本录入",
             });
+          } else if (item.link === "wxDrugsbagEntry") {
+            this.content.push({
+              text: "药品录入",
+            });
           }
         });
       },
@@ -540,6 +588,8 @@
           });
         } else if (e.item.text === "标本录入") {
           this.showHandViewSpecimen();
+        } else if (e.item.text === "药品录入") {
+          this.showHandViewDrugsbag();
         }
       },
       // 点击tab页切换

pages/scanning_code/scanning_code.vue

@@ -311,7 +311,7 @@
         (infoType == 'spe-dsd-3' && infoDATA.gdState.value == '5')
       ">
       <view class="btn3" @click="Scanning_again(dataId)">继续扫描</view>
-      <view class="btn3" @click="hand_again(dataId)">手动录入</view>
+      <view class="btn3" @click="showHandViewSpecimen()">手动录入</view>
     </view>
     <view class="foot_btn2 footerPadding" v-if="
         infoType == 'ins-dsd-1' ||
@@ -335,6 +335,7 @@
         infoType == 'jp-dsd-2'
       ">
       <view class="btn2" @click="Scanning_again(dataId)">继续扫描</view>
+      <view class="btn3" @click="showHandViewDrugsbag()">手动录入</view>
     </view>
     <view class="foot_btn2 footerPadding" v-if="
         infoType == 'drug-ddd-1' ||
@@ -354,6 +355,10 @@
     <handViewSpecimen v-if="speModels.disjunctor" :title="speModels.title" :disjunctor="speModels.disjunctor"
       @ok="speOk" @cancel="speCancel">
     </handViewSpecimen>
+    <!-- 手动查询药品弹窗 -->
+    <handViewDrugsBag v-if="drugbagModels.disjunctor" :title="drugbagModels.title"
+      :disjunctor="drugbagModels.disjunctor" @ok="drugbagOk" @cancel="drugbagCancel">
+    </handViewDrugsBag>
   </view>
 </template>
 <script>
@@ -375,6 +380,10 @@
         speModels: {
           disjunctor: false,
         },
+        // 手动查询药品弹窗model
+        drugbagModels: {
+          disjunctor: false,
+        },
         SMFlag: true,
         // 交接人信息
         accountObj: undefined,
@@ -397,6 +406,39 @@
       };
     },
     methods: {
+      // 手动查询药品-确认
+      drugbagOk(data) {
+        console.log(data);
+        if (!data.id) {
+          //没有查询到药品
+          uni.showModal({
+            title: '提示',
+            content: "没有查询到发药单号！",
+            showCancel: false,
+            success: function(res) {
+              if (res.confirm) {
+                console.log('用户点击确定');
+              } else if (res.cancel) {
+                console.log('用户点击取消');
+              }
+            }
+          });
+          return;
+        }
+        this.drugbagModels.disjunctor = false;
+        this.hand_scanning_common(data.packid, 'hand');
+      },
+      // 手动查询药品-取消
+      drugbagCancel() {
+        this.drugbagModels.disjunctor = false;
+      },
+      // 手动查询药品弹窗
+      showHandViewDrugsbag() {
+        this.drugbagModels = {
+          title: '填写发药单号',
+          disjunctor: true,
+        }
+      },
       // 手动查询标本-确认
       speOk(data) {
         console.log(data);
@@ -430,10 +472,6 @@
           disjunctor: true,
         }
       },
-      // 手动录入标本
-      hand_again(id) {
-        this.showHandViewSpecimen();
-      },
       // 拍照
       photograph(data, obj) {
         photographTool(data, obj);
@@ -507,8 +545,6 @@
                     .associationType.value == 'specimenPlan') {
                     if (type === 'scan') {
                       this.Scanning_again(this.dataId);
-                    } else if (type === 'hand') {
-                      // this.hand_again(this.dataId);
                     }
                   }
                   if (