修复

pages/my_list/my_list.vue

@@ -114,7 +114,7 @@
             </view>
             <view class="page_item_foot_text">
               <text class="text1">扫描接收数量</text>&nbsp;&nbsp;
-              <text class="text1">{{ infoDATA.actualReceiveNum || 0 }}</text>
+              <text class="text1 b">{{ infoDATA.actualReceiveNum || 0 }}</text>
             </view>
           </view>
         </view>
@@ -290,6 +290,11 @@
         post("/api/getOrdersByDate/" + this.types, data).then((res) => {
           uni.hideLoading();
           if (res.status == 200) {
+            res.data.data.forEach(v=>{
+              if(v.completeTime){
+                v.completeTime = v.completeTime.slice(5,16)
+              }
+            })
             this.workData = res.data.data;
           } else {
             uni.showToast({
@@ -745,6 +750,9 @@
 
               .text1 {
                 color: rgb(102, 102, 102);
+                &.b{
+                  font-weight: bolder;
+                }
               }
 
               .text2 {
@@ -776,6 +784,9 @@
 
                 .text1 {
                   color: rgb(102, 102, 102);
+                  &.b{
+                    font-weight: bolder;
+                  }
                 }
 
                 .text2 {

pages/scanning_B/scanning_B.vue

@@ -34,7 +34,7 @@
     <view class="foot_btn">
       <view class="btn3" @click="showAlert()">知道了</view>
       <block v-if="res.scanCodeSpecimenOrderSign == 1">
-        <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="buildAndOrderSign(res.data.id,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>
@@ -146,62 +146,28 @@
           }
         });
       },
-      // 接单并签到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) {
+      // 接单并签到或建单并签到
+      buildAndOrderSign(speId,orderId) {
         this.type = 'buildAndOrderSign';
+        if(orderId){
+          // 接单并签到
+          this.type = 'specimenAssignAndSign';
+        }else{
+          // 建单并签到
+          this.type = 'buildAndOrderSign';
+        }
         uni.showLoading({
           title: "加载中",
           mask: true,
         });
-        post("/workerOrder/specimenCreateAndSign", {
-          speId,
-        }).then((res) => {
+        let postData = {
+          speId
+        }
+        if(orderId){
+          // 接单并签到
+          postData.orderId = orderId;
+        }
+        post("/workerOrder/specimenCreateAndSign", postData).then((res) => {
           if (res.state == 200 || res.state == 201) {
             uni.hideLoading();
             if (res.status == 200) {