拉取代码

pages/scanning_blood/scanning_blood.vue

@@ -126,6 +126,9 @@
         taskTypeConfig: {}, //血制品配置信息
         orderId:'',//工单id
         gotoFlag: true,
+				configs:null,
+				hosId:null,
+				orderState:null
       };
     },
     methods: {
@@ -139,10 +142,18 @@
         if (!this.gotoFlag) {
           return;
         }
+				let content = null
+				if(this.configs.sendingMergeOrder && 
+					this.configs.sendingMergeOrder==1 && 
+					this.orderState==5){
+					content = "您有当前科室未送达的血制品工单，将为您合并工单。"
+				}else{
+					content = "请确认是否接单并签到？"
+				}
         this.gotoFlag = false;
         uni.showModal({
           title: "提示",
-          content: "请确认是否接单并签到？",
+          content: content,
           success: (result) => {
             if (result.confirm) {
               console.log("用户点击确定");
@@ -245,6 +256,7 @@
             if (res.state == 200) {
               this.bloodDTO = res.data.dto || {};
               this.orderId = res.data.orderId;
+							this.orderState = res.data.orderState
               console.log(this.orderId);
               this.taskTypeConfig = res.data.taskTypeConfig;
               let sign_ids = this.taskTypeConfig.signTypeIds?this.taskTypeConfig.signTypeIds.split(','):[];
@@ -277,6 +289,34 @@
           });
         });
       },
+			//获取血制品配置页面
+			getTaskConfig(){
+			  let postData = {
+			      "idx": 0,
+			      "sum": 10,
+			      "taskTypeConfig": {
+			          "taskTypeDTO": {
+			              "hosId": {
+			                  "id": this.hosId
+			              },
+			              "ordinaryField": {
+			                  "key": "ordinary_field",
+			                  "value": "blood"
+			              }
+			          }
+			      }
+			  };
+			  post('/simple/data/fetchDataList/taskTypeConfig', postData).then(result => {
+			    if(result.status == 200){
+			      this.configs = result.list[0] || {};
+			    }else{
+			      uni.showToast({
+			        icon: "none",
+			        title: result.msg || "接口获取数据失败！",
+			      });
+			    }
+			  })
+			},
     },
     onShow() {
       this.gotoFlag = true;
@@ -289,6 +329,7 @@
       }else if (this.options.id) {
         this.scanInfo(this.options.id, 'id');
       }
+			this.getTaskConfig()
       // #ifdef APP-PLUS
       webHandle("no", "app");
       // #endif
@@ -296,6 +337,9 @@
       webHandle("no", "wx");
       // #endif
     },
+		created(){
+		  this.hosId = uni.getStorageSync('userData').user.currentHospital.id;
+		}
   };
 </script>
 <style lang="less" scoped>