From b62e1b70fa423fcf2f8c7ca731f3e25db8fba811 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 05 十二月 2025 15:43:49 +0800
Subject: [PATCH] 1.海川开心-设备巡检改为巡检任务，增加时间选项，不要评测
---
src/views/equipmentManagement/inspectionManagement/components/formDia.vue | 64 ++++++++++++++++++-------------
src/views/equipmentManagement/inspectionManagement/index.vue | 2
2 files changed, 38 insertions(+), 28 deletions(-)
diff --git a/src/views/equipmentManagement/inspectionManagement/components/formDia.vue b/src/views/equipmentManagement/inspectionManagement/components/formDia.vue
index be72141..bf6c0c2 100644
--- a/src/views/equipmentManagement/inspectionManagement/components/formDia.vue
+++ b/src/views/equipmentManagement/inspectionManagement/components/formDia.vue
@@ -5,15 +5,8 @@
<el-form ref="formRef" :model="form" :rules="rules" label-width="120px">
<el-row>
<el-col :span="12">
- <el-form-item label="璁惧鍚嶇О" prop="taskId">
- <el-select v-model="form.taskId" @change="setDeviceModel">
- <el-option
- v-for="(item, index) in deviceOptions"
- :key="index"
- :label="item.deviceName"
- :value="item.id"
- ></el-option>
- </el-select>
+ <el-form-item label="宸℃浠诲姟" prop="taskName">
+ <el-input v-model="form.taskName" placeholder="璇疯緭鍏ュ贰妫�浠诲姟" />
</el-form-item>
</el-col>
<el-col :span="12">
@@ -30,6 +23,18 @@
<el-col :span="12">
<el-form-item label="澶囨敞" prop="remarks">
<el-input v-model="form.remarks" placeholder="璇疯緭鍏ュ娉�" type="textarea" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鐧昏鏃堕棿" prop="dateStr">
+ <el-date-picker
+ v-model="form.dateStr"
+ type="date"
+ placeholder="閫夋嫨鐧昏鏃ユ湡"
+ format="YYYY-MM-DD"
+ value-format="YYYY-MM-DD"
+ style="width: 100%"
+ />
</el-form-item>
</el-col>
</el-row>
@@ -116,7 +121,7 @@
const deviceOptions = ref([]);
const data = reactive({
form: {
- taskId: undefined,
+ taskName: undefined,
taskName: undefined,
inspector: '',
inspectorIds: '',
@@ -124,11 +129,13 @@
frequencyType: '',
frequencyDetail: '',
week: '',
- time: ''
+ time: '',
+ dateStr: ''
},
rules: {
- taskId: [{ required: true, message: "璇烽�夋嫨璁惧", trigger: "change" },],
+ taskName: [{ required: true, message: "璇烽�夋嫨璁惧", trigger: "blur" },],
inspector: [{ required: true, message: "璇疯緭鍏ュ贰妫�浜�", trigger: "blur" },],
+ dateStr: [{ required: true, message: "璇烽�夋嫨鐧昏鏃堕棿", trigger: "change" }]
}
})
const { form, rules } = toRefs(data)
@@ -165,11 +172,6 @@
if (type === 'edit' && row) {
form.value = {...row}
form.value.inspector = form.value.inspectorIds.split(',').map(Number)
-
- // 濡傛灉鏈夎澶嘔D锛岃嚜鍔ㄨ缃澶囦俊鎭�
- if (form.value.taskId) {
- setDeviceModel(form.value.taskId);
- }
}
}
@@ -187,15 +189,15 @@
}
// 閲嶇疆琛ㄥ崟鏁版嵁纭繚璁惧淇℃伅姝ｇ‘閲嶇疆
form.value = {
- taskId: undefined,
- taskName: undefined,
+ taskName: '',
inspector: '',
inspectorIds: '',
remarks: '',
frequencyType: '',
frequencyDetail: '',
week: '',
- time: ''
+ time: '',
+ dateStr: ''
}
}
@@ -204,19 +206,27 @@
proxy.$refs["formRef"].validate(async valid => {
if (valid) {
try {
- form.value.inspectorIds = form.value.inspector.join(',')
- delete form.value.inspector
+ // 鍒涘缓鎻愪氦鏁版嵁鐨勫壇鏈�
+ const submitData = {...form.value}
- if (form.value.frequencyType === 'WEEKLY') {
+ submitData.inspectorIds = submitData.inspector.join(',')
+ delete submitData.inspector
+
+ // 缂栬緫妯″紡涓嬩笉浼犻�掔櫥璁版椂闂�
+ if (operationType.value === 'edit') {
+ delete submitData.createTime
+ }
+
+ if (submitData.frequencyType === 'WEEKLY') {
let frequencyDetail = ''
- frequencyDetail = form.value.week + ',' + form.value.time
- form.value.frequencyDetail = frequencyDetail
+ frequencyDetail = submitData.week + ',' + submitData.time
+ submitData.frequencyDetail = frequencyDetail
}
let res = await userStore.getInfo()
- form.value.registrantId = res.user.userId
+ submitData.registrantId = res.user.userId
- await addOrEditTimingTask(form.value)
+ await addOrEditTimingTask(submitData)
cancel()
proxy.$modal.msgSuccess('鎻愪氦鎴愬姛')
} catch (error) {
diff --git a/src/views/equipmentManagement/inspectionManagement/index.vue b/src/views/equipmentManagement/inspectionManagement/index.vue
index 3e4e31e..15fa56e 100644
--- a/src/views/equipmentManagement/inspectionManagement/index.vue
+++ b/src/views/equipmentManagement/inspectionManagement/index.vue
@@ -160,7 +160,7 @@
}
},
{ prop: "registrant", label: "鐧昏浜�", minWidth: 100 },
- { prop: "createTime", label: "鐧昏鏃ユ湡", minWidth: 100 },
+ { prop: "dateStr", label: "鐧昏鏃ユ湡", minWidth: 100 },
]);
// 鎿嶄綔鍒楅厤缃�
--
Gitblit v1.9.3