From 006cedaa4188d5bd5f99ef0721572a24c89d7ce4 Mon Sep 17 00:00:00 2001 From: Admin <978517621@qq.com> Date: 星期六, 20 八月 2022 17:19:08 +0800 Subject: [PATCH] Default Changelist --- src/views/intellectInspect/inspectTaskManage/inspectTask/components/inspectTaskDialog.vue | 25 +++++++++++++++++++------ 1 files changed, 19 insertions(+), 6 deletions(-) diff --git a/src/views/intellectInspect/inspectTaskManage/inspectTask/components/inspectTaskDialog.vue b/src/views/intellectInspect/inspectTaskManage/inspectTask/components/inspectTaskDialog.vue index 3de28ea..48c420c 100644 --- a/src/views/intellectInspect/inspectTaskManage/inspectTask/components/inspectTaskDialog.vue +++ b/src/views/intellectInspect/inspectTaskManage/inspectTask/components/inspectTaskDialog.vue @@ -29,7 +29,7 @@ </el-col> <el-col :span="12" style="margin-bottom: 20px"> <el-form-item label="巡检周期" prop="checkCycle"> - <el-input v-model="inspectTaskForm.checkCycle" :disabled="!inspectPointConfirm" placeholder="请输入巡检周期" class="input-add"> + <el-input v-model="inspectTaskForm.checkCycle" @input="onVerifiyNumberInteger($event, 'checkCycle')" :disabled="!inspectPointConfirm" placeholder="请输入巡检周期" class="input-add"> <template #append> <el-select v-model="inspectTaskForm.checkCycleUnit" :disabled="!inspectPointConfirm" placeholder="选择单位"> <el-option v-for="item in timeList" :key="item.id" :value="item.id" :label="item.name"></el-option> @@ -40,7 +40,7 @@ </el-col> <el-col :span="12" style="margin-bottom: 20px"> <el-form-item label="提前通知时间" prop="noticeTime"> - <el-input v-model="inspectTaskForm.noticeTime" :disabled="!inspectPointConfirm" placeholder="请输入提前通知时间" class="input-add"> + <el-input @input="onVerifiyNumberInteger($event, 'noticeTime')" v-model="inspectTaskForm.noticeTime" :disabled="!inspectPointConfirm" placeholder="请输入提前通知时间" class="input-add"> <template #append> <el-select v-model="inspectTaskForm.noticeTimeUnit" :disabled="!inspectPointConfirm" placeholder="选择单位"> <el-option v-for="item in timeList" :key="item.id" :value="item.id" :label="item.name"></el-option> @@ -51,7 +51,7 @@ </el-col> <el-col :span="12" style="margin-bottom: 20px"> <el-form-item label="有效时间" prop="validTime"> - <el-input v-model="inspectTaskForm.validTime" :disabled="!inspectPointConfirm" placeholder="请输入有效时间" class="input-add"> + <el-input v-model="inspectTaskForm.validTime" @input="onVerifiyNumberInteger($event, 'validTime')" :disabled="!inspectPointConfirm" placeholder="请输入有效时间" class="input-add"> <template #append> <el-select v-model="inspectTaskForm.validTimeUnit" :disabled="!inspectPointConfirm" placeholder="选择单位"> <el-option v-for="item in timeList" :key="item.id" :value="item.id" :label="item.name"></el-option> @@ -200,6 +200,7 @@ import { ElMessage } from 'element-plus/es'; import { inspectTaskApi } from '/@/api/intellectInspectSystem/inspectTask'; import { facilityAreaApi } from '/@/api/intellectInspectSystem/facilityAreaManage'; +import { verifiyNumberInteger } from '/@/utils/toolsValidate'; interface dataState { title: string; pointTitle: string; @@ -470,7 +471,8 @@ data.inspectTaskForm.points.push(data.inspectPointForm); data.inspectPointDialog = false; } else if (data.title === '新增巡检任务' && data.pointTitle === '修改巡检点') { - let result = data.inspectTaskForm.points.findIndex((item) => item.id === data.inspectPointForm.id); + debugger; + let result = data.inspectTaskForm.points.findIndex((item) => item.execSequence === data.inspectPointForm.execSequence); data.inspectTaskForm.points[result] = data.inspectPointForm; data.inspectPointDialog = false; } else if (data.title === '修改巡检任务' && data.pointTitle === '新增巡检点') { @@ -504,7 +506,7 @@ message: '巡检点修改成功', duration: 2000 }); - let result = data.inspectTaskForm.points.findIndex((item) => item.id === data.inspectPointForm.id); + let result = data.inspectTaskForm.points.findIndex((item) => item.execSequence === data.inspectPointForm.execSequence); data.inspectTaskForm.points[result] = data.inspectPointForm; data.inspectPointDialog = false; } else { @@ -594,12 +596,23 @@ }); }; + const onVerifiyNumberInteger = (val: number, title: string) => { + if (title === 'noticeTime') { + data.inspectTaskForm.noticeTime = Number(verifiyNumberInteger(val.toString())) === 0 ? null : Number(verifiyNumberInteger(val.toString())); + } else if (title === 'checkCycle') { + data.inspectTaskForm.checkCycle = Number(verifiyNumberInteger(val.toString())) === 0 ? null : Number(verifiyNumberInteger(val.toString())); + } else { + data.inspectTaskForm.validTime = Number(verifiyNumberInteger(val.toString())) === 0 ? null : Number(verifiyNumberInteger(val.toString())); + } + }; + return { ...toRefs(data), inspectTaskFormRef, deleteFlow, giveQuotaUnit, giveClassGroup, + onVerifiyNumberInteger, submitInspectTask, submitInspectPoint, giveRegionAndRFID, @@ -613,7 +626,7 @@ <style scoped lang="scss"> $homeNavLengh: 8; .home-container { - height: calc(100vh - 114px); + height: calc(100vh - 144px); box-sizing: border-box; overflow: hidden; .homeCard { -- Gitblit v1.9.2