From 7726b6cdab80596d2e2f7dd3fe1ec3dfbdeee155 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期五, 12 六月 2026 09:42:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_pro_河南鹤壁
---
src/views/equipmentManagement/upkeep/index.vue | 58 ++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 40 insertions(+), 18 deletions(-)
diff --git a/src/views/equipmentManagement/upkeep/index.vue b/src/views/equipmentManagement/upkeep/index.vue
index 6bdbc8f..52ad842 100644
--- a/src/views/equipmentManagement/upkeep/index.vue
+++ b/src/views/equipmentManagement/upkeep/index.vue
@@ -2,8 +2,8 @@
<div class="app-container">
<el-tabs v-model="activeTab"
@tab-change="handleTabChange">
- <!-- 瀹氭椂浠诲姟绠＄悊tab -->
- <el-tab-pane label="瀹氭椂浠诲姟绠＄悊"
+ <!-- 淇濆吇浠诲姟tab -->
+ <el-tab-pane label="淇濆吇浠诲姟"
name="scheduled">
<div class="search_form">
<el-form :model="scheduledFilters"
@@ -37,7 +37,7 @@
<div class="table_list">
<div class="actions">
<el-text class="mx-1"
- size="large">瀹氭椂浠诲姟绠＄悊</el-text>
+ size="large">淇濆吇浠诲姟</el-text>
<div>
<el-button type="primary"
icon="Plus"
@@ -63,6 +63,12 @@
}"
@selection-change="handleScheduledSelectionChange"
@pagination="changeScheduledPage">
+ <template #isActiveRef="{ row }">
+ <el-tag v-if="row.isActive === 1"
+ type="success">寮�鍚�</el-tag>
+ <el-tag v-else
+ type="info">鍏抽棴</el-tag>
+ </template>
<template #statusRef="{ row }">
<el-tag v-if="row.status === 1"
type="success">鍚敤</el-tag>
@@ -84,8 +90,8 @@
</PIMTable>
</div>
</el-tab-pane>
- <!-- 浠诲姟璁板綍tab锛堝師璁惧淇濆吇椤甸潰锛� -->
- <el-tab-pane label="浠诲姟璁板綍"
+ <!-- 淇濆吇璁板綍tab锛堝師璁惧淇濆吇椤甸潰锛� -->
+ <el-tab-pane label="淇濆吇璁板綍"
name="record">
<div class="search_form">
<el-form :model="filters"
@@ -130,7 +136,7 @@
<div class="table_list">
<div class="actions">
<el-text class="mx-1"
- size="large">浠诲姟璁板綍</el-text>
+ size="large">淇濆吇璁板綍</el-text>
<div>
<el-button type="success"
icon="Van"
@@ -262,7 +268,7 @@
const fileDialogVisible = ref(false);
const currentMaintenanceTaskId = ref(null);
- // 浠诲姟璁板綍tab锛堝師璁惧淇濆吇椤甸潰锛夌浉鍏冲彉閲�
+ // 淇濆吇璁板綍tab锛堝師璁惧淇濆吇椤甸潰锛夌浉鍏冲彉閲�
const filters = reactive({
deviceName: "",
maintenancePlanTime: "",
@@ -278,7 +284,7 @@
});
const multipleList = ref([]);
- // 瀹氭椂浠诲姟绠＄悊tab鐩稿叧鍙橀噺
+ // 淇濆吇浠诲姟tab鐩稿叧鍙橀噺
const scheduledFilters = reactive({
taskName: "",
status: "",
@@ -292,7 +298,7 @@
});
const scheduledMultipleList = ref([]);
- // 瀹氭椂浠诲姟绠＄悊琛ㄦ牸鍒楅厤缃�
+ // 淇濆吇浠诲姟琛ㄦ牸鍒楅厤缃�
const scheduledColumns = ref([
{ prop: "taskName", label: "璁惧鍚嶇О" },
{
@@ -308,7 +314,7 @@
{
prop: "frequencyType",
label: "棰戞",
- minWidth: 150,
+ minWidth: 50,
// PIMTable 浣跨敤鐨勬槸 formatData锛岃�屼笉鏄� Element-Plus 鐨� formatter
formatData: cell =>
({
@@ -321,7 +327,7 @@
{
prop: "frequencyDetail",
label: "寮�濮嬫棩鏈熶笌鏃堕棿",
- minWidth: 150,
+ minWidth: 130,
// 鍚屾牱鏀圭敤 formatData锛孭IMTable 鍐呴儴浼氭妸鍗曞厓鏍煎�间紶杩涙潵
formatData: cell => {
if (typeof cell !== "string") return "";
@@ -342,20 +348,34 @@
);
},
},
+ {
+ prop: "isActive",
+ label: "瀹氭椂浠诲姟",
+ dataType: "slot",
+ slot: "isActiveRef",
+ align: "center",
+ minWidth: 100,
+ },
{ prop: "maintenancePerson", label: "淇濆吇浜�", minWidth: 100 },
{ prop: "registrant", label: "鐧昏浜�", minWidth: 100 },
- { prop: "registrationDate", label: "鐧昏鏃ユ湡", minWidth: 100 },
+ {
+ prop: "registrationDate",
+ label: "鐧昏鏃ユ湡",
+ minWidth: 100,
+ formatData: cell =>
+ cell ? dayjs(cell).format("YYYY-MM-DD") : "-",
+ },
{
fixed: "right",
label: "鎿嶄綔",
dataType: "slot",
slot: "operation",
align: "center",
- width: "200px",
+ width: "150px",
},
]);
- // 浠诲姟璁板綍琛ㄦ牸鍒楅厤缃紙鍘熻澶囦繚鍏昏〃鏍煎垪锛�
+ // 淇濆吇璁板綍琛ㄦ牸鍒楅厤缃紙鍘熻澶囦繚鍏昏〃鏍煎垪锛�
const columns = ref([
{
label: "璁惧鍚嶇О",
@@ -371,7 +391,9 @@
label: "璁″垝淇濆吇鏃ユ湡",
align: "center",
prop: "maintenancePlanTime",
- formatData: cell => dayjs(cell).format("YYYY-MM-DD"),
+ formatData: cell => {
+ return cell == null ? "-" : dayjs(cell).format("YYYY-MM-DD");
+ },
},
{
label: "褰曞叆浜�",
@@ -401,7 +423,7 @@
align: "center",
prop: "maintenanceActuallyTime",
formatData: cell =>
- cell ? dayjs(cell).format("YYYY-MM-DD HH:mm:ss") : "-",
+ cell ? dayjs(cell).format("YYYY-MM-DD") : "-",
},
{
label: "淇濆吇缁撴灉",
@@ -436,7 +458,7 @@
}
};
- // 瀹氭椂浠诲姟绠＄悊鐩稿叧鏂规硶
+ // 淇濆吇浠诲姟鐩稿叧鏂规硶
const getScheduledTableData = async () => {
try {
const params = {
@@ -503,7 +525,7 @@
ElMessage.info("瀵煎嚭瀹氭椂浠诲姟鍔熻兘寰呭疄鐜�");
};
- // 浠诲姟璁板綍鐩稿叧鏂规硶锛堝師璁惧淇濆吇椤甸潰鏂规硶锛�
+ // 淇濆吇璁板綍鐩稿叧鏂规硶锛堝師璁惧淇濆吇椤甸潰鏂规硶锛�
const getTableData = async () => {
try {
const params = {
--
Gitblit v1.9.3