From 9e03b447fa15fa3fa0e468ca42a4bb7b4eac1e3b Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: Wed, 08 Jan 2025 11:07:42 +0800
Subject: [PATCH] 导出报告
---
src/views/experiment/developing/components/developDialog.vue | 120 ++++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 93 insertions(+), 27 deletions(-)
diff --git a/src/views/experiment/developing/components/developDialog.vue b/src/views/experiment/developing/components/developDialog.vue
index ffc8c69..75b54a0 100644
--- a/src/views/experiment/developing/components/developDialog.vue
+++ b/src/views/experiment/developing/components/developDialog.vue
@@ -15,15 +15,18 @@
<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>
@@ -39,9 +42,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>
@@ -265,8 +276,9 @@
</el-form>
<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 @click="handleClose" 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>
@@ -296,9 +308,9 @@
const selectMaterialRef = ref()
const selectDangerRef = ref()
const selectEmergencyRef = ref()
-const userInfo = useUserInfo();
-const { userInfos } = storeToRefs(userInfo);
-
+const userInfo = useUserInfo()
+const { userInfos } = storeToRefs(userInfo)
+const typeValue = ref([])
const projectDialogState = reactive<ProjectDialogType>({
title: '',
disabled: false,
@@ -307,7 +319,8 @@
id: null,
experimentName: "",
experimentType: null,
- liabilityUserId: Number(userInfos.value.uid),
+ typeList: [],
+ liabilityUserId: null,
liabilityUserPhone: '',
safeLiabilityUser: '',
safeLiabilityUserPhone: '',
@@ -340,11 +353,20 @@
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' }],
+ value: [{ required: true, message: '', trigger: 'blur' }],
liabilityUserId: [{ required: true, message: '', trigger: 'blur' }],
liabilityUserPhone: [{ required: true, message: '', trigger: 'blur' }],
safeLiabilityUser: [{ required: true, message: '', trigger: 'blur' }],
@@ -388,7 +410,8 @@
id: null,
experimentName: "",
experimentType: null,
- liabilityUserId: Number(userInfos.value.uid),
+ typeList: [],
+ liabilityUserId: null,
liabilityUserPhone: '',
safeLiabilityUser: '',
safeLiabilityUserPhone: '',
@@ -419,14 +442,15 @@
stuffList: [],
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
@@ -435,6 +459,7 @@
projectDialogState.projectForm[i] = value[i];
}
}
+ typeValue.value = projectDialogState.projectForm.typeList.map(item => item.typeId)
}
};
@@ -457,8 +482,45 @@
projectDialogState.projectForm.safeInformationSystem = ''
}
}
+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 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().temporaryDevelop(projectDialogState.projectForm);
+ if(res.data.code === 100){
+ handleClose()
+ ElMessage({
+ type: 'success',
+ message: '暂存信息成功'
+ })
+ }else{
+ ElMessage({
+ type: 'warning',
+ message: res.data.msg,
+ });
+ }
+}
+
+const onSubmitProject = async() => {
ProjectFormRef.value.validate(async(valid: boolean) => {
if(valid){
if(projectDialogState.projectForm.timeout == 2){
@@ -537,13 +599,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}))
+ 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().addDevelop(projectDialogState.projectForm);
if(res.data.code === 100){
- emit('refresh')
- projectDialogState.projectDialogVisible = false;
+ handleClose()
ElMessage({
type: 'success',
message: '新增成功'
@@ -559,8 +621,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: '整改已提交'
@@ -612,6 +673,11 @@
})
}
};
+const handleClose = () => {
+ typeValue.value = []
+ emit('refresh')
+ projectDialogState.projectDialogVisible = false;
+}
const emit = defineEmits(['refresh']);
--
Gitblit v1.9.2