bugfix

pages/receipt_infopage/receipt_infopage.vue

@@ -194,6 +194,7 @@
           <text class="text1">陪检方式</text>
           <text class="text2">{{ infoDATA.inspectScore.inspectMode }}</text>
         </view>
+        
         <view class="page_item_foot_text"
           v-if="(infoDATA.taskType.associationType.value == 'inspect' || infoDATA.taskType.associationType.value == 'patientTransport') && infoDATA.inspectUsers">
           <text class="text1">陪检人员</text>
@@ -204,6 +205,17 @@
           <text class="text1">陪检人数</text>
           <text class="text2">{{ infoDATA.inspectUsersNum }}</text>
         </view>
+        
+        <view class="page_item_foot_text"
+          v-if="infoDATA.taskType.associationType.value == 'other' && infoDATA.inspectUsers">
+          <text class="text1">执行人员</text>
+          <text class="text2">{{ infoDATA.inspectUsers }}</text>
+        </view>
+        <view class="page_item_foot_text"
+          v-if="infoDATA.taskType.associationType.value == 'other' && infoDATA.inspectUsersNum">
+          <text class="text1">执行人数</text>
+          <text class="text2">{{ infoDATA.inspectUsersNum }}</text>
+        </view>
       </view>
       <!-- 药包 -->
       <view class="page_item_info" v-if="infoDATA.taskType.associationType.value == 'drugsBag'">
@@ -397,7 +409,7 @@
       <view class="btn3" @click="toDrugBatches(infoDATA.drugs.batchNo)" v-if="infoDATA.taskType.associationType.value == 'drugsBag' && taskTypeConfig.drugsBatchInfo == 1" hover-class="seimin-btn-hover">药品批次</view>
       <view class="btn3" @click="viewBlood(infoDATA)" v-if="infoDATA.taskType.associationType.value == 'ordinary' && infoDATA.taskType.ordinaryField.value == 'blood'" hover-class="seimin-btn-hover">查看血制品</view>
       <view class="btn3" @click="additionalUser(infoDATA)" v-if="(infoDATA.taskType.associationType.value == 'inspect' || infoDATA.taskType.associationType.value == 'patientTransport') && infoDATA.worker && infoDATA.worker.id && multiplayerMode === 1" hover-class="seimin-btn-hover">追加陪检人员</view>
-      <view class="btn3" @click="additionalUser(infoDATA)" v-if="infoDATA.taskType.associationType.value == 'other' && infoDATA.worker && infoDATA.worker.id && clinicalMultiplayerMode === 1" hover-class="seimin-btn-hover">追加执行人员</view>
+      <view class="btn3" @click="additionalUser(infoDATA)" v-if="infoDATA.taskType.associationType.value == 'other' && infoDATA.worker && infoDATA.worker.id && clinicalMultiplayerMode === 1 && clinicalTaskIdsFlag" hover-class="seimin-btn-hover">追加执行人员</view>
     </view>
     <!-- 弹窗 -->
     <showModel :title="models.title" :icon="models.icon" :disjunctor="models.disjunctor" :content="models.content"
@@ -441,6 +453,7 @@
         currentData: {}, //当前小扫描的工单对象
         multiplayerMode: 0,
         clinicalMultiplayerMode: 0,
+        clinicalTaskIdsFlag: false,
         hosId: uni.getStorageSync('userData').user.currentHospital.id,
         SMFlag:true,
         actualDelivery: 0,
@@ -1347,30 +1360,28 @@
         });
       },
       // 获取临床服务页面控制开关
-      getTaskOtherConfig(){
+      getTaskOtherConfig(options){
         post("/simple/data/fetchDataList/taskTypeConfig", {
             "idx": 0,
             "sum": 10,
             "taskTypeConfig": {
-                "taskTypeDTO": {
-                    "hosId": {
-                        "id": this.hosId
-                    },
-                    "associationType": {
-                        "key": "association_types",
-                        "value": "other"
-                    }
-                }
+                "hosId": this.hosId,
+                "associationType": options.associationTypeId,
             }
         }).then((result) => {
           if (result.status == 200) {
             if(result.list && result.list[0]){
               this.clinicalMultiplayerMode = result.list[0].clinicalMultiplayerMode;
+              let clinicalTaskIds = result.list[0].clinicalTaskIds ? result.list[0].clinicalTaskIds.split(',') : [] ;
+              this.clinicalTaskIdsFlag = clinicalTaskIds.includes(options.taskTypeId);
+              console.log(clinicalTaskIds, options.taskTypeId)
             }else{
               this.clinicalMultiplayerMode = 0;
+              this.clinicalTaskIdsFlag = false;
             }
           } else {
             this.clinicalMultiplayerMode = 0;
+            this.clinicalTaskIdsFlag = false;
           }
         });
       }
@@ -1395,7 +1406,7 @@
       ) {
         this.getTaskConfig();
       }else if(options.associationTypeValue == 'other'){
-        this.getTaskOtherConfig();
+        this.getTaskOtherConfig(options);
       }
       // 创建动画
       this.animation = uni.createAnimation({

pages/receiptpage/receiptpage.vue

@@ -1149,7 +1149,7 @@
       itemInfo(workOrder) {
         console.log(workOrder);
         uni.navigateTo({
-          url: `../receipt_infopage/receipt_infopage?id=${workOrder.id}&associationTypeValue=${workOrder.taskType.associationType.value}`,
+          url: `../receipt_infopage/receipt_infopage?id=${workOrder.id}&associationTypeValue=${workOrder.taskType.associationType.value}&associationTypeId=${workOrder.taskType.associationType.id}&taskTypeId=${workOrder.taskType.id}`,
         });
       },
       //抢单后知道了