diff --git a/src/views/collect/ConfirmDrugDealOrder.vue b/src/views/collect/ConfirmDrugDealOrder.vue
index d4f95552..1cbc84b0 100644
--- a/src/views/collect/ConfirmDrugDealOrder.vue
+++ b/src/views/collect/ConfirmDrugDealOrder.vue
@@ -162,79 +162,79 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+ 清空
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
{{ formData.billNo }}
{{ formData.shipperName }}
@@ -251,6 +251,7 @@
@@ -413,7 +414,7 @@ import {
getNextOrder,
findByBill,
findFromCorp,
- orderDetail,
+ orderDetail,bizConfirm,
removeByScanCode,confirmFinish
} from "@/api/collect/collectOrder";
import PanelOrderAllDetail from "@/views/collect/PanelOrderAllDetail";
@@ -497,7 +498,7 @@ export default {
scanCode: "",
isSuccess: false,
checked: true,
- scanTitle: "扫码结果:",
+ scanTitle: "单据录入结果:",
result: " \n",
msgTip: "信息提醒：",
originCode: "",
@@ -522,10 +523,12 @@ export default {
errResult: "",
warnVisible: false,
errVisible: false,
+ needSplitConfirm: false,
workplaceId: null,
ws: null,
- scanTip: "扫码录入:",
+ scanTip: "单据录入:",
scanSplit: false,
+ info: {},
//
labels: {
1: '扫码录入:',
@@ -552,6 +555,34 @@ export default {
},
methods: {
+ fifoHandleClick(scanCode){
+ this.info.confirmSplitCode = scanCode
+ bizConfirm(this.info).then((response) => {
+ if (response.code === 20000) {
+ this.$message.success('操作成功！')
+ this.getPrescribeDetail(this);
+ return
+ } else {
+ this.$message.error(response.message)
+ }
+ })
+ },
+
+ //是否拆零的组件调用父级方法
+ fifoSplitResult(data,info){
+ this.info = info
+ if (data == null)
+ return;
+ if (data.needSplitConfirm){//需要
+ this.needSplitConfirm = data.needSplitConfirm
+ this.scanTitle = "拆零扫码结果:";
+ this.scanTip = "拆零扫码:";
+ this.result = "";
+ return;
+ }else {//不需要
+ return
+ }
+ },
getBillNo(billNo) {
let post = {
billNo: billNo,
@@ -786,130 +817,17 @@ export default {
},
enterKey() {
- if (this.formData.billNo == null && this.formDataVisible.scanType != 1) {
- this.enterBillNoKey()
- return;
+ if (this.$isBlank(this.scanCode)) {
+ this.$message.error("请先扫码")
+ return
}
- this.checkSuccess = true;
- this.filterQuery.code = this.scanCode.trim();
- if (this.filterQuery.code.includes(";")) {
- const codeArray = this.filterQuery.code.split(";");
- let params = {
- codeList: codeArray,
- };
- this.batchVailCode(params)
+ if (!this.needSplitConfirm) {
+ this.enterBillNoKey()
return;
- }
- if (this.filterQuery.code)
- if (!this.parseString(this.filterQuery.code)) {
- this.$refs.inputRef.focus();
- this.$refs.inputRef.select();
- this.$message.error("无效追溯码");
- return;
- }
- let tQuery = {
- viewType: "tagCode",
- workPlaceCode: this.workplaceId,
- originCode: this.originCode,
- busType: this.formData.busType,
- code: this.filterQuery.code.trim(),
- };
- if (this.scanStatus == 1) {
- const codeArray = this.filterQuery.code.split(";");
- let query = {
- orderId: this.formData.billNo,
- codeList: codeArray
- }
- //剔除码
- this.removeCodesTemp(query)
- } else if (this.scanSplit) {
-
- //todo 拆零扫码确认
- const codeArray = this.filterQuery.code.split(";");
- let query = {
- orderId: this.formData.billNo,
- codeList: codeArray
- }
- //更新扫码确认
- batchUpdateCode(query).then((response) => {
- this.saveLoading = false
- if (response.code === 20000) {
- this.$message.success('确认成功')
- this.result = ''
- this.$refs.inputRef.focus()
- this.getBizDetailList();
- } else {
- this.$message.error(response.message)
- }
- this.loading = false
- this.saveLoading = false
- })
-
-
} else {
- enterCodeWeb(tQuery).then((response) => {
- if (response.code === 20000) {
- this.$refs.inputRef.focus();
- this.$refs.inputRef.select();
- this.isSuccess = true;
- this.printCodeResult(response.data, response.message)
- this.filterQuery.code = response.data.code;
- this.scanCode = ""
- this.originCode = ""
- this.addCode();
- } else {
- if (response.code == 502) {
- this.checkSuccess = false;
- this.isSuccess = false;
- this.printCodeResult(response.data, response.message)
- this.filterQuery.code = response.data.code;
- this.originCode = response.data.code;
- this.scanCode = ""
- } else if (response.code == 501) {
- this.checkSuccess = false;
- this.$message.error(response.message);
- this.scanCode = ""
- } else if (response.code == 503) {
- this.checkSuccess = false;
- this.isSuccess = false;
- this.printCodeResult(response.data, response.message)
- this.filterQuery.code = response.data.code;
- this.scanCode = ""
- this.$confirm(response.message, "提示", {
- type: "warning",
- })
- .then(() => {
- this.filterQuery.code = response.data.code;
- this.addCode();
- })
- .catch(() => {
- this.filterQuery.code = response.data.code;
- });
- } else if (response.code == 508) {
- this.originCode = "";
- this.filterQuery.code = "01" + response.data.nameCode;
- this.originCode = this.filterQuery.code;
- } else if (response.code == 601) {
- this.formData.billNo = response.data.billNo
- this.placeholder = "已选入单据，请扫UDI码进行作业"
- this.getBillNo(this.formData.billNo)
- this.startDeal();
-
- } else {
- this.scanCode = ""
- this.$alert(response.message, "提示", {
- confirmButtonText: "确定",
- type: "warning",
- closeOnClickModal: true,
- callback: (action) => {
- this.$refs.inputRef.focus();
- this.$refs.inputRef.select();
- },
- });
- }
- }
- this.loading = false;
- });
+ this.fifoHandleClick(this.scanCode)
+ this.startDeal();
+ return;
}
},
@@ -971,6 +889,7 @@ export default {
this.filterQuery.code = "01" + response.data.nameCode;
this.originCode = this.filterQuery.code;
} else if (response.code == 601) {
+ this.result = "已选入单据"
this.placeholder = "已选入单据，请扫UDI码进行作业"
this.formData.billNo = response.data.billNo
this.getBillNo(this.formData.billNo)
@@ -1360,7 +1279,7 @@ export default {
this.originCode = "";
this.formData.code = "";
this.scanCode = "";
- this.scanTitle = "扫码结果：";
+ this.scanTitle = "单据录入结果：";
this.result = "";
this.warnResult = ""
this.errResult = ""
@@ -1642,7 +1561,7 @@ export default {
overdeleteCode() {
this.labelName = 1
this.scanStatus = null
- this.scanTip = "扫码录入:"
+ this.scanTip = "单据录入:"
this.placeholder = '请点击输入框进行选扫码'
},
},
diff --git a/src/views/collect/PannelOrderBizCard.vue b/src/views/collect/PannelOrderBizCard.vue
index 1a2c9a37..a587afcb 100644
--- a/src/views/collect/PannelOrderBizCard.vue
+++ b/src/views/collect/PannelOrderBizCard.vue
@@ -71,6 +71,10 @@ export default {
default: null,
required: true
},
+ fifoSplitResult: {
+ type: Function,
+ required: true
+ },
//上货方式：1:拆零上货；2:整取上货;
fifoSplit: {
type: Object,
@@ -115,8 +119,29 @@ export default {
handleClick(info){
bizConfirm(info).then((response) => {
if (response.code === 20000) {
- this.$message.success("操作成功！");
- this.getPrescribeDetail(this);
+ if (response.data.needSplitConfirm){
+ this.$confirm("是否确定拆零扫码确认?", "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "忽略",
+ type: "warning",
+ }).then(() => {
+ this.fifoSplitResult(response.data,info)
+ }).catch(() => {
+ //忽略 改为false 继续提交
+ info.needSplitConfirm = false
+ //触发提交
+ bizConfirm(info).then((response) => {
+ if (response.code === 20000) {
+ this.getPrescribeDetail(this)
+ return
+ } else {
+ this.$message.error(response.message)
+ }
+ })
+ });
+
+ }
+ this.getPrescribeDetail(this)
} else {
this.$message.error(response.message);
}