From 7b2b3bb85db79bafe2132f4708688cfe8c7c1c95 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 25 六月 2026 13:04:42 +0800
Subject: [PATCH] Merge branch 'dev_NEW_pro' of http://114.132.189.42:9002/r/product-inventory-management into dev_NEW_pro
---
src/views/index.vue | 14 +++++++-------
src/api/viewIndex.js | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/api/viewIndex.js b/src/api/viewIndex.js
index 4d2923c..0087d66 100644
--- a/src/api/viewIndex.js
+++ b/src/api/viewIndex.js
@@ -349,7 +349,7 @@
export const productionOrderProgress = (params = {}) => {
const safePageNum = Math.max(1, Number(params.pageNum || 1));
- const safeTab = ["all", "inProgress", "completed", "paused"].includes(params.tab)
+ const safeTab = ["all", "inProgress", "completed", "end"].includes(params.tab)
? params.tab
: "all";
return request({
diff --git a/src/views/index.vue b/src/views/index.vue
index aec7bad..4a03b41 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -117,7 +117,7 @@
<el-radio-button :value="'waiting'">寰呭紑濮�({{ orderProgressMeta.waitingCount }})</el-radio-button>
<el-radio-button :value="'inProgress'">杩涜涓�({{ orderProgressMeta.inProgressCount }})</el-radio-button>
<el-radio-button :value="'completed'">宸插畬鎴�({{ orderProgressMeta.completedCount }})</el-radio-button>
- <el-radio-button :value="'paused'">宸叉殏鍋�({{ orderProgressMeta.pausedCount }})</el-radio-button>
+ <el-radio-button :value="'end'">宸茬粨鏉�({{ orderProgressMeta.endCount }})</el-radio-button>
</el-radio-group>
</div>
<div class="order-table-wrap">
@@ -477,7 +477,7 @@
waitingCount: 0,
inProgressCount: 0,
completedCount: 0,
- pausedCount: 0,
+ endCount: 0,
});
const todayPlanList = ref([]);
@@ -852,12 +852,12 @@
const productionOrders = ref([]);
-const orderFilterOptions = ["all", "waiting", "inProgress", "completed", "paused"];
+const orderFilterOptions = ["all", "waiting", "inProgress", "completed", "end"];
const orderFilterAliasMap = {
1: "waiting",
2: "inProgress",
3: "completed",
- 4: "paused",
+ 5: "end",
};
const orderFilter = ref("all");
const filteredOrders = computed(() => productionOrders.value);
@@ -1157,7 +1157,7 @@
1: "寰呭紑濮�",
2: "杩涜涓�",
3: "宸插畬鎴�",
- 4: "宸叉殏鍋�",
+ 5: "宸茬粨鏉�",
};
return mapping[status] || "鏈煡";
};
@@ -1264,7 +1264,7 @@
waitingCount: resolveProgressCount(data.waitingCount, statusValue, "waiting", total),
inProgressCount: resolveProgressCount(data.inProgressCount, statusValue, "inProgress", total),
completedCount: resolveProgressCount(data.completedCount, statusValue, "completed", total),
- pausedCount: resolveProgressCount(data.pausedCount, statusValue, "paused", total),
+ endCount: resolveProgressCount(data.endCount, statusValue, "end", total),
};
productionOrders.value = (data.records || []).map(mapOrderProgressRecord);
} catch {
@@ -1278,7 +1278,7 @@
waitingCount: 0,
inProgressCount: 0,
completedCount: 0,
- pausedCount: 0,
+ endCount: 0,
};
productionOrders.value = [];
}
--
Gitblit v1.9.3