标本数字交接

components/bigScreen/bigScreen.vue

@@ -17,6 +17,7 @@
   export default {
     data() {
       return {
+        hosId: uni.getStorageSync('userData').user.currentHospital.id,
         // 填写交接人工号弹窗model
         hosModels: {
           disjunctor: false,
@@ -87,11 +88,50 @@
           disjunctor: true,
         };
       },
+      // 标本配送-待送达-运输过程-标本数字交接,则,科室签到不需要填写交接人
+      validateHandoverSpecimen(){
+        return post("/simple/data/fetchDataList/taskType", {
+          "idx": 0,
+          "sum": 1,
+          "taskType": {
+              "hosId": {
+                  "id": this.hosId
+              },
+              "associationType": {
+                  "key": "association_types",
+                  "value": "specimen"
+              }
+          }
+        });
+      },
       //科室签到
       //trueBigScanner----判断是否大扫描
       //bigScanner----判断是否需要交接人
       //accountObj----弹窗填写的交接人信息
-      orderDeptHandler(bigScanner, accountObj) {
+      async orderDeptHandler(bigScanner, accountObj) {
+        console.log(this.infoDATA);
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        if(this.tabType === 'specimen' && this.infoDATA.specimen && this.infoDATA.specimen[0].gdState.value == 5){
+          let result = await this.validateHandoverSpecimen();
+          if (result.status == 200) {
+            if(result.list.length){
+              // 标本-运送过程-终点科室-标本数字交接
+              if(result.list[0].carryingCourses[1].checkoutMethod.value == 3){
+                bigScanner = false;
+              }
+            }else{
+              uni.showToast({
+                icon: "none",
+                title: "请配置标本配送任务类型！",
+              });
+              uni.hideLoading();
+              return;
+            }
+          }
+        }
         let type = "orderSign/" + this.code;
         let list = {
           ids: this.userId.ids,
@@ -101,10 +141,7 @@
         if (accountObj) {
           list.handover = [accountObj.accountId];
         }
-        uni.showLoading({
-          title: "加载中",
-          mask: true,
-        });
+        
         post("/workerOrder/" + type, list).then((res) => {
           console.log(this.tabType)
           uni.hideLoading();

pages.json

@@ -513,7 +513,16 @@
       }
 
     }
-  ],
+      ,{
+            "path" : "pages/specimenOrderComplete/specimenOrderComplete",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+    ],
   "globalStyle": {
     "navigationBarTextStyle": "black",
     "navigationBarBackgroundColor": "#F8F8F8",

pages/receiptpage/receiptpage.vue

@@ -266,7 +266,7 @@
                 item.taskType.associationType.value != 'inspect' &&
                 item.taskType.associationType.value != 'other' &&
                 item.taskType.associationType.value != 'ordinary' &&
-                (item.taskType.associationType.value == 'specimen' && item.taskType.carryingCourses[1].checkoutMethod.value != 3 && item.gdState.value != 5)
+                !(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/specimenDetail/specimenDetail.vue

@@ -31,6 +31,7 @@
   export default {
     data() {
       return {
+        queryObj: {},
         id: 0,
         index: 0,
         arrayKey: 0,
@@ -65,8 +66,9 @@
       // 获取检验项目
       getSpecimenDesc(){
         post(`/api/specimenDesc/specimenCount`, {
-          "hosId": uni.getStorageSync('userData').user.currentHospital.id,
-          "gdId": this.workOrderId,
+            "hosId": uni.getStorageSync('userData').user.currentHospital.id,
+            "gdId": this.workOrderId || undefined,
+            "speIds": this.queryObj.speIds || undefined,
           }).then((res) => {
           res.data = res.data || [];
           let array = [{ id: 0, name: '全部', total: '', nameNum: ''}];
@@ -85,7 +87,8 @@
           "idx": isAccumulate ? ++this.idx : 0,
           "sum": 20,
           "specimen": {
-            "gdid": this.workOrderId,
+            "gdid": this.workOrderId || undefined,
+            "speIds": this.queryObj.speIds || undefined,
             "hosId": uni.getStorageSync('userData').user.currentHospital.id,
             "specimenDesc": this.array[this.index].id ? this.array[this.index].name : undefined,
             "orderBy": 'patientNoDesc',
@@ -121,6 +124,7 @@
     },
     onLoad(options) {
       console.log(options, "标本详情");
+      this.queryObj = options;
       this.workOrderId = options.workOrderId;
       this.associationTypeValue = options.associationTypeValue;
       this.getList();

pages/specimenHandoverNew/specimenHandoverNew.vue

@@ -37,10 +37,13 @@
           </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">
+          <view class="Scanning_cont_list_item" @click="clickRow(item)" v-for="(item, j) in dataList" :key="j">
+            <view class="name" v-if="type === 'patient'">
               {{item.patientname}}
             </view>
+            <view class="name" v-if="type === 'checkType'">
+              {{item.stype}}
+            </view>
             <view class="value">
               <view>
                 {{item.count}}
@@ -53,14 +56,15 @@
 
     <view class="foot_btn">
       <view class="btn" @click="goBack()"> 取消 </view>
-      <view class="btn" @click="onClick()"> 汇总交接 </view>
+      <view class="btn" @click="onClick()" v-if="dataList.length"> 确认交接 </view>
     </view>
-    <!-- 填写数字弹窗 -->
-    <selectNum v-if="numModels.disjunctor" :disjunctor="numModels.disjunctor" @ok="numOk" @cancel="numCancel" :content="numModels.content" :dataName="numModels.dataName">
-    </selectNum>
+    <!-- 填写交接人工号弹窗 -->
+    <selectAccount @click.stop.native v-if="hosModels.disjunctor" :disjunctor="hosModels.disjunctor" @ok="hosOk"
+      @cancel="hosCancel" :content="hosModels.content">
+    </selectAccount>
     <!-- 弹窗 -->
-    <showModel :title="models1.title" :icon="models1.icon" :disjunctor="models1.disjunctor" :content="models1.content"
-      @ok="ok1" @cancel="cancel1" :operate="models1.operate"></showModel>
+    <showModel :title="models.title" :icon="models.icon" :disjunctor="models.disjunctor" :content="models.content"
+      @ok="ok" @cancel="cancel" :operate="models.operate"></showModel>
   </view>
 </template>
 <script>
@@ -76,10 +80,6 @@
         hosId: uni.getStorageSync('userData').user.currentHospital.id,
         type: 'patient',//patient|checkType
         queryObj: {}, //路由传递过来的数据
-        // 填写数字弹窗model
-        numModels: {
-          disjunctor: false,
-        },
         typeList: {
           "patient": {
             id: -1,
@@ -95,72 +95,69 @@
           }
         },
         dataList: [],
-        coopData: {},
+        // 填写交接人工号弹窗model
+        hosModels: {
+          disjunctor: false,
+        },
         // 弹窗model
-        models1: {
+        models: {
           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}));
+      ok(){
+        this.models.disjunctor = false;
         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`,
-                  });
-                }
+        post("/simple/data/fetchDataList/taskType", {
+          "idx": 0,
+          "sum": 1,
+          "taskType": {
+              "hosId": {
+                  "id": this.hosId
               },
-            });
-          }else{
+              "associationType": {
+                  "key": "association_types",
+                  "value": "specimen"
+              }
+          }
+        }).then((result) => {
+          uni.hideLoading();
+          if (result.status == 200) {
+            if(result.list.length){
+              // 标本-运送过程-终点科室-是否填写交接人
+              if(result.list[0].carryingCourses[1].handoverSwitch){
+                this.showSelectAccount();
+              }else{
+                this.orderDeptHandler();
+              }
+            }else{
+              uni.showToast({
+                icon: "none",
+                title: "请配置标本配送任务类型！",
+              });
+            }
+          } else {
             uni.showToast({
               icon: "none",
-              title: res.msg || "接口获取数据失败！",
+              title: result.msg || "接口获取数据失败！",
             });
           }
         });
       },
-      //取消
-      cancel1() {
-        this.models1.disjunctor = false;
+      // 取消
+      cancel() {
+        this.models.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 = {
+      //核对完成
+      allStart() {
+        this.models = {
           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>，您确认交接吗？`,
+          content: "是否确定交接？",
           icon: "warn",
           operate: {
             ok: "确定",
@@ -168,32 +165,95 @@
           },
         };
       },
-      // 填写数量-确认
-      numOk(data) {
+      // 填写交接人工号-确认
+      hosOk(data) {
         console.log(data);
-        this.numModels.disjunctor = false;
-        this.updateNum(data);
-      },
-      // 填写数量-取消
-      numCancel() {
-        this.numModels.disjunctor = false;
+        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(data);
       },
-      onClick(){
-        this.showModel1();
+      // 填写交接人工号-取消
+      hosCancel() {
+        this.hosModels.disjunctor = false;
       },
-      clickRow(data){
-        this.coopData = data;
-        this.numModels = {
+      // 填写交接人工号弹窗
+      showSelectAccount() {
+        this.hosModels = {
+          content: '确定交接完成，请输入交接人员工号',
           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);
+      orderDeptHandler(accountObj){
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        post("/workerOrder/ordersSpeSign", {
+          deptId: this.queryObj.deptId,
+          orderIds: JSON.parse(this.queryObj.ids).toString(),
+          handover: accountObj ? accountObj.accountId : undefined
+        }).then((result) => {
+          uni.hideLoading();
+          if (result.state == 200) {
+            uni.navigateTo({
+              url: `/pages/specimenOrderComplete/specimenOrderComplete?deptName=${this.queryObj.dept}&ids=${this.queryObj.ids}`
+            })
+          } else {
+            uni.showToast({
+              icon: "none",
+              title: result.msg || "接口获取数据失败！",
+            });
           }
+        });
+      },
+      goBack(){
+        uni.navigateBack();
+      },
+      clickTab(key){
+        this.type = key;
+        this.initData();
+      },
+      onClick(){
+        this.allStart();
+      },
+      clickRow(data){
+        uni.navigateTo({
+          url: `/pages/specimenDetail/specimenDetail?speIds=${data.ids || ''}`
         })
       },
       getInfo(type){
@@ -208,8 +268,8 @@
         }).then((result) => {
           uni.hideLoading();
           if (result.state == 200) {
-            this.typeList[type].count = result.count;
-            this.typeList[type].titleCount = result.title;
+            this.typeList[type].count = result.count || 0;
+            this.typeList[type].titleCount = result.title || 0;
             if(this.type === type){
               this.dataList = result.data || [];
             }

pages/specimenOrderComplete/specimenOrderComplete.vue

@@ -0,0 +1,216 @@
+<template>
+  <view class="Scanning_Result">
+    <view class="Scanning_top">
+      <view class="Scanning_top_icon">
+        <text class="cubeic-ok icon_transport transport-duigou"></text>
+      </view>
+      <view class="Scanning_top_text">
+        <view class="text1"> 交接成功 </view>
+      </view>
+    </view>
+
+    <view class="Scanning_cont">
+      <view>您已到达{{queryObj.deptName}}，请核对以下数量</view>
+      <view class="table_head">
+        <view>科室</view>
+        <view>是否配送完成</view>
+      </view>
+      <view class="table_bodys">
+        <view class="table_body" v-for="(item, index) in dataList" :key="index">
+          <view>{{item.dept}}</view>
+          <view :class="{red: item.all != item.complete}">{{item.all == item.complete ? '是' : '否'}}</view>
+        </view>
+      </view>
+    </view>
+
+    <view class="foot_btn_spe">
+      <view class="btn3" @click="goIndex()">知道了</view>
+    </view>
+  </view>
+</template>
+<script>
+  import {
+    get,
+    post,
+    SM,
+    webHandle
+  } from "@/http/http.js";
+  export default {
+    data() {
+      return {
+        orderIds: '',
+        bloodIds: '',
+        hosId: uni.getStorageSync('userData').user.currentHospital.id,
+        dataList: [],
+        queryObj: {}, //路由传递过来的数据
+      };
+    },
+    methods: {
+      
+      // 知道了
+      goIndex() {
+        uni.navigateTo({
+          url: `/pages/receiptpage/receiptpage`
+        })
+      },
+      //获取页面信息
+      getInfo(){
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        post('/workerOrder/ordersSpeSignDeptInfo', {
+          "orderIds": JSON.parse(this.queryObj.ids).toString(),
+        }).then(res => {
+          uni.hideLoading();
+          if(res.state == 200){
+            this.dataList = res.data || [];
+          }else{
+            uni.showToast({
+              icon: "none",
+              title: res.msg || "接口获取数据失败！",
+            });
+          }
+        })
+      },
+
+    },
+    onLoad(options) {
+      console.log(options, "result");
+      this.queryObj = options;
+      this.getInfo();
+      // #ifdef APP-PLUS
+      webHandle("no", "app");
+      // #endif
+      // #ifdef H5
+      webHandle("no", "wx");
+      // #endif
+    },
+    // 监听自定义事件并进行页面刷新操作
+    onShow() {
+      uni.$on('refresh', (data) => {
+        if (data.refresh) {
+            // 刷新操作
+          this.getInfo();
+        }
+      });
+    },
+    onUnload() {
+      uni.$off('refresh'); // 需要手动解绑自定义事件
+    }
+  };
+</script>
+<style lang="less" scoped>
+  .Scanning_Result {
+    padding: 0 20rpx;
+    display: flex;
+    flex-direction: column;
+    height: 100vh;
+
+    .Scanning_top {
+      .Scanning_top_icon {
+        width: 140rpx;
+        height: 140rpx;
+        margin: 50rpx auto 40rpx;
+        border-radius: 50%;
+
+        .speNum{
+          text-align: center;
+          font-size: 140rpx;
+        }
+
+        .cubeic-ok {
+          font-size: 140rpx;
+          color: #35b34a;
+        }
+
+        .cubeic-close {
+          font-size: 140rpx;
+          color: #ff3b53;
+        }
+      }
+
+      .Scanning_top_text {
+        .text1 {
+          font-size: 48rpx;
+          text-align: center;
+        }
+
+        .success_tips {
+          color: red;
+          font-size: 30rpx;
+        }
+      }
+    }
+
+    .Scanning_cont {
+      flex: 1;
+      text-align: center;
+      display: flex;
+      flex-direction: column;
+
+      .table_bodys{
+        overflow-y: auto;
+        flex: 1;
+      }
+
+      .table_head{
+        display: flex;
+        margin-top: 50rpx;
+        .ml16{
+          margin-left: 16rpx;
+        }
+
+        view {
+          height: 110rpx;
+          line-height: 1;
+          flex: 1;
+          font-weight: bold;
+          color: #000;
+          font-size: 38rpx;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+        }
+      }
+
+      .table_body{
+        background: #F3FAF7;
+        border-radius: 8px;
+        border: 1px solid #E9E9E9;
+        display: flex;
+        margin-bottom: 20rpx;
+        padding: 30rpx 20rpx;
+        view {
+          line-height: 1;
+          flex: 1;
+          color: #555;
+          font-size: 38rpx;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          word-break: break-all;
+        }
+      }
+    }
+
+    .foot_btn_spe {
+      line-height: 64rpx;
+      height: 64rpx;
+      margin-bottom: 40rpx;
+      text-align: center;
+      display: flex;
+      justify-content: space-between;
+
+      view {
+        height: 64rpx;
+        flex: 1;
+        margin: 0 1%;
+        background-image: linear-gradient(to right, #72c172, #3bb197);
+        color: #fff;
+        border-radius: 8rpx;
+        font-size: 26rpx;
+      }
+    }
+  }
+</style>