From c2ded572eff614cf2a259e263e60a5e8feb3e676 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 23 四月 2026 16:52:30 +0800
Subject: [PATCH] fix: 销售订单发货状态修改
---
src/views/salesManagement/salesLedger/index.vue | 35 +++++++++++++++++++++++++++++------
1 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index 083d3db..e4206ad 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -66,8 +66,10 @@
:value="2" />
<el-option label="瀹℃壒澶辫触"
:value="3" />
- <el-option label="宸插彂璐�"
+ <el-option label="瀹℃壒閫氳繃"
:value="4" />
+ <el-option label="宸插彂璐�"
+ :value="5" />
</el-select>
</el-form-item>
<el-form-item label="鍏ュ簱鐘舵�侊細">
@@ -118,8 +120,8 @@
</el-button>
<template #dropdown>
<el-dropdown-menu>
- <el-dropdown-item command="notShipped">鏈彂璐�</el-dropdown-item>
- <el-dropdown-item command="shipped">宸插彂璐�</el-dropdown-item>
+ <el-dropdown-item command="notShipped">鏈嚭搴�</el-dropdown-item>
+ <el-dropdown-item command="shipped">宸插嚭搴�</el-dropdown-item>
</el-dropdown-menu>
</template>
</el-dropdown>
@@ -158,7 +160,7 @@
style="width: 100%"
:summary-method="summarizeMainTable"
@expand-change="expandChange"
- height="calc(100vh - 18.5em)">
+ height="calc(100vh - 22em)">
<el-table-column align="center"
type="selection"
width="55"
@@ -383,6 +385,8 @@
type="success">閮ㄥ垎鍏ュ簱</el-tag>
<el-tag v-else-if="Number(scope.row.stockStatus) === 2"
type="success">宸插叆搴�</el-tag>
+ <el-tag v-else-if="Number(scope.row.stockStatus) === 3"
+ type="warning">瀹℃壒涓�</el-tag>
<el-tag v-else
type="info">-</el-tag>
</template>
@@ -2908,7 +2912,15 @@
notShipped: "/sales/ledger/salesHistory/notShippingImport",
shipped: "/sales/ledger/salesHistory/shippingImport",
};
-
+ const HISTORY_IMPORT_TEMPLATE_URL_MAP = {
+ notShipped: "/sales/ledger/salesHistory/notShippingImportTemplate",
+ shipped: "/sales/ledger/salesHistory/shippingImportTemplate",
+ };
+ const HISTORY_IMPORT_TEMPLATE_FILE_NAME_MAP = {
+ notShipped: "閿�鍞彂璐у巻鍙叉暟鎹鍏ユā鏉�-鏈彂璐�.xlsx",
+ shipped: "閿�鍞彂璐у巻鍙叉暟鎹鍏ユā鏉�-宸插彂璐�.xlsx",
+ };
+ const currentImportCommand = ref("default");
const changeDaterange = value => {
if (value) {
searchForm.entryDateStart = dayjs(value[0]).format("YYYY-MM-DD");
@@ -3875,18 +3887,29 @@
};
// 瀵煎叆
const handleImport = () => {
+ currentImportCommand.value = "default";
openImportDialog("瀵煎叆閿�鍞彴璐�", "/sales/ledger/import");
};
// 鍘嗗彶杩佺Щ
const handleHistoryImportCommand = command => {
const url = HISTORY_IMPORT_URL_MAP[command];
if (!url) return;
- const title = command === "shipped" ? "鍘嗗彶杩佺Щ-宸插彂璐�" : "鍘嗗彶杩佺Щ-鏈彂璐�";
+ currentImportCommand.value = command;
+ const title = command === "shipped" ? "鍘嗗彶杩佺Щ-宸插嚭搴�" : "鍘嗗彶杩佺Щ-鏈嚭搴�";
openImportDialog(title, url);
};
// 涓嬭浇瀵煎叆妯℃澘
const downloadTemplate = () => {
+ const command = currentImportCommand.value;
+ if (command && command !== "default") {
+ const templateUrl = HISTORY_IMPORT_TEMPLATE_URL_MAP[command];
+ const fileName = HISTORY_IMPORT_TEMPLATE_FILE_NAME_MAP[command];
+ if (templateUrl) {
+ proxy.download(templateUrl, {}, fileName || "閿�鍞彂璐у巻鍙叉暟鎹鍏ユā鏉�.xlsx");
+ return;
+ }
+ }
proxy.download("/sales/ledger/exportTemplate", {}, "閿�鍞彴璐﹀鍏ユā鏉�.xlsx");
};
const onClose = () => {
--
Gitblit v1.9.3