标本扫描修改

App.vue

@@ -123,4 +123,7 @@
   .footerOtherMargin{
     margin-bottom: 174rpx!important;
   }
+  .red{
+    color: red!important;
+  }
 </style>

pages.json

@@ -176,6 +176,14 @@
         }
       }
 
+    },{
+      "path": "pages/noScanSpecimen/noScanSpecimen",
+      "style": {
+        "h5": {
+          "titleNView": false
+        }
+      }
+
     }, {
       "path": "components/footTool/footTool",
       "style": {

pages/noScanSpecimen/noScanSpecimen.vue

@@ -0,0 +1,341 @@
+<template>
+  <view class="pharmacyDetails">
+    <view class="pharmacyDetails_title">未扫描标本信息</view>
+    <view class="page_item footerOtherMargin">
+      <view class="page_item_wrap" v-for="spe in specimens" :key="spe.id">
+        <view class="page_item">
+          <view class="page_item_top">
+            <view class="page_item_top-inner">
+              <view class="page_item_top_L">
+                <text class="L_text">标本类型：{{ spe.stype ? spe.stype.name : "" }}({{
+                  spe.urgent == 1 ? "急" : "普"
+                }})</text>
+              </view>
+              <view class="page_item_top_R"></view>
+            </view>
+          </view>
+          <view class="page_item_cont">
+            <view class="page_item_cont_B">
+              <view class="page_item_cont_title">
+                <text>标本编码</text>
+                <text class="text_big">
+                  <text>{{ spe.scode }}</text>
+                </text>
+              </view>
+            </view>
+            <view class="page_item_cont_C">
+              <view class="page_item_cont_title_C">
+                <text>患者姓名</text>
+                <text class="text_big">
+                  <text>{{ spe.patientName }}<text v-if="spe.bedNum">({{spe.bedNum}})</text></text>
+                </text>
+              </view>
+            </view>
+            <view class="page_item_cont_C">
+              <view class="page_item_cont_title_C">
+                <text>目标科室</text>
+                <text class="text_big">
+                  <text>{{ spe.checkDept ? spe.checkDept.dept : "-" }}</text>
+                </text>
+              </view>
+            </view>
+          </view>
+          <view class="L"></view>
+          <view class="R"></view>
+        </view>
+        <view class="L-l"></view>
+        <view class="R-l"></view>
+      </view>
+    </view>
+    <view class="foot_btn2 footerPadding">
+      <view class="btn2" @click="goBack">返回</view>
+    </view>
+  </view>
+</template>
+<script>
+  import {
+    post,
+    webHandle
+  } from "../../http/http.js";
+  export default {
+    data() {
+      return {
+        workOrderId: -1,
+        specimens: [],
+      };
+    },
+    methods: {
+      // 返回
+      goBack() {
+        uni.navigateBack();
+      },
+      // 获取未扫描标本信息
+      getNoScanSpecimen() {
+        let postData = {
+          workOrderId: this.workOrderId,
+          currentPage: 0,
+          pageSize: 999,
+        };
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        post("/api/noScanSpecimenData", postData).then((res) => {
+          uni.hideLoading();
+          if (res.data) {
+            this.specimens = res.data;
+          }
+        });
+      },
+    },
+    onLoad(options) {
+      this.workOrderId = options.workOrderId;
+      this.getNoScanSpecimen();
+      // #ifdef APP-PLUS
+      webHandle("no", "app");
+      // #endif
+      // #ifdef H5
+      webHandle("no", "wx");
+      // #endif
+    },
+  };
+</script>
+<style lang="less" scoped>
+  .pharmacyDetails {
+    background-color: rgb(249, 250, 251);
+    padding-top: 50rpx;
+    height: 100%;
+    box-sizing: border-box;
+
+    .pharmacyDetails_title {
+      font-size: 46rpx;
+      font-weight: 550;
+      text-align: center;
+    }
+
+    .page_item_wrap {
+      position: relative;
+      margin-top: 32rpx;
+
+      .page_item {
+        margin-top: 16rpx;
+        margin-bottom: 124rpx;
+        background: #fff;
+        border-radius: 8rpx;
+        margin: 0 20rpx;
+        border: 2rpx solid #e5e9ed;
+        position: relative;
+        overflow: hidden;
+        padding: 0 16rpx;
+
+        .L {
+          width: 40rpx;
+          height: 40rpx;
+          border-radius: 50%;
+          background: #f9fafb;
+          position: absolute;
+          left: -20rpx;
+          top: 68rpx;
+          border: 2rpx solid #e5e9ed;
+        }
+
+        .R {
+          width: 40rpx;
+          height: 40rpx;
+          border-radius: 50%;
+          background: #f9fafb;
+          position: absolute;
+          float: right;
+          right: -20rpx;
+          top: 68rpx;
+          border: 2rpx solid #e5e9ed;
+        }
+
+        .page_item_top {
+          height: 88rpx;
+          border-bottom: 2rpx dashed #e5e9ed;
+          padding: 0 16rpx;
+
+          .page_item_top-inner {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            height: 100%;
+
+            .page_item_top_L {
+              .L_text {
+                font-size: 32rpx;
+                font-weight: 700;
+              }
+            }
+
+            .page_item_top_R {
+              font-size: 32rpx;
+
+              .L_iocn {
+                color: rgb(7, 134, 60);
+                font-size: 36rpx;
+                font-weight: 700;
+              }
+            }
+          }
+        }
+
+        .page_item_cont {
+          min-height: 180rpx;
+          max-height: 424rpx;
+          padding: 0 16rpx;
+          text-align: left;
+          position: relative;
+
+          .text_big {
+            font-size: 32rpx;
+            font-weight: 700;
+
+            text {
+              font-weight: 700;
+              line-height: 1.5;
+            }
+          }
+
+          .line {
+            height: 20rpx;
+            width: 2rpx;
+            border-left: 2rpx solid #e5e9ed;
+            position: absolute;
+            top: 82rpx;
+            left: 40rpx;
+          }
+
+          .page_item_cont_T {
+            padding-top: 28rpx;
+            font-size: 28rpx;
+
+            .page_item_cont_title {
+              height: 100%;
+              font-size: 32rpx;
+              display: flex;
+              justify-content: space-between;
+            }
+          }
+
+          .page_item_cont_B {
+            padding-top: 28rpx;
+            margin-bottom: 28rpx;
+
+            .page_item_cont_title {
+              font-size: 32rpx;
+              display: flex;
+              justify-content: space-between;
+              align-items: center;
+            }
+          }
+
+          .page_item_cont_C {
+            margin-bottom: 28rpx;
+
+            .page_item_cont_title_C {
+              font-size: 32rpx;
+              display: flex;
+              justify-content: space-between;
+              align-items: center;
+            }
+          }
+
+          #infos {
+            display: none;
+          }
+        }
+      }
+
+      .L-l {
+        width: 2rpx;
+        height: 40rpx;
+        background: #f9fafb;
+        position: absolute;
+        left: 20rpx;
+        top: 72rpx;
+      }
+
+      .R-l {
+        width: 2rpx;
+        height: 40rpx;
+        background: #f9fafb;
+        position: absolute;
+        right: 20rpx;
+        top: 72rpx;
+      }
+    }
+
+    .cube-toolbar-item {
+      width: 710rpx;
+      height: 68rpx;
+      line-height: 68rpx;
+      position: fixed;
+      left: 20rpx;
+      bottom: 160rpx;
+      border-radius: 8rpx;
+      background: linear-gradient(to right, #72c172, #3bb197);
+      font-size: 36rpx;
+      color: #fff;
+      text-align: center;
+    }
+
+    .btn-wrap {
+      display: flex;
+      justify-content: space-between;
+      position: fixed;
+      left: 20rpx;
+      bottom: 160rpx;
+    }
+
+    .cube-toolbar-item1 {
+      width: 350rpx;
+      height: 68rpx;
+      line-height: 68rpx;
+      border-radius: 8rpx;
+      margin: 0 5rpx;
+      background: linear-gradient(to right, #72c172, #3bb197);
+      font-size: 36rpx;
+      color: #fff;
+      text-align: center;
+    }
+
+    .foot_btn2 {
+      position: fixed;
+      bottom: 0;
+      right: 20rpx;
+      left: 20rpx;
+      line-height: 66rpx;
+      height: 100rpx;
+      border-top: 2rpx solid #e5e9ed;
+      background: #f9fafb;
+      display: flex;
+      justify-content: space-between;
+
+      .btn2 {
+        height: 66rpx;
+        width: 100%;
+        margin: 0 1%;
+        background-image: linear-gradient(to right, #72c172, #3bb197);
+        color: #fff;
+        border-radius: 8rpx;
+        font-size: 32rpx;
+        margin-top: 16rpx;
+        text-align: center;
+      }
+
+      .btn3 {
+        height: 66rpx;
+        width: 48%;
+        margin: 0 1%;
+        background-image: linear-gradient(to right, #72c172, #3bb197);
+        color: #fff;
+        border-radius: 8rpx;
+        font-size: 32rpx;
+        margin-top: 16rpx;
+        text-align: center;
+      }
+    }
+  }
+</style>

pages/receiptpage/receiptpage.vue

@@ -703,7 +703,6 @@
       this.selectedLabelSlots = "执行中";
       this.waitingOrdersGetNum();
       this.executingOrders(0);
-      uni.removeStorageSync("speNum");
       // #ifdef APP-PLUS
       webHandle("no", "app");
       // #endif

pages/scanning/scanning.vue

@@ -228,8 +228,9 @@ export default {
     this.infoType = options.type1;
     this.DEPTCode = options.deptCode;
     this.DEPT = options.dept;
-    this.speNum = uni.getStorageSync("speNum");
-    this.speNum = Number(this.speNum);
+    if (options.speNum) {
+      this.speNum = options.speNum;
+    }
     // #ifdef APP-PLUS
     webHandle("no", "app");
     // #endif

pages/scanning_Result/scanning_Result.vue

@@ -73,8 +73,12 @@
     </view>
     <view class="Scanning_cont" v-if="res.status == 200 && (type == 'drugsBag' || type == 'jPBag')">
       <view v-if="type == 'drugsBag'"> 药包编码 : #{{ infoDATA.packid }} </view>
-      <view v-if="type == 'drugsBag' && accountObj && (queryObj.type1 === 'drug-ddd-2' || queryObj.type1 === 'drug-dsd-2')"> 交接人账号 : {{ accountObj.account }} </view>
-      <view v-if="type == 'drugsBag' && accountObj && (queryObj.type1 === 'drug-ddd-2' || queryObj.type1 === 'drug-dsd-2')"> 交接人姓名 : {{ accountObj.accountName }} </view>
+      <view
+        v-if="type == 'drugsBag' && accountObj && (queryObj.type1 === 'drug-ddd-2' || queryObj.type1 === 'drug-dsd-2')">
+        交接人账号 : {{ accountObj.account }} </view>
+      <view
+        v-if="type == 'drugsBag' && accountObj && (queryObj.type1 === 'drug-ddd-2' || queryObj.type1 === 'drug-dsd-2')">
+        交接人姓名 : {{ accountObj.accountName }} </view>
       <view v-if="type == 'jPBag'">
         静配药包编码 : #{{ infoDATA.packid }}
       </view>
@@ -93,6 +97,7 @@
         (type == 'specimenPlan' && isKs != '1')
       ">
       <view class="btn1" @click="Scanning_again()"> 继续扫描 </view>
+      <view class="btn3" @click="getNoScanSpecimen()">查看未扫描标本</view>
       <view class="btn2" @click="Scanning_complete(dataId)"> 完成扫描 </view>
     </view>
     <view class="foot_btn" v-if="
@@ -206,6 +211,10 @@
     <showModel :title="models1.title" :icon="models1.icon" :disjunctor="models1.disjunctor"
       :radioItem="models1.radioItem" @ok="ok1" @radioChange="radioChange1" @cancel="cancel1" :operate="models1.operate">
     </showModel>
+    <!-- 弹窗 -->
+    <showModel :title="models2.title" :icon="models2.icon" :disjunctor="models2.disjunctor" :content="models2.content"
+      @ok="ok2" @cancel="cancel2" :operate="models2.operate">
+    </showModel>
   </view>
 </template>
 <script>
@@ -223,7 +232,7 @@
     data() {
       return {
         // 交接人信息
-        accountObj:undefined,
+        accountObj: undefined,
         // 完成扫描的id
         wcId: "",
         // 弹窗model
@@ -234,6 +243,10 @@
         models1: {
           disjunctor: false,
         },
+        // 完成扫描弹窗model1
+        models2: {
+          disjunctor: false,
+        },
         isKs: "", //是否科室签到 1
         infoDATA: {},
         res: {},
@@ -247,9 +260,20 @@
         speNum: 0,
         queryObj: {}, //路由传递过来的数据
         selectRadio: [], //单选框选中的数据，第一项是qrcode，第二项是名称
+        gotoFlag: true
       };
     },
     methods: {
+      // 查看未扫描标本
+      getNoScanSpecimen() {
+        if (!this.gotoFlag) {
+          return;
+        }
+        this.gotoFlag = false;
+        uni.navigateTo({
+          url: `../noScanSpecimen/noScanSpecimen?workOrderId=${this.queryObj.id}`,
+        });
+      },
       // 拍照
       photograph(data, obj) {
         photographTool(data, obj);
@@ -302,8 +326,6 @@
                   if (ress.status == 200) {
                     if (this.type == "specimenPlan" || this.type == "specimen") {
                       this.infoDATA = ress.data;
-                      this.speNum++;
-                      uni.setStorageSync("speNum", this.speNum);
                       uni.navigateTo({
                         url: `../scanning_Result/scanning_Result?type=${
                         this.queryObj.type
@@ -313,9 +335,7 @@
                         JSON.stringify(ress.data)
                       )}&status=${ress.status}&msg=${ress.msg}&deptCode=${
                         this.queryObj.deptCode
-                      }&dept=${this.queryObj.dept}&id=${this.dataId}&speNum=${
-                        this.speNum
-                      }&model=${encodeURIComponent(JSON.stringify(ress))}`,
+                      }&dept=${this.queryObj.dept}&id=${this.dataId}&model=${encodeURIComponent(JSON.stringify(ress))}`,
                       });
                     } else if (
                       this.type == "inspect" ||
@@ -330,9 +350,7 @@
                         JSON.stringify(ress.data)
                       )}&status=${ress.status}&msg=${ress.msg}&deptCode=${
                         this.queryObj.deptCode
-                      }&dept=${this.queryObj.dept}&id=${this.dataId}&speNum=${
-                        this.speNum
-                      }&model=${encodeURIComponent(
+                      }&dept=${this.queryObj.dept}&id=${this.dataId}&model=${encodeURIComponent(
                         JSON.stringify(ress)
                       )}&patient=${ress.patient}&patientCode=${
                         ress.patientCode
@@ -348,9 +366,7 @@
                         JSON.stringify(ress.data)
                       )}&status=${ress.status}&msg=${ress.msg}&deptCode=${
                         this.queryObj.deptCode
-                      }&dept=${this.queryObj.dept}&id=${this.dataId}&speNum=${
-                        this.speNum
-                      }&model=${encodeURIComponent(JSON.stringify(ress))}`,
+                      }&dept=${this.queryObj.dept}&id=${this.dataId}&model=${encodeURIComponent(JSON.stringify(ress))}`,
                       });
                     }
                   } else {
@@ -361,9 +377,7 @@
                       ress.msg
                     }&deptCode=${this.queryObj.deptCode}&dept=${
                       this.queryObj.dept
-                    }&id=${this.dataId}&speNum=${
-                      this.speNum
-                    }&model=${encodeURIComponent(
+                    }&id=${this.dataId}&model=${encodeURIComponent(
                       JSON.stringify(this.infoDATA)
                     )}`,
                     });
@@ -383,22 +397,18 @@
           // ------------------------------
         });
       },
-      // 确定
-      ok() {
-        this.models.disjunctor = false;
+      // 正常完成扫描
+      overFinish() {
         let data = {
           type: this.queryObj.type1,
           ids: [],
         };
         data.ids.push(this.wcId);
-        // uni.showLoading({
-        //   title: '加载中',
-        //   mask: true
-        // });
         //只要是标本轮巡1对多或者多对多
+        // plan-spe-dsd-2  1对多
+        // plan-spe-dsd-3  多对多
         if (
           this.queryObj.type1 === "plan-spe-ddd-2" ||
-          this.queryObj.type1 === "plan-spe-ddd-3" ||
           this.queryObj.type1 === "plan-spe-dsd-2" ||
           this.queryObj.type1 === "plan-spe-dsd-3"
         ) {
@@ -431,10 +441,75 @@
           });
         }
       },
+      // 确定
+      ok() {
+        this.models.disjunctor = false;
+        let postData = {
+          ids: [this.queryObj.id],
+          sign: true
+        };
+        uni.showLoading({
+          title: '加载中',
+          mask: true
+        });
+        post("/workerOrder/expectedAndActual", postData).then((ress) => {
+          uni.hideLoading();
+          if (ress.status == 200) {
+            if (ress.actualReceiveNum === undefined) {
+              //正常完成扫描
+              this.overFinish()
+            } else {
+              this.models2 = {
+                disjunctor: true,
+                title: "提示",
+                content: `您扫描的标本<strong class="red">${ress.actualReceiveNum}</strong>个，与系统预计标本${ress.expectReceiveNum}个标本不一致，您确认要完成扫描码？`,
+                icon: "warn",
+                operate: {
+                  ok: "确定",
+                  cancel: "取消",
+                },
+              };
+            }
+          } else {
+            uni.showToast({
+              icon: "none",
+              title: "请求失败！",
+            });
+          }
+        })
+      },
       // 取消
       cancel() {
         this.models.disjunctor = false;
       },
+      // 确定
+      ok2() {
+        this.models2.disjunctor = false;
+        let postData = {
+          ids: [this.queryObj.id],
+        };
+        uni.showLoading({
+          title: '加载中',
+          mask: true
+        });
+        post("/workerOrder/expectedAndActual", postData).then((ress) => {
+          uni.hideLoading();
+          if (ress.status == 200) {
+            uni.navigateTo({
+              url: "../receiptpage/receiptpage",
+            });
+          } else {
+            uni.showToast({
+              icon: "none",
+              title: "请求失败！",
+            });
+          }
+        })
+      },
+      // 取消
+      cancel2() {
+        this.models2.disjunctor = false;
+      },
       // 完成扫描
       Scanning_complete(id) {
         let data = {
@@ -549,10 +624,13 @@
       // 知道了
       showAlert(id) {
         uni.navigateTo({
-          url: "../receiptpage/receiptpage",
+          url: "../receiptpage/receiptpage"
         });
       },
     },
+    onShow() {
+      this.gotoFlag = true;
+    },
     onLoad(options) {
       console.log(options, "result");
       this.queryObj = options;
@@ -562,7 +640,7 @@
       } else if (options.model) {
         this.infoDATA = JSON.parse(options.model);
       }
-      if(options.accountObj && options.accountObj != "undefined"){
+      if (options.accountObj && options.accountObj != "undefined") {
         this.accountObj = JSON.parse(options.accountObj);
       }
 
@@ -581,13 +659,6 @@
       }
       if (options.speNum) {
         this.speNum = options.speNum;
-      } else {
-        this.speNumLocal = uni.getStorageSync("speNum");
-        if (this.speNumLocal) {
-          this.speNum = Number(this.speNumLocal);
-        } else {
-          this.speNum = 0;
-        }
       }
       this.DEPTCode = options.deptCode;
       this.type = options.type;
@@ -602,7 +673,7 @@
 </script>
 <style lang="less">
   .Scanning_Result {
-    padding: 0 74rpx;
+    padding: 0 20rpx;
 
     .Scanning_top {
       .Scanning_top_icon {
@@ -672,7 +743,7 @@
       .btn2,
       .btn3 {
         height: 88rpx;
-        width: 45%;
+        flex: 1;
         margin: 0 1%;
         background-image: linear-gradient(to right, #72c172, #3bb197);
         color: #fff;

pages/scanning_code/scanning_code.vue

@@ -446,6 +446,7 @@
                 }
                 //扫描
                 post("/workerOrder/" + postType, data).then((ress) => {
+                  console.log(ress,1111)
                   if (ress.status == 200) {
                     // 药包核对中状态变为已完成
                     if (
@@ -462,7 +463,6 @@
                           uni.hideLoading();
                           if (result.state == 200) {
                             // --------start----------
-                            uni.setStorageSync("speNum", 1);
                             uni.navigateTo({
                               url: `../scanning_Result/scanning_Result?type=${
                               this.queryObj.type
@@ -489,7 +489,6 @@
                       } else {
                         uni.hideLoading();
                         // --------start----------
-                        uni.setStorageSync("speNum", 1);
                         uni.navigateTo({
                           url: `../scanning_Result/scanning_Result?type=${
                           this.queryObj.type
@@ -537,7 +536,6 @@
                         )}`,
                         });
                       } else {
-                        uni.setStorageSync("speNum", 1);
                         uni.navigateTo({
                           url: `../scanning_Result/scanning_Result?type=${
                           this.queryObj.type
@@ -551,7 +549,7 @@
                           this.queryObj.dept
                         }&id=${id}&model=${encodeURIComponent(
                           JSON.stringify(ress)
-                        )}`,
+                        )}&speNum=${ress.specimenCount}`,
                         });
                       }
 

pages/scanning_djEnd/scanning_djEnd.vue

@@ -9,14 +9,17 @@
       </view>
     </view>
 
-    <view class="Scanning_top" v-if="
+    <view
+      class="Scanning_top"
+      v-if="
         infoDATA.status == 10005 ||
         infoDATA.status == 100018 ||
         infoDATA.status == 10004 ||
         infoDATA.status == 100021 ||
         infoDATA.status == 500 ||
         infoDATA.status == 100031
-      ">
+      "
+    >
       <view class="Scanning_top_icon">
         <text class="cubeic-close icon_transport transport-shibai"></text>
       </view>
@@ -25,26 +28,55 @@
       </view>
     </view>
 
-    <view class="Scanning_cont" v-if="
+    <view
+      class="Scanning_cont"
+      v-if="
         (infoDATA.status == 200 && type == 'specimenPlan') ||
         (infoDATA.status == 200 && type == 'specimen')
-      "></view>
-    <view class="Scanning_cont" v-if="
+      "
+    ></view>
+    <view
+      class="Scanning_cont"
+      v-if="
         (infoDATA.status == 200 && type == 'patientTransport') ||
         (infoDATA.status == 200 && type == 'inspect')
-      ">扫描患者腕带并将患者送往目标科室.</view>
-    <view class="Scanning_cont" v-if="
-        (infoDATA.status == 200 && type == 'drugsBag'&&(type1 == 'drug-ddd-2'||type1 == 'drug-dsd-2')) ||
-        (infoDATA.status == 200 && type == 'jPBag'&&(type1 == 'jp-ddd-2'||type1 == 'jp-dsd-2'))
-      ">已到达目标科室,请扫描药包或静配包.</view>
-    <view class="Scanning_cont" v-if="
-          (infoDATA.status == 200 && type == 'drugsBag'&&(type1 == 'drug-ddd-1'||type1 == 'drug-dsd-1')) ||
-          (infoDATA.status == 200 && type == 'jPBag'&&(type1 == 'jp-ddd-1'||type1 == 'jp-dsd-1'))
-        ">已到达目标科室,请取药包或静配包后送达目标科室.</view>
-    <view class="Scanning_cont" v-if="
+      "
+      >扫描患者腕带并将患者送往目标科室.</view
+    >
+    <view
+      class="Scanning_cont"
+      v-if="
+        (infoDATA.status == 200 &&
+          type == 'drugsBag' &&
+          (type1 == 'drug-ddd-2' || type1 == 'drug-dsd-2')) ||
+        (infoDATA.status == 200 &&
+          type == 'jPBag' &&
+          (type1 == 'jp-ddd-2' || type1 == 'jp-dsd-2'))
+      "
+      >已到达目标科室,请扫描药包或静配包.</view
+    >
+    <view
+      class="Scanning_cont"
+      v-if="
+        (infoDATA.status == 200 &&
+          type == 'drugsBag' &&
+          (type1 == 'drug-ddd-1' || type1 == 'drug-dsd-1')) ||
+        (infoDATA.status == 200 &&
+          type == 'jPBag' &&
+          (type1 == 'jp-ddd-1' || type1 == 'jp-dsd-1'))
+      "
+      >已到达目标科室,请取药包或静配包后送达目标科室.</view
+    >
+    <view
+      class="Scanning_cont"
+      v-if="
         infoDATA.status == 200 && type == 'other' && infoDATA.type == 'qt-ddd-1'
-      ">已到达目标科室,请执行该工单.</view>
-    <view class="Scanning_cont" v-if="
+      "
+      >已到达目标科室,请执行该工单.</view
+    >
+    <view
+      class="Scanning_cont"
+      v-if="
         (infoDATA.state == 'finish' &&
           infoDATA.status == 200 &&
           type == 'specimenPlan' &&
@@ -52,8 +84,12 @@
         (infoDATA.status == 200 &&
           type == 'other' &&
           infoDATA.type == 'qt-dsd-1')
-      ">已到达目标科室,工单已完成.</view>
-    <view class="Scanning_cont" v-if="
+      "
+      >已到达目标科室,工单已完成.</view
+    >
+    <view
+      class="Scanning_cont"
+      v-if="
         (infoDATA.status == 200 &&
           type == 'specimenPlan' &&
           infoDATA.type != 'plan-spe-ddd-1' &&
@@ -62,16 +98,24 @@
           type == 'specimen' &&
           infoDATA.type != 'spe-ddd-1' &&
           infoDATA.type != 'spe-dsd-1')
-      ">已到达目标科室,请扫描标本.</view>
-    <view class="Scanning_cont" v-if="
+      "
+      >已到达目标科室,请扫描标本.</view
+    >
+    <view
+      class="Scanning_cont"
+      v-if="
         (infoDATA.status == 200 &&
           type == 'specimenPlan' &&
           infoDATA.type == 'plan-spe-ddd-1') ||
         (infoDATA.status == 200 &&
           type == 'specimen' &&
           infoDATA.type == 'spe-ddd-1')
-      ">已到达目标科室,请取标本后送达目标科室.</view>
-    <view class="Scanning_cont" v-if="
+      "
+      >已到达目标科室,请取标本后送达目标科室.</view
+    >
+    <view
+      class="Scanning_cont"
+      v-if="
         (infoDATA.state != 'finish' &&
           infoDATA.status == 200 &&
           type == 'specimenPlan' &&
@@ -79,47 +123,83 @@
         (infoDATA.status == 200 &&
           type == 'specimen' &&
           infoDATA.type == 'spe-dsd-1')
-      ">已到达目标科室,请放置标本完成该工单.</view>
+      "
+      >已到达目标科室,请放置标本完成该工单.</view
+    >
     <view class="Scanning_cont" v-if="infoDATA.status != 200">
       <view>{{ infoDATA.msg }}</view>
     </view>
-    <view class="foot_btn" v-if="type == 'inspect' || type == 'patientTransport'">
+    <view
+      class="foot_btn"
+      v-if="type == 'inspect' || type == 'patientTransport'"
+    >
       <view class="btn3" @click="Scanning_again()">继续扫描</view>
     </view>
     <view class="foot_btn" v-if="type == 'drugsBag' || type == 'jPBag'">
-      <view class="btn3" @click="Scanning_again()"
-        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'||type1==='jp-ddd-1'||type1==='jp-dsd-1'">知道了</view>
+      <view
+        class="btn3"
+        @click="Scanning_again()"
+        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' ||
+          type1 === 'jp-ddd-1' ||
+          type1 === 'jp-dsd-1'
+        "
+        >知道了</view
+      >
     </view>
-    <view class="foot_btn" v-if="
+    <view
+      class="foot_btn"
+      v-if="
         (type == 'specimenPlan' &&
           type1 != 'plan-spe-dsd-1' &&
           (type1 != 'plan-spe-ddd-1') & (type1 != 'plan-spe-ddd-2')) ||
         (type == 'specimen' &&
           type1 != 'spe-dsd-1' &&
           (type1 != 'spe-ddd-1') & (type1 != 'spe-ddd-2'))
-      ">
-      <view class="btn1" @click="Scanning_again()">继续扫描</view>
-      <view class="btn2" @click="Scanning_complete(ids)">完成扫描</view>
+      "
+    >
+      <view class="btn1" @click="Scanning_again()">继续扫描标本</view>
+      <!-- <view class="btn3" @click="getNoScanSpecimen()">查看未扫描标本</view> -->
+      <!-- <view class="btn2" @click="Scanning_complete(ids)">完成扫描</view> -->
     </view>
-    <view class="foot_btn" v-if="
+    <view
+      class="foot_btn"
+      v-if="
         (type == 'specimenPlan' && type1 == 'plan-spe-ddd-2') ||
         (type == 'specimen' && type1 == 'spe-ddd-2')
-      ">
-      <view class="btn1" @click="Scanning_again()">继续扫描</view>
-      <view class="btn2" @click="Scanning_complete(ids)">完成扫描</view>
+      "
+    >
+      <view class="btn1" @click="Scanning_again()">继续扫描标本</view>
+      <!-- <view class="btn3" @click="getNoScanSpecimen()">查看未扫描标本</view> -->
+      <!-- <view class="btn2" @click="Scanning_complete(ids)">完成扫描</view> -->
     </view>
-    <view class="foot_btn" v-if="
+    <view
+      class="foot_btn"
+      v-if="
         (infoDATA.state != 'finish' &&
           type == 'specimenPlan' &&
           type1 == 'plan-spe-dsd-1') ||
         (type == 'specimen' && type1 == 'spe-dsd-1')
-      ">
+      "
+    >
       <view class="btn1" @click="Scanning_complete1(ids)">完成工单</view>
       <view class="btn2" @click="showAlert()">继续配送</view>
     </view>
-    <view class="foot_btn" v-if="
+    <view
+      class="foot_btn"
+      v-if="
         infoDATA.status != 200 &&
         type != 'specimenPlan' &&
         type != 'specimen' &&
@@ -127,198 +207,302 @@
         type !== 'inspect' &&
         type !== 'drugsBag' &&
         type !== 'patientTransport'
-      ">
+      "
+    >
       <view class="btn3" @click="showAlert()">知道了</view>
     </view>
-    <view class="foot_btn" v-if="
+    <view
+      class="foot_btn"
+      v-if="
         (infoDATA.status == 200 && type1 == 'spe-ddd-1') ||
         (infoDATA.status == 200 && type1 == 'plan-spe-ddd-1')
-      ">
+      "
+    >
       <view class="btn3" @click="showAlert()">知道了</view>
     </view>
-    <view class="foot_btn" v-if="
+    <view
+      class="foot_btn"
+      v-if="
         (infoDATA.state == 'finish' &&
           infoDATA.status == 200 &&
           type == 'specimenPlan' &&
           type1 == 'plan-spe-dsd-1') ||
         (infoDATA.status == 200 && type == 'other')
-      ">
+      "
+    >
       <view class="btn3" @click="showAlert()">知道了</view>
     </view>
     <!-- 弹窗 -->
-    <showModel :title="models.title" :icon="models.icon" :disjunctor="models.disjunctor" :content="models.content"
-      @ok="ok" @cancel="cancel" :operate="models.operate"></showModel>
+    <showModel
+      :title="models.title"
+      :icon="models.icon"
+      :disjunctor="models.disjunctor"
+      :content="models.content"
+      @ok="ok"
+      @cancel="cancel"
+      :operate="models.operate"
+    ></showModel>
+    <!-- 弹窗 -->
+    <showModel
+      :title="models2.title"
+      :icon="models2.icon"
+      :disjunctor="models2.disjunctor"
+      :content="models2.content"
+      @ok="ok2"
+      @cancel="cancel2"
+      :operate="models2.operate"
+    >
+    </showModel>
   </view>
 </template>
 <script>
-  import showModel from "../../components/showModel/showModel.vue";
-  import {
-    get,
-    post,
-    SM,
-    webHandle
-  } from "../../http/http.js";
-  export default {
-    data() {
-      return {
-        // 弹窗model
-        models: {
-          disjunctor: false,
-        },
-        wcId: "", //工单完成ID
-        modelFlag: "", //工单完成类型
-        infoDATA: [],
-        ids: [],
-        speNum: 0,
-        type: "",
-        type1: "",
-        queryObj: {}, //路由传递过来的参数
-      };
+import showModel from "../../components/showModel/showModel.vue";
+import { get, post, SM, webHandle } from "../../http/http.js";
+export default {
+  data() {
+    return {
+      // 弹窗model
+      models: {
+        disjunctor: false,
+      },
+      // 完成扫描弹窗model1
+      models2: {
+        disjunctor: false,
+      },
+      wcId: "", //工单完成ID
+      modelFlag: "", //工单完成类型
+      infoDATA: [],
+      ids: [],
+      type: "",
+      type1: "",
+      queryObj: {}, //路由传递过来的参数
+      gotoFlag: true,
+    };
+  },
+  methods: {
+    // 查看未扫描标本
+    getNoScanSpecimen() {
+      if (!this.gotoFlag) {
+        return;
+      }
+      this.gotoFlag = false;
+      let id = JSON.parse(this.queryObj.ids)[0];
+      uni.navigateTo({
+        url: `../noScanSpecimen/noScanSpecimen?workOrderId=${id}`,
+      });
     },
-    methods: {
-      // 确定
-      ok() {
-        this.models.disjunctor = false;
-        if (this.modelFlag === "complete") {
-          //完成扫描
-          let postType = "";
-          if (this.queryObj.type1 == "plan-spe-ddd-2") {
-            postType = "finishPlanSpes";
-          } else if (this.queryObj.type1 == "spe-ddd-2") {
-            postType = "finishSpes";
-          }
-          let data = {
-            type: this.queryObj.type1,
-            ids: this.wcId,
-          };
-          uni.showLoading({
-            title: '加载中',
-            mask: true,
-          });
-          post("/workerOrder/" + postType, data).then((res) => {
-            if (res.status == 200) {
-              uni.reLaunch({
-                url: "../receiptpage/receiptpage",
-              });
-            } else {
-              uni.hideLoading();
-              uni.showToast({
-                icon: "none",
-                title: "请求失败！",
-              });
-            }
+    // 正常完成扫描
+    overFinish() {
+      //完成扫描
+      let postType = "";
+      if (
+        this.queryObj.type1 === "plan-spe-ddd-2" ||
+        this.queryObj.type1 === "plan-spe-dsd-2" ||
+        this.queryObj.type1 === "plan-spe-dsd-3"
+      ) {
+        postType = "finishPlanSpes";
+      } else if (this.queryObj.type1 == "spe-ddd-2") {
+        postType = "finishSpes";
+      }
+      let data = {
+        type: this.queryObj.type1,
+        ids: this.wcId,
+      };
+      uni.showLoading({
+        title: "加载中",
+        mask: true,
+      });
+      post("/workerOrder/" + postType, data).then((res) => {
+        if (res.status == 200) {
+          uni.reLaunch({
+            url: "../receiptpage/receiptpage",
           });
-        } else if (this.modelFlag === "complete1") {
-          //1对1标本完成工单
-          let ids = this.wcId;
-          uni.showLoading({
-            title: '加载中',
-            mask: true,
+        } else {
+          uni.hideLoading();
+          uni.showToast({
+            icon: "none",
+            title: "请求失败！",
           });
-          post("/workerOrder/finishSpeOrder", ids).then((res) => {
-            if (res.status == 200) {
-              uni.reLaunch({
-                url: "../receiptpage/receiptpage",
-              });
+        }
+      });
+    },
+    // 确定
+    ok() {
+      this.models.disjunctor = false;
+      if (this.modelFlag === "complete") {
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        let id = JSON.parse(this.queryObj.ids)[0];
+        let postData = {
+          ids: [id],
+          sign: true
+        };
+        post("/workerOrder/expectedAndActual", postData).then((ress) => {
+          uni.hideLoading();
+          if (ress.status == 200) {
+            if (ress.actualReceiveNum === undefined) {
+              //正常完成扫描
+              this.overFinish();
             } else {
-              uni.hideLoading();
-              uni.showToast({
-                icon: "none",
-                title: "请求失败！",
-              });
+              this.models2 = {
+                disjunctor: true,
+                title: "提示",
+                content: `您扫描的标本<strong class="red">${ress.actualReceiveNum}</strong>个，与系统预计标本${ress.expectReceiveNum}个标本不一致，您确认要完成扫描码？`,
+                icon: "warn",
+                operate: {
+                  ok: "确定",
+                  cancel: "取消",
+                },
+              };
             }
+          } else {
+            uni.showToast({
+              icon: "none",
+              title: "请求失败！",
+            });
+          }
+        });
+      } else if (this.modelFlag === "complete1") {
+        //1对1标本完成工单
+        let ids = this.wcId;
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        post("/workerOrder/finishSpeOrder", ids).then((res) => {
+          if (res.status == 200) {
+            uni.reLaunch({
+              url: "../receiptpage/receiptpage",
+            });
+          } else {
+            uni.hideLoading();
+            uni.showToast({
+              icon: "none",
+              title: "请求失败！",
+            });
+          }
+        });
+      }
+    },
+    // 取消
+    cancel() {
+      this.models.disjunctor = false;
+    },
+    // 确定
+    ok2() {
+      this.models2.disjunctor = false;
+      let id = JSON.parse(this.queryObj.ids)[0];
+      let postData = {
+        ids: [id],
+      };
+      uni.showLoading({
+        title: "加载中",
+        mask: true,
+      });
+      post("/workerOrder/expectedAndActual", postData).then((ress) => {
+        uni.hideLoading();
+        if (ress.status == 200) {
+          uni.navigateTo({
+            url: "../receiptpage/receiptpage",
           });
-        }
-      },
-      // 取消
-      cancel() {
-        this.models.disjunctor = false;
-      },
-      //完成扫描
-      Scanning_complete(id) {
-        this.modelFlag = "complete";
-        if (
-          this.queryObj.type1 == "plan-spe-ddd-2" ||
-          this.queryObj.type1 == "spe-ddd-2"
-        ) {
-          this.wcId = id;
-          this.models = {
-            disjunctor: true,
-            title: "提示",
-            content: "是否确定标本已扫描完成?",
-            icon: "warn",
-            operate: {
-              ok: "确定",
-              cancel: "取消",
-            },
-          };
         } else {
-          uni.navigateTo({
-            url: `../scanning/scanning?type=${this.queryObj.type}&type1=${
-            this.queryObj.type1
-          }&deptCode=${this.queryObj.code}&dept=${
-            this.queryObj.dept
-          }&id=${encodeURIComponent(JSON.stringify(this.ids))}`,
+          uni.showToast({
+            icon: "none",
+            title: "请求失败！",
           });
         }
-      },
-      //一对一完成工单
-      Scanning_complete1(id) {
-        this.modelFlag = "complete1";
+      });
+    },
+    // 取消
+    cancel2() {
+      this.models2.disjunctor = false;
+    },
+    //完成扫描
+    Scanning_complete(id) {
+      this.modelFlag = "complete";
+      if (
+        this.queryObj.type1 == "plan-spe-ddd-2" ||
+        this.queryObj.type1 == "spe-ddd-2"
+      ) {
         this.wcId = id;
         this.models = {
           disjunctor: true,
           title: "提示",
-          content: "是否确定标本配送完成?",
+          content: "是否确定标本已扫描完成?",
           icon: "warn",
           operate: {
             ok: "确定",
             cancel: "取消",
           },
         };
-      },
-      //继续扫描
-      Scanning_again() {
-        SM().then((ress1) => {
-          // ----------------
-          //检验二维码的有效性
-          post("/dept/scanning", {
-            content: ress1,
-          }).then((result) => {
-            if (result.state == 200 || result.state == 201) {
-              let ress = result.code;
-              let speCode = ress;
-              let data = {
-                code: speCode,
-                type: this.queryObj.type1,
-                deptCode: this.code,
-                ids: this.ids,
-              };
-              let postType = "";
-              if (this.type == "jPBag" || this.type == "drugsBag") {
-                postType = "handleDrugsAndJp";
-              }
-              if (this.type == "specimen") {
-                postType = "handleSpes";
-                data["speCode"] = data.code;
-                delete data.code;
-              }
-              if (this.type == "specimenPlan") {
-                postType = "handlePlanSpes";
-                data["speCode"] = data.code;
-                delete data.code;
-              }
-              if (this.type == "inspect") {
-                postType = "handleIns";
-              }
-              if (this.type == "patientTransport") {
-                postType = "handleTrans";
-              }
-              post("/workerOrder/" + postType, data).then((ress) => {
-                if (ress.status == 200) {
-                  this.speNum++;
-                  uni.navigateTo({
-                    url: `../scanning_djInfo/scanning_djInfo?type=${
+      } else {
+        uni.navigateTo({
+          url: `../scanning/scanning?type=${this.queryObj.type}&type1=${
+            this.queryObj.type1
+          }&deptCode=${this.queryObj.code}&dept=${
+            this.queryObj.dept
+          }&id=${encodeURIComponent(JSON.stringify(this.ids))}`,
+        });
+      }
+    },
+    //一对一完成工单
+    Scanning_complete1(id) {
+      this.modelFlag = "complete1";
+      this.wcId = id;
+      this.models = {
+        disjunctor: true,
+        title: "提示",
+        content: "是否确定标本配送完成?",
+        icon: "warn",
+        operate: {
+          ok: "确定",
+          cancel: "取消",
+        },
+      };
+    },
+    //继续扫描
+    Scanning_again() {
+      SM().then((ress1) => {
+        // ----------------
+        //检验二维码的有效性
+        post("/dept/scanning", {
+          content: ress1,
+        }).then((result) => {
+          if (result.state == 200 || result.state == 201) {
+            let ress = result.code;
+            let speCode = ress;
+            let data = {
+              code: speCode,
+              type: this.queryObj.type1,
+              deptCode: this.code,
+              ids: this.ids,
+            };
+            let postType = "";
+            if (this.type == "jPBag" || this.type == "drugsBag") {
+              postType = "handleDrugsAndJp";
+            }
+            if (this.type == "specimen") {
+              postType = "handleSpes";
+              data["speCode"] = data.code;
+              delete data.code;
+            }
+            if (this.type == "specimenPlan") {
+              postType = "handlePlanSpes";
+              data["speCode"] = data.code;
+              delete data.code;
+            }
+            if (this.type == "inspect") {
+              postType = "handleIns";
+            }
+            if (this.type == "patientTransport") {
+              postType = "handleTrans";
+            }
+            post("/workerOrder/" + postType, data).then((ress) => {
+              if (ress.status == 200) {
+                uni.navigateTo({
+                  url: `../scanning_djInfo/scanning_djInfo?type=${
                     this.queryObj.type
                   }&type1=${this.queryObj.type1}&infoData=${encodeURIComponent(
                     JSON.stringify(ress.data)
@@ -326,14 +510,11 @@
                     this.queryObj.code
                   }&dept=${this.queryObj.dept}&ids=${encodeURIComponent(
                     JSON.stringify(this.ids)
-                  )}&speNum=${this.speNum}&model=${encodeURIComponent(
-                    JSON.stringify(ress)
-                  )}`,
-                  });
-                  uni.setStorageSync("speNum", this.speNum);
-                } else {
-                  uni.navigateTo({
-                    url: `../scanning_djInfo/scanning_djInfo?type=${
+                  )}&model=${encodeURIComponent(JSON.stringify(ress))}`,
+                });
+              } else {
+                uni.navigateTo({
+                  url: `../scanning_djInfo/scanning_djInfo?type=${
                     this.queryObj.type
                   }&type1=${this.queryObj.type1}&status=${ress.status}&msg=${
                     ress.msg
@@ -341,142 +522,126 @@
                     this.queryObj.dept
                   }&ids=${encodeURIComponent(
                     JSON.stringify(this.ids)
-                  )}&speNum=${this.speNum}&infoData=${encodeURIComponent(
+                  )}&infoData=${encodeURIComponent(
                     JSON.stringify(ress.data)
                   )}&model=${encodeURIComponent(JSON.stringify(ress))}`,
-                  });
-                }
-              });
-            } else {
-              uni.showToast({
-                icon: "none",
-                title: "请求失败！",
-              });
-            }
-          });
-          // ------------------------------
-        });
-      },
-      // 知道了
-      showAlert() {
-        uni.navigateTo({
-          url: "../receiptpage/receiptpage",
+                });
+              }
+            });
+          } else {
+            uni.showToast({
+              icon: "none",
+              title: "请求失败！",
+            });
+          }
         });
-      },
+        // ------------------------------
+      });
     },
-    onLoad(options) {
-      console.log(options, "djEnd");
-      this.queryObj = options;
-      let list = JSON.parse(options.model); //签到返回的信息
-      this.code = options.code; //二维码code
-      this.ids = options.ids && JSON.parse(options.ids); //科室ID数组
-      this.infoDATA = list;
-      if (options.type) {
-        //关联类型
-        this.type = options.type;
-      } else {
-        this.type = list.type;
-      }
-      this.type1 = options.type1;
-      if (options.speNum) {
-        this.speNum = options.speNum;
-      } else {
-        this.speNumLocal = uni.getStorageSync("speNum");
-        // 本地存在speNum的时候
-        if (this.speNumLocal) {
-          this.speNum = Number(this.speNumLocal);
-        }
-      }
-      // #ifdef APP-PLUS
-      webHandle("no", "app");
-      // #endif
-      // #ifdef H5
-      webHandle("no", "wx");
-      // #endif
+    // 知道了
+    showAlert() {
+      uni.navigateTo({
+        url: "../receiptpage/receiptpage",
+      });
     },
-  };
+  },
+  onShow() {
+    this.gotoFlag = true;
+  },
+  onLoad(options) {
+    console.log(options, "djEnd");
+    this.queryObj = options;
+    let list = JSON.parse(options.model); //签到返回的信息
+    this.code = options.code; //二维码code
+    this.ids = options.ids && JSON.parse(options.ids); //科室ID数组
+    this.infoDATA = list;
+    if (options.type) {
+      //关联类型
+      this.type = options.type;
+    } else {
+      this.type = list.type;
+    }
+    this.type1 = options.type1;
+    // #ifdef APP-PLUS
+    webHandle("no", "app");
+    // #endif
+    // #ifdef H5
+    webHandle("no", "wx");
+    // #endif
+  },
+};
 </script>
 <style lang="less">
-  .Scanning_djEnd {
-    padding: 0px 74rpx;
+.Scanning_djEnd {
+  padding: 0px 20rpx;
 
-    .Scanning_top {
-      height: 270rpx;
+  .Scanning_top {
+    height: 270rpx;
 
-      .Scanning_top_icon {
-        width: 140rpx;
-        height: 140rpx;
-        margin: 0 auto;
-        // margin-top: 116rpx;
-        border-radius: 50%;
-        line-height: 140rpx;
-
-        .cubeic-ok {
-          font-size: 140rpx;
-          color: #35b34a;
-        }
+    .Scanning_top_icon {
+      width: 140rpx;
+      height: 140rpx;
+      margin: 0 auto;
+      // margin-top: 116rpx;
+      border-radius: 50%;
+      line-height: 140rpx;
 
-        .cubeic-close {
-          font-size: 140rpx;
-          color: #ff3b53;
-        }
+      .cubeic-ok {
+        font-size: 140rpx;
+        color: #35b34a;
       }
 
-      .Scanning_top_text {
-        .text1 {
-          margin-top: 40rpx;
-          font-size: 48rpx;
-          text-align: center;
-        }
+      .cubeic-close {
+        font-size: 140rpx;
+        color: #ff3b53;
       }
     }
 
-    .Scanning_cont {
-      font-size: 32rpx;
-      text-align: center;
-
-      view {
-        margin-bottom: 16rpx;
-      }
-
-      .text {
-        margin-top: 24rpx;
-        color: #35b34a;
-      }
-
+    .Scanning_top_text {
       .text1 {
-        margin-top: 24rpx;
-        color: #ff3b53;
+        margin-top: 40rpx;
+        font-size: 48rpx;
+        text-align: center;
       }
     }
+  }
 
-    .foot_btn {
-      line-height: 88rpx;
-      height: 100rpx;
-      margin-top: 40rpx;
-      text-align: center;
+  .Scanning_cont {
+    font-size: 32rpx;
+    text-align: center;
 
-      view {
-        height: 88rpx;
-        width: 45%;
-        background-image: linear-gradient(to right, #72c172, #3bb197);
-        color: #fff;
-        border-radius: 8rpx;
-        font-size: 32rpx;
-        margin-top: 16rpx;
-      }
+    view {
+      margin-bottom: 16rpx;
+    }
 
-      .btn1 {
-        float: left;
-      }
+    .text {
+      margin-top: 24rpx;
+      color: #35b34a;
+    }
 
-      .btn2 {
-        float: right;
-      }
+    .text1 {
+      margin-top: 24rpx;
+      color: #ff3b53;
+    }
+  }
 
-      .btn3 {
-        margin: 0 auto;
-      }
+  .foot_btn {
+    line-height: 88rpx;
+    height: 100rpx;
+    margin-top: 40rpx;
+    text-align: center;
+    display: flex;
+
+    view {
+      height: 88rpx;
+      flex: 1;
+      margin: 0 1%;
+      background-image: linear-gradient(to right, #72c172, #3bb197);
+      color: #fff;
+      border-radius: 8rpx;
+      font-size: 32rpx;
+      margin-top: 16rpx;
     }
   }
+}
 </style>

pages/scanning_djInfo/scanning_djInfo.vue

@@ -76,6 +76,7 @@
         res.status == 100018 || type == 'specimen' || type == 'specimenPlan'
       ">
       <view class="btn1" @click="Scanning_again()">继续扫描</view>
+      <view class="btn3" @click="getNoScanSpecimen()" v-if="type == 'specimen' || type == 'specimenPlan'">查看未扫描标本</view>
       <view class="btn2" @click="Scanning_complete(ids)">完成扫描</view>
     </view>
     <view class="foot_btn" v-if="
@@ -108,6 +109,10 @@
     <!-- 弹窗 -->
     <showModel :title="models.title" :icon="models.icon" :disjunctor="models.disjunctor" :content="models.content"
       @ok="ok" @cancel="cancel" :operate="models.operate"></showModel>
+    <!-- 弹窗 -->
+    <showModel :title="models2.title" :icon="models2.icon" :disjunctor="models2.disjunctor" :content="models2.content"
+      @ok="ok2" @cancel="cancel2" :operate="models2.operate">
+    </showModel>
   </view>
 </template>
 <script>
@@ -125,6 +130,10 @@
         models: {
           disjunctor: false,
         },
+        // 完成扫描弹窗model1
+        models2: {
+          disjunctor: false,
+        },
         wcId: "", //工单完成ID
         infoDATA: [],
         res: {
@@ -142,18 +151,31 @@
         packid: "",
         speNum: 0,
         queryObj: {}, //路由传递过来的参数
+        gotoFlag: true,
       };
     },
     methods: {
-      // 确定
-      ok() {
+      // 查看未扫描标本
+      getNoScanSpecimen() {
+        if (!this.gotoFlag) {
+          return;
+        }
+        this.gotoFlag = false;
+        uni.navigateTo({
+          url: `../noScanSpecimen/noScanSpecimen?workOrderId=${this.queryObj.ids[0]}`,
+        });
+      },
+      overFinish() {
         let postType = "";
-        if (this.queryObj.type1 == "plan-spe-ddd-2") {
+        if (
+          this.queryObj.type1 === "plan-spe-ddd-2" ||
+          this.queryObj.type1 === "plan-spe-dsd-2" ||
+          this.queryObj.type1 === "plan-spe-dsd-3"
+        ) {
           postType = "finishPlanSpes";
         } else if (this.queryObj.type1 == "spe-ddd-2") {
           postType = "finishSpes";
         }
-        this.models.disjunctor = false;
         let data = {
           type: this.queryObj.type1,
           ids: this.wcId,
@@ -171,10 +193,76 @@
           }
         });
       },
+      // 确定
+      ok() {
+        this.models.disjunctor = false;
+        let postData = {
+          ids: this.queryObj.ids,
+          sign: true
+        };
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        post("/workerOrder/expectedAndActual", postData).then((ress) => {
+          uni.hideLoading();
+          if (ress.status == 200) {
+            if (ress.actualReceiveNum === undefined) {
+              //正常完成扫描
+              this.overFinish();
+            } else {
+              this.models2 = {
+                disjunctor: true,
+                title: "提示",
+                content: `您扫描的标本<strong class="red">${ress.actualReceiveNum}</strong>个，与系统预计标本${ress.expectReceiveNum}个标本不一致，您确认要完成扫描码？`,
+                icon: "warn",
+                operate: {
+                  ok: "确定",
+                  cancel: "取消",
+                },
+              };
+            }
+          } else {
+            uni.showToast({
+              icon: "none",
+              title: "请求失败！",
+            });
+          }
+        });
+
+      },
       // 取消
       cancel() {
         this.models.disjunctor = false;
       },
+      // 确定
+      ok2() {
+        this.models2.disjunctor = false;
+        let postData = {
+          ids: this.queryObj.ids,
+        };
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        post("/workerOrder/expectedAndActual", postData).then((ress) => {
+          uni.hideLoading();
+          if (ress.status == 200) {
+            uni.navigateTo({
+              url: "../receiptpage/receiptpage",
+            });
+          } else {
+            uni.showToast({
+              icon: "none",
+              title: "请求失败！",
+            });
+          }
+        });
+      },
+      // 取消
+      cancel2() {
+        this.models2.disjunctor = false;
+      },
       //完成扫描
       Scanning_complete(id) {
         if (
@@ -286,8 +374,7 @@
                       this.type == "specimen"
                     ) {
                       this.infoDATA = res;
-                      this.speNum++;
-                      uni.setStorageSync("speNum", this.speNum); //seimin 2020年6月15日18:45:46
+                      this.speNum = res.specimenCount;
                       // --------------------------
                       this.res["status"] = res.status;
                       this.res["msg"] = res.msg;
@@ -305,7 +392,7 @@
                         this.queryObj.deptCode
                       }&dept=${this.queryObj.dept}&ids=${encodeURIComponent(
                         JSON.stringify(this.ids)
-                      )}&speNum=${this.speNum}&model=${encodeURIComponent(
+                      )}&model=${encodeURIComponent(
                         JSON.stringify(res)
                       )}`,
                       });
@@ -318,7 +405,7 @@
                       this.queryObj.deptCode
                     }&dept=${this.queryObj.dept}&ids=${encodeURIComponent(
                       JSON.stringify(this.ids)
-                    )}&speNum=${this.speNum}&model=${encodeURIComponent(
+                    )}&model=${encodeURIComponent(
                       JSON.stringify(res)
                     )}`,
                     });
@@ -343,6 +430,7 @@
       },
     },
     onLoad(options) {
+      console.log(options,'options')
       this.queryObj = options;
       if (this.queryObj.model) {
         let list = JSON.parse(this.queryObj.model);
@@ -368,12 +456,6 @@
           this.idsType = 2;
         }
       }
-      if (this.queryObj.speNum) {
-        this.speNum = this.queryObj.speNum;
-      } else {
-        this.speNum = uni.getStorageSync("speNum");
-        this.speNum = Number(this.speNum);
-      }
       this.DEPTCode = this.queryObj.deptCode;
       this.type = this.queryObj.type;
       // #ifdef APP-PLUS
@@ -387,7 +469,7 @@
 </script>
 <style lang="less">
   .Scanning_djInfo {
-    padding: 0 74rpx;
+    padding: 0 20rpx;
 
     .Scanning_top {
       height: 270rpx;
@@ -448,30 +530,20 @@
       height: 100rpx;
       margin-top: 40rpx;
       text-align: center;
+      display: flex;
 
       .btn1,
       .btn2,
       .btn3 {
         height: 88rpx;
-        width: 45%;
+        margin: 0 1%;
+        flex: 1;
         background-image: linear-gradient(to right, #72c172, #3bb197);
         color: #fff;
         border-radius: 8rpx;
         font-size: 32rpx;
         margin-top: 16rpx;
       }
-
-      .btn1 {
-        float: left;
-      }
-
-      .btn2 {
-        float: right;
-      }
-
-      .btn3 {
-        margin: 0 auto;
-      }
     }
   }
 </style>