From 44cd199a79b5d9e7cc0900166340e3c4991c0fcf Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 17 六月 2026 14:15:52 +0800
Subject: [PATCH] fix:1.发货台账删除去掉 2.出库台账反审添加
---
src/views/inventoryManagement/dispatchLog/Record.vue | 41 ++++++++++++++++++++
src/views/salesManagement/deliveryLedger/index.vue | 14 +++---
src/api/inventoryManagement/stockOut.js | 9 ++++
3 files changed, 57 insertions(+), 7 deletions(-)
diff --git a/src/api/inventoryManagement/stockOut.js b/src/api/inventoryManagement/stockOut.js
index 004ba99..b54e004 100644
--- a/src/api/inventoryManagement/stockOut.js
+++ b/src/api/inventoryManagement/stockOut.js
@@ -35,3 +35,12 @@
data,
});
}
+
+// 鎵归噺鍙嶅鍑哄簱璁板綍
+export const batchUnapproveStockOutRecords = (data) => {
+ return request({
+ url: "/stockOutRecord/reAudit",
+ method: "post",
+ data,
+ });
+}
diff --git a/src/views/inventoryManagement/dispatchLog/Record.vue b/src/views/inventoryManagement/dispatchLog/Record.vue
index 2d7411d..5a056d6 100644
--- a/src/views/inventoryManagement/dispatchLog/Record.vue
+++ b/src/views/inventoryManagement/dispatchLog/Record.vue
@@ -76,6 +76,8 @@
<div class="actions">
<el-button type="primary"
@click="handleBatchApprove">瀹℃壒</el-button>
+ <el-button :disabled="!canReverseApprove"
+ @click="handleReverseApprove">鍙嶅</el-button>
<el-button @click="handleOut">瀵煎嚭</el-button>
<el-button type="danger"
plain
@@ -163,6 +165,7 @@
getStockOutPage,
delPendingStockOut,
batchApproveStockOutRecords,
+ batchUnapproveStockOutRecords,
} from "@/api/inventoryManagement/stockOut.js";
import {
findAllQualifiedStockOutRecordTypeOptions,
@@ -306,6 +309,44 @@
selectedRows.value = selection.filter(item => item.id);
console.log("selection", selectedRows.value);
};
+
+ const isRejectedApproval = status => {
+ return status === 2 || status === "2" || status === "rejected" || status === "REJECTED";
+ };
+
+ const canReverseApprove = computed(() => {
+ return (
+ selectedRows.value.length > 0 &&
+ selectedRows.value.every(row => isRejectedApproval(row.approvalStatus))
+ );
+ });
+
+ const handleReverseApprove = () => {
+ if (!canReverseApprove.value) {
+ proxy.$modal.msgWarning("璇烽�夋嫨椹冲洖鐘舵�佺殑鏁版嵁");
+ return;
+ }
+ const ids = selectedRows.value.map(item => item.id);
+ ElMessageBox.confirm("鍙嶅鍚庤褰曞皢鎭㈠涓哄緟瀹℃壒鐘舵�侊紝鏄惁纭鍙嶅锛�", "鍙嶅", {
+ confirmButtonText: "纭",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
+ })
+ .then(() => {
+ batchUnapproveStockOutRecords({ ids })
+ .then(() => {
+ proxy.$modal.msgSuccess("鍙嶅鎴愬姛");
+ getList();
+ })
+ .catch(() => {
+ proxy.$modal.msgError("鍙嶅澶辫触");
+ });
+ })
+ .catch(() => {
+ proxy.$modal.msg("宸插彇娑�");
+ });
+ };
+
const expandedRowKeys = ref([]);
const handleBatchApprove = () => {
diff --git a/src/views/salesManagement/deliveryLedger/index.vue b/src/views/salesManagement/deliveryLedger/index.vue
index c8890cc..33fa45f 100644
--- a/src/views/salesManagement/deliveryLedger/index.vue
+++ b/src/views/salesManagement/deliveryLedger/index.vue
@@ -139,13 +139,13 @@
@click="openDetail(scope.row)"
>璇︽儏
</el-button>
- <el-button
- link
- type="danger"
- :disabled="isApproving(scope.row.status)"
- @click="handleDeleteSingle(scope.row)"
- >鍒犻櫎
- </el-button>
+ <!-- <el-button-->
+ <!-- link-->
+ <!-- type="danger"-->
+ <!-- :disabled="isApproving(scope.row.status)"-->
+ <!-- @click="handleDeleteSingle(scope.row)"-->
+ <!-- >鍒犻櫎-->
+ <!-- </el-button>-->
</template>
</el-table-column>
</el-table>
--
Gitblit v1.9.3