From b95a00bf7ec7c667e16032bcabc4d97ef42909fc Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 18 五月 2026 15:27:20 +0800
Subject: [PATCH] feat: 设备保养添加任务状态
---
src/views/equipmentManagement/upkeep/index.vue | 187 +++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 166 insertions(+), 21 deletions(-)
diff --git a/src/views/equipmentManagement/upkeep/index.vue b/src/views/equipmentManagement/upkeep/index.vue
index 046c0fa..56e54c7 100644
--- a/src/views/equipmentManagement/upkeep/index.vue
+++ b/src/views/equipmentManagement/upkeep/index.vue
@@ -16,9 +16,9 @@
/>
</el-form-item>
<el-form-item label="浠诲姟鐘舵��">
- <el-select v-model="scheduledFilters.status" placeholder="璇烽�夋嫨浠诲姟鐘舵��" clearable style="width: 200px">
- <el-option label="鍚敤" value="1" />
- <el-option label="鍋滅敤" value="0" />
+ <el-select v-model="scheduledFilters.isActive" placeholder="璇烽�夋嫨浠诲姟鐘舵��" clearable style="width: 200px">
+ <el-option label="鍚敤" :value="1" />
+ <el-option label="鍋滅敤" :value="0" />
</el-select>
</el-form-item>
<el-form-item>
@@ -58,8 +58,8 @@
@pagination="changeScheduledPage"
>
<template #statusRef="{ row }">
- <el-tag v-if="row.status === 1" type="success">鍚敤</el-tag>
- <el-tag v-if="row.status === 0" type="danger">鍋滅敤</el-tag>
+ <el-tag v-if="row.isActive === 1" type="success">鍚敤</el-tag>
+ <el-tag v-if="row.isActive === 0" type="danger">鍋滅敤</el-tag>
</template>
<template #operation="{ row }">
<el-button
@@ -162,23 +162,19 @@
@selection-change="handleSelectionChange"
@pagination="changePage"
>
- <template #maintenanceResultRef="{ row }">
- <div>{{ row.maintenanceResult || '-' }}</div>
- </template>
<template #statusRef="{ row }">
<el-tag v-if="row.status === 2" type="danger">澶辫触</el-tag>
<el-tag v-if="row.status === 1" type="success">瀹岀粨</el-tag>
<el-tag v-if="row.status === 0" type="warning">寰呬繚鍏�</el-tag>
</template>
<template #operation="{ row }">
- <!-- 杩欎釜鍔熻兘璺熸柊澧炰繚鍏诲姛鑳戒竴妯′竴鏍凤紝鏈夊暐鎰忎箟锛� -->
- <!-- <el-button
- type="primary"
- text
- @click="addMaintain(row)"
+ <el-button
+ type="primary"
+ link
+ @click="openDetail(row)"
>
- 鏂板淇濆吇
- </el-button> -->
+ 璇︽儏
+ </el-button>
<el-button
type="primary"
link
@@ -203,6 +199,13 @@
>
鍒犻櫎
</el-button>
+ <el-button
+ type="primary"
+ link
+ @click="openFileDialog(row)"
+ >
+ 闄勪欢
+ </el-button>
</template>
</PIMTable>
</div>
@@ -211,6 +214,20 @@
<PlanModal ref="planModalRef" @ok="getTableData" />
<MaintenanceModal ref="maintainModalRef" @ok="getTableData" />
<FormDia ref="formDiaRef" @closeDia="getScheduledTableData" />
+ <UpkeepDetailModal ref="upkeepDetailModalRef" :java-api="javaApi" />
+ <FileListDialog
+ ref="fileListDialogRef"
+ v-model="fileDialogVisible"
+ :title="currentRecordFinished ? '闄勪欢锛堝凡瀹岀粨锛屼粎鍙煡鐪嬶級' : '闄勪欢'"
+ :show-upload-button="!currentRecordFinished"
+ :show-delete-button="!currentRecordFinished"
+ :delete-method="handleAttachmentDelete"
+ :name-column-label="'闄勪欢鍚嶇О'"
+ :upload-url="maintenanceFileUploadUrl"
+ :upload-data="maintenanceFileUploadData"
+ :upload-direct-save="true"
+ @upload="refreshFileList"
+ />
</div>
</template>
@@ -220,13 +237,19 @@
import { ElMessage, ElMessageBox } from 'element-plus'
import PlanModal from './Form/PlanModal.vue'
import MaintenanceModal from './Form/MaintenanceModal.vue'
+import UpkeepDetailModal from './Form/UpkeepDetailModal.vue'
import FormDia from './Form/formDia.vue'
+import FileListDialog from '@/components/Dialog/FileListDialog.vue'
import {
getUpkeepPage,
delUpkeep,
deviceMaintenanceTaskList,
deviceMaintenanceTaskDel,
} from '@/api/equipmentManagement/upkeep'
+import {
+ listMaintenanceTaskFiles,
+ delMaintenanceTaskFile,
+} from '@/api/equipmentManagement/maintenanceTaskFile'
import dayjs from 'dayjs'
const { proxy } = getCurrentInstance()
@@ -238,8 +261,40 @@
const planModalRef = ref()
// 淇濆吇寮圭獥鎺у埗鍣�
const maintainModalRef = ref()
+const upkeepDetailModalRef = ref()
// 瀹氭椂浠诲姟寮圭獥鎺у埗鍣�
const formDiaRef = ref()
+// 闄勪欢寮圭獥
+const fileListDialogRef = ref(null)
+const fileDialogVisible = ref(false)
+const currentMaintenanceTaskId = ref(null)
+/** 褰撳墠闄勪欢鎵�灞炶褰曟槸鍚﹀凡瀹岀粨锛坰tatus=1锛� */
+const currentRecordFinished = ref(false)
+
+const javaApi = import.meta.env.VITE_APP_BASE_API
+const maintenanceFileUploadUrl = `${javaApi}/maintenanceTaskFile/upload`
+const maintenanceFileUploadData = computed(() => ({
+ deviceMaintenanceId: currentMaintenanceTaskId.value,
+}))
+
+const normalizeMaintenanceFileUrl = (rawUrl = "") => {
+ let fileUrl = rawUrl || ""
+ if (!fileUrl) return ""
+ if (fileUrl.startsWith("http://") || fileUrl.startsWith("https://")) return fileUrl
+ if (fileUrl.indexOf("\\") > -1) {
+ const lowerPath = fileUrl.toLowerCase()
+ const uploadPathIndex = lowerPath.indexOf("uploadpath")
+ if (uploadPathIndex > -1) {
+ fileUrl = fileUrl.substring(uploadPathIndex).replace(/\\/g, "/")
+ } else {
+ fileUrl = fileUrl.replace(/\\/g, "/")
+ }
+ }
+ fileUrl = fileUrl.replace(/^\/?uploadPath/i, "/profile")
+ if (!fileUrl.startsWith("/")) fileUrl = "/" + fileUrl
+ if (!fileUrl.startsWith(javaApi)) fileUrl = javaApi + fileUrl
+ return fileUrl
+}
// 浠诲姟璁板綍tab锛堝師璁惧淇濆吇椤甸潰锛夌浉鍏冲彉閲�
const filters = reactive({
@@ -260,7 +315,7 @@
// 瀹氭椂浠诲姟绠＄悊tab鐩稿叧鍙橀噺
const scheduledFilters = reactive({
taskName: '',
- status: '',
+ isActive: '',
})
const scheduledDataList = ref([])
@@ -312,7 +367,22 @@
}
},
{ prop: "registrant", label: "鐧昏浜�", minWidth: 100 },
+ { prop: "maintenancePerson", label: "淇濆吇浜�", minWidth: 100 },
+ {
+ prop: "maintenanceItems",
+ label: "淇濆吇椤圭洰",
+ minWidth: 180,
+ showOverflowTooltip: true,
+ },
{ prop: "registrationDate", label: "鐧昏鏃ユ湡", minWidth: 100 },
+ {
+ label: "浠诲姟鐘舵��",
+ prop: "isActive",
+ minWidth: 100,
+ dataType: "slot",
+ slot: "statusRef",
+ align: "center",
+ },
{
fixed: "right",
label: "鎿嶄綔",
@@ -334,6 +404,17 @@
label: "瑙勬牸鍨嬪彿",
align: "center",
prop: "deviceModel",
+ },
+ {
+ label: "淇濆吇椤圭洰",
+ align: "center",
+ prop: "maintenanceLocation",
+ showOverflowTooltip: true,
+ },
+ {
+ label: "淇濆吇浜�",
+ align: "center",
+ prop: "maintenancePerson",
},
{
label: "璁″垝淇濆吇鏃ユ湡",
@@ -369,8 +450,8 @@
label: "淇濆吇缁撴灉",
align: "center",
prop: "maintenanceResult",
- dataType: "slot",
- slot: "maintenanceResultRef",
+ minWidth: 200,
+ showOverflowTooltip: true,
},
{
label: "鐘舵��",
@@ -385,7 +466,7 @@
dataType: "slot",
slot: "operation",
align: "center",
- width: "300px",
+ width: "400px",
},
])
@@ -405,7 +486,7 @@
current: scheduledPagination.currentPage,
size: scheduledPagination.pageSize,
taskName: scheduledFilters.taskName || undefined,
- status: scheduledFilters.status || undefined,
+ isActive: scheduledFilters.isActive !== '' ? scheduledFilters.isActive : undefined,
}
const { code, data } = await deviceMaintenanceTaskList(params)
if (code === 200) {
@@ -419,7 +500,7 @@
const resetScheduledFilters = () => {
scheduledFilters.taskName = ''
- scheduledFilters.status = ''
+ scheduledFilters.isActive = ''
getScheduledTableData()
}
@@ -571,6 +652,70 @@
getTableData()
}
+// 闄勪欢鐩稿叧鏂规硶
+// 鏌ヨ闄勪欢鍒楄〃
+const fetchMaintenanceTaskFiles = async (deviceMaintenanceId) => {
+ try {
+ const params = {
+ current: 1,
+ size: 100,
+ deviceMaintenanceId,
+ }
+ const res = await listMaintenanceTaskFiles(params)
+ const records = res?.data?.records || []
+ const mapped = records.map(item => ({
+ id: item.id,
+ name: item.fileName || item.name,
+ url: normalizeMaintenanceFileUrl(item.fileUrl || item.url),
+ raw: item,
+ }))
+ fileListDialogRef.value?.setList(mapped)
+ } catch (error) {
+ ElMessage.error('鑾峰彇闄勪欢鍒楄〃澶辫触')
+ }
+}
+
+const openDetail = (row) => {
+ upkeepDetailModalRef.value?.open(row)
+}
+
+// 鎵撳紑闄勪欢寮圭獥
+const openFileDialog = async (row) => {
+ currentMaintenanceTaskId.value = row.id
+ currentRecordFinished.value = row.status === 1
+ fileDialogVisible.value = true
+ await fetchMaintenanceTaskFiles(row.id)
+}
+
+// 鍒锋柊闄勪欢鍒楄〃
+const refreshFileList = async () => {
+ if (!currentMaintenanceTaskId.value) return
+ await fetchMaintenanceTaskFiles(currentMaintenanceTaskId.value)
+}
+
+// 鍒犻櫎闄勪欢锛堝凡瀹岀粨涓嶅彲鍒狅級
+const handleAttachmentDelete = async (row) => {
+ if (currentRecordFinished.value) {
+ ElMessage.warning('璇ヤ繚鍏诲凡瀹岀粨锛屼笉鍙垹闄ら檮浠�')
+ return false
+ }
+ if (!row?.id) return false
+ try {
+ await ElMessageBox.confirm('纭鍒犻櫎璇ラ檮浠讹紵', '鎻愮ず', { type: 'warning' })
+ } catch {
+ return false
+ }
+ try {
+ await delMaintenanceTaskFile(row.id)
+ ElMessage.success('鍒犻櫎鎴愬姛')
+ await refreshFileList()
+ return true
+ } catch (error) {
+ ElMessage.error('鍒犻櫎澶辫触')
+ return false
+ }
+}
+
onMounted(() => {
// 鏍规嵁榛樿婵�娲荤殑 Tab 璋冪敤瀵瑰簲鐨勬煡璇㈡帴鍙�
if (activeTab.value === 'scheduled') {
--
Gitblit v1.9.3