From 4a716a9b964f760ee414f48a6998f6728b3a5c8d Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 01 七月 2025 16:39:41 +0800
Subject: [PATCH] 1.巡检管理频次选择逻辑修改
---
src/views/inspectionManagement/components/formDia.vue | 24 +++++++++---------------
src/views/inspectionManagement/index.vue | 34 ++++++++++++++++++++++++----------
2 files changed, 33 insertions(+), 25 deletions(-)
diff --git a/src/views/inspectionManagement/components/formDia.vue b/src/views/inspectionManagement/components/formDia.vue
index 91e9c5c..a492bfc 100644
--- a/src/views/inspectionManagement/components/formDia.vue
+++ b/src/views/inspectionManagement/components/formDia.vue
@@ -57,7 +57,7 @@
<el-option label="鍛ㄥ叚" value="SAT"/>
<el-option label="鍛ㄦ棩" value="SUN"/>
</el-select>
- <el-time-picker v-model="form.frequencyDetail" placeholder="閫夋嫨鏃堕棿" format="HH:mm"
+ <el-time-picker v-model="form.time" placeholder="閫夋嫨鏃堕棿" format="HH:mm"
value-format="HH:mm" style="width: 50%"/>
</el-form-item>
</el-col>
@@ -98,7 +98,7 @@
</template>
<script setup>
-import {reactive, ref, computed} from "vue";
+import {reactive, ref} from "vue";
import useUserStore from '@/store/modules/user'
import {addOrEditTimingTask} from "@/api/inspectionManagement/index.js";
import {userListAll} from "@/api/publicApi/index.js";
@@ -135,6 +135,7 @@
})
if (type === 'edit') {
form.value = {...row}
+ form.value.inspector = form.value.inspectorIds.split(',').map(Number)
}
}
@@ -144,26 +145,19 @@
dialogVisitable.value = false
emit('closeDia')
}
-const selectedDateTime = ref(null)
-// 璁＄畻鏄熸湡鍑�
-const dayOfWeek = computed(() => {
- if (!selectedDateTime.value) return ''
-
- const date = new Date(selectedDateTime.value)
- const dayIndex = date.getDay()
-
- const weekDays = ['鏄熸湡鏃�', '鏄熸湡涓�', '鏄熸湡浜�', '鏄熸湡涓�', '鏄熸湡鍥�', '鏄熸湡浜�', '鏄熸湡鍏�']
- return weekDays[dayIndex]
-})
// 鎻愪氦鍚堝苟琛ㄥ崟
const submitForm = () => {
- proxy.$refs["formRef"].validate(valid => {
+ proxy.$refs["formRef"].validate(async valid => {
if (valid) {
form.value.inspectorIds = form.value.inspector.join(',')
if (form.value.frequencyType === 'WEEKLY') {
- form.value.frequencyDetail = form.value.week + ',' + form.value.frequencyDetail
+ let frequencyDetail = ''
+ frequencyDetail = form.value.week + ',' + form.value.time
+ form.value.frequencyDetail = frequencyDetail
}
+ let res = await userStore.getInfo()
+ form.value.registrantId = res.user.userId
addOrEditTimingTask(form.value).then(() => {
cancel()
proxy.$modal.msgSuccess('鎻愪氦鎴愬姛')
diff --git a/src/views/inspectionManagement/index.vue b/src/views/inspectionManagement/index.vue
index e0ba31f..028a3f5 100644
--- a/src/views/inspectionManagement/index.vue
+++ b/src/views/inspectionManagement/index.vue
@@ -1,9 +1,9 @@
<template>
<div class="app-container">
<el-form :inline="true" :model="queryParams" class="search-form">
- <el-form-item label="鏃堕棿">
+ <el-form-item label="浠诲姟鍚嶇О">
<el-input
- v-model="queryParams.supplierName"
+ v-model="queryParams.taskName"
placeholder="璇疯緭鍏�"
clearable
:style="{ width: '100%' }"
@@ -11,7 +11,7 @@
</el-form-item>
<el-form-item label="璁惧鍚嶇О">
<el-input
- v-model="queryParams.coal"
+ v-model="queryParams.deviceName"
placeholder="璇疯緭鍏�"
clearable
:style="{ width: '100%' }"
@@ -127,8 +127,8 @@
const viewQrCodeFiles = ref()
// 鏌ヨ鍙傛暟
const queryParams = reactive({
- supplierName: "",
- coal: "",
+ taskName: "",
+ deviceName: "",
})
// 褰撳墠鏍囩
const activeTab = ref("task");
@@ -156,11 +156,22 @@
const pageSize = ref(10);
const columns = ref([
{ prop: "taskName", label: "宸℃浠诲姟鍚嶇О", minWidth: 160 },
- { prop: "port", label: "鍦扮偣", minWidth: 120 },
+ { prop: "inspectionLocation", label: "鍦扮偣", minWidth: 120 },
{ prop: "remarks", label: "澶囨敞", minWidth: 150 },
{ prop: "inspector", label: "鎵ц宸℃浜�", minWidth: 150 },
- { prop: "inspector", label: "棰戞", minWidth: 150 },
- { prop: "inspector", label: "寮�濮嬫棩鏈�", minWidth: 150 },
+ { prop: "frequencyType", label: "棰戞", minWidth: 150,
+ formatter: (row, column, cellValue) => {
+ if (cellValue === 'DAILY') {
+ return '姣忔棩';
+ } else if (cellValue === 'MONTHLY') {
+ return '姣忔湀';
+ } else if (cellValue === 'WEEKLY') {
+ return '姣忓懆';
+ } else {
+ return '瀛ｅ害'
+ }
+ }},
+ { prop: "frequencyDetail", label: "寮�濮嬫棩鏈熶笌鏃堕棿", minWidth: 150 },
{ prop: "registrant", label: "鐧昏浜�", minWidth: 100 },
{ prop: "createTime", label: "鐧昏鏃ユ湡", minWidth: 100 },
]);
@@ -181,12 +192,15 @@
getList();
};
const radioChange = (value) => {
- if (value !== "task") {
+ if (value === "taskManage") {
tableColumns.value = columns.value;
operationsArr.value = ['edit']
+ } else if (value === "task") {
+ tableColumns.value = columns.value;
+ operationsArr.value = ['viewFile']
} else {
tableColumns.value = columns1.value;
- operationsArr.value = ['viewFile']
+ operationsArr.value = ['edit']
}
getList();
}
--
Gitblit v1.9.3