药品录入，标本录入

pages/scanning_djEnd/scanning_djEnd.vue

@@ -114,6 +114,12 @@
           type1 === 'jp-ddd-2' ||
           type1 === 'jp-dsd-2'
         ">继续扫描</view>
+      <view class="btn3" @click="showHandViewDrugsbag()" v-if="
+          type1 === 'drug-ddd-2' ||
+          type1 === 'drug-dsd-2' ||
+          type1 === 'jp-ddd-2' ||
+          type1 === 'jp-dsd-2'
+        ">手动录入</view>
       <view class="btn3" @click="showAlert()" v-if="
           type1 === 'drug-ddd-1' ||
           type1 === 'drug-dsd-1' ||
@@ -130,7 +136,7 @@
           (type1 != 'spe-ddd-1') & (type1 != 'spe-ddd-2'))
       ">
       <view class="btn1" @click="Scanning_again()">扫描标本</view>
-      <view class="btn3" @click="hand_again()">手动录入</view>
+      <view class="btn3" @click="showHandViewSpecimen()">手动录入</view>
       <view class="btn3" @click="getNoScanSpecimen()">未扫描标本</view>
       <view class="btn2" @click="Scanning_complete(ids)">完成扫描</view>
     </view>
@@ -139,7 +145,7 @@
         (type == 'specimen' && type1 == 'spe-ddd-2')
       ">
       <view class="btn1" @click="Scanning_again()">扫描标本</view>
-      <view class="btn3" @click="hand_again()">手动录入</view>
+      <view class="btn3" @click="showHandViewSpecimen()">手动录入</view>
       <view class="btn3" @click="getNoScanSpecimen()">未扫描标本</view>
       <view class="btn2" @click="Scanning_complete(ids)">完成扫描</view>
     </view>
@@ -189,6 +195,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>
@@ -207,6 +217,10 @@
         speModels: {
           disjunctor: false,
         },
+        // 手动查询药品弹窗model
+        drugbagModels: {
+          disjunctor: false,
+        },
         // 交接人信息
         accountObj: undefined,
         //传给后端查询是否继续扫描
@@ -234,6 +248,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);
@@ -267,10 +314,6 @@
           disjunctor: true,
         }
       },
-      // 手动录入标本
-      hand_again() {
-        this.showHandViewSpecimen();
-      },
       // 手动输入标本和扫码公共方法
       hand_scanning_common(ress1, type) {
         uni.showLoading({
@@ -283,8 +326,8 @@
           content: ress1,
         }).then((result) => {
           this.SMFlag = true;
-          this.currentCode = result.code;
           if (result.state == 200 || result.state == 201) {
+            this.currentCode = result.code;
             let ress = result.code;
             let speCode = ress;
             let data = {
@@ -331,8 +374,6 @@
                 if (this.type == "specimenPlan" || this.type == "specimen") {
                   if (type === 'scan') {
                     this.Scanning_again();
-                  } else if (type === 'hand') {
-                    // this.hand_again();
                   }
                 }
                 this.speNum = ress.specimenCount;