From a35ffb2a781f9082cde9813b7517c36bfcef33ad Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 22 六月 2026 19:03:18 +0800
Subject: [PATCH] fix: 发货改为出库
---
src/views/salesManagement/salesLedger/index.vue | 72 ++++++++++++++++++------------------
1 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index efa27fb..744831c 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -796,11 +796,11 @@
placeholder="璇烽�夋嫨"
clearable
style="width: 100%">
- <el-option label="鏈彂璐�" :value="1" />
+ <el-option label="鏈嚭搴�" :value="1" />
<el-option label="瀹℃壒涓�" :value="2" />
<el-option label="瀹℃壒涓嶉�氳繃" :value="3" />
<el-option label="瀹℃壒閫氳繃" :value="4" />
- <el-option label="宸插彂璐�" :value="5" />
+ <el-option label="宸插嚭搴�" :value="5" />
<el-option label="閮ㄥ垎鍙戣揣" :value="6" />
</el-select>
</el-form-item>
@@ -994,7 +994,7 @@
align="center">
<template #default="scope">
<el-tag v-if="Number(scope.row.deliveryStatus) === 1"
- type="info">鏈彂璐�</el-tag>
+ type="info">鏈嚭搴�</el-tag>
<el-tag v-else-if="Number(scope.row.deliveryStatus) === 2"
type="warning">瀹℃壒涓�</el-tag>
<el-tag v-else-if="Number(scope.row.deliveryStatus) === 3"
@@ -1002,7 +1002,7 @@
<el-tag v-else-if="Number(scope.row.deliveryStatus) === 4"
type="primary">瀹℃壒閫氳繃</el-tag>
<el-tag v-else-if="Number(scope.row.deliveryStatus) === 5"
- type="success">宸插彂璐�</el-tag>
+ type="success">宸插嚭搴�</el-tag>
<el-tag v-else-if="Number(scope.row.deliveryStatus) === 6"
type="warning">閮ㄥ垎鍙戣揣</el-tag>
<el-tag v-else
@@ -2803,7 +2803,7 @@
entryDate: null, // 褰曞叆鏃ユ湡
entryDateStart: undefined,
entryDateEnd: undefined,
- deliveryStatus: undefined, // 鍙戣揣鐘舵�侊細1鏈彂璐� 2瀹℃壒涓� 3瀹℃壒涓嶉�氳繃 4瀹℃壒閫氳繃 5宸插彂璐� 6閮ㄥ垎鍙戣揣
+ deliveryStatus: undefined, // 鍙戣揣鐘舵�侊細1鏈嚭搴� 2瀹℃壒涓� 3瀹℃壒涓嶉�氳繃 4瀹℃壒閫氳繃 5宸插嚭搴� 6閮ㄥ垎鍙戣揣
stockStatus: undefined, // 鍏ュ簱鐘舵�侊細0鏈叆搴� 1閮ㄥ垎鍏ュ簱 2宸插叆搴�
reviewStatus: undefined, // 瀹℃牳鐘舵�侊細0寰呭鏍� 1宸插鏍� 2宸插弽瀹�
},
@@ -3114,7 +3114,7 @@
if (operationType.value === "view") return;
if (!row) return;
if (isProductShipped(row)) {
- proxy.$modal.msgWarning("宸插彂璐ф垨瀹℃牳閫氳繃鐨勪骇鍝佷笉鑳藉鍒�");
+ proxy.$modal.msgWarning("宸插嚭搴撴垨瀹℃牳閫氳繃鐨勪骇鍝佷笉鑳藉鍒�");
return;
}
const hasBlockingEditingRow = (productData.value || []).some(
@@ -3196,7 +3196,7 @@
if (operationType.value === "view") return;
if (!row) return;
if (isProductShipped(row)) {
- proxy.$modal.msgWarning("宸插彂璐ф垨瀹℃牳閫氳繃鐨勪骇鍝佷笉鑳界紪杈�");
+ proxy.$modal.msgWarning("宸插嚭搴撴垨瀹℃牳閫氳繃鐨勪骇鍝佷笉鑳界紪杈�");
return;
}
if (!discardPlaceholderRowIfPristine()) return;
@@ -3298,7 +3298,7 @@
if (operationType.value === "view") return;
if (!row) return;
if (isProductShipped(row)) {
- proxy.$modal.msgWarning("宸插彂璐ф垨瀹℃牳閫氳繃鐨勪骇鍝佷笉鑳界紪杈�");
+ proxy.$modal.msgWarning("宸插嚭搴撴垨瀹℃牳閫氳繃鐨勪骇鍝佷笉鑳界紪杈�");
return;
}
// 纭繚 productForm 鎸囧悜褰撳墠琛岋紝浠ュ鐢ㄨ绠楅�昏緫
@@ -3395,7 +3395,7 @@
if (!row) return;
if (operationType.value === "view") return;
if (isProductShipped(row)) {
- proxy.$modal.msgWarning("宸插彂璐ф垨瀹℃牳閫氳繃鐨勪骇鍝佷笉鑳界紪杈�");
+ proxy.$modal.msgWarning("宸插嚭搴撴垨瀹℃牳閫氳繃鐨勪骇鍝佷笉鑳界紪杈�");
return;
}
ensureProductRowDefaults(row);
@@ -3445,7 +3445,7 @@
if (!row) return;
if (operationType.value === "view") return;
if (isProductShipped(row)) {
- proxy.$modal.msgWarning("宸插彂璐ф垨瀹℃牳閫氳繃鐨勪骇鍝佷笉鑳界紪杈�");
+ proxy.$modal.msgWarning("宸插嚭搴撴垨瀹℃牳閫氳繃鐨勪骇鍝佷笉鑳界紪杈�");
return;
}
ensureProductRowDefaults(row);
@@ -3864,8 +3864,8 @@
shipped: "/sales/ledger/salesHistory/shippingImportTemplate",
};
const HISTORY_IMPORT_TEMPLATE_FILE_NAME_MAP = {
- notShipped: "閿�鍞彂璐у巻鍙叉暟鎹鍏ユā鏉�-鏈彂璐�.xlsx",
- shipped: "閿�鍞彂璐у巻鍙叉暟鎹鍏ユā鏉�-宸插彂璐�.xlsx",
+ notShipped: "閿�鍞彂璐у巻鍙叉暟鎹鍏ユā鏉�-鏈嚭搴�.xlsx",
+ shipped: "閿�鍞彂璐у巻鍙叉暟鎹鍏ユā鏉�-宸插嚭搴�.xlsx",
};
const currentImportCommand = ref("default");
const activeStatusTab = ref("all");
@@ -3875,7 +3875,7 @@
{ key: "reviewed", label: "宸插鏍�" },
{ key: "reverseReviewed", label: "鍙嶅鏍�" },
{ key: "stocked", label: "宸插叆搴�" },
- { key: "delivered", label: "宸插彂璐�" },
+ { key: "delivered", label: "宸插嚭搴�" },
];
const resetStatusFilters = () => {
@@ -4985,9 +4985,9 @@
const productIndex = ref(0);
// 鎵撳紑浜у搧寮规
const openProductForm = async (type, row, index) => {
- // 缂栬緫鏃舵鏌ヤ骇鍝佹槸鍚﹀凡鍙戣揣鎴栧鏍搁�氳繃
+ // 缂栬緫鏃舵鏌ヤ骇鍝佹槸鍚﹀凡鍑哄簱鎴栧鏍搁�氳繃
if (type === "edit" && isProductShipped(row)) {
- proxy.$modal.msgWarning("宸插彂璐ф垨瀹℃牳閫氳繃鐨勪骇鍝佷笉鑳界紪杈�");
+ proxy.$modal.msgWarning("宸插嚭搴撴垨瀹℃牳閫氳繃鐨勪骇鍝佷笉鑳界紪杈�");
return;
}
@@ -5139,12 +5139,12 @@
return;
}
- // 妫�鏌ユ槸鍚︽湁宸插彂璐ф垨瀹℃牳閫氳繃鐨勪骇鍝�
+ // 妫�鏌ユ槸鍚︽湁宸插嚭搴撴垨瀹℃牳閫氳繃鐨勪骇鍝�
const shippedProducts = productSelectedRows.value.filter(row =>
isProductShipped(row)
);
if (shippedProducts.length > 0) {
- proxy.$modal.msgWarning("宸插彂璐ф垨瀹℃牳閫氳繃鐨勪骇鍝佷笉鑳藉垹闄�");
+ proxy.$modal.msgWarning("宸插嚭搴撴垨瀹℃牳閫氳繃鐨勪骇鍝佷笉鑳藉垹闄�");
return;
}
@@ -5347,24 +5347,24 @@
);
exportProcessRouteDialogVisible.value = false;
};
- /** 鍒ゆ柇鍗曚釜浜у搧鏄惁宸插彂璐э紙鏍规嵁shippingStatus鍒ゆ柇锛屽凡鍙戣揣鎴栧鏍搁�氳繃涓嶅彲缂栬緫鍜屽垹闄わ級 */
+ /** 鍒ゆ柇鍗曚釜浜у搧鏄惁宸插嚭搴擄紙鏍规嵁shippingStatus鍒ゆ柇锛屽凡鍑哄簱鎴栧鏍搁�氳繃涓嶅彲缂栬緫鍜屽垹闄わ級 */
const isProductShipped = product => {
if (!product) return false;
const status = String(product.shippingStatus || "").trim();
- // 濡傛灉鍙戣揣鐘舵�佹槸"宸插彂璐�"鎴�"瀹℃牳閫氳繃"锛屽垯涓嶅彲缂栬緫鍜屽垹闄�
- return status === "宸插彂璐�" || status === "瀹℃牳閫氳繃";
+ // 濡傛灉鍙戣揣鐘舵�佹槸"宸插嚭搴�"鎴�"瀹℃牳閫氳繃"锛屽垯涓嶅彲缂栬緫鍜屽垹闄�
+ return status === "宸插嚭搴�" || status === "瀹℃牳閫氳繃";
};
- /** 鍒ゆ柇閿�鍞鍗曚笅鏄惁瀛樺湪宸插彂璐�/鍙戣揣瀹屾垚鐨勪骇鍝侊紙涓嶅彲鍒犻櫎锛� */
+ /** 鍒ゆ柇閿�鍞鍗曚笅鏄惁瀛樺湪宸插嚭搴�/鍙戣揣瀹屾垚鐨勪骇鍝侊紙涓嶅彲鍒犻櫎锛� */
const hasShippedProducts = products => {
if (!products || !products.length) return false;
return products.some(p => {
const status = String(p.shippingStatus || "").trim();
- // 鏈夊彂璐ф棩鏈熸垨杞︾墝鍙疯涓哄凡鍙戣揣
+ // 鏈夊彂璐ф棩鏈熸垨杞︾墝鍙疯涓哄凡鍑哄簱
if (p.shippingDate || p.shippingCarNumber) return true;
- // 宸茶繘琛屽彂璐с�佸彂璐у畬鎴愩�佸凡鍙戣揣 鍧囦笉鍙垹闄�
+ // 宸茶繘琛屽彂璐с�佸彂璐у畬鎴愩�佸凡鍑哄簱 鍧囦笉鍙垹闄�
return (
- status === "宸茶繘琛屽彂璐�" || status === "鍙戣揣瀹屾垚" || status === "宸插彂璐�"
+ status === "宸茶繘琛屽彂璐�" || status === "鍙戣揣瀹屾垚" || status === "宸插嚭搴�"
);
});
};
@@ -5880,9 +5880,9 @@
* @param row 琛屾暟鎹�
*/
const getShippingStatusText = row => {
- // 濡傛灉宸插彂璐э紙鏈夊彂璐ф棩鏈熸垨杞︾墝鍙凤級锛屾樉绀�"宸插彂璐�"
+ // 濡傛灉宸插嚭搴擄紙鏈夊彂璐ф棩鏈熸垨杞︾墝鍙凤級锛屾樉绀�"宸插嚭搴�"
if (row.shippingDate || row.shippingCarNumber) {
- return "宸插彂璐�";
+ return "宸插嚭搴�";
}
// 鑾峰彇鍙戣揣鐘舵�佸瓧娈�
@@ -5901,7 +5901,7 @@
瀹℃牳涓�: "瀹℃牳涓�",
瀹℃牳鎷掔粷: "瀹℃牳鎷掔粷",
瀹℃牳閫氳繃: "瀹℃牳閫氳繃",
- 宸插彂璐�: "宸插彂璐�",
+ 宸插嚭搴�: "宸插嚭搴�",
};
return statusTextMap[statusStr] || "寰呭彂璐�";
};
@@ -5911,7 +5911,7 @@
* @param row 琛屾暟鎹�
*/
const getShippingStatusType = row => {
- // 濡傛灉宸插彂璐э紙鏈夊彂璐ф棩鏈熸垨杞︾墝鍙凤級锛屾樉绀虹豢鑹�
+ // 濡傛灉宸插嚭搴擄紙鏈夊彂璐ф棩鏈熸垨杞︾墝鍙凤級锛屾樉绀虹豢鑹�
if (row.shippingDate || row.shippingCarNumber) {
return "success";
}
@@ -5932,7 +5932,7 @@
瀹℃牳涓�: "warning",
瀹℃牳鎷掔粷: "danger",
瀹℃牳閫氳繃: "success",
- 宸插彂璐�: "success",
+ 宸插嚭搴�: "success",
};
return typeTextMap[statusStr] || "info";
};
@@ -5948,7 +5948,7 @@
return false;
}
- // 鍙拌处绾у彂璐х姸鎬侊紙deliveryStatus锛夛細2瀹℃壒涓��5宸插彂璐� 鏃朵笉鍙啀鍙戣捣鏈鍙戣揣锛�6閮ㄥ垎鍙戣揣浠嶅彲鎸夋槑缁嗙户缁彂
+ // 鍙拌处绾у彂璐х姸鎬侊紙deliveryStatus锛夛細2瀹℃壒涓��5宸插嚭搴� 鏃朵笉鍙啀鍙戣捣鏈鍙戣揣锛�6閮ㄥ垎鍙戣揣浠嶅彲鎸夋槑缁嗙户缁彂
const deliveryStatus = row.deliveryStatus;
if (
deliveryStatus !== null &&
@@ -5962,7 +5962,7 @@
// 鑾峰彇鍙戣揣鐘舵��
const shippingStatus = row.shippingStatus;
- // 濡傛灉宸插彂璐э紙鏈夊彂璐ф棩鏈熸垨杞︾墝鍙凤級锛屼笉鑳藉啀娆″彂璐�
+ // 濡傛灉宸插嚭搴擄紙鏈夊彂璐ф棩鏈熸垨杞︾墝鍙凤級锛屼笉鑳藉啀娆″彂璐�
if (row.shippingDate || row.shippingCarNumber) {
return false;
}
@@ -6012,14 +6012,14 @@
return;
}
- // 鍏佽锛�1鏈彂璐с��3瀹℃壒涓嶉�氳繃銆�4瀹℃壒閫氳繃銆�6閮ㄥ垎鍙戣揣锛涗笉鍏佽锛�2瀹℃壒涓��5宸插彂璐�
+ // 鍏佽锛�1鏈嚭搴撱��3瀹℃壒涓嶉�氳繃銆�4瀹℃壒閫氳繃銆�6閮ㄥ垎鍙戣揣锛涗笉鍏佽锛�2瀹℃壒涓��5宸插嚭搴�
const statusItem = selectedRows.value[0].deliveryStatus;
const ledgerAllowsDelivery = s => [1, 3, 4, 6].includes(Number(s));
let isTrue = true;
selectedRows.value.forEach(row => {
if (!ledgerAllowsDelivery(row.deliveryStatus)) {
proxy.$modal.msgWarning(
- "浠呮湭鍙戣揣銆佸鎵逛笉閫氳繃銆佸鎵归�氳繃鎴栭儴鍒嗗彂璐х殑鍙拌处鍙互鍙戣揣"
+ "浠呮湭鍑哄簱銆佸鎵逛笉閫氳繃銆佸鎵归�氳繃鎴栭儴鍒嗗彂璐х殑鍙拌处鍙互鍙戣揣"
);
isTrue = false;
return;
@@ -6063,7 +6063,7 @@
);
if (shippedLedgers.length === selectedRows.value.length) {
try {
- await ElMessageBox.alert("鎵�閫夐攢鍞彴璐﹀潎宸插彂璐э紝涓嶈兘鍐嶆鍙戣揣銆�", "鎻愮ず", {
+ await ElMessageBox.alert("鎵�閫夐攢鍞彴璐﹀潎宸插嚭搴擄紝涓嶈兘鍐嶆鍙戣揣銆�", "鎻愮ず", {
type: "warning",
confirmButtonText: "鐭ラ亾浜�",
});
@@ -6075,7 +6075,7 @@
if (shippedLedgers.length > 0) {
try {
await ElMessageBox.alert(
- "閫変腑鐨勯攢鍞彴璐︿腑鍖呭惈宸插彂璐ц褰曪紝宸插彂璐х殑涓嶈兘鍐嶆鍙戣揣锛岀郴缁熷皢浠呬负鏈彂璐у彴璐﹀鐞嗐��",
+ "閫変腑鐨勯攢鍞彴璐︿腑鍖呭惈宸插嚭搴撹褰曪紝宸插嚭搴撶殑涓嶈兘鍐嶆鍙戣揣锛岀郴缁熷皢浠呬负鏈嚭搴撳彴璐﹀鐞嗐��",
"鎻愮ず",
{
type: "warning",
@@ -6177,7 +6177,7 @@
const status = Number(row.deliveryStatus);
if (![1, 3, 4, 6].includes(status)) {
proxy.$modal.msgWarning(
- "鍙湁鍙戣揣鐘舵�佷负鏈彂璐с�佸鎵逛笉閫氳繃銆佸鎵归�氳繃鎴栭儴鍒嗗彂璐х殑璁板綍鎵嶅彲浠ュ彂璐�"
+ "鍙湁鍙戣揣鐘舵�佷负鏈嚭搴撱�佸鎵逛笉閫氳繃銆佸鎵归�氳繃鎴栭儴鍒嗗彂璐х殑璁板綍鎵嶅彲浠ュ彂璐�"
);
return;
}
--
Gitblit v1.9.3