diff --git a/src/api/inout/order.js b/src/api/inout/order.js index 903376ab..50853826 100644 --- a/src/api/inout/order.js +++ b/src/api/inout/order.js @@ -553,3 +553,15 @@ export function orderChange(query) { }); } + + +export function rollbackWaitcheck(params) { + return axios({ + url: "/udiwms/inout/order/waitCheck/rollback", + method: "get", + params: params + }); +} + + + diff --git a/src/views/basic/product/productEdit.vue b/src/views/basic/product/productEdit.vue index 96027f24..5a2ed847 100644 --- a/src/views/basic/product/productEdit.vue +++ b/src/views/basic/product/productEdit.vue @@ -345,7 +345,7 @@ + type="number" v-model="editQuery.useNum"> diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue index 05dad06a..7ca663da 100644 --- a/src/views/inout/DialogCreateOrder.vue +++ b/src/views/inout/DialogCreateOrder.vue @@ -22,23 +22,29 @@ >草稿保存 立即提交 - 待配货提交 - + 完成验收 + >撤回单据 - 完成验收 - + + + + + + + + + + + + + + + @@ -69,7 +75,6 @@ - - + > - - + + {{ checkTip }} + + 取消 + 确定 + + + @@ -524,7 +539,7 @@ import { submitOrderWeb, saveOrderWeb, updateCodeBindSup, - enterCodeWeb, submitAllocateBiz, + enterCodeWeb, submitAllocateBiz, rollbackWaitcheck, } from "../../api/inout/order"; import {filterSubAll, findByFrom, findInvByUser} from "../../api/system/invSubWarehouse"; import {parseTime} from "../../utils/coTools"; @@ -618,7 +633,7 @@ export default { fromOptions: [], isCodeAlive: true, bizShow: true, - isCheckResultAlive: false, + isCheckResultAlive: true, isBizDetailAlive: true, isCodeDetailAlive: true, editCodeVisible: false, @@ -679,6 +694,8 @@ export default { preSpaceShow: false, //寄售，预验收仓库界面 spaceCodeList: [], + checkTipDialogVisible: false, + checkTip: null, }; }, components: { @@ -1189,18 +1206,66 @@ export default { this.isCodeAlive = false; this.isBizDetailAlive = false; this.isCodeDetailAlive = false; + this.$nextTick(() => { //重新加载组件 this.isCodeAlive = true; this.isBizDetailAlive = true; this.isCodeDetailAlive = true; + }); + + //选择性刷新 + if (this.isCheckResultAlive) { + this.isCheckResultAlive = false; + this.$nextTick(() => { + //重新加载组件 + this.isCheckResultAlive = true; + }); + } }, refreshOrder(orderQuery) { this.orderFormData = orderQuery; }, + //撤回单据 + revokeBill() { + this.$confirm("是否确定撤回改单据?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) + .then(() => { + let query = {billNo: this.orderFormData.billNo}; + + rollbackWaitcheck(query) + .then((response) => { + if (response.code == 20000) { + this.$message.success("撤回成功！"); + } else { + this.$message.error(response.message); + } + }) + .catch(() => { + }); + }) + .catch(() => { + }); + }, + + + //待校验以扫码结果为准 + submitCodeResult() { + + }, + + //待校验以正确结果为准 + submitCheckResult() { + + }, + + submit(val) { if (this.$isBlank(this.orderFormData.action)) { this.$message.warning("单据类型不能为空！"); @@ -1262,7 +1327,11 @@ export default { this.$message.error(response.message); } }); - } else { //校验后提交 + } + if (this.viewType = 7) { //待校验提交 + + + } else { //配货拣货后后提交 submitOrderWeb(tQuery).then((response) => { if (response.code === 20000) { this.$message.success("提交成功"); diff --git a/src/views/inout/IoDealCheckOrder.vue b/src/views/inout/IoDealCheckOrder.vue index edc56719..f7612135 100644 --- a/src/views/inout/IoDealCheckOrder.vue +++ b/src/views/inout/IoDealCheckOrder.vue @@ -342,6 +342,7 @@ export default { startTime: null, endTime: null, invCode: this.$store.getters.locInvCode, + vueType: "waitCheck", }, viewType: 7, checkStatus: { @@ -460,6 +461,7 @@ export default { limit: 10, startTime: null, endTime: null, + vueType: "waitCheck", invCode: this.$store.getters.locInvCode, }; this.actDateRange = []; @@ -495,7 +497,7 @@ export default { let query = { code: this.filterQuery.invCode, enabled: true, - vueType: "supDelivery", + vueType: "waitCheck", }; getLocalJoinByUser(query) .then((response) => { @@ -639,6 +641,9 @@ export default { if (!row.checkSuccess) { rowBackground.color = '#f60303'; } + if (row.count != row.scanCount) { + rowBackground.color = '#f60303'; + } return rowBackground; }, diff --git a/src/views/inout/IoDealOrder.vue b/src/views/inout/IoDealOrder.vue index d5fcd26a..efaced76 100644 --- a/src/views/inout/IoDealOrder.vue +++ b/src/views/inout/IoDealOrder.vue @@ -366,6 +366,7 @@ export default { startTime: null, endTime: null, invCode: this.$store.getters.locInvCode, + vueType: "waitDeal", }, viewType: 3, checkStatus: { @@ -484,6 +485,7 @@ export default { limit: 10, startTime: null, endTime: null, + vueType: "waitDeal", invCode: this.$store.getters.locInvCode, }; this.actDateRange = []; @@ -519,7 +521,7 @@ export default { let query = { code: this.filterQuery.invCode, enabled: true, - vueType: "supDelivery", + vueType: "waitDeal", }; getLocalJoinByUser(query) .then((response) => { @@ -664,6 +666,9 @@ export default { if (!row.checkSuccess) { rowBackground.color = '#f60303'; } + if (row.count != row.scanCount) { + rowBackground.color = '#f60303'; + } return rowBackground; }, diff --git a/src/views/inout/PanelCreateOrderCheckDetail.vue b/src/views/inout/PanelCreateOrderCheckDetail.vue index c8759171..163d7b17 100644 --- a/src/views/inout/PanelCreateOrderCheckDetail.vue +++ b/src/views/inout/PanelCreateOrderCheckDetail.vue @@ -151,11 +151,11 @@ export default { methods: { getOrderDetails() { this.loading = true; - this.query.orderId = this.idQuery.billNo; + this.query.orderIdFk = this.idQuery.billNo; getCheckDetailList(this.query) //查找该单号下的所有条码 .then((response) => { - this.detailList = response.data.list || []; - this.total = response.data.total || 0; + this.detailList = response.data || []; + this.total = response.data || 0; this.loading = false; }) .catch(() => { @@ -198,6 +198,9 @@ export default { if (!row.checkSuccess) { rowBackground.color = '#f60303'; } + if (row.count != row.scanCount) { + rowBackground.color = '#f60303'; + } return rowBackground; },