拉取代码

components/showModel/showModel.vue

@@ -12,7 +12,7 @@
           :class="[
             'showModel__icon--' + icon,
             { 'newicon-duigou': icon === 'success' },
-            { 'newicon-shibai': icon === 'error' },
+            // { 'newicon-shibai': icon === 'error' },
             { 'newicon-wenhao': icon === 'warn' },
           ]"
         ></text>
@@ -98,16 +98,16 @@
 export default {
   data() {
     return {
-      time: 5, //5秒后自动关闭
+      time: 3, //5秒后自动关闭
       timer: null, //5秒后自动关闭，定时器
-      timerFlag: true, //是否显示取消自动关闭按钮
+      timerFlag: false, //是否显示取消自动关闭按钮
     };
   },
   watch: {
     disjunctor(newValue) {
       if (newValue && this.operate.know == "知道了") {
-        this.time = 5;
-        this.timerFlag = true;
+        this.time = 3;
+        // this.timerFlag = true;
         this.timer = setInterval(() => {
           this.time--;
           if (this.time <= 0) {

pages/receiptpage/receiptpage.vue

@@ -1179,10 +1179,198 @@
           return;
         }
         this.drugbagModels.disjunctor = false;
-        uni.navigateTo({
-          url: `/pages/scanning_drug/scanning_drug?drugsBagId=${data.id}`,
-        });
+				if ( data.drugsBagType && (data.drugsBagType.value == 'drugsJpbag' || data.drugsBagType.value == 'drugsWestern' || data.drugsBagType.value == 'drugsReturn' || data.drugsBagType.value == 'drugsPoison' || data.drugsBagType.value == 'drugsHerbal')) {
+				  //新药品-扫静配|西药|退药|毒麻|中草药
+				  if(data.gdId){
+				    // 有工单
+				    this.getInfo(data, data.packid);
+				  }else{
+				    // 没有工单,进入起点科室流程
+				    uni.navigateTo({
+				      url: `/pages/newDrug/createOrder/createOrder?drugsBagType=${data.drugsBagType.value}&drugsBagId=${data.id}&type=build`,
+				    });
+				  }
+				}else{
+				  //扫药包码
+				  uni.navigateTo({
+				    url: `/pages/scanning_drug/scanning_drug?drugsBagId=${data.id}&drugsBagBatchNo=${data.batchNo}`,
+				  });
+				}
+        // uni.navigateTo({
+        //   url: `/pages/scanning_drug/scanning_drug?drugsBagId=${data.id}`,
+        // });
       },
+			//获取药包信息
+			getInfo(responeseData, code){
+			  console.log(responeseData);
+			  uni.showLoading({
+			    title: "加载中",
+			    mask: true,
+			  });
+			
+			  post(`/transflow/scanInfo`, {type: responeseData.drugsBagType.value, id: responeseData.id, orderStateValue: responeseData.drugsState.value}).then(res => {
+			    uni.hideLoading();
+			    if(res.state == 200){
+			      if(res.data){
+			        let drugsBag = res.data.dto || {};
+			        let orderId = responeseData.gdId;
+			        let config = res.data.taskTypeConfig || {};
+			        console.log(res);
+			        if(responeseData.drugsState.value == 2 || responeseData.drugsState.value == 3 || (responeseData.drugsState.value == 4 && responeseData.workOrderDTO.worker.id == uni.getStorageSync('userData').user.id)){
+			          // 待抢单、待接单、待到达(本人),进入起点科室流程
+			          uni.navigateTo({
+			            url: `/pages/newDrug/createOrder/createOrder?drugsBagType=${responeseData.drugsBagType.value}&drugsBagId=${responeseData.id}&orderId=${responeseData.gdId || ''}&type=receive`,
+			          });
+			        }else if(responeseData.drugsState.value == 5 && responeseData.workOrderDTO.worker.id == uni.getStorageSync('userData').user.id){
+			          // 待送达(本人),进入终点科室流程
+			          this.pageNavigateByConfig(config, responeseData, responeseData, code)
+			        }else{
+			          // 查看药包信息
+			          uni.navigateTo({
+			            url: `/pages/newDrug/createOrder/createOrder?drugsBagType=${responeseData.drugsBagType.value}&drugsBagId=${responeseData.id}&type=view`,
+			          });
+			        }
+			      }
+			    }else{
+			      uni.showToast({
+			        icon: "none",
+			        title: res.msg || "接口获取数据失败！",
+			      });
+			    }
+			  })
+			},
+			// 根据配置跳转页面
+			pageNavigateByConfig(config, responseData, queryObj, code){
+			  let drugsBagType = queryObj.drugsBagType.value;
+			  let orderId = responseData.gdId;
+			  let drugsBagId = responseData.id;
+			  let orderStateValue = responseData.drugsState;
+			  if(config.drugsModel === 1){
+			    // 一单一码
+			    if(responseData.drugsState.value == 4){
+			      // 待到达
+			      if(config.drugsStartCheck === 1){
+			        // 起点科室支持核对
+			        uni.navigateTo({
+			          url: `/pages/newDrug/checkPage/checkPage?drugsBagType=${drugsBagType}&orderId=${orderId}`,
+			        });
+			      }else{
+			        // 起点科室不支持核对
+			        if(config.drugsStartPhoto === 1){
+			          // 起点科室支持拍照留存
+			          uni.navigateTo({
+			            url: `/pages/newDrug/photoRetention/photoRetention?drugsBagType=${drugsBagType}&orderId=${orderId}`,
+			          });
+			        }else{
+			          // 起点科室不支持拍照留存
+			          this.completeOrder(responseData, queryObj);
+			        }
+			      }
+			    }else if(responseData.drugsState.value == 5){
+			      // 待送达
+			      uni.showLoading({
+			        title: "加载中",
+			        mask: true,
+			      });
+			      post("/transflow/scanBind", { type: drugsBagType, orderId, code }).then((ress) => {
+			        uni.hideLoading();
+			        if (ress.state == 200) {
+			          if(ress.data.msg){
+			            uni.showToast({
+			              icon: "none",
+			              title: ress.data.msg || "接口获取数据失败！",
+			            });
+			          }else{
+			            if(config.drugsEndCheck === 1){
+			              // 起点科室支持核对
+			              uni.navigateTo({
+			                url: `/pages/newDrug/checkPage/checkPage?drugsBagType=${drugsBagType}&orderId=${orderId}`,
+			              });
+			            }else{
+			              // 起点科室不支持核对
+			              if(config.drugsEndPhoto === 1){
+			                // 起点科室支持拍照留存
+			                uni.navigateTo({
+			                  url: `/pages/newDrug/photoRetention/photoRetention?drugsBagType=${drugsBagType}&orderId=${orderId}`,
+			                });
+			              }else{
+			                // 终点科室不支持拍照留存
+			                this.completeOrder(responseData, queryObj);
+			              }
+			            }
+			          }
+			        } else {
+			          uni.showToast({
+			            icon: "none",
+			            title: ress.msg || "接口获取数据失败！",
+			          });
+			        }
+			      });
+			    }
+			  }else if(config.drugsModel === 2){
+			    // 一单多码
+			    uni.showLoading({
+			      title: "加载中",
+			      mask: true,
+			    });
+			    post("/transflow/scanBind", { type: drugsBagType, orderId, code }).then((ress) => {
+			      uni.hideLoading();
+			      if (ress.state == 200) {
+			        if(ress.data.msg){
+			          uni.showToast({
+			            icon: "none",
+			            title: ress.data.msg || "接口获取数据失败！",
+			          });
+			        }else{
+			          uni.navigateTo({
+			            url: `/pages/newDrug/continueScanning/continueScanning?drugsBagType=${drugsBagType}&orderId=${orderId}&drugsBagId=${drugsBagId}&orderStateValue=${orderStateValue.value}`,
+			          });
+			        }
+			      } else {
+			        uni.showToast({
+			          icon: "none",
+			          title: ress.msg || "接口获取数据失败！",
+			        });
+			      }
+			    });
+			  }
+			},
+			// 工单完成
+			completeOrder(responseData, queryObj){
+			  console.log(responseData, queryObj)
+			  uni.showLoading({
+			    title: "加载中",
+			    mask: true,
+			  });
+			  let postData = {
+			    "type": queryObj.drugsBagType.value,
+			    "orderId": responseData.gdId,
+			  };
+			  post('/transflow/checkComplete', postData).then(res => {
+			    uni.hideLoading();
+			    if(res.state == 200){
+			       uni.showToast({
+			         icon: "none",
+			         title: responseData.drugsState.value == 4 ? "交接成功，请尽快送达科室！" : (responseData.drugsState.value == 5 ? "交接成功，完成配送！" : ""),
+			         duration: 60000,
+			         mask: true,
+			         complete(){
+			           setTimeout(() => {
+			             uni.hideToast();
+			             uni.redirectTo({
+			               url: `/pages/receiptpage/receiptpage`,
+			             });
+			           }, 2000)
+			         }
+			       });
+			    }else{
+			      uni.showToast({
+			        icon: "none",
+			        title: res.msg || "接口获取数据失败！",
+			      });
+			    }
+			  })
+			},
       // 手动查询药品-取消
       drugbagCancel() {
         this.drugbagModels.disjunctor = false;