From be7fb5b515ccd11aa3378160863aee5f0a4be1b0 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期二, 27 一月 2026 11:38:36 +0800
Subject: [PATCH] Merge branch 'dev_New' of http://114.132.189.42:9002/r/product-inventory-management into dev_New
---
src/views/salesManagement/deliveryLedger/index.vue | 38 ++++++++++++++++++++++++++------------
1 files changed, 26 insertions(+), 12 deletions(-)
diff --git a/src/views/salesManagement/deliveryLedger/index.vue b/src/views/salesManagement/deliveryLedger/index.vue
index 688741b..983a3e5 100644
--- a/src/views/salesManagement/deliveryLedger/index.vue
+++ b/src/views/salesManagement/deliveryLedger/index.vue
@@ -51,13 +51,13 @@
link
type="primary"
size="small"
- :disabled="!isApproved(scope.row.status)"
+ :disabled="isApproving(scope.row.status)"
@click="openForm('edit', scope.row)">缂栬緫</el-button>
<el-button
link
type="danger"
size="small"
- :disabled="!isApproved(scope.row.status)"
+ :disabled="isApproving(scope.row.status)"
@click="handleDeleteSingle(scope.row)">鍒犻櫎</el-button>
</template>
</el-table-column>
@@ -284,9 +284,9 @@
// 鎵撳紑寮规
const openForm = async (type, row) => {
- // 缂栬緫鏃舵鏌ュ鏍哥姸鎬�
- if (type === 'edit' && row && !isApproved(row.status)) {
- proxy.$modal.msgWarning("鍙兘缂栬緫瀹℃牳閫氳繃鐨勬暟鎹�");
+ // 缂栬緫鏃舵鏌ュ鏍哥姸鎬侊紝鍙湁瀹℃牳涓笉鑳界紪杈�
+ if (type === 'edit' && row && isApproving(row.status)) {
+ proxy.$modal.msgWarning("瀹℃牳涓殑鏁版嵁涓嶈兘缂栬緫");
return;
}
@@ -430,10 +430,10 @@
return;
}
- // 妫�鏌ラ�変腑鐨勮鏄惁閮芥槸"瀹℃牳閫氳繃"鐘舵��
- const notApprovedRows = selectedRows.value.filter(row => !isApproved(row.status));
- if (notApprovedRows.length > 0) {
- proxy.$modal.msgWarning("鍙兘鍒犻櫎瀹℃牳閫氳繃鐨勬暟鎹�");
+ // 妫�鏌ラ�変腑鐨勮鏄惁鏈�"瀹℃牳涓�"鐘舵��
+ const approvingRows = selectedRows.value.filter(row => isApproving(row.status));
+ if (approvingRows.length > 0) {
+ proxy.$modal.msgWarning("瀹℃牳涓殑鏁版嵁涓嶈兘鍒犻櫎");
return;
}
@@ -456,9 +456,9 @@
// 鍗曚釜鍒犻櫎
const handleDeleteSingle = (row) => {
- // 妫�鏌ユ槸鍚︿负"瀹℃牳閫氳繃"鐘舵��
- if (!isApproved(row.deliveryLedger)) {
- proxy.$modal.msgWarning("鍙兘鍒犻櫎瀹℃牳閫氳繃鐨勬暟鎹�");
+ // 妫�鏌ユ槸鍚︿负"瀹℃牳涓�"鐘舵��
+ if (isApproving(row.status)) {
+ proxy.$modal.msgWarning("瀹℃牳涓殑鏁版嵁涓嶈兘鍒犻櫎");
return;
}
@@ -635,6 +635,20 @@
return statusStr === '瀹℃牳閫氳繃' || statusStr === '3';
};
+// 妫�鏌ュ鏍哥姸鎬佹槸鍚︿负"瀹℃牳涓�"
+const isApproving = (status) => {
+ if (status === null || status === undefined || status === '') {
+ return false;
+ }
+ // 濡傛灉鏄暟瀛楋紝1 琛ㄧず瀹℃牳涓�
+ if (typeof status === 'number') {
+ return status === 1;
+ }
+ // 濡傛灉鏄瓧绗︿覆
+ const statusStr = String(status).trim();
+ return statusStr === '瀹℃牳涓�' || statusStr === '1';
+};
+
onMounted(() => {
getList();
});
--
Gitblit v1.9.3