From 550d2a9600c3aba2f5091ef4938781b08ba674ee Mon Sep 17 00:00:00 2001 From: hwj Date: Mon, 22 Jun 2026 10:35:38 +0800 Subject: [PATCH] =?UTF-8?q?style=EF=BC=9A=E5=85=A5=E5=BA=93=E5=8D=95?= =?UTF-8?q?=E6=8D=AE/=E5=87=BA=E5=BA=93=E5=8D=95=E6=8D=AE-=E5=B7=B2?= =?UTF-8?q?=E9=A9=B3=E5=9B=9E=E7=8A=B6=E6=80=81=E9=87=8D=E6=96=B0=E5=85=A5?= =?UTF-8?q?=E5=BA=93/=E5=87=BA=E5=BA=93-=E8=B0=83=E7=94=A8audit=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/erp/stock/in/index.vue | 15 +++++++++++++-- src/views/erp/stock/out/index.vue | 15 +++++++++++++-- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/src/views/erp/stock/in/index.vue b/src/views/erp/stock/in/index.vue index 9963ca4f..bc58977a 100644 --- a/src/views/erp/stock/in/index.vue +++ b/src/views/erp/stock/in/index.vue @@ -398,6 +398,7 @@ const submitFormRef = ref() const submitFormData = reactive({ id: '', auditUserId: '', + status: '', remark: '' }) const submitFormRules = computed(() => isAuditDisabled.value ? {} : { @@ -487,6 +488,7 @@ const handleDelete = async (ids: number[]) => { const openSubmitDialog = (row: StockInVO) => { submitFormData.id = String(row.id) submitFormData.auditUserId = '' + submitFormData.status = String(row.status) submitFormData.remark = '' submitDialogVisible.value = true nextTick(() => submitFormRef.value?.clearValidate?.()) @@ -505,8 +507,17 @@ const handleSubmitStockIn = async () => { if (!isAuditDisabled.value) { data.auditUserId = submitFormData.auditUserId } - await StockInApi.submitStockIn(data as { id: string; auditUserId: string; remark?: string }) - message.success(t('ErpStock.In.submitSuccess')) + if (isAuditDisabled.value && submitFormData.status === '1') { + await StockInApi.auditStockIn({ + id: submitFormData.id, + status: '20', + remark: submitFormData.remark + }) + message.success(t('ErpStock.In.auditApproveSuccess')) + } else { + await StockInApi.submitStockIn(data as { id: string; auditUserId: string; remark?: string }) + message.success(t('ErpStock.In.submitSuccess')) + } submitDialogVisible.value = false await getList() } finally { diff --git a/src/views/erp/stock/out/index.vue b/src/views/erp/stock/out/index.vue index b62e8687..5ec878c6 100644 --- a/src/views/erp/stock/out/index.vue +++ b/src/views/erp/stock/out/index.vue @@ -397,6 +397,7 @@ const submitFormRef = ref() const submitFormData = reactive({ id: '', auditUserId: '', + status: '', remark: '' }) const submitFormRules = computed(() => isAuditDisabled.value ? {} : { @@ -485,6 +486,7 @@ const handleDelete = async (ids: number[]) => { const openSubmitDialog = (row: StockOutVO) => { submitFormData.id = String(row.id) submitFormData.auditUserId = '' + submitFormData.status = String(row.status) submitFormData.remark = '' submitDialogVisible.value = true nextTick(() => submitFormRef.value?.clearValidate?.()) @@ -503,8 +505,17 @@ const handleSubmitStockOut = async () => { if (!isAuditDisabled.value) { data.auditUserId = submitFormData.auditUserId } - await StockOutApi.submitStockOut(data as { id: string; auditUserId: string; remark?: string }) - message.success(t('ErpStock.Out.submitSuccess')) + if (isAuditDisabled.value && submitFormData.status === '1') { + await StockOutApi.auditStockOut({ + id: submitFormData.id, + status: '20', + remark: submitFormData.remark + }) + message.success(t('ErpStock.Out.auditApproveSuccess')) + } else { + await StockOutApi.submitStockOut(data as { id: string; auditUserId: string; remark?: string }) + message.success(t('ErpStock.Out.submitSuccess')) + } submitDialogVisible.value = false await getList() } finally {