From 47bae1f938f915206e3934ea960aff975e5738c9 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 12 六月 2026 16:09:49 +0800
Subject: [PATCH] feat(teachingDemo): 新增工艺路线与BOM教学演示模块
---
src/views/index.vue | 80 ++++++++++++++++++++++++++++++++--------
1 files changed, 64 insertions(+), 16 deletions(-)
diff --git a/src/views/index.vue b/src/views/index.vue
index 3176042..e12ded2 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -113,10 +113,11 @@
<div class="panel-title-row">
<div class="panel-title">鐢熶骇璁㈠崟杩涘害</div>
<el-radio-group v-model="orderFilter" size="small">
- <el-radio-button label="all">鍏ㄩ儴({{ orderProgressMeta.total }})</el-radio-button>
- <el-radio-button label="inProgress">杩涜涓�({{ orderProgressMeta.inProgressCount }})</el-radio-button>
- <el-radio-button label="completed">宸插畬鎴�({{ orderProgressMeta.completedCount }})</el-radio-button>
- <el-radio-button label="paused">宸叉殏鍋�({{ orderProgressMeta.pausedCount }})</el-radio-button>
+ <el-radio-button :value="'all'">鍏ㄩ儴({{ orderProgressMeta.total }})</el-radio-button>
+ <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-group>
</div>
<el-table :data="filteredOrders" stripe>
@@ -319,7 +320,7 @@
<div class="process-selection-wrapper">
<el-checkbox-group v-model="tempProcessIds">
<div class="process-grid">
- <el-checkbox v-for="item in processOptions" :key="item.id" :label="item.id" border>
+ <el-checkbox v-for="item in processOptions" :key="item.id" :value="item.id" border>
{{ item.name }}
</el-checkbox>
</div>
@@ -454,10 +455,13 @@
});
const orderProgressMeta = ref({
+ status: "all",
tab: "all",
+ bizDate: null,
total: 0,
pageNum: 1,
pageSize: 10,
+ waitingCount: 0,
inProgressCount: 0,
completedCount: 0,
pausedCount: 0,
@@ -832,8 +836,36 @@
const productionOrders = ref([]);
+const orderFilterOptions = ["all", "waiting", "inProgress", "completed", "paused"];
+const orderFilterAliasMap = {
+ 1: "waiting",
+ 2: "inProgress",
+ 3: "completed",
+ 4: "paused",
+};
const orderFilter = ref("all");
const filteredOrders = computed(() => productionOrders.value);
+
+const normalizeOrderFilter = (value, fallback = "all") => {
+ const safeFallback = orderFilterOptions.includes(fallback) ? fallback : "all";
+ const text = String(value ?? "").trim();
+ if (orderFilterAliasMap[text]) {
+ return orderFilterAliasMap[text];
+ }
+ return orderFilterOptions.includes(text) ? text : safeFallback;
+};
+
+const parseCount = (value) => {
+ if (value === null || value === undefined || value === "") return null;
+ const num = Number(value);
+ return Number.isFinite(num) ? num : null;
+};
+
+const resolveProgressCount = (rawValue, currentStatus, targetStatus, total) => {
+ const count = parseCount(rawValue);
+ if (count !== null) return count;
+ return currentStatus === targetStatus ? total : 0;
+};
const getCompareTrend = (value) => {
const num = Number(value || 0);
@@ -1198,27 +1230,36 @@
const refreshProductionOrderProgress = async () => {
try {
const res = await productionOrderProgress({
+ status: orderFilter.value,
tab: orderFilter.value,
pageNum: 1,
pageSize: 10,
});
const data = res?.data || {};
+ const statusValue = normalizeOrderFilter(data.status, orderFilter.value);
+ const total = Number(data.total || 0);
orderProgressMeta.value = {
+ status: statusValue,
tab: data.tab || orderFilter.value,
- total: Number(data.total || 0),
+ bizDate: data.bizDate || null,
+ total,
pageNum: Number(data.pageNum || 1),
pageSize: Number(data.pageSize || 10),
- inProgressCount: Number(data.inProgressCount || 0),
- completedCount: Number(data.completedCount || 0),
- pausedCount: Number(data.pausedCount || 0),
+ 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),
};
productionOrders.value = (data.records || []).map(mapOrderProgressRecord);
} catch {
orderProgressMeta.value = {
+ status: orderFilter.value,
tab: orderFilter.value,
+ bizDate: null,
total: 0,
pageNum: 1,
pageSize: 10,
+ waitingCount: 0,
inProgressCount: 0,
completedCount: 0,
pausedCount: 0,
@@ -1229,7 +1270,10 @@
const refreshTodayProductionPlan = async () => {
try {
- const res = await todayProductionPlan({ limit: 4 });
+ const res = await todayProductionPlan({
+ limit: 4,
+ planDate: nowDate.value,
+ });
const data = res?.data || {};
todayPlanTotal.value = Number(data.total || 0);
todayPlanList.value = (data.records || []).map(mapTodayPlanRecord);
@@ -1263,9 +1307,12 @@
const statisticsReceivable = async () => {
const res = await statisticsReceivablePayable({ type: 1 });
+ const data = res?.data || {};
+ const payableMoney = Number(data.payableMoney ?? 0);
+ const receivableMoney = Number(data.receivableMoney ?? 0);
barSeries.value[0].data = [
- { value: res.data.payableMoney, itemStyle: { color: barColors2[0] } },
- { value: res.data.receivableMoney, itemStyle: { color: barColors2[1] } },
+ { value: payableMoney, itemStyle: { color: barColors2[0] } },
+ { value: receivableMoney, itemStyle: { color: barColors2[1] } },
];
};
@@ -1275,15 +1322,16 @@
barSeries1.value[0].data = [];
barSeries1.value[1].data = [];
barSeries1.value[2].data = [];
- (res.data.item || []).forEach((item) => {
+ const data = res.data || {};
+ (data.item || []).forEach((item) => {
xAxis1.value[0].data.push(item.date);
barSeries1.value[0].data.push(item.supplierNum);
barSeries1.value[1].data.push(item.processNum);
barSeries1.value[2].data.push(item.factoryNum);
});
- qualityStatisticsObject.value.supplierNum = res.data.supplierNum;
- qualityStatisticsObject.value.processNum = res.data.processNum;
- qualityStatisticsObject.value.factoryNum = res.data.factoryNum;
+ qualityStatisticsObject.value.supplierNum = data.supplierNum || 0;
+ qualityStatisticsObject.value.processNum = data.processNum || 0;
+ qualityStatisticsObject.value.factoryNum = data.factoryNum || 0;
};
const getAmountHalfYearNum = async () => {
--
Gitblit v1.9.3