From 759a2c06bbd187a19c78cb408456e4fb79831840 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 03 十一月 2026 19:16:59 +0800
Subject: [PATCH] 巡检任务频次增加“每年”,日期不精确到时分
---
src/views/equipmentManagement/inspectionManagement/components/formDia.vue | 36 ++++++++++++++++++++++++++++++++++--
src/views/equipmentManagement/inspectionManagement/index.vue | 10 +++++++++-
2 files changed, 43 insertions(+), 3 deletions(-)
diff --git a/src/views/equipmentManagement/inspectionManagement/components/formDia.vue b/src/views/equipmentManagement/inspectionManagement/components/formDia.vue
index e1a0b22..e72d110 100644
--- a/src/views/equipmentManagement/inspectionManagement/components/formDia.vue
+++ b/src/views/equipmentManagement/inspectionManagement/components/formDia.vue
@@ -49,6 +49,7 @@
<el-option label="姣忔棩" value="DAILY"/>
<el-option label="姣忓懆" value="WEEKLY"/>
<el-option label="姣忔湀" value="MONTHLY"/>
+ <el-option label="姣忓勾" value="YEARLY"/>
<!-- <el-option label="瀛e害" value="QUARTERLY"/> -->
</el-select>
</el-form-item>
@@ -84,6 +85,16 @@
format="DD,HH:mm"
value-format="DD,HH:mm"
/>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12" v-if="form.frequencyType === 'YEARLY'">
+ <el-form-item label="鏃ユ湡" prop="frequencyDetail">
+ <el-select v-model="form.yearMonth" placeholder="鏈�" clearable style="width: 50%">
+ <el-option v-for="m in 12" :key="m" :label="m + '鏈�'" :value="String(m)" />
+ </el-select>
+ <el-select v-model="form.yearDay" placeholder="鏃�" clearable style="width: 50%">
+ <el-option v-for="d in 31" :key="d" :label="d + '鏃�'" :value="String(d)" />
+ </el-select>
</el-form-item>
</el-col>
<el-col :span="12" v-if="form.frequencyType === 'QUARTERLY' && form.frequencyType">
@@ -190,7 +201,9 @@
frequencyType: '',
frequencyDetail: '',
week: '',
- time: ''
+ time: '',
+ yearMonth: '',
+ yearDay: ''
},
rules: {
taskName: [{ required: true, message: "璇烽�夋嫨璁惧", trigger: "change" },],
@@ -210,6 +223,12 @@
if (form.value.frequencyType === 'WEEKLY') {
if (!form.value.week || !form.value.time) {
callback(new Error("璇烽�夋嫨鏃ユ湡鍜屾椂闂�"))
+ } else {
+ callback()
+ }
+ } else if (form.value.frequencyType === 'YEARLY') {
+ if (!form.value.yearMonth || !form.value.yearDay) {
+ callback(new Error("璇烽�夋嫨鏈堜唤鍜屾棩鏈�"))
} else {
callback()
}
@@ -338,6 +357,12 @@
if (type === 'edit' && row) {
form.value = {...row}
form.value.inspector = form.value.inspectorIds.split(',').map(Number)
+ // 姣忓勾棰戠巼鍥炴樉锛歠requencyDetail 鏍煎紡涓� "鏈�,鏃�"
+ if (form.value.frequencyType === 'YEARLY' && form.value.frequencyDetail) {
+ const parts = form.value.frequencyDetail.split(',')
+ form.value.yearMonth = parts[0] || ''
+ form.value.yearDay = parts[1] || ''
+ }
// 濡傛灉鏈夎澶嘔D锛岃嚜鍔ㄨ缃澶囦俊鎭�
if (form.value.taskId) {
@@ -372,7 +397,9 @@
frequencyType: '',
frequencyDetail: '',
week: '',
- time: ''
+ time: '',
+ yearMonth: '',
+ yearDay: ''
}
}
@@ -388,7 +415,12 @@
let frequencyDetail = ''
frequencyDetail = form.value.week + ',' + form.value.time
form.value.frequencyDetail = frequencyDetail
+ } else if (form.value.frequencyType === 'YEARLY') {
+ form.value.frequencyDetail = form.value.yearMonth + ',' + form.value.yearDay
}
+ // 骞翠唤/鏃ユ湡浠呯敤浜庤〃鍗曚氦浜掞紝鎻愪氦鍓嶆竻鐞�
+ delete form.value.yearMonth
+ delete form.value.yearDay
let res = await userStore.getInfo()
form.value.registrantId = res.user.userId
diff --git a/src/views/equipmentManagement/inspectionManagement/index.vue b/src/views/equipmentManagement/inspectionManagement/index.vue
index 8c0d52c..3935963 100644
--- a/src/views/equipmentManagement/inspectionManagement/index.vue
+++ b/src/views/equipmentManagement/inspectionManagement/index.vue
@@ -160,6 +160,8 @@
? "姣忓懆"
: params === "MONTHLY"
? "姣忔湀"
+ : params === "YEARLY"
+ ? "姣忓勾"
: params === "QUARTERLY"
? "瀛e害"
: "";
@@ -167,9 +169,15 @@
},
{
prop: "frequencyDetail",
- label: "寮�濮嬫棩鏈熶笌鏃堕棿",
+ label: "鏃ユ湡",
minWidth: 200,
formatter: (row, column, cellValue) => {
+ // 姣忓勾鏍煎紡涓� "鏈�,鏃�"锛屼笉灞曠ず鏃跺垎
+ if (row.frequencyType === "YEARLY") {
+ const parts = String(cellValue || "").split(",");
+ if (parts.length < 2 || !parts[0] || !parts[1]) return "";
+ return `${parts[0]}鏈�${parts[1]}鏃;
+ }
// 鍏堝垽鏂槸鍚︽槸瀛楃涓�
if (typeof cellValue !== "string") return "";
let val = cellValue;
--
Gitblit v1.9.3