From 17600f41d7c3f6c28cc5393dbb4d3d7e82eccad6 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期四, 25 八月 2022 09:54:47 +0800
Subject: [PATCH] conflict
---
src/views/doublePrevent/riskLevel/unit/components/safetyRiskAnalyseUnitDialog.vue | 138 +++++++++++++++++++++------------------------
1 files changed, 64 insertions(+), 74 deletions(-)
diff --git a/src/views/doublePrevent/riskLevel/unit/components/safetyRiskAnalyseUnitDialog.vue b/src/views/doublePrevent/riskLevel/unit/components/safetyRiskAnalyseUnitDialog.vue
index 0764dc3..4723b27 100644
--- a/src/views/doublePrevent/riskLevel/unit/components/safetyRiskAnalyseUnitDialog.vue
+++ b/src/views/doublePrevent/riskLevel/unit/components/safetyRiskAnalyseUnitDialog.vue
@@ -1,83 +1,63 @@
<template>
<div class="system-add-menu-container">
- <el-dialog :title="title" v-model="isSafetyRiskAnalyseUnitDialog" width="600px">
- <el-form
- :model="safetyRiskAnalyseUnitForm"
- :rules="safetyRiskAnalyseUnitFormRules"
- ref="safetyRiskAnalyseUnitFormRef"
- size="default"
- label-width="180px"
- >
+ <el-dialog :title="title" v-model="isSafetyRiskAnalyseUnitDialog" width="600px" :close-on-click-modal="false">
+ <el-form :model="safetyRiskAnalyseUnitForm" :rules="safetyRiskAnalyseUnitFormRules" ref="safetyRiskAnalyseUnitFormRef" size="default" label-width="180px">
<el-row :gutter="35">
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
- <el-form-item label="安全风险分析对象编码" prop="riskCode">
- <el-input
- class="input-length"
- v-model.trim="safetyRiskAnalyseUnitForm.riskCode"
- placeholder="请输入安全风险分析对象编码"
- ></el-input>
+ <el-form-item label="安全风险分析单元名称" prop="riskUnitName">
+ <el-input class="input-add" :disabled="!disabled" v-model.trim="safetyRiskAnalyseUnitForm.riskUnitName" placeholder="请输入安全风险分析单元名称"></el-input>
</el-form-item>
</el-col>
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
- <el-form-item label="安全风险分析单元名称" prop="riskUnitName">
- <el-input
- class="input-length"
- v-model.trim="safetyRiskAnalyseUnitForm.riskUnitName"
- placeholder="请输入安全风险分析单元名称"
- ></el-input>
+ <el-form-item label="安全风险分析对象编码" prop="riskCode">
+ <el-input class="input-add" :disabled="!disabled" v-model.trim="safetyRiskAnalyseUnitForm.riskCode" placeholder="请输入安全风险分析对象编码"></el-input>
</el-form-item>
</el-col>
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
<el-form-item label="生产装置名称" prop="produceDeviceId">
- <el-select
- class="input-length"
- v-model="safetyRiskAnalyseUnitForm.produceDeviceId"
- placeholder="请输入生产装置名称"
- clearable
- >
- <el-option
- v-for="item in allProduceDeviceData"
- :key="item.id"
- :label="item.produceDeviceName"
- :value="item.id"
- ></el-option>
+ <el-select class="input-add" :disabled="!disabled" v-model="safetyRiskAnalyseUnitForm.produceDeviceId" placeholder="请输入生产装置名称" clearable>
+ <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="24" class="mb20">
<el-form-item label="责任部门" prop="liableDepId">
- <el-cascader
- @change="achieveUserList"
- :options="departmentList"
- :props="{ emitPath: false, checkStrictly: true, value: 'depId', label: 'depName' }"
- placeholder="请选择部门"
- clearable
- filterable
- style="width: 85%"
- v-model="safetyRiskAnalyseUnitForm.liableDepId"
- >
- </el-cascader>
+ <el-cascader class="input-add" @change="achieveUserList" :disabled="!disabled" :options="departmentList" :props="{ emitPath: false, checkStrictly: true, value: 'depId', label: 'depName' }" placeholder="请选择部门" clearable filterable style="width: 85%" v-model="safetyRiskAnalyseUnitForm.liableDepId"> </el-cascader>
</el-form-item>
</el-col>
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
<el-form-item label="责任人" prop="liablePersonId">
- <el-select
- class="input-length"
- v-model="safetyRiskAnalyseUnitForm.liablePersonId"
- placeholder="请选择责任人"
- clearable
- filterable
- >
+ <el-select class="input-add" :disabled="!disabled" v-model="safetyRiskAnalyseUnitForm.liablePersonId" placeholder="请选择责任人" clearable filterable>
<el-option v-for="item in userList" :key="item.uid" :label="item.realName" :value="item.uid"></el-option>
</el-select>
+ </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="safetyRiskAnalyseUnitForm.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="safetyRiskAnalyseUnitForm.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="safetyRiskAnalyseUnitForm.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="safetyRiskAnalyseUnitForm.gmtModitify" placeholder="请输入区域位置"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<template #footer>
- <span class="dialog-footer">
+ <span class="dialog-footer" v-show="disabled">
<el-button @click="isSafetyRiskAnalyseUnitDialog = !isSafetyRiskAnalyseUnitDialog" size="default">取 消</el-button>
- <el-button type="primary" @click="submitSafetyRiskAnalyseUnitDialog" v-throttle size="default">确 实</el-button>
+ <el-button type="primary" @click="submitSafetyRiskAnalyseUnitDialog" v-throttle size="default">确 定</el-button>
</span>
</template>
</el-dialog>
@@ -87,6 +67,8 @@
<script lang="ts">
interface stateType {
isSafetyRiskAnalyseUnitDialog: Boolean;
+ disabled: Boolean;
+ personTime: Boolean;
safetyRiskAnalyseUnitForm: {
riskCode: string | null;
riskUnitName: string | null;
@@ -95,7 +77,7 @@
produceDeviceId: number | null;
};
title: string;
- userList: [];
+ userList: any[];
departmentList: [];
allProduceDeviceData: [];
safetyRiskAnalyseUnitFormRules: {};
@@ -103,13 +85,16 @@
import { reactive, toRefs, ref } from 'vue';
import { safetyRiskAnalyseUnitApi } from '/@/api/doublePreventSystem/safetyRiskAnalyseUnit';
import { ElMessage } from 'element-plus';
-import { userApi } from '/@/api/user';
+import { userApi } from '/@/api/systemManage/user';
+import { getUserByDepartment } from '/@/assets/methods';
export default {
name: 'productionDeviceDialog',
setup(props: any, context: any) {
const safetyRiskAnalyseUnitFormRef = ref();
const state = reactive<stateType>({
title: '',
+ disabled: false,
+ personTime: false,
userList: [],
departmentList: [],
allProduceDeviceData: [],
@@ -140,6 +125,8 @@
safetyRiskAnalyseUnitFormRef.value.clearValidate();
});
if (type === '新增') {
+ state.disabled = true;
+ state.personTime = false;
state.title = '新增风险分析单元';
state.safetyRiskAnalyseUnitForm = {
riskCode: null,
@@ -148,7 +135,14 @@
liableDepId: null,
produceDeviceId: null
};
+ } else if (type === '查看') {
+ state.disabled = false;
+ state.personTime = true;
+ state.title = '查看风险分析单元';
+ state.safetyRiskAnalyseUnitForm = JSON.parse(JSON.stringify(value));
} else {
+ state.disabled = true;
+ state.personTime = false;
state.title = '修改风险分析单元';
state.safetyRiskAnalyseUnitForm = JSON.parse(JSON.stringify(value));
}
@@ -200,24 +194,24 @@
});
};
- const achieveUserList = () => {
+ const achieveUserList = async () => {
state.safetyRiskAnalyseUnitForm.liablePersonId = null;
- state.userList = [];
- getUserData();
+ const userList: unknown = await getUserByDepartment(state.safetyRiskAnalyseUnitForm.liableDepId);
+ state.userList = userList as [];
};
- //获取用户列表
- const getUserData = async () => {
- let res = await userApi().getUserLByDepartment(state.safetyRiskAnalyseUnitForm.liableDepId);
- if (res.data.code === '200') {
- state.userList = res.data.data;
- } else {
- ElMessage({
- type: 'warning',
- message: res.data.msg
- });
- }
- };
+ // //获取用户列表
+ // const getUserData = async () => {
+ // let res = await userApi().getUserLByDepartment(state.safetyRiskAnalyseUnitForm.liableDepId);
+ // if (res.data.code === '200') {
+ // state.userList = res.data.data;
+ // } else {
+ // ElMessage({
+ // type: 'warning',
+ // message: res.data.msg
+ // });
+ // }
+ // };
return {
...toRefs(state),
@@ -230,8 +224,4 @@
};
</script>
-<style scoped>
-.input-length {
- width: 85%;
-}
-</style>
+<style scoped></style>
--
Gitblit v1.9.2