From 8deee9363e7a5d180bd77cdb2db0fa22dbb1702d Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期三, 01 四月 2026 14:59:07 +0800
Subject: [PATCH] fix: 优化库存管理
---
src/views/inventoryManagement/stockManagement/New.vue | 16 -----
src/views/salesManagement/deliveryLedger/index.vue | 106 ++++++++++++-----------------------
src/views/inventoryManagement/stockManagement/Qualified.vue | 7 +-
3 files changed, 40 insertions(+), 89 deletions(-)
diff --git a/src/views/inventoryManagement/stockManagement/New.vue b/src/views/inventoryManagement/stockManagement/New.vue
index b939b1f..913c3fd 100644
--- a/src/views/inventoryManagement/stockManagement/New.vue
+++ b/src/views/inventoryManagement/stockManagement/New.vue
@@ -42,20 +42,6 @@
</el-form-item>
<el-form-item
- label="鐢熶骇鏃ユ湡"
- prop="productionDate"
- >
- <el-date-picker
- v-model="formState.productionDate"
- type="date"
- placeholder="璇烽�夋嫨鐢熶骇鏃ユ湡"
- value-format="YYYY-MM-DD"
- format="YYYY-MM-DD"
- style="width: 100%"
- />
- </el-form-item>
-
- <el-form-item
label="渚涘簲鍟�"
prop="customer"
:rules="[{ required: true, message: '璇烽�夋嫨渚涘簲鍟�', trigger: 'change' }]"
@@ -146,7 +132,6 @@
productModelName: "",
unit: "",
batchNo: "",
- productionDate: "",
customer: "",
qualitity: 0,
warnNum: 0,
@@ -175,7 +160,6 @@
productModelName: "",
unit: "",
batchNo: "",
- productionDate: "",
customer: "",
qualitity: 0,
warnNum: 0,
diff --git a/src/views/inventoryManagement/stockManagement/Qualified.vue b/src/views/inventoryManagement/stockManagement/Qualified.vue
index 69583f3..1ccad6f 100644
--- a/src/views/inventoryManagement/stockManagement/Qualified.vue
+++ b/src/views/inventoryManagement/stockManagement/Qualified.vue
@@ -67,11 +67,10 @@
<el-table-column label="鍗曚綅" prop="unit" show-overflow-tooltip />
<el-table-column label="搴撳瓨鏁伴噺" prop="qualitity" show-overflow-tooltip />
<el-table-column label="鍐荤粨鏁伴噺" prop="lockedQuantity" show-overflow-tooltip />
- <el-table-column label="搴撳瓨棰勮鏁伴噺" width="120" prop="warnNum" show-overflow-tooltip />
- <el-table-column label="鐢熶骇鏃ユ湡" prop="productionDate" show-overflow-tooltip />
+ <el-table-column label="搴撳瓨棰勮鏁伴噺" prop="warnNum" show-overflow-tooltip />
<el-table-column label="澶囨敞" prop="remark" show-overflow-tooltip />
- <el-table-column label="鏈�杩戞洿鏂版椂闂�" width="120" prop="updateTime" show-overflow-tooltip />
- <el-table-column fixed="right" label="鎿嶄綔" min-width="100" align="center">
+ <el-table-column label="鏈�杩戞洿鏂版椂闂�" prop="updateTime" show-overflow-tooltip />
+ <el-table-column fixed="right" label="鎿嶄綔" min-width="120" align="center">
<template #default="scope">
<el-button link type="primary" size="small" @click="showSubtractModal(scope.row)" :disabled="scope.row.unLockedQuantity === 0">棰嗙敤</el-button>
<el-button link type="primary" size="small" v-if="scope.row.unLockedQuantity > 0" @click="showFrozenModal(scope.row)">鍐荤粨</el-button>
diff --git a/src/views/salesManagement/deliveryLedger/index.vue b/src/views/salesManagement/deliveryLedger/index.vue
index db21d42..7927b73 100644
--- a/src/views/salesManagement/deliveryLedger/index.vue
+++ b/src/views/salesManagement/deliveryLedger/index.vue
@@ -40,10 +40,10 @@
<el-table-column label="鍙戣揣杞︾墝鍙�" prop="shippingCarNumber" show-overflow-tooltip />
<el-table-column label="蹇�掑叕鍙�" prop="expressCompany" show-overflow-tooltip />
<el-table-column label="蹇�掑崟鍙�" prop="expressNumber" show-overflow-tooltip />
- <el-table-column label="瀹℃牳鐘舵��" prop="status" align="center" width="120">
+ <el-table-column label="鍙戣揣鐘舵��" prop="status" align="center" width="120">
<template #default="scope">
- <el-tag :type="getApprovalStatusType(scope.row.status)">
- {{ getApprovalStatusText(scope.row.status) }}
+ <el-tag :type="getShippingStatusType(scope.row.status)">
+ {{ getShippingStatusText(scope.row.status) }}
</el-tag>
</template>
</el-table-column>
@@ -53,7 +53,7 @@
link
type="primary"
size="small"
- :disabled="!isApproved(scope.row.status)"
+ :disabled="isShipped(scope.row.status)"
@click="openForm('edit', scope.row)">琛ュ厖鍙戣揣淇℃伅</el-button>
<el-button
link
@@ -65,7 +65,7 @@
link
type="danger"
size="small"
- :disabled="isApproving(scope.row.status)"
+ :disabled="isShipped(scope.row.status)"
@click="handleDeleteSingle(scope.row)">鍒犻櫎</el-button>
</template>
</el-table-column>
@@ -186,7 +186,7 @@
<el-descriptions-item label="瑙勬牸鍨嬪彿">{{ detailRow.specificationModel || '--' }}</el-descriptions-item>
<el-descriptions-item label="鍙戣揣绫诲瀷">{{ detailRow.type || '--' }}</el-descriptions-item>
<el-descriptions-item label="鍙戣揣鏃ユ湡">{{ detailRow.shippingDate || '--' }}</el-descriptions-item>
- <el-descriptions-item label="瀹℃牳鐘舵��">{{ getApprovalStatusText(detailRow.status) }}</el-descriptions-item>
+ <el-descriptions-item label="鍙戣揣鐘舵��">{{ getShippingStatusText(detailRow.status) }}</el-descriptions-item>
<el-descriptions-item label="鍙戣揣杞︾墝鍙�">{{ detailRow.shippingCarNumber || '--' }}</el-descriptions-item>
<el-descriptions-item label="蹇�掑叕鍙�">{{ detailRow.expressCompany || '--' }}</el-descriptions-item>
<el-descriptions-item label="蹇�掑崟鍙�" :span="2">{{ detailRow.expressNumber || '--' }}</el-descriptions-item>
@@ -356,9 +356,9 @@
// 鎵撳紑寮规
const openForm = async (type, row) => {
- // 琛ュ厖鍙戣揣淇℃伅锛氫粎鈥滃鏍搁�氳繃鈥濆厑璁哥紪杈�
- if (type === 'edit' && row && !isApproved(row.status)) {
- proxy.$modal.msgWarning("鍙湁瀹℃牳閫氳繃鐨勬暟鎹墠鍙互琛ュ厖鍙戣揣淇℃伅");
+ // 琛ュ厖鍙戣揣淇℃伅锛氫粎鈥滄湭鍙戣揣鈥濆厑璁哥紪杈�
+ if (type === 'edit' && row && isShipped(row.status)) {
+ proxy.$modal.msgWarning("宸插彂璐х殑鏁版嵁涓嶈兘琛ュ厖鍙戣揣淇℃伅");
return;
}
@@ -486,10 +486,10 @@
return;
}
- // 妫�鏌ラ�変腑鐨勮鏄惁鏈�"瀹℃牳涓�"鐘舵��
- const approvingRows = selectedRows.value.filter(row => isApproving(row.status));
- if (approvingRows.length > 0) {
- proxy.$modal.msgWarning("瀹℃牳涓殑鏁版嵁涓嶈兘鍒犻櫎");
+ // 宸插彂璐ф暟鎹笉鍏佽鍒犻櫎
+ const shippedRows = selectedRows.value.filter(row => isShipped(row.status));
+ if (shippedRows.length > 0) {
+ proxy.$modal.msgWarning("宸插彂璐х殑鏁版嵁涓嶈兘鍒犻櫎");
return;
}
@@ -512,9 +512,9 @@
// 鍗曚釜鍒犻櫎
const handleDeleteSingle = (row) => {
- // 妫�鏌ユ槸鍚︿负"瀹℃牳涓�"鐘舵��
- if (isApproving(row.status)) {
- proxy.$modal.msgWarning("瀹℃牳涓殑鏁版嵁涓嶈兘鍒犻櫎");
+ // 宸插彂璐ф暟鎹笉鍏佽鍒犻櫎
+ if (isShipped(row.status)) {
+ proxy.$modal.msgWarning("宸插彂璐х殑鏁版嵁涓嶈兘鍒犻櫎");
return;
}
@@ -617,92 +617,60 @@
}
};
-// 鑾峰彇瀹℃牳鐘舵�佹枃鏈�
-const getApprovalStatusText = (status) => {
+// 鑾峰彇鍙戣揣鐘舵�佹枃鏈�
+const getShippingStatusText = (status) => {
if (status === null || status === undefined || status === '') {
- return '寰呭鏍�';
+ return '鏈彂璐�';
}
- // 濡傛灉鏄暟瀛�
if (typeof status === 'number') {
const statusMap = {
- 0: '寰呭鏍�',
- 1: '瀹℃牳涓�',
- 2: '瀹℃牳鎷掔粷',
- 3: '瀹℃牳閫氳繃'
+ 0: '鏈彂璐�',
+ 1: '宸插彂璐�',
};
- return statusMap[status] || '寰呭鏍�';
+ return statusMap[status] || '鏈彂璐�';
}
- // 濡傛灉鏄瓧绗︿覆锛岀洿鎺ヨ繑鍥炴垨鏄犲皠
const statusStr = String(status).trim();
const statusTextMap = {
- '寰呭鏍�': '寰呭鏍�',
- '瀹℃牳涓�': '瀹℃牳涓�',
- '瀹℃牳鎷掔粷': '瀹℃牳鎷掔粷',
- '瀹℃牳閫氳繃': '瀹℃牳閫氳繃',
- '0': '寰呭鏍�',
- '1': '瀹℃牳涓�',
- '2': '瀹℃牳鎷掔粷',
- '3': '瀹℃牳閫氳繃'
+ '鏈彂璐�': '鏈彂璐�',
+ '宸插彂璐�': '宸插彂璐�',
+ '0': '鏈彂璐�',
+ '1': '宸插彂璐�',
};
- return statusTextMap[statusStr] || statusStr || '寰呭鏍�';
+ return statusTextMap[statusStr] || statusStr || '鏈彂璐�';
};
-// 鑾峰彇瀹℃牳鐘舵�佹爣绛剧被鍨嬶紙棰滆壊锛�
-const getApprovalStatusType = (status) => {
+// 鑾峰彇鍙戣揣鐘舵�佹爣绛剧被鍨嬶紙棰滆壊锛�
+const getShippingStatusType = (status) => {
if (status === null || status === undefined || status === '') {
return 'info';
}
- // 濡傛灉鏄暟瀛�
if (typeof status === 'number') {
const typeMap = {
- 0: 'info', // 寰呭鏍� - 鐏拌壊
- 1: 'warning', // 瀹℃牳涓� - 榛勮壊
- 2: 'danger', // 瀹℃牳鎷掔粷 - 绾㈣壊
- 3: 'success' // 瀹℃牳閫氳繃 - 缁胯壊
+ 0: 'info', // 鏈彂璐� - 鐏拌壊
+ 1: 'success', // 宸插彂璐� - 缁胯壊
};
return typeMap[status] || 'info';
}
- // 濡傛灉鏄瓧绗︿覆
const statusStr = String(status).trim();
const typeTextMap = {
- '寰呭鏍�': 'info',
- '瀹℃牳涓�': 'warning',
- '瀹℃牳鎷掔粷': 'danger',
- '瀹℃牳閫氳繃': 'success',
+ '鏈彂璐�': 'info',
+ '宸插彂璐�': 'success',
'0': 'info',
- '1': 'warning',
- '2': 'danger',
- '3': 'success'
+ '1': 'success',
};
return typeTextMap[statusStr] || 'info';
};
-// 妫�鏌ュ鏍哥姸鎬佹槸鍚︿负"瀹℃牳閫氳繃"
-const isApproved = (status) => {
+// 鏄惁宸插彂璐�
+const isShipped = (status) => {
if (status === null || status === undefined || status === '') {
return false;
}
- // 濡傛灉鏄暟瀛楋紝3 琛ㄧず瀹℃牳閫氳繃
- if (typeof status === 'number') {
- return status === 3;
- }
- // 濡傛灉鏄瓧绗︿覆
- const statusStr = String(status).trim();
- 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';
+ return statusStr === '宸插彂璐�' || statusStr === '1';
};
onMounted(() => {
--
Gitblit v1.9.3