增加工单类型备注等

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.3');
+console.info('v2.4.4');
 Vue.prototype.wx = wx //声明扫码
 Vue.prototype.audios = [] //待播放的语音集合
 // #endif

pages/my_list/my_list.vue

@@ -62,15 +62,15 @@
               </view>
             </view>
             <view class="page_item_top_L">
-              <text class="L_iocn" v-if="infoDATA.taskType.associationType.value == 'specimen'">标本</text>
-              <text class="L_iocn" v-if="infoDATA.taskType.associationType.value == 'specimenPlan'">标本</text>
-              <text class="L_iocn" v-if="infoDATA.taskType.associationType.value == 'drugsBag'">药品</text>
-              <text class="L_iocn" v-if="infoDATA.taskType.associationType.value == 'jPBag'">静配</text>
-              <text class="L_iocn" v-if="infoDATA.taskType.associationType.value == 'inspect'">陪检</text>
+              <text class="L_iocn" v-if="infoDATA.taskType.associationType.value == 'specimen'">标本<template v-if="infoDATA.goodsRemark">-{{infoDATA.goodsRemark}}</template></text>
+              <text class="L_iocn" v-if="infoDATA.taskType.associationType.value == 'specimenPlan'">标本<template v-if="infoDATA.goodsRemark">-{{infoDATA.goodsRemark}}</template></text>
+              <text class="L_iocn" v-if="infoDATA.taskType.associationType.value == 'drugsBag'">药品<template v-if="infoDATA.goodsRemark">-{{infoDATA.goodsRemark}}</template></text>
+              <text class="L_iocn" v-if="infoDATA.taskType.associationType.value == 'jPBag'">静配<template v-if="infoDATA.goodsRemark">-{{infoDATA.goodsRemark}}</template></text>
+              <text class="L_iocn" v-if="infoDATA.taskType.associationType.value == 'inspect'">陪检<template v-if="infoDATA.goodsRemark">-{{infoDATA.goodsRemark}}</template></text>
               <text class="L_iocn" v-if="
                   infoDATA.taskType.associationType.value == 'patientTransport'
-                ">转运</text>
-              <text class="L_iocn" v-if="infoDATA.taskType.associationType.value == 'other'">其他</text>
+                ">转运<template v-if="infoDATA.goodsRemark">-{{infoDATA.goodsRemark}}</template></text>
+              <text class="L_iocn" v-if="infoDATA.taskType.associationType.value == 'other'">其他<template v-if="infoDATA.goodsRemark">-{{infoDATA.goodsRemark}}</template></text>
             </view>
             <view class="page_item_top_R">
               <view class="num" v-if="infoDATA.gdState.value != 6">
@@ -110,7 +110,11 @@
           <view class="page_item_foot">
             <view class="page_item_foot_text">
               <text class="text1">完成时间</text>&nbsp;&nbsp;
-              <text class="text1">{{ infoDATA.completeTime || 0 }}</text>
+              <text class="text1">{{ infoDATA.completeTime || '' }}</text>
+            </view>
+            <view class="page_item_foot_text">
+              <text class="text1">扫描接收数量</text>&nbsp;&nbsp;
+              <text class="text1">{{ infoDATA.actualReceiveNum || 0 }}</text>
             </view>
           </view>
         </view>
@@ -729,6 +733,9 @@
             border-top: 2rpx dashed #e5e9ed;
             padding: 28rpx 16rpx;
             text-align: left;
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
 
             .page_item_foot_text {
               height: 48rpx;

pages/receipt_infopage/receipt_infopage.vue

@@ -99,7 +99,7 @@
         </view>
         <view class="page_item_foot_text">
           <text class="text1">任务类型</text>
-          <text class="text2">{{ infoDATA.taskType.taskName }}</text>
+          <text class="text2">{{ infoDATA.taskType.taskName }}<template v-if="infoDATA.goodsRemark">-{{infoDATA.goodsRemark}}</template></text>
         </view>
         <view class="page_item_foot_text" v-if="infoDATA.taskType.associationType.value==='inspect'">
           <text class="text1">是否半程陪检</text>

pages/receiptpage/receiptpage.vue

@@ -56,7 +56,7 @@
               <view class="page_item_top_R type">
                 {{
                   item.isHalfInspect === 1 ? "半程陪检" : item.taskType.taskName
-                }}
+                }}<template v-if="item.goodsRemark">-{{item.goodsRemark}}</template>
               </view>
             </view>
             <view class="page_item_cont" @click="itemInfo(item.id)">

pages/scanning_B/scanning_B.vue

@@ -34,7 +34,8 @@
     <view class="foot_btn">
       <view class="btn3" @click="showAlert()">知道了</view>
       <block v-if="res.scanCodeSpecimenOrderSign == 1">
-        <view class="btn3" @click="orderSign(res.workOrder)" v-if="res.workOrder">执行工单</view>
+        <view class="btn3" @click="specimenAssignAndSign(res.workOrder.id)" v-if="res.workOrder&&(res.workOrder.gdState.value == 2||res.workOrder.gdState.value == 4)">接单并签到</view>
+        <view class="btn3" @click="orderSign(res.workOrder)" v-if="res.workOrder&&res.workOrder.gdState.value != 2&&res.workOrder.gdState.value != 4">执行工单</view>
         <view class="btn3" @click="buildAndOrderSign(res.data.id)" v-if="!res.workOrder && res.data">建单并签到</view>
       </block>
     </view>
@@ -145,6 +146,52 @@
           }
         });
       },
+      // 接单并签到workorderId
+      specimenAssignAndSign(orderId) {
+        this.type = 'specimenAssignAndSign';
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        post("/workerOrder/specimenAssignAndSign", {
+          orderId,
+        }).then((res) => {
+          if (res.state == 200 || res.state == 201) {
+            uni.hideLoading();
+            if (res.status == 200) {
+              // 跳转到扫描科室
+              // type1: res.type, //type类型
+              // id: data.id, //工单ID
+              // deptCode: code, //二维码
+              // dept: res.dept //科室名称
+              uni.navigateTo({
+                url: `/pages/scanning_code/scanning_code?type=${
+                res.workOrder.taskType.associationType.value
+              }&type1=${res.type}&id=${res.workOrder.id}&deptCode=${
+                this.currentCode
+              }&dept=${res.dept}&accountObj=${encodeURIComponent(
+                JSON.stringify(undefined)
+              )}&deptId=${res.deptId}`,
+              });
+            } else {
+              uni.navigateTo({
+                url: `/pages/scanning_Result/scanning_Result?type=${res.workOrder.taskType.associationType.value}&type1=${res.type}&id=${res.workOrder.id}&status=600&msg=${res.msg}&isKs=1`,
+              });
+            }
+          } else if (res.state == "0000") {
+            uni.hideLoading();
+            this.currentCode = res.code;
+            this.res.workOrder = res.workOrder;
+            this.showSelectAccount();
+          } else {
+            uni.hideLoading();
+            uni.showToast({
+              icon: "none",
+              title: res.msg || "请求失败！",
+            });
+          }
+        });
+      },
       // 建单并签到
       buildAndOrderSign(speId) {
         this.type = 'buildAndOrderSign';