From 0c0fa2483fd431104f6498e40fffd983d913dce2 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期二, 25 四月 2023 17:11:09 +0800
Subject: [PATCH] 修改
---
src/views/experiment/developing/components/developDialog.vue | 239 +++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 164 insertions(+), 75 deletions(-)
diff --git a/src/views/experiment/developing/components/developDialog.vue b/src/views/experiment/developing/components/developDialog.vue
index f6704e9..7edbbe1 100644
--- a/src/views/experiment/developing/components/developDialog.vue
+++ b/src/views/experiment/developing/components/developDialog.vue
@@ -15,7 +15,7 @@
<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>
@@ -24,27 +24,32 @@
<el-radio :label="5">特种设备类</el-radio>
<el-radio :label="6">其他类</el-radio>
</el-radio-group>
-
-
+ </el-form-item>
</td>
</tr>
<tr>
<td class="w-25 m-color required">部门</td>
<td class="w-75 m-color">
+ <el-form-item prop="dep">
<el-input :disabled="projectDialogState.disabled" v-model="projectDialogState.projectForm.dep" />
+ </el-form-item>
</td>
</tr>
<tr>
<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>
+ </el-form-item>
<!-- <el-input :disabled="projectDialogState.disabled" v-model="projectDialogState.projectForm.liabilityUserId"/>-->
</td>
<td class="w-25 m-color required">电话</td>
<td class="w-25 m-color">
+ <el-form-item prop="liabilityUserPhone">
<el-input :disabled="projectDialogState.disabled" v-model="projectDialogState.projectForm.liabilityUserPhone" />
+ </el-form-item>
</td>
</tr>
<tr>
@@ -58,34 +63,46 @@
<!-- :label="item.personName"-->
<!-- ></el-option>-->
<!-- </el-select>-->
- <el-input :disabled="projectDialogState.disabled" v-model="projectDialogState.projectForm.safeLiabilityUser"/>
+ <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">
- <el-input :disabled="projectDialogState.disabled" v-model="projectDialogState.projectForm.safeLiabilityUserPhone" />
+ <el-form-item prop="safeLiabilityUserPhone">
+ <el-input :disabled="projectDialogState.disabled" v-model="projectDialogState.projectForm.safeLiabilityUserPhone" />
+ </el-form-item>
</td>
</tr>
<tr>
<td class="w-25 m-color required">立项时间</td>
<td class="w-25 m-color">
- <el-date-picker :disabled="projectDialogState.disabled" type="datetime" format="YYYY/MM/DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" v-model="projectDialogState.projectForm.createExperimentTime" />
+ <el-form-item prop="createExperimentTime">
+ <el-date-picker :disabled="projectDialogState.disabled" type="datetime" format="YYYY/MM/DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" v-model="projectDialogState.projectForm.createExperimentTime" />
+ </el-form-item>
</td>
<td class="w-25 m-color required">开展时间</td>
<td class="w-25 m-color">
+ <el-form-item prop="startTime">
<el-date-picker :disabled="projectDialogState.disabled" type="datetime" format="YYYY/MM/DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" v-model="projectDialogState.projectForm.startTime" />
+ </el-form-item>
</td>
</tr>
<tr>
<td class="w-25 m-color required">是否是安全化信息系统</td>
<td class="w-25 m-color">
+ <el-form-item prop="sisStatus">
<el-radio-group :disabled="projectDialogState.disabled" v-model="projectDialogState.projectForm.sisStatus" @change="hasSafeSystem">
<el-radio :label="1">是</el-radio>
<el-radio :label="2">否</el-radio>
</el-radio-group>
+ </el-form-item>
</td>
- <td class="w-25 m-color" :class="projectDialogState.projectForm.sisStatus==1?'required':''">安全信息化系统</td>
- <td class="w-25 m-color">
- <el-input :disabled="projectDialogState.disabled" :readonly="projectDialogState.projectForm.sisStatus!==1" v-model="projectDialogState.projectForm.safeInformationSystem" />
+ <td class="w-25 m-color" v-if="projectDialogState.projectForm.sisStatus == 1" :class="projectDialogState.projectForm.sisStatus==1?'required':''">安全信息化系统</td>
+ <td class="w-25 m-color" v-if="projectDialogState.projectForm.sisStatus == 1">
+ <el-form-item prop="safeInformationSystem">
+ <el-input :disabled="projectDialogState.disabled" v-model="projectDialogState.projectForm.safeInformationSystem" />
+ </el-form-item>
</td>
</tr>
<select-room ref="selectRoomRef" v-model:disabled="projectDialogState.disabled" v-model:data="projectDialogState.projectForm.siteList"></select-room>
@@ -94,119 +111,154 @@
<tr>
<td class="w-25 m-color required">实验步骤</td>
<td class="w-75 m-color">
+ <el-form-item prop="experimentStep">
<el-input :disabled="projectDialogState.disabled" v-model="projectDialogState.projectForm.experimentStep" placeholder="请输入实验步骤" />
+ </el-form-item>
</td>
</tr>
<tr>
<td class="w-25 m-color required">操作方法</td>
<td class="w-75 m-color">
+ <el-form-item prop="experimentMethod">
<el-input :disabled="projectDialogState.disabled" v-model="projectDialogState.projectForm.experimentMethod" placeholder="请输入操作方法" />
+ </el-form-item>
</td>
</tr>
<tr>
<td class="w-25 m-color required">工艺过程</td>
<td class="w-75 m-color">
+ <el-form-item prop="process">
<el-input :disabled="projectDialogState.disabled" v-model="projectDialogState.projectForm.process" placeholder="请输入工艺过程" />
+ </el-form-item>
</td>
</tr>
<tr>
<td class="w-25 m-color required">特殊/关键过程</td>
<td class="w-75 m-color">
+ <el-form-item prop="keyProcess">
<el-input :disabled="projectDialogState.disabled" v-model="projectDialogState.projectForm.keyProcess" placeholder="请输入特殊/关键过程" />
+ </el-form-item>
</td>
</tr>
<tr>
<td class="w-25 m-color required">预防措施</td>
<td class="w-75 m-color">
- <el-input :disabled="projectDialogState.disabled" v-model="projectDialogState.projectForm.measure" placeholder="请输入预防措施" />
+ <el-form-item prop="measure">
+ <el-input :disabled="projectDialogState.disabled" v-model="projectDialogState.projectForm.measure" placeholder="请输入预防措施" />
+ </el-form-item>
</td>
</tr>
<tr>
<td class="w-25 m-color required">是否存在过夜、老化实验</td>
<td class="w-25 m-color">
+ <el-form-item prop="timeout">
<el-radio-group :disabled="projectDialogState.disabled" v-model="projectDialogState.projectForm.timeout">
<el-radio :label="1">存在</el-radio>
<el-radio :label="2">不存在</el-radio>
</el-radio-group>
+ </el-form-item>
</td>
- <td class="w-25 m-color required">过夜、老化保障措施</td>
- <td class="w-25 m-color">
+ <td class="w-25 m-color required" v-if="projectDialogState.projectForm.timeout === 1">过夜、老化保障措施</td>
+ <td class="w-25 m-color" v-if="projectDialogState.projectForm.timeout === 1">
+ <el-form-item prop="timeoutManager">
<el-input :disabled="projectDialogState.disabled" v-model="projectDialogState.projectForm.timeoutManager" />
+ </el-form-item>
</td>
</tr>
<tr>
<td class="w-25 m-color required">是否在封闭条件下</td>
<td class="w-25 m-color">
+ <el-form-item prop="closed">
<el-radio-group :disabled="projectDialogState.disabled" v-model="projectDialogState.projectForm.closed">
<el-radio :label="1">存在</el-radio>
<el-radio :label="2">不存在</el-radio>
</el-radio-group>
+ </el-form-item>
</td>
- <td class="w-25 m-color required">封闭条件保障措施</td>
- <td class="w-25 m-color">
+ <td class="w-25 m-color required" v-if="projectDialogState.projectForm.closed === 1">封闭条件保障措施</td>
+ <td class="w-25 m-color" v-if="projectDialogState.projectForm.closed === 1">
+ <el-form-item prop="unclosedManager">
<el-input :disabled="projectDialogState.disabled" v-model="projectDialogState.projectForm.unclosedManager" />
+ </el-form-item>
</td>
</tr>
<tr>
<td class="w-25 m-color required">实验场所防爆措施条件和设施情况</td>
<td class="w-75 m-color">
+ <el-form-item prop="explosionProof">
<el-input :disabled="projectDialogState.disabled" v-model="projectDialogState.projectForm.explosionProof" placeholder="请输入" />
+ </el-form-item>
</td>
</tr>
<tr>
<td class="w-25 m-color required">实验场所防火措施条件和设施情况</td>
<td class="w-75 m-color">
+ <el-form-item prop="fireProof">
<el-input :disabled="projectDialogState.disabled" v-model="projectDialogState.projectForm.fireProof" placeholder="请输入" />
+ </el-form-item>
</td>
</tr>
<tr>
<td class="w-25 m-color required">实验场所防中毒措施条件和设施情况</td>
<td class="w-75 m-color">
+ <el-form-item prop="poisonProof">
<el-input :disabled="projectDialogState.disabled" v-model="projectDialogState.projectForm.poisonProof" placeholder="请输入" />
+ </el-form-item>
</td>
</tr>
<select-danger ref="selectDangerRef" v-model:data="projectDialogState.projectForm.hazardousWasteList" v-model:disabled="projectDialogState.disabled"></select-danger>
<select-person ref="selectPersonRef" v-model:data="projectDialogState.projectForm.persons" v-model:disabled="projectDialogState.disabled"></select-person>
+<!-- <tr class="m-color b-font" style="text-align: center">应急预案/应急演练</tr>-->
+<!-- <tr>-->
+<!-- <td class="w-25 m-color required">有无预案</td>-->
+<!-- <td class="w-25 m-color required">预案名称</td>-->
+<!-- <td class="w-25 m-color required">是否演练</td>-->
+<!-- <td class="w-25 m-color required">演练情况</td>-->
+<!-- </tr>-->
+<!-- <tr>-->
+<!-- <td class="w-25 m-color">-->
+<!-- <el-input :disabled="projectDialogState.disabled" v-model="projectDialogState.projectForm.emergencyPlan" />-->
+<!-- </td>-->
+<!-- <td class="w-25 m-color">-->
+<!-- <el-input :disabled="projectDialogState.disabled" v-model="projectDialogState.projectForm.emergencyPlanName" />-->
+<!-- </td>-->
+<!-- <td class="w-25 m-color">-->
+<!-- <el-input :disabled="projectDialogState.disabled" v-model="projectDialogState.projectForm.emergencyDrillStatus" />-->
+<!-- </td>-->
+<!-- <td class="w-25 m-color">-->
+<!-- <el-input :disabled="projectDialogState.disabled" v-model="projectDialogState.projectForm.emergencyDrill" />-->
+<!-- </td>-->
+<!-- </tr>-->
+ <select-emergency ref="selectEmergencyRef" v-model:disabled="projectDialogState.disabled" v-model:data="projectDialogState.projectForm.emergencyList"></select-emergency>
<tr>
- <td class="w-25 m-color required">安全管理制度</td>
- <td class="w-75 m-color">
- <el-input :disabled="projectDialogState.disabled" v-model="projectDialogState.projectForm.safeManagerMethod" placeholder="请输入" />
- </td>
- </tr>
- <tr class="m-color b-font" style="text-align: center">应急预案/应急演练</tr>
- <tr>
- <td class="w-25 m-color required">有无预案</td>
- <td class="w-25 m-color required">预案名称</td>
- <td class="w-25 m-color required">是否演练</td>
- <td class="w-25 m-color required">演练情况</td>
- </tr>
- <tr>
- <td class="w-25 m-color">
- <el-input :disabled="projectDialogState.disabled" v-model="projectDialogState.projectForm.emergencyPlan" />
- </td>
- <td class="w-25 m-color">
- <el-input :disabled="projectDialogState.disabled" v-model="projectDialogState.projectForm.emergencyPlanName" />
- </td>
- <td class="w-25 m-color">
- <el-input :disabled="projectDialogState.disabled" v-model="projectDialogState.projectForm.emergencyDrillStatus" />
- </td>
- <td class="w-25 m-color">
- <el-input :disabled="projectDialogState.disabled" v-model="projectDialogState.projectForm.emergencyDrill" />
- </td>
+ <td class="w-25 m-color required">安全管理制度</td>
+ <td class="w-75 m-color">
+ <el-form-item prop="safeManagerMethod">
+ <el-input :disabled="projectDialogState.disabled" v-model="projectDialogState.projectForm.safeManagerMethod" placeholder="请输入" />
+ </el-form-item>
+ </td>
</tr>
<tr class="m-color b-font" style=" text-align: center">其他信息</tr>
<tr>
<td class="w-25 m-color required">实验场所是否需要分区隔断</td>
<td class="w-75 m-color">
- <el-input :disabled="projectDialogState.disabled" v-model="projectDialogState.projectForm.partitionCondition" placeholder="请输入" />
+ <el-form-item prop="partitionCondition">
+<!-- <el-input :disabled="projectDialogState.disabled" v-model="projectDialogState.projectForm.partitionCondition" placeholder="请输入" />-->
+ <el-radio-group :disabled="projectDialogState.disabled" v-model="projectDialogState.projectForm.partitionCondition">
+ <el-radio :label="0">是</el-radio>
+ <el-radio :label="1">否</el-radio>
+ </el-radio-group>
+ </el-form-item>
</td>
</tr>
<tr>
<td class="w-25 m-color">其它基础信息（详细描述）</td>
<td class="w-75 m-color">
+ <el-form-item>
<el-input :disabled="projectDialogState.disabled" v-model="projectDialogState.projectForm.note" placeholder="请输入" />
+ </el-form-item>
</td>
</tr>
</table>
@@ -227,21 +279,23 @@
import {projectApi} from "/@/api/experiment/project";
import {personApi} from "/@/api/basic/person";
import {userApi} from "/@/api/systemManage/user";
-import SelectRoom from "/@/views/experiment/project/components/selectRoom.vue";
+
import {useUserInfo} from "/@/stores/userInfo";
import {storeToRefs} from "pinia";
import {checkChineseName, verifyPhone} from "/@/utils/toolsValidate";
const SelectEquipment = defineAsyncComponent(() => import('../../project/components/selectEquipment.vue'))
const SelectMaterial = defineAsyncComponent(() => import('../../project/components/selectMaterial.vue'))
const SelectDanger = defineAsyncComponent(() => import('../../project/components/selectDanger.vue'))
+const SelectEmergency = defineAsyncComponent(() => import('../../project/components/selectEmergency.vue'))
const SelectPerson = defineAsyncComponent(() => import('../../project/components/selectPerson.vue'))
+const SelectRoom = defineAsyncComponent(() => import('../../project/components/selectRoom.vue'))
const ProjectFormRef = ref()
const selectPersonRef = ref()
const selectEquipmentRef = ref()
const selectRoomRef = ref()
const selectMaterialRef = ref()
const selectDangerRef = ref()
-
+const selectEmergencyRef = ref()
const userInfo = useUserInfo();
const { userInfos } = storeToRefs(userInfo);
@@ -272,13 +326,9 @@
explosionProof: "",
fireProof: "",
poisonProof: "",
- hazardousWaste: null,
safeManagerMethod: "",
- emergencyPlan: "",
- emergencyDrill: "",
- emergencyPlanName: "",
- emergencyDrillStatus: "",
- partitionCondition: "",
+ emergencyList: [],
+ partitionCondition: null,
note: "",
createExperimentTime: '',
startTime: '',
@@ -293,10 +343,32 @@
]
},
projectFormRules: {
- experimentName: [{ required: true, message: '请填写设备编号', trigger: 'blur' }],
- deviceName: [{ required: true, message: '请填写设备名称', trigger: 'blur' }],
- devicePower: [{ required: true, message: '请填写设备功率', trigger: 'blur' }],
- deviceUnit: [{ required: true, message: '请选择计量单位', trigger: 'change' }]
+ experimentName: [{ required: true, message: '', trigger: 'blur' }],
+ experimentType: [{ required: true, message: '', trigger: 'blur' }],
+ liabilityUserId: [{ required: true, message: '', trigger: 'blur' }],
+ liabilityUserPhone: [{ required: true, message: '', trigger: 'blur' }],
+ safeLiabilityUser: [{ required: true, message: '', trigger: 'blur' }],
+ safeLiabilityUserPhone: [{ required: true, message: '', trigger: 'blur' }],
+ sisStatus: [{ required: true, message: '', trigger: 'blur' }],
+ safeInformationSystem: [{ required: true, message: '', trigger: 'blur' }],
+ dep: [{ required: true, message: '', trigger: 'blur' }],
+ experimentStep: [{ required: true, message: '', trigger: 'blur' }],
+ experimentMethod: [{ required: true, message: '', trigger: 'blur' }],
+ process: [{ required: true, message: '', trigger: 'blur' }],
+ keyProcess: [{ required: true, message: '', trigger: 'blur' }],
+ measure: [{ required: true, message: '', trigger: 'blur' }],
+ timeout: [{ required: true, message: '', trigger: 'blur' }],
+ timeoutManager: [{ required: true, message: '', trigger: 'blur' }],
+ closed: [{ required: true, message: '', trigger: 'blur' }],
+ unclosedManager: [{ required: true, message: '', trigger: 'blur' }],
+ explosionProof: [{ required: true, message: '', trigger: 'blur' }],
+ fireProof: [{ required: true, message: '', trigger: 'blur' }],
+ poisonProof: [{ required: true, message: '', trigger: 'blur' }],
+ safeManagerMethod: [{ required: true, message: '', trigger: 'blur' }],
+ emergencyList: [{ required: true, message: '', trigger: 'blur' }],
+ partitionCondition: [{ required: true, message: '', trigger: 'blur' }],
+ createExperimentTime: [{ required: true, message: '', trigger: 'blur' }],
+ startTime: [{ required: true, message: '', trigger: 'blur' }]
},
allPersonList: [],
allRoomList: [],
@@ -335,25 +407,17 @@
explosionProof: "",
fireProof: "",
poisonProof: "",
- hazardousWaste: 1,
safeManagerMethod: "",
- emergencyPlan: "",
- emergencyDrill: "",
- emergencyPlanName: "",
- emergencyDrillStatus: "",
- partitionCondition: "",
+ emergencyList: [],
+ partitionCondition: null,
note: "",
createExperimentTime: '',
startTime: '',
- persons: [
- ],
+ persons: [],
siteList: [],
- deviceList: [
- ],
- stuffList: [
- ],
- hazardousWasteList: [
- ]
+ deviceList: [],
+ stuffList: [],
+ hazardousWasteList: []
};
}else if(title === '整改'){
projectDialogState.title = '整改';
@@ -397,6 +461,30 @@
const onSubmitProject = () => {
ProjectFormRef.value.validate(async(valid: boolean) => {
if(valid){
+ if(projectDialogState.projectForm.timeout == 2){
+ projectDialogState.projectForm.timeoutManager = ''
+ }else{
+ if(projectDialogState.projectForm.timeoutManager == ''){
+ ElMessage({
+ type: 'warning',
+ message: '请填写过夜、老化保障措施',
+ duration: 1000
+ });
+ return
+ }
+ }
+ if(projectDialogState.projectForm.closed == 2){
+ projectDialogState.projectForm.unclosedManager = ""
+ }else{
+ if(projectDialogState.projectForm.unclosedManager == ''){
+ ElMessage({
+ type: 'warning',
+ message: '请填写封闭条件保障措施',
+ duration: 1000
+ });
+ return
+ }
+ }
if(projectDialogState.title === '新增'){
if(checkChineseName(projectDialogState.projectForm.safeLiabilityUser) == false){
ElMessage({
@@ -438,14 +526,6 @@
});
return
}
- if(projectDialogState.projectForm.hazardousWasteList.length === 0){
- ElMessage({
- type: 'warning',
- message: '请选择添加危废数据',
- duration: 1000
- });
- return
- }
if(projectDialogState.projectForm.persons.length === 0){
ElMessage({
type: 'warning',
@@ -454,6 +534,7 @@
});
return
}
+ 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}))
@@ -646,7 +727,15 @@
.m-color {
color: #0c4995;
}
-
+::v-deep(.el-form-item){
+ height: 100%;
+ display: flex;
+ justify-content: center;
+ .el-form-item__content{
+ display: flex;
+ justify-content: center;
+ }
+}
.roomSelect{
::v-deep(.el-popper){
.el-select-dropdown__item{
--
Gitblit v1.9.2