From f84e425bb9debb5f2af8e417bf07d2a2b0077609 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 28 四月 2026 17:00:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_NEW_pro' into dev_NEW_pro
---
src/views/inventoryManagement/dispatchLog/Record.vue | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/views/inventoryManagement/dispatchLog/Record.vue b/src/views/inventoryManagement/dispatchLog/Record.vue
index 061aeeb..80d7515 100644
--- a/src/views/inventoryManagement/dispatchLog/Record.vue
+++ b/src/views/inventoryManagement/dispatchLog/Record.vue
@@ -120,7 +120,7 @@
import { getCurrentDate } from "@/utils/index.js";
import {
getStockOutPage,
- delStockOut,
+ delPendingStockOut,
batchApproveStockOutRecords,
} from "@/api/inventoryManagement/stockOut.js";
import {
@@ -252,7 +252,7 @@
distinguishCancelAndClose: true,
})
.then(() => {
- batchApproveStockOutRecords({ ids, approvalStatus: "閫氳繃" })
+ batchApproveStockOutRecords({ ids, approvalStatus: 1 })
.then(() => {
proxy.$modal.msgSuccess("瀹℃壒閫氳繃鎴愬姛");
getList();
@@ -263,7 +263,7 @@
})
.catch((action) => {
if (action === "cancel") {
- batchApproveStockOutRecords({ ids, approvalStatus: "椹冲洖" })
+ batchApproveStockOutRecords({ ids, approvalStatus: 2 })
.then(() => {
proxy.$modal.msgSuccess("瀹℃壒椹冲洖鎴愬姛");
getList();
@@ -307,7 +307,7 @@
type: "warning",
})
.then(() => {
- delStockOut(ids).then((res) => {
+ delPendingStockOut(ids).then((res) => {
proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
getList();
});
--
Gitblit v1.9.3