diff --git a/src/views/modules/boxManage/saleBoxManage.vue b/src/views/modules/boxManage/saleBoxManage.vue index 6954f06..c6cfa5e 100644 --- a/src/views/modules/boxManage/saleBoxManage.vue +++ b/src/views/modules/boxManage/saleBoxManage.vue @@ -1115,19 +1115,28 @@ export default { // 处理完成操作 async handleComplete(row){ - this.$confirm('是否包装完成?', '提示', { + this.$confirm('是否包装完成?完成后将创建检验任务', '提示', { confirmButtonText: '是', cancelButtonText: '否', type: 'warning' }).then(async () => { try { - const {data} = await updateOrderStatus({ - site: row.site, - buNo: row.buNo, - orderNo: row.orderNo + const {data} = await this.$http({ + url: this.$http.adornUrl('/boxForNotification/completePacking'), + method: 'post', + data: this.$http.adornData({ + site: row.site, + buNo: row.buNo, + orderNo: row.orderNo, + customerId: row.customerId, + relatedOrderNo: row.relatedOrderNo, + relatedOrderLineNo: row.relatedOrderLineNo, + requiredQty: row.requiredQty, + orderQty: row.orderQty + }) }) if(data && data.code === 0){ - this.$message.success('操作成功,单据状态已更新为"待出库"') + this.$message.success('包装完成,检验任务已创建') // 刷新列表 this.getMainData() } else { diff --git a/src/views/modules/warehouse/countingReport.vue b/src/views/modules/warehouse/countingReport.vue index 3f1b960..686ebf7 100644 --- a/src/views/modules/warehouse/countingReport.vue +++ b/src/views/modules/warehouse/countingReport.vue @@ -193,13 +193,14 @@ border v-loading="detailLoading" style="width: 100%;"> - + + - + @@ -374,7 +375,7 @@ export default { const month = String(today.getMonth() + 1).padStart(2, '0') const day = String(today.getDate()).padStart(2, '0') const todayStr = `${year}-${month}-${day}` - + this.modalData = { flag: 'add', bu: this.userBuList.length > 0 ? this.userBuList[0].buNo : '',