diff --git a/src/api/inout/order.js b/src/api/inout/order.js
index 50853826..6b4f02b2 100644
--- a/src/api/inout/order.js
+++ b/src/api/inout/order.js
@@ -554,7 +554,6 @@ export function orderChange(query) {
}
-
export function rollbackWaitcheck(params) {
return axios({
url: "/udiwms/inout/order/waitCheck/rollback",
@@ -564,4 +563,20 @@ export function rollbackWaitcheck(params) {
}
+export function submitCodeResult(query) {
+ return axios({
+ url: "/warehouse/inout/codeResult/submitOrderWeb",
+ method: "post",
+ data: query
+ });
+}
+
+export function submitCheckResult(query) {
+ return axios({
+ url: "/warehouse/inout/codeCheck/submitOrderWeb",
+ method: "post",
+ data: query
+ });
+}
+
diff --git a/src/api/inout/orderDetailCode.js b/src/api/inout/orderDetailCode.js
index 332e1e82..895b8d42 100644
--- a/src/api/inout/orderDetailCode.js
+++ b/src/api/inout/orderDetailCode.js
@@ -9,6 +9,15 @@ export function getDetailCodes(query) {
});
}
+
+export function getCheckDetailCodes(query) {
+ return axios({
+ url: "/admin/warehouse/inout/findCheckCode",
+ method: "get",
+ params: query
+ });
+}
+
//获取业务明细
export function getDetailBizs(query) {
return axios({
diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue
index 7ca663da..135a7c10 100644
--- a/src/views/inout/DialogCreateOrder.vue
+++ b/src/views/inout/DialogCreateOrder.vue
@@ -22,12 +22,19 @@
>草稿保存
立即提交
- 撤回单据
+ 校验结果提交
+
+ 扫码结果提交
+
+
+ 撤回单据
@@ -429,7 +436,6 @@
>
-
{{ checkTip }}
@@ -539,7 +550,7 @@ import {
submitOrderWeb,
saveOrderWeb,
updateCodeBindSup,
- enterCodeWeb, submitAllocateBiz, rollbackWaitcheck,
+ enterCodeWeb, submitAllocateBiz, rollbackWaitcheck, submitCodeResult, submitCheckResult,
} from "../../api/inout/order";
import {filterSubAll, findByFrom, findInvByUser} from "../../api/system/invSubWarehouse";
import {parseTime} from "../../utils/coTools";
@@ -1231,7 +1242,7 @@ export default {
//撤回单据
revokeBill() {
- this.$confirm("是否确定撤回改单据?", "提示", {
+ this.$confirm("是否确定撤回单据至草稿状态?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
@@ -1255,14 +1266,32 @@ export default {
},
- //待校验以扫码结果为准
- submitCodeResult() {
+ submitCheckDialog() {
+ this.checkTipDialogVisible = true;
+ },
+ //待校验以扫码结果为准
+ submitCodeResult(query) {
+ submitCodeResult(query).then((response) => {
+ if (response.code === 20000) {
+ this.$message.success("提交成功");
+ this.closeDialog();
+ } else {
+ this.$message.error(response.message);
+ }
+ });
},
//待校验以正确结果为准
- submitCheckResult() {
-
+ submitCheckResult(query) {
+ submitCheckResult(query).then((response) => {
+ if (response.code === 20000) {
+ this.$message.success("提交成功");
+ this.closeDialog();
+ } else {
+ this.$message.error(response.message);
+ }
+ });
},
@@ -1289,13 +1318,10 @@ export default {
return;
}
}
-
-
let tQuery = Object.assign(
JSON.parse(JSON.stringify(this.orderFormData))
);
tQuery.orderId = this.orderFormData.billNo;
- console.log(this.curAction)
if (this.viewType == 2) { //扫码单据立即提交
submitCodes(tQuery).then((response) => {
if (response.code === 20000) {
@@ -1329,8 +1355,31 @@ export default {
});
}
if (this.viewType = 7) { //待校验提交
+ if (val = 1) {
+ this.$confirm("此操作将以校验的正确结果重新生成业务单并提交，是否继续？", "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(() => {
+ this.submitCheckResult(tQuery);
+ })
+ .catch(() => {
+ });
+ } else {
+ this.$confirm("此操作将以扫码结果重新生成业务单并提交，是否继续？", "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(() => {
+ this.submitCodeResult(tQuery);
+ })
+ .catch(() => {
+ });
+ }
} else { //配货拣货后后提交
submitOrderWeb(tQuery).then((response) => {
if (response.code === 20000) {
@@ -1341,7 +1390,6 @@ export default {
}
});
}
-
},
saveOrder() {
let tQuery = Object.assign(
diff --git a/src/views/inout/PanelCreateOrderCodes.vue b/src/views/inout/PanelCreateOrderCodes.vue
index 3492962d..99c69382 100644
--- a/src/views/inout/PanelCreateOrderCodes.vue
+++ b/src/views/inout/PanelCreateOrderCodes.vue
@@ -94,13 +94,24 @@
+
+
+
+ 红色:多余条码
+
+
+
+ 黄色:包含多余条码
+
+
+
@@ -166,6 +177,7 @@ import selectRlDialog from "./DialogSelectRl";
import DialogSelectUnit from "./DialogSelectUnit";
import editCodeDialog from "./DialogEditCode";
import {parseTime} from "@/utils/coTools";
+import {getCheckDetailCodes} from "@/api/inout/orderDetailCode";
export default {
name: "IoAddCodeDetail",
@@ -189,6 +201,10 @@ export default {
editTitle: {
type: Object,
required: true,
+ },
+ viewType: {
+ type: Object,
+ required: true,
}
},
@@ -214,22 +230,41 @@ export default {
getCodeList() {
this.loading = true;
this.query.orderId = this.idQuery.billNo;
- errorCodeList(this.query) //查找该单号下的所有条码
- .then((response) => {
- this.codeArray = response.data.list || [];
- this.total = response.data.total || 0;
- for (let i = 0; i < this.codeArray.length; i++) {
- this.codeArray[i].fromType = this.formData.fromType;
- this.codeArray[i].billType = this.formData.billType;
- }
- this.tableSelection();
- this.loading = false;
- })
- .catch(() => {
- this.loading = false;
- this.list = [];
- this.total = 0;
- });
+
+ if (this.viewType == 7) {
+ //展示带校验条码
+ getCheckDetailCodes(this.query) //查找该单号下的所有条码
+ .then((response) => {
+ this.codeArray = response.data.list || [];
+ this.total = response.data.total || 0;
+ this.loading = false;
+ })
+ .catch(() => {
+ this.loading = false;
+ this.detailList = [];
+ this.total = 0;
+ });
+
+ } else {
+ errorCodeList(this.query) //查找该单号下的所有条码
+ .then((response) => {
+ this.codeArray = response.data.list || [];
+ this.total = response.data.total || 0;
+ for (let i = 0; i < this.codeArray.length; i++) {
+ this.codeArray[i].fromType = this.formData.fromType;
+ this.codeArray[i].billType = this.formData.billType;
+ }
+ this.tableSelection();
+ this.loading = false;
+ })
+ .catch(() => {
+ this.loading = false;
+ this.list = [];
+ this.total = 0;
+ });
+ }
+
+
},
deleteCode(index, row) {
@@ -277,6 +312,11 @@ export default {
if (!this.$isNotBlank(row.supId) || !this.$isNotBlank(row.relId)) {
rowBackground.color = '#f60303';
}
+ if (row.checkStatus == 2) {
+ rowBackground.color = '#F7BB29';
+ } else if (row.checkStatus == 1) {
+ rowBackground.color = '#FC4A45';
+ }
return rowBackground;
},