From d476be7eda60a04e0cbbc28c5aa048dfceffd789 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 03 七月 2026 15:39:23 +0800
Subject: [PATCH] 新增采购退货后，如果对应的采购退货审批也通过，采购退货记录不能删除，删除按钮置灰
---
src/views/index.vue | 88 ++++++++++++++++++++++++++++++++-----------
1 files changed, 65 insertions(+), 23 deletions(-)
diff --git a/src/views/index.vue b/src/views/index.vue
index 5785cbe..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">
@@ -216,7 +216,7 @@
<div v-if="visiblePanels.todo" class="cockpit-panel todo-panel">
<div class="panel-title-row">
<div class="panel-title">寰呭姙浜嬮」</div>
- <span class="panel-more">鏇村</span>
+ <span class="panel-more" @click="openTodoDialog">鏇村</span>
</div>
<ul class="todo-list" v-if="todoList.length > 0">
<li v-for="item in todoList" :key="item.id" class="todo-item">
@@ -234,7 +234,6 @@
<div v-if="visiblePanels.realtime" class="cockpit-panel realtime-panel">
<div class="panel-title-row">
<div class="panel-title">鐢熶骇瀹炴椂鐪嬫澘</div>
- <span class="panel-more">鏇村</span>
</div>
<div class="realtime-grid">
<div class="realtime-item" v-for="item in realtimeBoard" :key="item.key">
@@ -334,6 +333,18 @@
<el-button type="primary" @click="handleProcessDialogConfirm">纭</el-button>
</span>
</template>
+ </el-dialog>
+
+ <el-dialog v-model="todoDialogVisible" title="鍏ㄩ儴寰呭姙浜嬮」" width="900px" append-to-body destroy-on-close>
+ <div v-loading="todoDialogLoading" class="todo-dialog-body">
+ <el-table :data="todoDialogList" stripe max-height="520">
+ <el-table-column prop="approveId" label="寰呭姙缂栧彿" min-width="160" />
+ <el-table-column prop="approveDeptName" label="閮ㄩ棬/妯℃澘" min-width="160" />
+ <el-table-column prop="approveReason" label="浜嬬敱" min-width="240" show-overflow-tooltip />
+ <el-table-column prop="approveUserName" label="鍙戣捣浜�" min-width="120" />
+ <el-table-column prop="approveTime" label="鏃堕棿" min-width="170" />
+ </el-table>
+ </div>
</el-dialog>
</div>
</template>
@@ -466,11 +477,14 @@
waitingCount: 0,
inProgressCount: 0,
completedCount: 0,
- pausedCount: 0,
+ endCount: 0,
});
const todayPlanList = ref([]);
const todayPlanTotal = ref(0);
+const todoDialogVisible = ref(false);
+const todoDialogLoading = ref(false);
+const todoDialogList = ref([]);
const sum = ref(0);
const yny = ref(0);
@@ -838,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);
@@ -1143,7 +1157,7 @@
1: "寰呭紑濮�",
2: "杩涜涓�",
3: "宸插畬鎴�",
- 4: "宸叉殏鍋�",
+ 5: "宸茬粨鏉�",
};
return mapping[status] || "鏈煡";
};
@@ -1250,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 {
@@ -1264,7 +1278,7 @@
waitingCount: 0,
inProgressCount: 0,
completedCount: 0,
- pausedCount: 0,
+ endCount: 0,
};
productionOrders.value = [];
}
@@ -1273,7 +1287,7 @@
const refreshTodayProductionPlan = async () => {
try {
const res = await todayProductionPlan({
- limit: 4,
+ limit: 1000,
planDate: nowDate.value,
});
const data = res?.data || {};
@@ -1305,6 +1319,19 @@
const todoInfoS = async () => {
const res = await homeTodos();
todoList.value = res.data || [];
+};
+
+const openTodoDialog = async () => {
+ todoDialogVisible.value = true;
+ todoDialogLoading.value = true;
+ try {
+ const res = await homeTodos();
+ todoDialogList.value = res.data || [];
+ } catch {
+ todoDialogList.value = [];
+ } finally {
+ todoDialogLoading.value = false;
+ }
};
const statisticsReceivable = async () => {
@@ -1741,6 +1768,34 @@
font-size: 14px;
color: #2563eb;
cursor: pointer;
+}
+
+.todo-dialog-body {
+ min-height: 220px;
+}
+
+.plan-panel {
+ overflow: hidden;
+}
+
+.plan-list {
+ margin: 10px 0 0;
+ padding: 0 4px 0 0;
+ list-style: none;
+ display: flex;
+ flex-direction: column;
+ gap: 8px;
+ max-height: 300px;
+ overflow-y: auto;
+}
+
+.plan-list::-webkit-scrollbar {
+ width: 6px;
+}
+
+.plan-list::-webkit-scrollbar-thumb {
+ border-radius: 999px;
+ background: rgba(37, 99, 235, 0.28);
}
.todo-list {
@@ -2242,25 +2297,12 @@
transition: transform 0.2s ease, box-shadow 0.2s ease, border-color 0.2s ease;
}
-.plan-panel {
- min-height: 236px;
-}
-
.quality-panel {
min-height: 0;
}
.receipt-panel {
min-height: 340px;
-}
-
-.plan-list {
- margin: 10px 0 0;
- padding: 0;
- list-style: none;
- display: flex;
- flex-direction: column;
- gap: 8px;
}
.plan-item {
--
Gitblit v1.9.3