From 1621b3719092d93e6c29f7a27e401529e0454420 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期一, 01 八月 2022 18:57:45 +0800
Subject: [PATCH] 双重预防
---
src/views/doublePrevent/riskCheckManage/hiddenManagement/hiddenReport/components/reportDialog.vue | 132 ++++++++------------------------------------
1 files changed, 24 insertions(+), 108 deletions(-)
diff --git a/src/views/doublePrevent/hiddenManage/hiddenReport/components/reportDialog.vue b/src/views/doublePrevent/riskCheckManage/hiddenManagement/hiddenReport/components/reportDialog.vue
similarity index 73%
rename from src/views/doublePrevent/hiddenManage/hiddenReport/components/reportDialog.vue
rename to src/views/doublePrevent/riskCheckManage/hiddenManagement/hiddenReport/components/reportDialog.vue
index f675a08..b2a509c 100644
--- a/src/views/doublePrevent/hiddenManage/hiddenReport/components/reportDialog.vue
+++ b/src/views/doublePrevent/riskCheckManage/hiddenManagement/hiddenReport/components/reportDialog.vue
@@ -7,72 +7,30 @@
<el-row :gutter="25">
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="12" class="mb20">
<el-form-item label="隐患描述" prop="dangerDesc">
- <el-input
- class="input-add"
- v-model.trim="reportForm.dangerDesc"
- placeholder="请输入隐患情况描述"
- clearable
- ></el-input>
+ <el-input class="input-add" v-model.trim="reportForm.dangerDesc" placeholder="请输入隐患情况描述" clearable></el-input>
</el-form-item>
</el-col>
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="12" class="mb20">
<el-form-item label="隐患名称" prop="dangerCode">
- <el-input
- class="input-add"
- v-model.trim="reportForm.dangerCode"
- placeholder="请输入隐患名称"
- clearable
- ></el-input>
+ <el-input class="input-add" v-model.trim="reportForm.dangerCode" placeholder="请输入隐患名称" clearable></el-input>
</el-form-item>
</el-col>
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="12" class="mb20">
<el-form-item label="隐患所属部门" prop="depId">
- <el-cascader
- :options="departmentList"
- :props="{ emitPath: false, checkStrictly: true, value: 'depId', label: 'depName' }"
- placeholder="请选择部门"
- clearable
- filterable
- class="input-add"
- v-model="reportForm.depId"
- >
- </el-cascader>
+ <el-cascader :options="departmentList" :props="{ emitPath: false, checkStrictly: true, value: 'depId', label: 'depName' }" placeholder="请选择部门" clearable filterable class="input-add" v-model="reportForm.depId"> </el-cascader>
</el-form-item>
</el-col>
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="12" class="mb20">
<el-form-item label="生产装置" prop="produceDeviceId">
- <el-select
- class="input-add"
- v-model="reportForm.produceDeviceId"
- placeholder="请输入生产装置"
- clearable
- filterable
- @change="changeUnit"
- >
- <el-option
- v-for="item in allProduceDeviceData"
- :key="item.id"
- :label="item.produceDeviceName"
- :value="item.id"
- ></el-option>
+ <el-select class="input-add" v-model="reportForm.produceDeviceId" placeholder="请输入生产装置" clearable filterable @change="changeUnit">
+ <el-option v-for="item in allProduceDeviceData" :key="item.id" :label="item.produceDeviceName" :value="item.id"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="12" class="mb20">
<el-form-item label="风险分析单元" prop="riskUnitId">
- <el-select
- class="input-add"
- v-model.trim="reportForm.riskUnitId"
- placeholder="请输入风险分析单元"
- clearable
- filterable
- >
- <el-option
- v-for="item in safetyRiskUnitData"
- :key="item.id"
- :label="item.riskUnitName"
- :value="item.id"
- ></el-option>
+ <el-select class="input-add" v-model.trim="reportForm.riskUnitId" placeholder="请输入风险分析单元" clearable filterable>
+ <el-option v-for="item in safetyRiskUnitData" :key="item.id" :label="item.riskUnitName" :value="item.id"></el-option>
</el-select>
</el-form-item>
</el-col>
@@ -100,27 +58,14 @@
</el-col>
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="12" class="mb20">
<el-form-item label="隐患可能后果" prop="dangerResult">
- <el-select
- class="input-add"
- v-model="reportForm.dangerResult"
- placeholder="请选择隐患可能后果"
- clearable
- filterable
- >
+ <el-select class="input-add" v-model="reportForm.dangerResult" placeholder="请选择隐患可能后果" clearable filterable>
<el-option v-for="item in dangerResultList" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="12">
<el-form-item label="隐患产生原因" prop="dangerReason">
- <el-input
- class="input-add"
- type="textarea"
- :rows="2"
- style="padding-bottom: 10px"
- v-model.trim="reportForm.dangerReason"
- placeholder="请输入隐患产生原因"
- ></el-input>
+ <el-input class="input-add" type="textarea" :rows="2" style="padding-bottom: 10px" v-model.trim="reportForm.dangerReason" placeholder="请输入隐患产生原因"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -135,51 +80,23 @@
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="12" class="mb20">
<el-form-item label="整改类型" prop="rectifyType">
<el-select class="input-add" v-model="reportForm.rectifyType" placeholder="请选择整改类型" clearable filterable>
- <el-option
- v-for="item in rectifyTypeList"
- :key="item.id"
- :label="item.name"
- :value="item.id"
- ></el-option> </el-select
- ></el-form-item>
+ <el-option v-for="item in rectifyTypeList" :key="item.id" :label="item.name" :value="item.id"></el-option>
+ </el-select>
+ </el-form-item>
</el-col>
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="12" class="mb20">
<el-form-item label="整改期限" prop="rectifyTime">
- <el-date-picker
- type="datetime"
- value-format="YYYY-MM-DD HH:mm:ss"
- class="input-add"
- v-model="reportForm.rectifyTime"
- placeholder="请选择整改期限"
- clearable
- >
- </el-date-picker>
+ <el-date-picker type="datetime" value-format="YYYY-MM-DD HH:mm:ss" class="input-add" v-model="reportForm.rectifyTime" placeholder="请选择整改期限" clearable> </el-date-picker>
</el-form-item>
</el-col>
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="12" class="mb20">
<el-form-item label="整改部门" prop="rectifyDepId">
- <el-cascader
- @change="achieveUserList"
- :options="departmentList"
- :props="{ emitPath: false, checkStrictly: true, value: 'depId', label: 'depName' }"
- placeholder="请选择部门"
- clearable
- filterable
- class="input-add"
- v-model="reportForm.rectifyDepId"
- >
- </el-cascader>
+ <el-cascader @change="achieveUserList" :options="departmentList" :props="{ emitPath: false, checkStrictly: true, value: 'depId', label: 'depName' }" placeholder="请选择部门" clearable filterable class="input-add" v-model="reportForm.rectifyDepId"> </el-cascader>
</el-form-item>
</el-col>
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="12" class="mb20">
<el-form-item label="整改责任人" prop="liablePersonId">
- <el-select
- class="input-add"
- v-model="reportForm.liablePersonId"
- placeholder="请选择整改责任人"
- clearable
- filterable
- >
+ <el-select class="input-add" v-model="reportForm.liablePersonId" placeholder="请选择整改责任人" clearable filterable>
<el-option v-for="item in userList" :key="item.uid" :label="item.username" :value="item.uid"></el-option>
</el-select>
</el-form-item>
@@ -192,14 +109,7 @@
</el-col>
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="12">
<el-form-item label="整改措施" prop="rectifyDesc">
- <el-input
- class="input-add"
- type="textarea"
- :rows="2"
- style="padding-bottom: 10px"
- v-model.trim="reportForm.rectifyDesc"
- placeholder="请输入整改措施"
- ></el-input>
+ <el-input class="input-add" type="textarea" :rows="2" style="padding-bottom: 10px" v-model.trim="reportForm.rectifyDesc" placeholder="请输入整改措施"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -207,7 +117,7 @@
</el-tabs>
</el-form>
<template #footer>
- <span class="dialog-footer">
+ <span class="dialog-footer" v-show="disabled">
<el-button @click="isShowReportDialog = !isShowReportDialog" size="default">取 消</el-button>
<el-button type="primary" @click="submitReport" v-throttle size="default">确 实</el-button>
</span>
@@ -364,7 +274,7 @@
reportFormRef.value.clearValidate();
});
if (type === '新增') {
- state.disabled = false;
+ state.disabled = true;
state.title = '新增隐患';
state.reportForm = {
dangerDesc: null,
@@ -384,6 +294,12 @@
cost: null,
rectifyDesc: null
};
+ } else if (type === '查看') {
+ state.title = '修改隐患';
+ state.disabled = false;
+ state.reportForm.rectifyDepId = JSON.parse(JSON.stringify(value)).rectifyDepId;
+ achieveUserList();
+ state.reportForm = JSON.parse(JSON.stringify(value));
} else {
state.title = '修改隐患';
state.disabled = true;
--
Gitblit v1.9.2