优化

pages.json

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

pages/scanning_all/scanning_all.vue

@@ -280,11 +280,50 @@
           url: "../receiptpage/receiptpage",
         });
       },
+      // 标本配送-待送达-运输过程-标本数字交接,则,科室签到不需要填写交接人
+      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,
@@ -294,10 +333,6 @@
         if (accountObj) {
           list.handover = [accountObj.accountId];
         }
-        uni.showLoading({
-          title: "加载中",
-          mask: true,
-        });
         post("/workerOrder/" + type, list).then((res) => {
           console.log(this.tabType)
           uni.hideLoading();

pages/specimenHandoverNew/specimenHandoverNew.vue

@@ -22,17 +22,17 @@
           <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 class="name" v-if="type === 'specimenDesc'">
+            项目名称<text class="red">({{typeList.specimenDesc.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 class="value" v-if="type === 'specimenDesc'">
             <view>
-              标本数量<text class="red">({{typeList.patient.count}})</text>
+              标本数量<text class="red">({{typeList.specimenDesc.count}})</text>
             </view>
           </view>
         </view>
@@ -41,8 +41,8 @@
             <view class="name" v-if="type === 'patient'">
               {{item.patientname}}
             </view>
-            <view class="name" v-if="type === 'checkType'">
-              {{item.stype}}
+            <view class="name" v-if="type === 'specimenDesc'">
+              {{item.specimen_desc}}
             </view>
             <view class="value">
               <view>
@@ -78,7 +78,7 @@
     data() {
       return {
         hosId: uni.getStorageSync('userData').user.currentHospital.id,
-        type: 'patient',//patient|checkType
+        type: 'patient',//patient|specimenDesc
         queryObj: {}, //路由传递过来的数据
         typeList: {
           "patient": {
@@ -87,7 +87,7 @@
             count: 0,
             titleCount: 0,
           },
-          "checkType": {
+          "specimenDesc": {
             id: -2,
             name: '检验项目',
             count: 0,
@@ -283,7 +283,7 @@
       },
       initData(){
         this.getInfo('patient');
-        this.getInfo('checkType');
+        this.getInfo('specimenDesc');
       },
     },
     onLoad(options) {