药品录入添加大扫描逻辑

pages/receiptpage/receiptpage.vue

@@ -1203,12 +1203,13 @@
 			//获取药包信息
 			getInfo(responeseData, code){
 			  console.log(responeseData);
+				let gdValue = responeseData.workOrderDTO ? responeseData.workOrderDTO.gdState.value : null;
 			  uni.showLoading({
 			    title: "加载中",
 			    mask: true,
 			  });
 			
-			  post(`/transflow/scanInfo`, {type: responeseData.drugsBagType.value, id: responeseData.id, orderStateValue: responeseData.drugsState.value}).then(res => {
+			  post(`/transflow/scanInfo`, {type: responeseData.drugsBagType.value, id: responeseData.id, orderStateValue: gdValue}).then(res => {
 			    uni.hideLoading();
 			    if(res.state == 200){
 			      if(res.data){
@@ -1216,12 +1217,12 @@
 			        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)){
+			        if(gdValue == 2 || gdValue == 3 || (gdValue == 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){
+			        }else if(gdValue == 5 && responeseData.workOrderDTO.worker.id == uni.getStorageSync('userData').user.id){
 			          // 待送达(本人),进入终点科室流程
 			          this.pageNavigateByConfig(config, responeseData, responeseData, code)
 			        }else{
@@ -1244,10 +1245,10 @@
 			  let drugsBagType = queryObj.drugsBagType.value;
 			  let orderId = responseData.gdId;
 			  let drugsBagId = responseData.id;
-			  let orderStateValue = responseData.drugsState;
+				let orderStateValue = responeseData.workOrderDTO ? responeseData.workOrderDTO.gdState.value : null;
 			  if(config.drugsModel === 1){
 			    // 一单一码
-			    if(responseData.drugsState.value == 4){
+			    if(orderStateValue == 4){
 			      // 待到达
 			      if(config.drugsStartCheck === 1){
 			        // 起点科室支持核对
@@ -1266,7 +1267,7 @@
 			          this.completeOrder(responseData, queryObj);
 			        }
 			      }
-			    }else if(responseData.drugsState.value == 5){
+			    }else if(orderStateValue == 5){
 			      // 待送达
 			      uni.showLoading({
 			        title: "加载中",
@@ -1323,7 +1324,7 @@
 			          });
 			        }else{
 			          uni.navigateTo({
-			            url: `/pages/newDrug/continueScanning/continueScanning?drugsBagType=${drugsBagType}&orderId=${orderId}&drugsBagId=${drugsBagId}&orderStateValue=${orderStateValue.value}`,
+			            url: `/pages/newDrug/continueScanning/continueScanning?drugsBagType=${drugsBagType}&orderId=${orderId}&drugsBagId=${drugsBagId}&orderStateValue=${orderStateValue}`,
 			          });
 			        }
 			      } else {
@@ -1351,7 +1352,7 @@
 			    if(res.state == 200){
 			       uni.showToast({
 			         icon: "none",
-			         title: responseData.drugsState.value == 4 ? "交接成功，请尽快送达科室！" : (responseData.drugsState.value == 5 ? "交接成功，完成配送！" : ""),
+			         title: orderStateValue == 4 ? "交接成功，请尽快送达科室！" : (orderStateValue == 5 ? "交接成功，完成配送！" : ""),
 			         duration: 60000,
 			         mask: true,
 			         complete(){