暂存

components/bigScreen/bigScreen.vue

@@ -142,7 +142,18 @@
                   JSON.stringify(this.userId.ids)
                 )}&model=${encodeURIComponent(JSON.stringify(res))}&accountObj=${encodeURIComponent(JSON.stringify(accountObj))}&deptId=${res.deptId}`,
                 });
-              } else {
+              } else if(res.type === 'spe-dsd-4'){
+                // 检验方式是标本数字交接
+                uni.navigateTo({
+                  url: `/pages/specimenHandoverNew/specimenHandoverNew?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

main.js

@@ -7,7 +7,7 @@ import './mixins/mixin'
 // new VConsole();
 // import eruda from 'eruda';
 // eruda.init();
-console.info('v2.4.46');
+console.info('v2.4.47');
 Vue.prototype.wx = wx //声明扫码
 Vue.prototype.audios = [] //待播放的语音集合
 // #endif

pages.json

@@ -504,6 +504,14 @@
           "titleNView": false
         }
       }
+    }, {
+      "path": "pages/specimenHandoverNew/specimenHandoverNew",
+      "style": {
+        "h5": {
+          "titleNView": false
+        }
+      }
+
     }
   ],
   "globalStyle": {

pages/receiptpage/receiptpage.vue

@@ -265,7 +265,8 @@
                 item.taskType.associationType.value != 'patientTransport' &&
                 item.taskType.associationType.value != 'inspect' &&
                 item.taskType.associationType.value != 'other' &&
-                item.taskType.associationType.value != 'ordinary'
+                item.taskType.associationType.value != 'ordinary' &&
+                (item.taskType.associationType.value == 'specimen' && item.taskType.carryingCourses[1].checkoutMethod.value != 3 && item.gdState.value != 5)
               " hover-class="seimin-btn-hover">
               <smallScreen :sData="item" :sType="2">扫码</smallScreen>
             </view>

pages/scanning_all/scanning_all.vue

@@ -352,6 +352,17 @@
                   JSON.stringify(this.userId.ids)
                 )}&model=${encodeURIComponent(JSON.stringify(res))}&accountObj=${encodeURIComponent(JSON.stringify(accountObj))}&deptId=${res.deptId}`,
                 });
+              } else if(res.type === 'spe-dsd-4'){
+                // 检验方式是标本数字交接
+                uni.navigateTo({
+                  url: `/pages/specimenHandoverNew/specimenHandoverNew?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=${

pages/specimenHandoverNew/specimenHandoverNew.vue

@@ -0,0 +1,384 @@
+<template>
+  <view class="Scanning_Result">
+    <view class="Scanning_top">
+      <view class="Scanning_top_icon">
+        <text class="cubeic-ok icon_transport transport-duigou"></text>
+        <view class="text1"> 签到成功 </view>
+      </view>
+      <view class="Scanning_top_text">
+        您已到达{{queryObj.dept}}，请核对填写以下标本信息
+      </view>
+    </view>
+
+    <view class="Scanning_cont">
+      <view class="Scanning_cont_head">
+        <view class="Scanning_cont_head_item" :class="{active: type == key}" v-for="(item, key) in typeList" :key="item.id" @click="clickTab(key)">
+          {{item.name}}
+        </view>
+      </view>
+      
+      <view class="Scanning_cont_list">
+        <view class="Scanning_cont_list_item Scanning_cont_list_head">
+          <view class="name" v-if="type === 'patient'">
+            患者名称<text class="red">({{typeList.patient.titleCount}})</text>
+          </view>
+          <view class="name" v-if="type === 'checkType'">
+            项目名称<text class="red">({{typeList.patient.titleCount}})</text>
+          </view>
+          <view class="value" v-if="type === 'patient'">
+            <view>
+              标本数量<text class="red">({{typeList.patient.count}})</text>
+            </view>
+          </view>
+          <view class="value" v-if="type === 'checkType'">
+            <view>
+              标本数量<text class="red">({{typeList.patient.count}})</text>
+            </view>
+          </view>
+        </view>
+        <scroll-view scroll-y="true" class="Scanning_cont_list_scroll">
+          <view class="Scanning_cont_list_item" @click="clickRow(item)" v-for="(item, j) in dataList" :key="item.id">
+            <view class="name">
+              {{item.patientname}}
+            </view>
+            <view class="value">
+              <view>
+                {{item.count}}
+              </view>
+            </view>
+          </view>
+        </scroll-view>
+      </view>
+    </view>
+
+    <view class="foot_btn">
+      <view class="btn" @click="goBack()"> 取消 </view>
+      <view class="btn" @click="onClick()"> 汇总交接 </view>
+    </view>
+    <!-- 填写数字弹窗 -->
+    <selectNum v-if="numModels.disjunctor" :disjunctor="numModels.disjunctor" @ok="numOk" @cancel="numCancel" :content="numModels.content" :dataName="numModels.dataName">
+    </selectNum>
+    <!-- 弹窗 -->
+    <showModel :title="models1.title" :icon="models1.icon" :disjunctor="models1.disjunctor" :content="models1.content"
+      @ok="ok1" @cancel="cancel1" :operate="models1.operate"></showModel>
+  </view>
+</template>
+<script>
+  import {
+    get,
+    post,
+    SM,
+    webHandle
+  } from "@/http/http.js";
+  export default {
+    data() {
+      return {
+        hosId: uni.getStorageSync('userData').user.currentHospital.id,
+        type: 'patient',//patient|checkType
+        queryObj: {}, //路由传递过来的数据
+        // 填写数字弹窗model
+        numModels: {
+          disjunctor: false,
+        },
+        typeList: {
+          "patient": {
+            id: -1,
+            name: '患者标本',
+            count: 0,
+            titleCount: 0,
+          },
+          "checkType": {
+            id: -2,
+            name: '检验项目',
+            count: 0,
+            titleCount: 0,
+          }
+        },
+        dataList: [],
+        coopData: {},
+        // 弹窗model
+        models1: {
+          disjunctor: false,
+        },
+      };
+    },
+    methods: {
+      goBack(){
+        uni.navigateBack();
+      },
+      clickTab(key){
+        this.type = key;
+        this.initData();
+      },
+      //确定
+      ok1() {
+        this.models1.disjunctor = false;
+        let bussList = this.dataList.map(v => v.children).flat().map(v => v.clothesWashingDTO).map(v => ({...v, exception: 0}));
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        post("/transflow/createOrTakeOrder", {
+          type: 'clothingGet',
+          id: 0,
+          startDeptId: this.queryObj.startDeptId,
+          hosId: this.hosId,
+          bussList,
+          orderId: this.queryObj.orderId,
+        }).then((res) => {
+          uni.hideLoading();
+          if (res.state == 200) {
+            uni.showModal({
+              title: "提示",
+              content: "交接成功",
+              showCancel: false,
+              success: (result) => {
+                if (result.confirm) {
+                  console.log("用户点击确定");
+                  uni.navigateTo({
+                    url: `/pages/receiptpage/receiptpage`,
+                  });
+                }
+              },
+            });
+          }else{
+            uni.showToast({
+              icon: "none",
+              title: res.msg || "接口获取数据失败！",
+            });
+          }
+        });
+      },
+      //取消
+      cancel1() {
+        this.models1.disjunctor = false;
+      },
+      // 被服回收弹窗
+      showModel1() {
+        let bussList = this.dataList.map(v => v.children).flat();
+        let num = bussList.reduce((prev, current) => prev + current.clothesWashingDTO.recyclingNum, 0);
+        this.models1 = {
+          disjunctor: true,
+          title: "提示",
+          content: `<strong class="red">${this.queryObj.startDeptName}</strong>已与<strong class="red">${this.queryObj.name}</strong>交接<strong class="red">${num}件</strong>被服，交接人为<strong class="red">${this.queryObj.name}</strong>，您确认交接吗？`,
+          icon: "warn",
+          operate: {
+            ok: "确定",
+            cancel: "取消",
+          },
+        };
+      },
+      // 填写数量-确认
+      numOk(data) {
+        console.log(data);
+        this.numModels.disjunctor = false;
+        this.updateNum(data);
+      },
+      // 填写数量-取消
+      numCancel() {
+        this.numModels.disjunctor = false;
+      },
+      onClick(){
+        this.showModel1();
+      },
+      clickRow(data){
+        this.coopData = data;
+        this.numModels = {
+          disjunctor: true,
+          content: `请输入被服数量`,
+          dataName: data.name,
+        };
+      },
+      updateNum(data){
+        this.dataList.children.forEach(v => {
+          if(v.id == this.coopData.id){
+            v.clothesWashingDTO && (v.clothesWashingDTO.recyclingNum = data.num);
+          }
+        })
+      },
+      getInfo(type){
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        post("/workerOrder/ordersSpeInfo", {
+          type,
+          deptId: this.queryObj.deptId,
+          orderIds: JSON.parse(this.queryObj.ids).toString(),
+        }).then((result) => {
+          uni.hideLoading();
+          if (result.state == 200) {
+            this.typeList[type].count = result.count;
+            this.typeList[type].titleCount = result.title;
+            if(this.type === type){
+              this.dataList = result.data || [];
+            }
+          } else {
+            uni.showToast({
+              icon: "none",
+              title: result.msg || "接口获取数据失败！",
+            });
+          }
+        });
+      },
+      initData(){
+        this.getInfo('patient');
+        this.getInfo('checkType');
+      },
+    },
+    onLoad(options) {
+      console.log(options, "result");
+      this.queryObj = options;
+      this.initData();
+      // #ifdef APP-PLUS
+      webHandle("no", "app");
+      // #endif
+      // #ifdef H5
+      webHandle("no", "wx");
+      // #endif
+    },
+  };
+</script>
+<style lang="less" scoped>
+  .Scanning_Result {
+    height: 100vh;
+    display: flex;
+    flex-direction: column;
+    background-color: #fafbfd;
+    .Scanning_top {
+      flex-shrink: 0;
+      .Scanning_top_icon {
+        padding-top: 26rpx;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+
+        .cubeic-ok {
+          font-size: 58rpx;
+          color: #35b34a;
+        }
+
+        .text1 {
+          font-size: 48rpx;
+          font-weight: bold;
+        }
+      }
+      .Scanning_top_text{
+        text-align: center;
+        font-size: 28rpx;
+        font-weight: bold;
+        padding: 8rpx 0 23rpx 0;
+      }
+    }
+
+    .Scanning_cont {
+      flex: 1;
+      min-height: 0;
+      display: flex;
+      flex-direction: column;
+      width: 710rpx;
+      margin: 0 20rpx;
+      background-color: #fff;
+      
+      .Scanning_cont_head{
+        flex-shrink: 0;
+        height: 78rpx;
+        display: flex;
+        border-top: 1rpx solid #EEEEEE;
+        border-bottom: 1rpx solid #EEEEEE;
+        .Scanning_cont_head_item{
+          flex: 1;
+          font-size: 28rpx;
+          font-weight: bold;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          position: relative;
+          &.active{
+            color: #49B856;
+            &::before{
+              content: '';
+              width: 70rpx;
+              height: 10rpx;
+              background-color: #49B856;
+              position: absolute;
+              left: 50%;
+              bottom: 0;
+              transform: translateX(-50%);
+              border-radius: 6rpx;
+            }
+          }
+          &::after{
+            content: '';
+            width: 2rpx;
+            height: 44rpx;
+            background-color: #D1D1D1;
+            position: absolute;
+            right: 0;
+            top: 50%;
+            transform: translateY(-50%);
+          }
+          &:last-of-type::after{
+            opacity: 0;
+          }
+        }
+      }
+      
+      .Scanning_cont_list{
+        flex: 1;
+        min-height: 0;
+        display: flex;
+        flex-direction: column;
+        .Scanning_cont_list_scroll{
+          flex: 1;
+          min-height: 0;
+        }
+        .Scanning_cont_list_item{
+          height: 70rpx;
+          display: flex;
+          align-items: center;
+          font-size: 28rpx;
+          border-bottom: 1rpx solid #CCCCCC;
+          &.Scanning_cont_list_head{
+            font-weight: bold;
+            font-size: 28rpx;
+            border-bottom: none;
+            flex-shrink: 0;
+          }
+          .name,
+          .value{
+            padding: 0 40rpx;
+            flex: 1;
+          }
+          .value {
+            view{
+              width: 7em;
+              text-align: center;
+            }
+          }
+        }
+      }
+    }
+
+    .foot_btn {
+      flex-shrink: 0;
+      line-height: 66rpx;
+      display: flex;
+      justify-content: center;
+
+      .btn {
+        height: 66rpx;
+        flex: 1;
+        margin-right: 1%;
+        background-image: linear-gradient(to right, #72c172, #3bb197);
+        color: #fff;
+        border-radius: 8rpx;
+        font-size: 28rpx;
+        text-align: center;
+        &:last-of-type{
+          margin-right: 0;
+        }
+      }
+    }
+  }
+</style>