标本优化

App.vue

@@ -134,6 +134,10 @@
     color: red !important;
   }
 
+  .fweight {
+    font-weight: bold !important;
+  }
+
   .f30 {
     font-size: 30rpx !important;
   }

main.js

@@ -4,7 +4,7 @@ import App from './App'
 import wx from 'weixin-jsapi'
 // import VConsole from 'vconsole';
 // new VConsole();
-console.info('v2.4.11');
+console.info('v2.4.12');
 Vue.prototype.wx = wx //声明扫码
 Vue.prototype.audios = [] //待播放的语音集合
 // #endif

pages.json

@@ -228,6 +228,24 @@
         },
         "enablePullDownRefresh": true
       }
+    }, {
+      "path": "pages/checkAfterScanning/checkAfterScanning",
+      "style": {
+        "h5": {
+          "titleNView": false
+        },
+        "enablePullDownRefresh": false
+      }
+
+    }, {
+      "path": "pages/checkAfterBigScreen/checkAfterBigScreen",
+      "style": {
+        "h5": {
+          "titleNView": false
+        },
+        "enablePullDownRefresh": false
+      }
+
     }
   ],
   "globalStyle": {

pages/checkAfterBigScreen/checkAfterBigScreen.vue

@@ -0,0 +1,316 @@
+<template>
+  <view class="checkAfterScanning">
+    <view class="checkAfterScanning_title">标本核对</view>
+    <view class="page_item_cont">
+      <view class="page_item_cont_T">
+        <view class="page_item_cont_title">
+          <view> 工单数量 </view>
+          <view class="text_big">{{info.gdNum}}</view>
+        </view>
+        <view class="page_item_cont_title">
+          <view> 标本总数 </view>
+          <view class="text_big" @click="goToSpeDetail()"><text class="underline">{{info.total}}</text>只</view>
+        </view>
+        <view class="page_item_cont_title">
+          <view> 临床科室 </view>
+          <view class="text_big">{{info.LCDept}}</view>
+        </view>
+        <view class="page_item_cont_title2">
+          检验科室标本数量：
+        </view>
+        <view class="page_item_cont_title" v-for="(item, i) in info.data" :key="i">
+          <view>{{item[1]}}</view>
+          <view class="text_big" @click="goToSpeDetail(item[1],item[2])"><text class="underline">{{item[3]}}</text>只
+          </view>
+        </view>
+      </view>
+    </view>
+    <view class="foot_btn_spe">
+      <view class="btn1" @click="allStart()">核对完成</view>
+      <view class="btn3" @click="goBack">取消</view>
+    </view>
+    <!-- 填写交接人账号弹窗 -->
+    <selectAccount v-if="hosModels.disjunctor" :title="hosModels.title" :disjunctor="hosModels.disjunctor" @ok="hosOk"
+      @cancel="hosCancel">
+    </selectAccount>
+  </view>
+</template>
+<script>
+  import {
+    get,
+    post,
+    SM,
+    webHandle
+  } from "../../http/http.js";
+  export default {
+    data() {
+      return {
+        // 填写交接人账号弹窗model
+        hosModels: {
+          disjunctor: false,
+        },
+        info: {},
+        queryObj: {}, //路由传递过来的数据
+      };
+    },
+    methods: {
+      // 填写交接人账号-确认
+      hosOk(data) {
+        console.log(data);
+        const {
+          accountName,
+          account,
+          accountId
+        } = data;
+        if (!accountName && !account) {
+          //没有填写交接人
+          uni.showModal({
+            title: "提示",
+            content: "请填写交接人账号！",
+            showCancel: false,
+            success: function(res) {
+              if (res.confirm) {
+                console.log("用户点击确定");
+              } else if (res.cancel) {
+                console.log("用户点击取消");
+              }
+            },
+          });
+          return;
+        } else if ((!accountName && account) || (accountName && !account)) {
+          //没有填写交接人
+          uni.showModal({
+            title: "提示",
+            content: "请填写正确的交接人账号！",
+            showCancel: false,
+            success: function(res) {
+              if (res.confirm) {
+                console.log("用户点击确定");
+              } else if (res.cancel) {
+                console.log("用户点击取消");
+              }
+            },
+          });
+          return;
+        }
+        this.hosModels.disjunctor = false;
+        this.orderDeptHandler(false, data);
+      },
+      // 填写交接人账号-取消
+      hosCancel() {
+        this.hosModels.disjunctor = false;
+      },
+      // 填写交接人账号弹窗
+      showSelectAccount() {
+        this.hosModels = {
+          title: "填写交接人账号",
+          disjunctor: true,
+        };
+      },
+      // 获取核对信息
+      getInfo(gdIds) {
+        gdIds = JSON.parse(gdIds).toString();
+        uni.showLoading({
+          title: '加载中',
+          mask: true
+        });
+        let postData = {
+          gdIds,
+          trueBigScanner:['666'],
+        };
+        post("/api/specimensCheck", postData).then((res) => {
+          uni.hideLoading();
+          if (res.status == 200) {
+            console.log(res)
+            res.LCDept = res.LCDept.join('，');
+            this.info = res;
+          } else {
+            uni.showToast({
+              icon: "none",
+              title: "请求失败！",
+            });
+          }
+        })
+      },
+      // 取消
+      goBack() {
+        uni.navigateTo({
+          url: "../receiptpage/receiptpage",
+        });
+      },
+      // 跳转到已扫描标本详情页
+      goToSpeDetail(deptName='', qrCode='') {
+        uni.navigateTo({
+          url: `../noScanSpecimen/noScanSpecimen?deptName=${deptName}&workOrderId=${this.queryObj.ids}&deptCode=${qrCode}&isScan=1&specimensCheck=1&noScan=1`,
+        });
+      },
+      //核对完成
+      allStart() {
+        this.orderDeptHandler(true);
+      },
+      //科室签到
+      //bigScanner----判断是否需要交接人
+      //accountObj----弹窗填写的交接人信息
+      orderDeptHandler(bigScanner, accountObj) {
+        let type = "orderSign/" + this.queryObj.code;
+        let list = {
+          ids: JSON.parse(this.queryObj.ids),
+        };
+        bigScanner && (list.bigScanner = ['666']);
+        if (accountObj) {
+          list.handover = [accountObj.accountId];
+        }
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        post("/workerOrder/" + type, list).then((res) => {
+          uni.hideLoading();
+          if (res.status == 200) {
+            uni.navigateTo({
+              url: "../receiptpage/receiptpage",
+            });
+          } else if (res.status == "0000") {
+            this.showSelectAccount();
+          } else {
+            this.flag = true;
+            uni.navigateTo({
+              url: `../scanning_djEnd/scanning_djEnd?type=specimen&type1=${
+              res.type
+            }&code=${this.queryObj.code}&dept=${res.dept}&ids=${this.queryObj.ids}&model=${encodeURIComponent(JSON.stringify(res))}&deptId=${res.deptId}`,
+            });
+          }
+        });
+      },
+    },
+    onLoad(options) {
+      console.log(options);
+      this.queryObj = options;
+      this.getInfo(this.queryObj.ids);
+      // #ifdef APP-PLUS
+      webHandle("no", "app");
+      // #endif
+      // #ifdef H5
+      webHandle("no", "wx");
+      // #endif
+    },
+  };
+</script>
+<style lang="less" scoped>
+  .checkAfterScanning {
+    .checkAfterScanning_title {
+      padding: 50rpx 0;
+      font-size: 46rpx;
+      font-weight: 550;
+      text-align: center;
+      border-bottom: 1px solid #ccc;
+    }
+
+    .page_item_cont {
+      min-height: 90rpx;
+      padding: 0 20rpx;
+      text-align: left;
+      position: relative;
+
+      .text_big {
+        font-size: 32rpx;
+        font-weight: 700;
+        margin-top: 10rpx;
+
+        .underline {
+          text-decoration: underline;
+        }
+      }
+
+      .page_item_cont_T {
+        padding-top: 28rpx;
+        padding-bottom: 28rpx;
+        font-size: 28rpx;
+
+        .page_item_cont_title {
+          height: 100%;
+          font-size: 32rpx;
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+        }
+
+        .page_item_cont_title2 {
+          margin-top: 36rpx;
+          margin-bottom: 18rpx;
+          height: 100%;
+          font-size: 32rpx;
+          font-weight: bold;
+          display: flex;
+          align-items: center;
+        }
+      }
+
+      .page_item_cont_B {
+        padding-top: 28rpx;
+        margin-bottom: 28rpx;
+
+        .page_item_cont_title {
+          font-size: 32rpx;
+          display: flex;
+          justify-content: space-between;
+        }
+
+        .page_item_cont_title1 {
+          height: 60rpx;
+          line-height: 60rpx;
+          font-size: 32rpx;
+          padding-left: 64rpx;
+        }
+      }
+    }
+
+    .foot_btn {
+      line-height: 88rpx;
+      height: 100rpx;
+      margin-top: 40rpx;
+      display: flex;
+      justify-content: center;
+
+      .btn1,
+      .btn2,
+      .btn3 {
+        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;
+        text-align: center;
+      }
+    }
+
+    .foot_btn_spe {
+      line-height: 88rpx;
+      height: 100rpx;
+      margin-top: 40rpx;
+      text-align: center;
+      display: flex;
+      justify-content: space-between;
+      flex-wrap: wrap;
+
+      &::after {
+        content: '';
+        flex: 1;
+      }
+
+      view {
+        height: 88rpx;
+        width: 48%;
+        margin: 0 1%;
+        background-image: linear-gradient(to right, #72c172, #3bb197);
+        color: #fff;
+        border-radius: 8rpx;
+        font-size: 32rpx;
+        margin-top: 16rpx;
+      }
+    }
+  }
+</style>

pages/checkAfterScanning/checkAfterScanning.vue

@@ -0,0 +1,412 @@
+<template>
+  <view class="checkAfterScanning">
+    <view class="checkAfterScanning_title">标本核对</view>
+    <view class="page_item_cont">
+      <view class="page_item_cont_T">
+        <view class="page_item_cont_title">
+          <view> 工单单号 </view>
+          <view class="text_big">{{info.gdCode}}</view>
+        </view>
+        <view class="page_item_cont_title">
+          <view> 科室名称 </view>
+          <view class="text_big">{{info.startDept}}</view>
+        </view>
+        <view class="page_item_cont_title">
+          <view> 扫描标本数量 </view>
+          <view class="text_big" @click="goToSpeDetail()"><text class="underline">{{info.total}}</text>只</view>
+        </view>
+        <view class="page_item_cont_title2">
+          检验科室标本数量：
+        </view>
+        <view class="page_item_cont_title" v-for="(item, i) in info.data" :key="i">
+          <view>{{item[1]}}</view>
+          <view class="text_big" @click="goToSpeDetail(item[1],item[2])"><text class="underline">{{item[3]}}</text>只</view>
+        </view>
+      </view>
+    </view>
+    <view class="foot_btn_spe">
+      <view class="btn1" @click="Scanning_complete()">核对完成</view>
+      <view class="btn3" @click="goBack">返回</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="models2.title" :icon="models2.icon" :disjunctor="models2.disjunctor" :content="models2.content"
+      @ok="ok2" @know="know2" @cancel="cancel2" :operate="models2.operate"></showModel>
+  </view>
+</template>
+<script>
+  import {
+    get,
+    post,
+    SM,
+    webHandle
+  } from "../../http/http.js";
+  export default {
+    data() {
+      return {
+        info: {},
+        wcFlag: false,
+        queryObj: {}, //路由传递过来的数据
+        // 弹窗model
+        models: {
+          disjunctor: false,
+        },
+        // 完成扫描弹窗model1
+        models2: {
+          disjunctor: false,
+        },
+      };
+    },
+    methods: {
+      // 获取核对信息
+      getInfo(gdId){
+        uni.showLoading({
+          title: '加载中',
+          mask: true
+        });
+        post("/api/specimensCheck", {gdIds:gdId}).then((res) => {
+          uni.hideLoading();
+          if (res.status == 200) {
+            console.log(res)
+            this.info = res;
+          } else {
+            uni.showToast({
+              icon: "none",
+              title: "请求失败！",
+            });
+          }
+        })
+      },
+      // 返回
+      goBack() {
+        uni.navigateBack();
+      },
+      // 完成核对
+      Scanning_complete() {
+        if (
+          this.queryObj.type1 == "plan-spe-ddd-2" ||
+          this.queryObj.type1 == "spe-ddd-2"
+        ) {
+          this.wcFlag = true;
+          this.models = {
+            disjunctor: true,
+            title: "提示",
+            content: "是否确定标本已核对完成？",
+            icon: "warn",
+            operate: {
+              ok: "确定",
+              cancel: "取消",
+            },
+          };
+        } else if (
+          this.queryObj.type1 == "plan-spe-dsd-2" ||
+          this.queryObj.type1 == "plan-spe-dsd-3" ||
+          this.queryObj.type1 == "spe-dsd-2" ||
+          this.queryObj.type1 == "spe-dsd-3"
+        ) {
+          this.wcFlag = false;
+          this.models = {
+            disjunctor: true,
+            title: "提示",
+            content: "是否确定标本已核对完成？",
+            icon: "warn",
+            operate: {
+              ok: "确定",
+              cancel: "取消",
+            },
+          };
+        } else {
+          this.gotoOver();
+        }
+      },
+      // 跳转完成工单页面
+      gotoOver() {
+        uni.navigateTo({
+          url: `../scanning/scanning?type=${this.queryObj.type}&type1=${
+            this.queryObj.type1
+          }&id=${encodeURIComponent(JSON.stringify([this.queryObj.id]))}&deptCode=${
+            this.queryObj.deptCode
+          }&dept=${this.queryObj.dept}&speNum=${this.queryObj.speNum}&content=${this.queryObj.content}`,
+        });
+      },
+      // 确定
+      ok() {
+        this.models.disjunctor = false;
+        let postData = {
+          ids: [this.queryObj.id],
+          sign: true,
+          deptQrCode: this.queryObj.deptCode
+        };
+        uni.showLoading({
+          title: '加载中',
+          mask: true
+        });
+        post("/workerOrder/expectedAndActual", postData).then((ress) => {
+          uni.hideLoading();
+          if (ress.status == 200) {
+            if (this.wcFlag) {
+              //正常完成扫描
+              this.overFinish()
+            } else {
+              this.gotoOver();
+            }
+          } else if (ress.status == 1000035) {
+            let content = '';
+            if (this.queryObj.type1 === 'spe-ddd-2' || this.queryObj.type1 === 'plan-spe-ddd-2') {
+              //待到达
+              content =
+                `系统内预计标本<strong class="red">${ress.expectReceiveNum}</strong>只，您扫描收取标本<strong class="red">${ress.actualReceiveNum}</strong>只，其中<strong class="red">${ress.notReceiveNum}</strong>只未扫描；`;
+            } else {
+              //待送达
+              this.content =
+                `本工单已签到<strong class="red">${ress.scanSet?ress.scanSet.join('、'):''}</strong>，剩余需签到科室<strong class="red">${ress.notScanSet?ress.notScanSet.join('、'):''}</strong>，总签收<strong class="red">${ress.totalAcceptance}</strong>只，剩余<strong class="red">${ress.notAcceptance}</strong>只未签收，您确定完成工单吗？`;
+              content =
+                `您在<strong class="red">${ress.deptName}</strong>检验科扫描了<strong class="red">${ress.deptScanNum}</strong>个标本，还需扫描<strong class="red">${ress.deptNotScanNum}</strong>标本。`;
+            }
+            this.models2 = {
+              disjunctor: true,
+              title: "提示",
+              content,
+              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],
+          deptQrCode: this.queryObj.deptCode
+        };
+        uni.showLoading({
+          title: '加载中',
+          mask: true
+        });
+        post("/workerOrder/expectedAndActual", postData).then((ress) => {
+          uni.hideLoading();
+          if (ress.status == 200) {
+            if (this.wcFlag) {
+              this.overFinish()
+            } else {
+              this.gotoOver();
+            }
+          } else {
+            uni.showToast({
+              icon: "none",
+              title: "请求失败！",
+            });
+          }
+        })
+      },
+      // 取消
+      cancel2() {
+        this.models2.disjunctor = false;
+      },
+      know2() {
+        this.models2.disjunctor = false;
+        uni.navigateTo({
+          url: "../receiptpage/receiptpage",
+        });
+      },
+      // 正常完成扫描
+      overFinish() {
+        let data = {
+          type: this.queryObj.type1,
+          ids: [this.queryObj.id],
+        };
+        //只要是标本轮巡1对多或者多对多
+        // plan-spe-dsd-2  1对多
+        // plan-spe-dsd-3  多对多
+        if (
+          this.queryObj.type1 === "plan-spe-ddd-2" ||
+          this.queryObj.type1 === "plan-spe-dsd-2" ||
+          this.queryObj.type1 === "plan-spe-dsd-3"
+        ) {
+          post("/workerOrder/finishPlanSpes", data).then((res) => {
+            // uni.hideLoading()
+            if (res.status == 200) {
+              this.models2 = {
+                disjunctor: true,
+                title: "提示",
+                content: `完成扫描成功`,
+                icon: "success",
+                operate: {
+                  know: "知道了",
+                },
+              };
+            } else {
+              uni.showToast({
+                icon: "none",
+                title: "请求失败！",
+              });
+            }
+          });
+        } else {
+          post("/workerOrder/finishSpes", data).then((res) => {
+            // uni.hideLoading()
+            if (res.status == 200) {
+              uni.navigateTo({
+                url: "../receiptpage/receiptpage",
+              });
+            } else {
+              uni.showToast({
+                icon: "none",
+                title: "请求失败！",
+              });
+            }
+          });
+        }
+      },
+      // 跳转到已扫描标本详情页
+      goToSpeDetail(deptName='', qrCode=''){
+        uni.navigateTo({
+          url: `../noScanSpecimen/noScanSpecimen?deptName=${deptName}&workOrderId=${encodeURIComponent(JSON.stringify([this.queryObj.id]))}&deptCode=${qrCode}&isScan=1&specimensCheck=1`,
+        });
+      }
+    },
+    onLoad(options) {
+      console.log(options);
+      this.queryObj = options;
+      this.getInfo(this.queryObj.id);
+      // #ifdef APP-PLUS
+      webHandle("no", "app");
+      // #endif
+      // #ifdef H5
+      webHandle("no", "wx");
+      // #endif
+    },
+  };
+</script>
+<style lang="less" scoped>
+  .checkAfterScanning {
+    .checkAfterScanning_title {
+      padding: 50rpx 0;
+      font-size: 46rpx;
+      font-weight: 550;
+      text-align: center;
+      border-bottom: 1px solid #ccc;
+    }
+
+    .page_item_cont {
+      min-height: 90rpx;
+      padding: 0 20rpx;
+      text-align: left;
+      position: relative;
+
+      .text_big {
+        font-size: 32rpx;
+        font-weight: 700;
+        margin-top: 10rpx;
+        
+        .underline{
+          text-decoration: underline;
+        }
+      }
+
+      .page_item_cont_T {
+        padding-top: 28rpx;
+        padding-bottom: 28rpx;
+        font-size: 28rpx;
+
+        .page_item_cont_title {
+          height: 100%;
+          font-size: 32rpx;
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+        }
+        .page_item_cont_title2{
+          margin-top: 36rpx;
+          margin-bottom: 18rpx;
+          height: 100%;
+          font-size: 32rpx;
+          font-weight: bold;
+          display: flex;
+          align-items: center;
+        }
+      }
+
+      .page_item_cont_B {
+        padding-top: 28rpx;
+        margin-bottom: 28rpx;
+
+        .page_item_cont_title {
+          font-size: 32rpx;
+          display: flex;
+          justify-content: space-between;
+        }
+
+        .page_item_cont_title1 {
+          height: 60rpx;
+          line-height: 60rpx;
+          font-size: 32rpx;
+          padding-left: 64rpx;
+        }
+      }
+    }
+
+    .foot_btn {
+      line-height: 88rpx;
+      height: 100rpx;
+      margin-top: 40rpx;
+      display: flex;
+      justify-content: center;
+
+      .btn1,
+      .btn2,
+      .btn3 {
+        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;
+        text-align: center;
+      }
+    }
+
+    .foot_btn_spe {
+      line-height: 88rpx;
+      height: 100rpx;
+      margin-top: 40rpx;
+      text-align: center;
+      display: flex;
+      justify-content: space-between;
+      flex-wrap: wrap;
+
+      &::after {
+        content: '';
+        flex: 1;
+      }
+
+      view {
+        height: 88rpx;
+        width: 48%;
+        margin: 0 1%;
+        background-image: linear-gradient(to right, #72c172, #3bb197);
+        color: #fff;
+        border-radius: 8rpx;
+        font-size: 32rpx;
+        margin-top: 16rpx;
+      }
+    }
+  }
+</style>

pages/my_list/my_list.vue

@@ -112,7 +112,7 @@
               <text class="text1">完成时间</text>&nbsp;&nbsp;
               <text class="text1">{{ infoDATA.completeTime || '' }}</text>
             </view>
-            <view class="page_item_foot_text">
+            <view class="page_item_foot_text" @click.stop="goToDetail(infoDATA.id)">
               <text class="text1">扫描接收数量</text>&nbsp;&nbsp;
               <text class="text1 b">{{ infoDATA.actualReceiveNum || 0 }}</text>
             </view>
@@ -173,6 +173,11 @@
       showModel,
     },
     methods: {
+      goToDetail(id){
+        uni.navigateTo({
+          url: `../noScanSpecimen/noScanSpecimen?workOrderId=${encodeURIComponent(JSON.stringify([id]))}&isScan=1&specimensCheck=1&noScan=1`,
+        });
+      },
       //滚动距离
       scrollList(e) {
         this.scroll_t_old = e.detail.scrollTop;

pages/noScanSpecimen/noScanSpecimen.vue

@@ -1,42 +1,41 @@
 <template>
   <view class="pharmacyDetails">
-    <view class="pharmacyDetails_title">{{isScan?'已':'未'}}扫描标本信息</view>
+    <view class="pharmacyDetails_title"><text v-if="queryObj.deptName">{{queryObj.deptName}}-</text>{{isScan?'已':'未'}}扫描标本信息</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 class="L_text">{{ spe.scode }}<text v-if="spe.stype">({{spe.stype.name}})</text></view>
+              </view>
+              <view class="page_item_top_R">
+                <text :style="{color:spe.urgent == 1?'red':'green'}">{{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_T">
               <view class="page_item_cont_title">
-                <text>标本编码</text>
-                <text class="text_big">
-                  <text>{{ spe.scode }}</text>
-                </text>
+                <view> 检验项目 </view>
+                <view class="text_big">{{ spe.specimenDesc || "无" }}</view>
               </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 class="page_item_cont_title">
+                <view> 患者姓名 </view>
+                <view class="text_big">{{ spe.patientName }}<text v-if="spe.bedNum">({{spe.bedNum}})</text></view>
               </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 class="page_item_cont_title">
+                <view> 住院号 </view>
+                <view class="text_big">{{spe.residenceNo||'无'}}</text></view>
+              </view>
+              <view class="page_item_cont_title">
+                <view class="text_big">{{
+                  spe.sickRoom ? spe.sickRoom.dept : "无"
+                }}</view>
+                <text style="width: 4em;text-align: center;" class="icon_transport transport-arrow-right-full"></text>
+                <view class="text_big">{{
+                  spe.checkDept ? spe.checkDept.dept : "无"
+                }}</view>
               </view>
             </view>
           </view>
@@ -60,6 +59,7 @@
   export default {
     data() {
       return {
+        queryObj: {}, //路由传递过来的数据
         isScan: false,//true是已扫描标本，false是未扫描标本
         workOrderId: -1,
         deptCode: '',
@@ -71,15 +71,27 @@
       goBack() {
         uni.navigateBack();
       },
-      // 获取未扫描标本信息
+      // 获取已扫描或未扫描标本信息
       getNoScanSpecimen(isScan) {
         let postData = {
           gdIds: this.workOrderId,
           currentPage: 0,
           pageSize: 999,
-          deptQrCode: this.deptCode
         };
-        if(isScan){
+        
+        if(this.queryObj.specimensCheck){
+          //标本核对页面过来的
+          if(this.queryObj.deptName){
+            // 标本核对,已扫描总数
+            postData.deptQrCode = this.deptCode||undefined;
+            postData.specimensCheck = 1;
+          }
+        }else{
+          postData.deptQrCode = this.deptCode||undefined;
+        }
+        // 是否是已扫描
+        if(isScan && !this.queryObj.noScan){
+          // 显示已扫描，但添加scanned参数
           postData.scanned = 1;
         }
         uni.showLoading({
@@ -95,6 +107,8 @@
       },
     },
     onLoad(options) {
+      console.log(options);
+      this.queryObj = options;
       this.workOrderId = JSON.parse(options.workOrderId);
       this.deptCode = options.deptCode;
       this.isScan = Boolean(options.isScan);
@@ -190,8 +204,7 @@
         }
 
         .page_item_cont {
-          min-height: 180rpx;
-          max-height: 424rpx;
+          min-height: 90rpx;
           padding: 0 16rpx;
           text-align: left;
           position: relative;
@@ -199,8 +212,9 @@
           .text_big {
             font-size: 32rpx;
             font-weight: 700;
-
-            text {
+            margin-top: 10rpx;
+          
+            p {
               font-weight: 700;
               line-height: 1.5;
             }
@@ -217,6 +231,7 @@
 
           .page_item_cont_T {
             padding-top: 28rpx;
+            padding-bottom: 28rpx;
             font-size: 28rpx;
 
             .page_item_cont_title {
@@ -224,6 +239,7 @@
               font-size: 32rpx;
               display: flex;
               justify-content: space-between;
+              align-items: center;
             }
           }
 

pages/receipt_infopage/receipt_infopage.vue

@@ -202,11 +202,20 @@
         <view>
           <text class="page_item_info_title">标本信息</text>
           <text class="text">
-            预计标本总数
+            预计接收
             <text class="page_item_info_txt">{{
               infoDATA.expectReceiveNum || 0
             }}</text>
           </text>
+          <text class="text"
+            v-if="infoDATA.gdState.value == 5 || infoDATA.gdState.value == 6 || infoDATA.gdState.value == 7">
+            扫描接收
+            <text class="page_item_info_txt">{{scanReception}}</text>
+          </text>
+          <text class="text" v-if="infoDATA.gdState.value == 6 || infoDATA.gdState.value == 7">
+            实际送达
+            <text class="page_item_info_txt">{{actualDelivery}}</text>
+          </text>
         </view>
         <view v-for="spe in infoDATA.specimenSet" :key="spe.id" class="spe_list">
           <view>
@@ -354,6 +363,8 @@
   export default {
     data() {
       return {
+        scanReception: 0,
+        actualDelivery: 0,
         currentUserId: 0,
         // 弹窗model
         models: {
@@ -623,6 +634,8 @@
         }).then((res) => {
           uni.hideLoading();
           if (res.state == 200) {
+            this.actualDelivery = res.actualDelivery;
+            this.scanReception = res.scanReception;
             this.infoDATA = res.data;
             // 计算高度
             setTimeout(() => {
@@ -941,6 +954,7 @@
           .page_item_info_txt {
             color: #49b856;
             margin-left: 8rpx;
+            margin-right: 8rpx;
           }
         }
       }
@@ -1032,7 +1046,8 @@
       display: flex;
       justify-content: space-between;
 
-      .btn2,.btn3 {
+      .btn2,
+      .btn3 {
         height: 66rpx;
         flex: 1;
         margin: 0 1%;

pages/scanning_Result/scanning_Result.vue

@@ -2,7 +2,10 @@
   <view class="Scanning_Result">
     <view class="Scanning_top" v-if="res.status == 200">
       <view class="Scanning_top_icon">
-        <text class="cubeic-ok icon_transport transport-duigou"></text>
+        <view v-if="type == 'specimenPlan' || type == 'specimen'">
+          <view class="red fweight speNum"> {{ speNum }} </view>
+        </view>
+        <text v-else class="cubeic-ok icon_transport transport-duigou"></text>
       </view>
       <view class="Scanning_top_text">
         <view class="text1"> 操作成功 </view>
@@ -26,13 +29,15 @@
         (res.status == 200 && type == 'specimenPlan') ||
         (res.status == 200 && type == 'specimen')
       ">
-      <view> 标本类型 : {{ infoDATA.stype.name || "-" }} </view>
-      <view> 标本编号 : {{ infoDATA.scode || "-" }} </view>
-      <view>检验科室 : {{ infoDATA.checkDept ? infoDATA.checkDept.dept : "-" }}</view>
+      <view>{{ infoDATA.stype.name }}（{{infoDATA.scode}}）</view>
       <view>检验项目 : {{ infoDATA.specimenDesc || "-" }}</view>
-      <view>患者姓名 : {{ infoDATA.patientName}}<text v-if="infoDATA.bedNum">({{infoDATA.bedNum}})</text></view>
-      <view>住院号 : {{infoDATA.residenceNo || "-"}}</view>
-      <view> 已扫描 : {{ speNum }} </view>
+      <view>
+        {{ infoDATA.sickRoom ? infoDATA.sickRoom.dept : "" }}
+        <text style="width: 4em;text-align: center;margin-left: 1em;margin-right: 1em;" class="icon_transport transport-arrow-right-full"></text>
+        {{ infoDATA.checkDept ? infoDATA.checkDept.dept : "" }}
+      </view>
+      <view>患者姓名 : {{ infoDATA.patientName}}（{{infoDATA.bedNum}}）</view>
+      <view>住院号 : {{ infoDATA.residenceNo || '-' }}</view>
     </view>
 
     <view class="Scanning_cont" v-if="
@@ -469,11 +474,11 @@
         this.gotoFlag = false;
         if(isScan){
           uni.navigateTo({
-            url: `../noScanSpecimen/noScanSpecimen?workOrderId=${encodeURIComponent(JSON.stringify([this.queryObj.id]))}&deptCode=${this.queryObj.deptCode}&isScan=1`,
+            url: `../noScanSpecimen/noScanSpecimen?deptName=${this.queryObj.dept}&workOrderId=${encodeURIComponent(JSON.stringify([this.queryObj.id]))}&deptCode=${this.queryObj.deptCode}&isScan=1`,
           });
         }else{
           uni.navigateTo({
-            url: `../noScanSpecimen/noScanSpecimen?workOrderId=${encodeURIComponent(JSON.stringify([this.queryObj.id]))}&deptCode=${this.queryObj.deptCode}`,
+            url: `../noScanSpecimen/noScanSpecimen?deptName=${this.queryObj.dept}&workOrderId=${encodeURIComponent(JSON.stringify([this.queryObj.id]))}&deptCode=${this.queryObj.deptCode}`,
           });
         }
       },
@@ -637,6 +642,13 @@
       },
       // 完成扫描
       Scanning_complete(id) {
+        // 如果是标本配送和标本轮巡,则进入标本核对页面
+        if((this.type === 'specimen' || this.type === 'specimenPlan') && this.queryObj.type1.includes('ddd')){
+          uni.navigateTo({
+            url: `../checkAfterScanning/checkAfterScanning?id=${id}&type=${this.queryObj.type}&type1=${this.queryObj.type1}&dept=${this.queryObj.dept}&deptId=${this.queryObj.deptId}&deptCode=${this.queryObj.deptCode}&speNum=${this.speNum}&content=${this.content}`,
+          });
+          return;
+        }
         this.wcId = id;
         if (
           this.queryObj.type1 == "plan-spe-ddd-2" ||
@@ -834,6 +846,11 @@
         margin-top: 116rpx;
         border-radius: 50%;
         line-height: 140rpx;
+        
+        .speNum{
+          text-align: center;
+          font-size: 140rpx;
+        }
 
         .cubeic-ok {
           font-size: 140rpx;
@@ -848,7 +865,6 @@
 
       .Scanning_top_text {
         .text1 {
-          margin-top: 40rpx;
           font-size: 48rpx;
           text-align: center;
         }

pages/scanning_all/scanning_all.vue

@@ -267,12 +267,14 @@
         });
       },
       //科室签到
+      //trueBigScanner----判断是否大扫描
       //bigScanner----判断是否需要交接人
       //accountObj----弹窗填写的交接人信息
       orderDeptHandler(bigScanner, accountObj) {
         let type = "orderSign/" + this.code;
         let list = {
-          ids: this.userId.ids
+          ids: this.userId.ids,
+          trueBigScanner: ['666']
         };
         bigScanner && (list.bigScanner = ['666']);
         if (accountObj) {
@@ -283,6 +285,7 @@
           mask: true,
         });
         post("/workerOrder/" + type, list).then((res) => {
+          console.log(this.tabType)
           uni.hideLoading();
           if (res.status == 200) {
             if (this.tabType == "inspect" || this.tabType == "patientTransport") {
@@ -305,9 +308,10 @@
               )}&model=${encodeURIComponent(JSON.stringify(res))}`,
               });
             } else if (this.tabType == 'specimenPlan') {
+              // -----------------------------
               console.log(this.selectArr, '选中工单')
               let gd = this.infoDATA.specimenPlan.find(v => v.id == this.selectArr[0]);
-              let startDeptId = gd.startDept.id; //起点科室id liaomingming
+              let startDeptId = gd.startDept.id; //起点科室id
               let isDigitalHandover = gd.taskType.isDigitalHandover; //是否数字交接开关
               let signDeptId = res.deptId; //签到的科室id
               let gdId = gd.id;
@@ -315,13 +319,36 @@
               let endDepts = gd.endDepts.map(v => v.id).toString();
               uni.navigateTo({
                 url: `../scanning_djEnd/scanning_djEnd?type=${
-                this.tabType
-              }&type1=${res.type}&code=${this.code}&dept=${
-                res.dept
-              }&ids=${encodeURIComponent(
-                JSON.stringify(this.userId.ids)
-              )}&model=${encodeURIComponent(JSON.stringify(res))}&accountObj=${encodeURIComponent(JSON.stringify(accountObj))}&deptId=${res.deptId}&startDeptId=${startDeptId}&isDigitalHandover=${isDigitalHandover}&signDeptId=${signDeptId}&gdId=${gdId}&gdState=${gdState}&endDepts=${endDepts}`,
+                  this.tabType
+                }&type1=${res.type}&code=${this.code}&dept=${
+                  res.dept
+                }&ids=${encodeURIComponent(
+                  JSON.stringify(this.userId.ids)
+                )}&model=${encodeURIComponent(JSON.stringify(res))}&accountObj=${encodeURIComponent(JSON.stringify(accountObj))}&deptId=${res.deptId}&startDeptId=${startDeptId}&isDigitalHandover=${isDigitalHandover}&signDeptId=${signDeptId}&gdId=${gdId}&gdState=${gdState}&endDepts=${endDepts}`,
               });
+            } else if (this.tabType == 'specimen') {
+              if (res.deptType && res.deptType.value === 'middleRoom') {
+                // 如果是中转科室
+                uni.navigateTo({
+                  url: `../checkAfterBigScreen/checkAfterBigScreen?type=${
+                  this.tabType
+                }&type1=${res.type}&code=${this.code}&dept=${
+                  res.dept
+                }&ids=${encodeURIComponent(
+                  JSON.stringify(this.userId.ids)
+                )}&model=${encodeURIComponent(JSON.stringify(res))}&accountObj=${encodeURIComponent(JSON.stringify(accountObj))}&deptId=${res.deptId}`,
+                });
+              } else {
+                uni.navigateTo({
+                  url: `../scanning_djEnd/scanning_djEnd?type=${
+                  this.tabType
+                }&type1=${res.type}&code=${this.code}&dept=${
+                  res.dept
+                }&ids=${encodeURIComponent(
+                  JSON.stringify(this.userId.ids)
+                )}&model=${encodeURIComponent(JSON.stringify(res))}&accountObj=${encodeURIComponent(JSON.stringify(accountObj))}&deptId=${res.deptId}`,
+                });
+              }
             } else {
               uni.navigateTo({
                 url: `../scanning_djEnd/scanning_djEnd?type=${
@@ -334,7 +361,7 @@
               });
             }
           } else if (res.status == "0000") {
-            this.showSelectAccount(); //yeye
+            this.showSelectAccount();
           } else {
             this.flag = true;
             uni.navigateTo({
@@ -349,6 +376,7 @@
       },
       //一键操作
       allStart() {
+        console.log(this.tabType)
         clearTimeout(this.flagTimer);
         this.flagTimer = setTimeout(() => {
           this.flag = false;
@@ -432,14 +460,14 @@
                             } else {
                               uni.navigateTo({
                                 url: `../scanning_djEnd/scanning_djEnd?type=${
-                                this.tabType
-                              }&type1=${res.type}&dept=${
-                                res.dept
-                              }&ids=${encodeURIComponent(
-                                JSON.stringify(this.userId.ids)
-                              )}&model=${encodeURIComponent(
-                                JSON.stringify(res)
-                              )}&code=${this.code}`,
+                                  this.tabType
+                                }&type1=${res.type}&dept=${
+                                  res.dept
+                                }&ids=${encodeURIComponent(
+                                  JSON.stringify(this.userId.ids)
+                                )}&model=${encodeURIComponent(
+                                  JSON.stringify(res)
+                                )}&code=${this.code}`,
                               });
                             }
                           } else {
@@ -606,7 +634,9 @@
       },
     },
     onLoad(options) {
+      console.log(options, 'options');
       this.infoDATA = JSON.parse(options.infoDATA); //扫描科室码返回的信息
+      console.log(this.infoDATA);
       this.code = options.code; //扫描科室码返回的二维码信息
       let arr = [];
       for (var key in this.infoDATA) {

pages/scanning_code/scanning_code.vue

@@ -192,10 +192,8 @@
           infoDATA.taskType.associationType.value == 'specimen' ||
           infoDATA.taskType.associationType.value == 'specimenPlan'
         ">
-        <text class="page_item_info_title">标本信息</text>
-        <!-- <text class="text" v-if="infoType=='plan-spe-ddd-1'||infoType=='plan-spe-dsd-2'||infoType=='plan-spe-dsd-3'&&infoDATA.gdState.value=='5'||infoType=='spe-ddd-1'||infoType=='spe-dsd-2'||infoType=='spe-dsd-3'&&infoDATA.gdState.value=='5'"> -->
-        <!-- <text class="text" v-if="infoType=='plan-spe-ddd-1'||infoType=='plan-spe-dsd-2'||infoType=='plan-spe-dsd-3'&&infoDATA.gdState.value=='5'||infoType=='spe-ddd-1'||infoType=='spe-dsd-2'"> -->
-        <text class="text" v-if="
+        <!-- <text class="page_item_info_title">标本信息</text> -->
+        <!-- <text class="text" v-if="
             infoType == 'plan-spe-ddd-1' ||
             infoType == 'plan-spe-dsd-2' ||
             infoType == 'spe-ddd-1' ||
@@ -224,7 +222,7 @@
           ">
           已收取标本总数
           <text>{{ infoDATA.actualReceiveNum || 0 }}</text>
-        </text>
+        </text> -->
       </view>
       <!-- 静配 -->
       <view class="page_item_info" v-if="infoDATA.taskType.associationType.value == 'jPBag'">
@@ -829,7 +827,7 @@
               this.queryObj.deptCode
             }&dept=${
               this.queryObj.dept
-            }&id=${this.dataId}&model=${encodeURIComponent(
+            }&deptId=${this.deptId}&id=${this.dataId}&model=${encodeURIComponent(
               JSON.stringify(ress)
             )}&speNum=${res.specimenCount}`,
             });
@@ -975,7 +973,7 @@
                         this.queryObj.deptCode
                       }&dept=${
                         this.queryObj.dept
-                      }&id=${this.dataId}&model=${encodeURIComponent(
+                      }&deptId=${this.deptId}&id=${this.dataId}&model=${encodeURIComponent(
                         JSON.stringify(ress)
                       )}&speNum=${ress.specimenCount}&scanOrHand=${type}`,
                       });

pages/scanning_djEnd/scanning_djEnd.vue

@@ -741,13 +741,13 @@
         let ids = JSON.parse(this.queryObj.ids);
         if (isScan) {
           uni.navigateTo({
-            url: `../noScanSpecimen/noScanSpecimen?workOrderId=${encodeURIComponent(
+            url: `../noScanSpecimen/noScanSpecimen?deptName=${this.queryObj.dept}&workOrderId=${encodeURIComponent(
             JSON.stringify(ids)
           )}&deptCode=${this.queryObj.code}&isScan=1`,
           });
         } else {
           uni.navigateTo({
-            url: `../noScanSpecimen/noScanSpecimen?workOrderId=${encodeURIComponent(
+            url: `../noScanSpecimen/noScanSpecimen?deptName=${this.queryObj.dept}&workOrderId=${encodeURIComponent(
             JSON.stringify(ids)
           )}&deptCode=${this.queryObj.code}`,
           });
@@ -923,6 +923,13 @@
       },
       //完成扫描
       Scanning_complete(id) {
+        // 如果是标本配送和标本轮巡,则进入标本核对页面
+        if((this.type === 'specimen' || this.type === 'specimenPlan') && this.queryObj.type1.includes('ddd')){
+          uni.navigateTo({
+            url: `../checkAfterScanning/checkAfterScanning?id=${id}&type=${this.queryObj.type}&type1=${this.queryObj.type1}&dept=${this.queryObj.dept}&deptId=${this.queryObj.deptId}&deptCode=${this.queryObj.deptCode}&speNum=${this.speNum}&content=${this.content}`,
+          });
+          return;
+        }
         this.modelFlag = "complete";
         this.wcId = id;
         if (

pages/scanning_djInfo/scanning_djInfo.vue

@@ -412,11 +412,11 @@
         this.gotoFlag = false;
         if(isScan){
           uni.navigateTo({
-            url: `../noScanSpecimen/noScanSpecimen?workOrderId=${encodeURIComponent(JSON.stringify(this.queryObj.ids))}&deptCode=${this.queryObj.deptCode}&isScan=1`,
+            url: `../noScanSpecimen/noScanSpecimen?deptName=${this.queryObj.dept}workOrderId=${encodeURIComponent(JSON.stringify(this.queryObj.ids))}&deptCode=${this.queryObj.deptCode}&isScan=1`,
           });
         }else{
           uni.navigateTo({
-            url: `../noScanSpecimen/noScanSpecimen?workOrderId=${encodeURIComponent(JSON.stringify(this.queryObj.ids))}&deptCode=${this.queryObj.deptCode}`,
+            url: `../noScanSpecimen/noScanSpecimen?deptName=${this.queryObj.dept}workOrderId=${encodeURIComponent(JSON.stringify(this.queryObj.ids))}&deptCode=${this.queryObj.deptCode}`,
           });
         }
       },
@@ -559,6 +559,13 @@
       },
       //完成扫描
       Scanning_complete(id) {
+        // 如果是标本配送和标本轮巡,则进入标本核对页面
+        if((this.type === 'specimen' || this.type === 'specimenPlan') && this.queryObj.type1.includes('ddd')){
+          uni.navigateTo({
+            url: `../checkAfterScanning/checkAfterScanning?id=${id}&type=${this.queryObj.type}&type1=${this.queryObj.type1}&dept=${this.queryObj.dept}&deptId=${this.queryObj.deptId}&deptCode=${this.queryObj.deptCode}&speNum=${this.speNum}&content=${this.content}`,
+          });
+          return;
+        }
         this.wcId = id;
         if (
           this.queryObj.type1 == "plan-spe-ddd-2" ||

pages/scanning_orderSign/scanning_orderSign.vue

@@ -105,11 +105,11 @@
           infoDATA.taskType.associationType.value == 'specimen' && ((infoType == 'plan-spe-dsd-3' && infoDATA.gdState.value == '7') ||
             (infoType == 'spe-dsd-3' && infoDATA.gdState.value == '7'))
         ">
-        <text class="page_item_info_title">标本信息</text>
+        <!-- <text class="page_item_info_title">标本信息</text>
         <text class="text">
           已扫描标本总数
           <text>{{ infoDATA.expectReceiveNum || 0 }}</text>
-        </text>
+        </text> -->
         <!-- <view class="page_item_list">
           <view class="page_item_list_head">
             <view>标本类型</view>