bugfix

pages/medicalWaste/medicalWasteBindCheck/medicalWasteBindCheck.vue

@@ -29,7 +29,7 @@
       <view class="btn" @click="scanDeptOrUser()"> 扫一扫 </view>
     </view>
     <!-- 弹窗 -->
-    <showModel :title="models1.title" :icon="models1.icon" :disjunctor="models1.disjunctor" :content="models1.content"  @know="know1" :operate="models1.operate"></showModel>
+    <showModel :title="models1.title" :icon="models1.icon" :disjunctor="models1.disjunctor" :content="models1.content" @ok="ok1" @cancel="cancel1"  @know="know1" :operate="models1.operate"></showModel>
   </view>
 </template>
 <script>
@@ -59,6 +59,35 @@
       this.SMFlag = true;
     },
     methods: {
+      ok1(){
+        this.models1.disjunctor = false;
+        uni.showLoading({
+          title: '加载中',
+          mask: true,
+        })
+        post("/medicalWaste/checkComplete", {
+          handoverId: this.handoverId || undefined,
+          deptId: +this.queryObj.deptId,
+          hosId: this.hosId,
+          clinicalWasteTypeIds: this.infoList.map(v => v.id).toString(),
+        })
+          .then((res) => {
+            uni.hideLoading();
+            if (res.status == 200) {
+              uni.navigateTo({
+                url: `/pages/receiptpage/receiptpage`,
+              });
+            } else {
+              uni.showToast({
+                icon: "none",
+                title: res.msg || "接口获取数据失败！",
+              });
+            }
+          });
+      },
+      cancel1(){
+        this.models1.disjunctor = false;
+      },
       // 扫科室或人
       scanDeptOrUser() {
         if (!this.SMFlag) {
@@ -78,15 +107,15 @@
               this.SMFlag = true;
               // 200检测通过，201没有有效期也通过。
               if (result.state == 200 || result.state == 201) {
+                
                 let data = {
                   code: result.code, //二维码
                 };
                 
-                post("/medicalWaste/checkComplete", {
-                  code: result.code,
+                post("/medicalWaste/scanByCode", {
                   deptId: +this.queryObj.deptId,
+                  code: result.code,
                   hosId: this.hosId,
-                  clinicalWasteTypeIds: this.infoList.map(v => v.id).toString(),
                 })
                   .then((res) => {
                     uni.hideLoading();
@@ -136,16 +165,15 @@
       //知道了
       know1() {
         this.models1.disjunctor = false;
-        uni.navigateTo({
-          url: `/pages/receiptpage/receiptpage`,
-        });
       },
       // 被服送回弹窗
       showModel1(data, type) {
         let content = '';
         if(type === 'dept'){
+          this.handoverId = undefined;
           content = `您与<strong class="red">${data.dept}</strong>成功交接，总重量为<strong class="red">${this.weightTotal}kg</strong>，<strong class="red">${this.countTotal}袋</strong>医废`;
         }else if(type === 'user'){
+          this.handoverId = data.id;
           content = `您与<strong class="red">${data.name}</strong>，<strong class="red">${data.dept?data.dept.dept:''}</strong>成功交接，总重量为<strong class="red">${this.weightTotal}kg</strong>，<strong class="red">${this.countTotal}袋</strong>医废`;
         }
         
@@ -155,7 +183,8 @@
           content,
           icon: "warn",
           operate: {
-            know: "知道了",
+            ok: "确定",
+            cancel: "取消",
           },
         };
       },

pages/medicalWaste/medicalWasteSignIn/medicalWasteSignIn.vue

@@ -20,7 +20,7 @@
       <view class="Scanning_cont_list">
         <view class="Scanning_cont_list_item Scanning_cont_list_head">
           <view class="name">
-            科室名称<text class="red">({{nameTotal}})</text>
+            {{parentIndex === 0 ? '科室名称' : '类型名称'}}<text class="red">({{nameTotal}})</text>
           </view>
           <view class="value">
             <view>
@@ -55,7 +55,7 @@
 
     <view class="foot_btn">
       <view class="btn" @click="goBack()"> 取消 </view>
-      <view class="btn" @click="onClick()"> 确认交接 </view>
+      <view class="btn" @click="onClick()" *ngIf="gdIds"> 确认交接 </view>
     </view>
     <!-- 弹窗 -->
     <showModel :title="models1.title" :icon="models1.icon" :disjunctor="models1.disjunctor" :content="models1.content"

pages/medicalWaste/medicalWasteSignOut/medicalWasteSignOut.vue

@@ -270,6 +270,21 @@
           });
           return;
         }
+        if(!this.wasteCountTotal){
+          uni.showModal({
+            title: "提示",
+            content: "选择的类型，无医废数据请确认后发起出库！",
+            showCancel: false,
+            success: function(res) {
+              if (res.confirm) {
+                console.log("用户点击确定");
+              } else if (res.cancel) {
+                console.log("用户点击取消");
+              }
+            },
+          });
+          return;
+        }
         this.showModel1()
       },
       goBack(){
@@ -283,6 +298,7 @@
           mask: true,
         });
         post("/medicalWaste/complete", {
+          clinicalWasteTypeIds: this.queryObj.clinicalWasteTypeIds,
           wasteOutInfo:{
             credentialsNumber: this.credentialsNumber,
             totalBox: +this.totalBox,