From 6f5336ab50c25e8a4a8c4df7ec703a0dfa418583 Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: Mon, 13 Jan 2025 15:14:11 +0800
Subject: [PATCH] 修改
---
src/views/experiment/project/components/projectDialog.vue | 187 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 144 insertions(+), 43 deletions(-)
diff --git a/src/views/experiment/project/components/projectDialog.vue b/src/views/experiment/project/components/projectDialog.vue
index e9fa759..f4f593c 100644
--- a/src/views/experiment/project/components/projectDialog.vue
+++ b/src/views/experiment/project/components/projectDialog.vue
@@ -1,6 +1,6 @@
<template>
<div class="system-menu-dialog-container">
- <el-dialog :title="projectDialogState.title" v-model="projectDialogState.projectDialogVisible" width="80%">
+ <el-dialog :title="projectDialogState.title" v-model="projectDialogState.projectDialogVisible" width="80%" :before-close="handleClose">
<el-form ref="ProjectFormRef" :rules="projectDialogState.projectFormRules" :model="projectDialogState.projectForm" size="default" label-width="0">
<table class="report-table">
<th class="m-color b-font" style="text-align: center">***研究所/***大学<br />科学研究实验项目安全风险基础信息录入表（新立项）（带<span style="color: red">*</span>为必填项）</th>
@@ -15,24 +15,35 @@
<tr>
<td class="w-25 m-color required">实验类型</td>
<td class="w-75 m-color">
- <el-form-item prop="experimentType" style="display: flex;justify-content: center">
- <el-radio-group style="text-align: center" :disabled="projectDialogState.disabled" v-model="projectDialogState.projectForm.experimentType">
- <el-radio :label="1">化学类</el-radio>
- <el-radio :label="2">生物类</el-radio>
- <el-radio :label="3">辐射类</el-radio>
- <el-radio :label="4">机电类</el-radio>
- <el-radio :label="5">特种设备类</el-radio>
- <el-radio :label="6">其他类</el-radio>
- </el-radio-group>
+ <el-form-item prop="typeValue" style="display: flex;justify-content: center">
+<!-- <el-radio-group style="text-align: center" :disabled="projectDialogState.disabled" v-model="projectDialogState.projectForm.experimentType">-->
+<!-- <el-radio :label="1">化学类</el-radio>-->
+<!-- <el-radio :label="2">生物类</el-radio>-->
+<!-- <el-radio :label="3">辐射类</el-radio>-->
+<!-- <el-radio :label="4">机电类</el-radio>-->
+<!-- <el-radio :label="5">特种设备类</el-radio>-->
+<!-- <el-radio :label="6">其他类</el-radio>-->
+<!-- </el-radio-group>-->
+ <el-checkbox-group style="text-align: center" v-model="typeValue" :disabled="projectDialogState.disabled" @change="changeList">
+ <el-checkbox v-for="item in projectDialogState.experimentTypeList" :label="item.typeId" :key="item.typeId" >{{item.typeName}}</el-checkbox>
+ </el-checkbox-group>
</el-form-item>
</td>
</tr>
<tr>
<td class="w-25 m-color required">部门</td>
<td class="w-25 m-color">
- <el-form-item prop="dep">
- <el-input :disabled="projectDialogState.disabled" v-model="projectDialogState.projectForm.dep" />
- </el-form-item>
+<!-- <el-form-item prop="dep">-->
+<!-- <el-input :disabled="projectDialogState.disabled" v-model="projectDialogState.projectForm.dep" />-->
+<!-- </el-form-item>-->
+ <el-select style="width: 100%" v-model="projectDialogState.projectForm.dep" clearable filterable>
+ <el-option
+ v-for="item in projectDialogState.deptList"
+ :key="item.id"
+ :value="item.depName"
+ :label="item.depName"
+ ></el-option>
+ </el-select>
</td>
<td class="w-25 m-color required">立项时间</td>
<td class="w-25 m-color">
@@ -45,9 +56,17 @@
<td class="w-25 m-color required">负责人</td>
<td class="w-25 m-color">
<el-form-item prop="liabilityUserId">
- <el-select style="width: 100%" disabled v-model="projectDialogState.projectForm.liabilityUserId" clearable filterable>
- <el-option :key="userInfos.uid" :value="userInfos.uid" :label="userInfos.userName"></el-option>
+ <el-select style="width: 100%" v-model="projectDialogState.projectForm.liabilityUserId" clearable filterable @change="getLiabilityUserPhone($event)">
+ <el-option
+ v-for="item in projectDialogState.systemPersonList"
+ :key="item.id"
+ :value="item.id"
+ :label="item.realName"
+ ></el-option>
</el-select>
+<!-- <el-select style="width: 100%" disabled v-model="projectDialogState.projectForm.liabilityUserId" clearable filterable>-->
+<!-- <el-option :key="userInfos.uid" :value="userInfos.uid" :label="userInfos.userName"></el-option>-->
+<!-- </el-select>-->
</el-form-item>
<!-- <el-input :disabled="projectDialogState.disabled" v-model="projectDialogState.projectForm.liabilityUserId"/>-->
</td>
@@ -69,9 +88,17 @@
<!-- :label="item.personName"-->
<!-- ></el-option>-->
<!-- </el-select>-->
- <el-form-item prop="safeLiabilityUser">
- <el-input :disabled="projectDialogState.disabled" v-model="projectDialogState.projectForm.safeLiabilityUser" />
- </el-form-item>
+ <el-select style="width: 100%" v-model="projectDialogState.projectForm.safeLiabilityUser" clearable filterable @change="getSafeLiabilityUserPhone($event)">
+ <el-option
+ v-for="item in projectDialogState.systemPersonList"
+ :key="item.id"
+ :value="item.realName"
+ :label="item.realName"
+ ></el-option>
+ </el-select>
+<!-- <el-form-item prop="safeLiabilityUser">-->
+<!-- <el-input :disabled="projectDialogState.disabled" v-model="projectDialogState.projectForm.safeLiabilityUser" />-->
+<!-- </el-form-item>-->
</td>
<td class="w-25 m-color required">电话</td>
<td class="w-25 m-color">
@@ -264,7 +291,8 @@
<template #footer>
<span class="dialog-footer" style="padding-top:10px;text-align: center !important;">
<el-button @click="projectDialogState.projectDialogVisible = !projectDialogState.projectDialogVisible" size="default">取 消</el-button>
- <el-button type="primary" v-if="!projectDialogState.disabled" @click="onSubmitProject" size="default">确定</el-button>
+ <el-button type="primary" v-if="!projectDialogState.disabled && projectDialogState.title!= '编辑'" @click="onSubmitProject" size="default">确定</el-button>
+ <el-button type="primary" v-if="!projectDialogState.disabled" @click="scratchProject" plain size="default">暂存</el-button>
</span>
</template>
</el-dialog>
@@ -280,6 +308,7 @@
import {useUserInfo} from "/@/stores/userInfo";
import {storeToRefs} from "pinia";
import {checkChineseName, verifyPhone} from "/@/utils/toolsValidate";
+import {departmentApi} from "/@/api/systemManage/department";
const SelectEquipment = defineAsyncComponent(() => import('./selectEquipment.vue'))
const SelectMaterial = defineAsyncComponent(() => import('./selectMaterial.vue'))
@@ -294,7 +323,7 @@
const selectMaterialRef = ref()
const selectEmergencyRef = ref()
const selectDangerRef = ref()
-
+const typeValue = ref([])
const userInfo = useUserInfo();
const { userInfos } = storeToRefs(userInfo);
@@ -306,7 +335,8 @@
id: null,
experimentName: "",
experimentType: null,
- liabilityUserId: Number(userInfos.value.uid),
+ typeList: [],
+ liabilityUserId: null,
liabilityUserPhone: '',
safeLiabilityUser: '',
safeLiabilityUserPhone: '',
@@ -334,9 +364,18 @@
stuffList: [],
hazardousWasteList: []
},
+ experimentTypeList: [
+ {typeId: 1, typeName: '化学类'},
+ {typeId: 2, typeName: '生物类'},
+ {typeId: 3, typeName: '辐射类'},
+ {typeId: 4, typeName: '机电类'},
+ {typeId: 5, typeName: '特种设备类'},
+ {typeId: 6, typeName: '其它类'},
+ ],
projectFormRules: {
experimentName: [{ required: true, message: '', trigger: 'blur' }],
experimentType: [{ required: true, message: '', trigger: 'blur' }],
+ typeList: [{ required: true, message: '', trigger: 'blur' }],
liabilityUserId: [{ required: true, message: '', trigger: 'blur' }],
liabilityUserPhone: [{ required: true, message: '', trigger: 'blur' }],
safeLiabilityUser: [{ required: true, message: '', trigger: 'blur' }],
@@ -362,6 +401,7 @@
allPersonList: [],
allRoomList: [],
systemPersonList: [],
+ deptList: []
})
const getLiabilityUserPhone = (value: number)=>{
@@ -370,10 +410,40 @@
}
const getSafeLiabilityUserPhone = (value: number)=>{
- const data = projectDialogState.allPersonList.find(item => item.id === value) as AllPersonListType
+ const data = projectDialogState.systemPersonList.find(item => item.realName === value) as AllPersonListType
projectDialogState.projectForm.safeLiabilityUserPhone = data.phone
}
+// const getSafeLiabilityUserPhone = (value: number)=>{
+// const data = projectDialogState.allPersonList.find(item => item.id === value) as AllPersonListType
+// projectDialogState.projectForm.safeLiabilityUserPhone = data.phone
+// }
+
+const scratchProject = async() => {
+ projectDialogState.projectForm.emergencyList = projectDialogState.projectForm.emergencyList ? projectDialogState.projectForm.emergencyList.map(obj => ({emergencyDrill :
+ obj.emergencyDrill, emergencyDrillStatus : obj.emergencyDrillStatus, emergencyPlan : obj.emergencyPlan, emergencyPlanName : obj.emergencyPlanName})): []
+ // projectDialogState.projectForm.emergencyList = projectDialogState.projectForm.emergencyList ? projectDialogState.projectForm.emergencyList: []
+ projectDialogState.projectForm.persons = projectDialogState.projectForm.persons ? projectDialogState.projectForm.persons: []
+ // projectDialogState.projectForm.hazardousWasteList = projectDialogState.projectForm.hazardousWasteList ? projectDialogState.projectForm.hazardousWasteList: []
+ projectDialogState.projectForm.hazardousWasteList = projectDialogState.projectForm.hazardousWasteList ? projectDialogState.projectForm.hazardousWasteList.map(obj => ({classify:obj.classify,wasteStorage:obj.wasteStorage,handAmount:obj.handAmount})): []
+ // const roomList = selectRoomRef.value.dataList ? selectRoomRef.value.dataList: []
+ projectDialogState.projectForm.siteList = projectDialogState.projectForm.siteList ?projectDialogState.projectForm.siteList.map(({siteId}) => ({siteId})) : []
+ projectDialogState.projectForm.stuffList = projectDialogState.projectForm.stuffList ? projectDialogState.projectForm.stuffList: []
+ projectDialogState.projectForm.deviceList = projectDialogState.projectForm.deviceList ? projectDialogState.projectForm.deviceList: []
+ let res = await projectApi().temporaryProject(projectDialogState.projectForm);
+ if(res.data.code === 100){
+ handleClose()
+ ElMessage({
+ type: 'success',
+ message: '暂存信息成功'
+ })
+ }else{
+ ElMessage({
+ type: 'warning',
+ message: res.data.msg,
+ });
+ }
+}
const showProjectDialog = (title: string, value: ProjectType, allRoomList: RoomType []) => {
projectDialogState.projectDialogVisible = true;
projectDialogState.allRoomList = allRoomList
@@ -387,7 +457,8 @@
id: null,
experimentName: "",
experimentType: null,
- liabilityUserId: Number(userInfos.value.uid),
+ typeList: [],
+ liabilityUserId: null,
liabilityUserPhone: '',
safeLiabilityUser: '',
safeLiabilityUserPhone: '',
@@ -413,16 +484,17 @@
siteList: [],
deviceList: [],
stuffList: [],
- hazardousWasteList: []
+ hazardousWasteList: [],
};
- }else if(title === '整改'){
- projectDialogState.title = '整改';
+ }else if(title === '整改' || title === '编辑'){
+ projectDialogState.title = title;
projectDialogState.disabled = false
for(let i in projectDialogState.projectForm) {
if(isValidKey(i, projectDialogState.projectForm)) {
projectDialogState.projectForm[i] = value[i];
}
}
+ typeValue.value = projectDialogState.projectForm.typeList.map(item => item.typeId)
}else{
projectDialogState.title = '查看';
projectDialogState.disabled = true
@@ -431,14 +503,32 @@
projectDialogState.projectForm[i] = value[i];
}
}
+ typeValue.value = projectDialogState.projectForm.typeList.map(item => item.typeId)
}
};
+
+const handleClose = () => {
+ typeValue.value = []
+ emit('refresh')
+ projectDialogState.projectDialogVisible = false;
+}
const isValidKey = (key: string | number | symbol, object:object): key is keyof typeof object =>{
return key in object;
};
+const changeList = (val: any) => {
+ const filteredNames = projectDialogState.experimentTypeList
+ .filter((obj) => val.includes(obj.typeId)).map(item => {
+ return {
+ typeId: item.typeId,
+ typeName: item.typeName
+ }
+ })
+ projectDialogState.projectForm.typeList = filteredNames
-const onSubmitProject = () => {
+}
+
+const onSubmitProject = async() => {
ProjectFormRef.value.validate(async(valid: boolean) => {
if(valid){
if(projectDialogState.projectForm.timeout === 2){
@@ -466,14 +556,14 @@
}
}
if(projectDialogState.title === '新增'){
- if(checkChineseName(projectDialogState.projectForm.safeLiabilityUser) == false){
- ElMessage({
- type: 'warning',
- message: '安全负责人姓名格式有误',
- duration: 1000
- });
- return
- }
+ // if(checkChineseName(projectDialogState.projectForm.safeLiabilityUser) == false){
+ // ElMessage({
+ // type: 'warning',
+ // message: '安全负责人姓名格式有误',
+ // duration: 1000
+ // });
+ // return
+ // }
if(verifyPhone(projectDialogState.projectForm.safeLiabilityUserPhone) == false || verifyPhone(projectDialogState.projectForm.liabilityUserPhone) == false){
ElMessage({
type: 'warning',
@@ -516,15 +606,13 @@
}
projectDialogState.projectForm.emergencyList = selectEmergencyRef.value.dataList
projectDialogState.projectForm.persons = selectPersonRef.value.dataList
- projectDialogState.projectForm.hazardousWasteList = selectDangerRef.value.dataList
- // projectDialogState.projectForm.siteList = selectRoomRef.value.dataList.map(({siteId}) => ({siteId}))
- projectDialogState.projectForm.siteList = selectRoomRef.value.dataList.map(obj => ({siteId:obj.siteId}))
+ const roomList = selectRoomRef.value.dataList
+ projectDialogState.projectForm.siteList = roomList.map(({siteId}) => ({siteId}))
projectDialogState.projectForm.stuffList = selectMaterialRef.value.dataList
projectDialogState.projectForm.deviceList = selectEquipmentRef.value.dataList
let res = await projectApi().addProject(projectDialogState.projectForm)
if(res.data.code === 100){
- emit('refresh')
- projectDialogState.projectDialogVisible = false;
+ handleClose()
ElMessage({
type: 'success',
message: '新增成功'
@@ -541,8 +629,7 @@
projectDialogState.projectForm.hazardousWasteList = selectDangerRef.value.dataList.map(obj => ({classify:obj.classify,wasteStorage:obj.wasteStorage,handAmount:obj.handAmount}))
let res = await projectApi().modProject(projectDialogState.projectForm)
if(res.data.code === 100){
- emit('refresh')
- projectDialogState.projectDialogVisible = false;
+ handleClose()
ElMessage({
type: 'success',
message: '整改已提交'
@@ -573,7 +660,7 @@
realName: ''
}
});
- if(res.data.code === 200){
+ if(res.data.code === 100){
projectDialogState.systemPersonList = JSON.parse(JSON.stringify(res.data.data));
}else{
ElMessage({
@@ -595,6 +682,19 @@
}
};
+const getDeptData =async () => {
+ let res = await departmentApi().getDepartmentList()
+ if (res.data.code === 100) {
+ projectDialogState.deptList = res.data.data
+ } else {
+ ElMessage({
+ type: 'warning',
+ message: res.data.msg
+ });
+ }
+}
+
+
const emit = defineEmits(['refresh']);
defineExpose({
@@ -604,6 +704,7 @@
onMounted(() => {
getAllPersonList();
getPersonList();
+ getDeptData();
});
</script>
--
Gitblit v1.9.2