From 50d33c74675a9d9eee957a685d9e55b77974f6f9 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期五, 06 一月 2023 16:44:06 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/gtqt
---
src/views/doublePrevent/riskCheckManage/hiddenManagement/hiddenRectify/components/rectifyDialog.vue | 42 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 38 insertions(+), 4 deletions(-)
diff --git a/src/views/doublePrevent/riskCheckManage/hiddenManagement/hiddenRectify/components/rectifyDialog.vue b/src/views/doublePrevent/riskCheckManage/hiddenManagement/hiddenRectify/components/rectifyDialog.vue
index 9403e25..50802ef 100644
--- a/src/views/doublePrevent/riskCheckManage/hiddenManagement/hiddenRectify/components/rectifyDialog.vue
+++ b/src/views/doublePrevent/riskCheckManage/hiddenManagement/hiddenRectify/components/rectifyDialog.vue
@@ -1,6 +1,6 @@
<template>
<div class="system-add-menu-container">
- <el-dialog :title="title" v-model="isShowRectifyDialog" width="600px">
+ <el-dialog :title="title" v-model="isShowRectifyDialog" width="600px" :close-on-click-modal="false">
<el-form :model="rectifyForm" :rules="rectifyFormRules" ref="rectifyFormRef" size="default" label-width="120px">
<el-row :gutter="35">
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
@@ -10,7 +10,7 @@
</el-col>
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
<el-form-item label="整改时间" prop="applyTime">
- <el-date-picker type="datetime" value-format="YYYY-MM-DD HH:mm:ss" class="input-add" v-model="rectifyForm.applyTime" placeholder="请选择整改时间" clearable> </el-date-picker>
+ <el-date-picker type="datetime" :disabled-date="disabledDate" value-format="YYYY-MM-DD HH:mm:ss" class="input-add" v-model="rectifyForm.applyTime" placeholder="请选择整改时间" clearable> </el-date-picker>
</el-form-item>
</el-col>
</el-row>
@@ -22,7 +22,7 @@
</span>
</template>
</el-dialog>
- <el-dialog :title="title" v-model="isShowDelayDialog" width="600px">
+ <el-dialog :title="title" v-model="isShowDelayDialog" width="600px" :close-on-click-modal="false">
<el-form :model="delayForm" :rules="delayFormRules" ref="rectifyFormRef" size="default" label-width="120px">
<el-row :gutter="35">
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
@@ -44,7 +44,7 @@
</span>
</template>
</el-dialog>
- <el-dialog :title="title" v-model="isShowCheckInfoDialog" width="600px">
+ <el-dialog :title="title" v-model="isShowCheckInfoDialog" width="600px" :close-on-click-modal="false">
<el-form :model="checkInfoForm" ref="checkFormRef" size="default" label-width="120px">
<el-row :gutter="35">
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
@@ -78,6 +78,26 @@
<el-input class="input-add" :disabled="!disabled" type="number" v-model="checkInfoForm.cost" readonly> </el-input>
</el-form-item>
</el-col>
+ <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20" v-show="personTime">
+ <el-form-item label="创建人" prop="location">
+ <el-input class="input-add" :disabled="!disabled" v-model.trim="checkInfoForm.createByUserName" placeholder="请输入区域位置"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20" v-show="personTime">
+ <el-form-item label="创建时间" prop="location">
+ <el-input class="input-add" :disabled="!disabled" v-model.trim="checkInfoForm.gmtCreate" placeholder="请输入区域位置"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20" v-show="personTime">
+ <el-form-item label="最后修改人" prop="location">
+ <el-input class="input-add" :disabled="!disabled" v-model.trim="checkInfoForm.lastEditUserName" placeholder="请输入区域位置"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20" v-show="personTime">
+ <el-form-item label="最后修改时间" prop="location">
+ <el-input class="input-add" :disabled="!disabled" v-model.trim="checkInfoForm.gmtModitify" placeholder="请输入区域位置"></el-input>
+ </el-form-item>
+ </el-col>
</el-row>
</el-form>
</el-dialog>
@@ -89,6 +109,7 @@
interface stateType {
disabled: Boolean;
+ personTime: Boolean;
isShowRectifyDialog: Boolean;
isShowDelayDialog: Boolean;
isShowCheckInfoDialog: Boolean;
@@ -104,6 +125,8 @@
rectifyTime: string | null;
timeOutDesc: string | null;
};
+ disabledDate: any;
+ rangeTime: any;
title: string;
departmentList: [];
userList: [];
@@ -130,6 +153,7 @@
const state = reactive<stateType>({
title: '',
disabled: false,
+ personTime: false,
rectifyTypeList: [],
departmentList: [],
userList: [],
@@ -145,6 +169,13 @@
dangerManagerId: null,
rectifyInfo: null,
applyTime: null
+ },
+ disabledDate: (time: any) => {
+ const r = new Date().getTime();
+ return time.getTime() > new Date().getTime();
+ },
+ rangeTime: () => {
+ return '15:15:14';
},
delayForm: {
id: null,
@@ -168,6 +199,7 @@
if (type === '延期') {
state.title = '延期';
state.disabled = true;
+ state.personTime = false;
state.isShowDelayDialog = true;
const delayForm = JSON.parse(JSON.stringify(value));
state.delayForm.id = delayForm.id;
@@ -176,12 +208,14 @@
state.delayForm.rectifyTime = null;
} else if (type === '查看') {
state.title = '查看';
+ state.personTime = true;
state.isShowCheckInfoDialog = true;
state.checkInfoForm.rectifyDepId = JSON.parse(JSON.stringify(value)).rectifyDepId;
await achieveUserList();
state.checkInfoForm = JSON.parse(JSON.stringify(value));
} else {
state.disabled = true;
+ state.personTime = false;
state.title = '整改';
state.isShowRectifyDialog = true;
const rectifyForm = JSON.parse(JSON.stringify(value));
--
Gitblit v1.9.2