From bfb8feb317f69b849994106025d9ef62eb34bd59 Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: Thu, 07 Nov 2024 08:43:16 +0800
Subject: [PATCH] 新增暂存功能
---
src/views/experiment/project/index.ts | 8 +
src/views/experiment/developing/components/developDialog.vue | 95 +++++++++++++++---
src/api/experiment/project/index.ts | 15 +++
src/views/experiment/developing/index.vue | 44 +++++++-
src/views/experiment/project/components/projectDialog.vue | 93 +++++++++++++++---
src/views/experiment/project/index.vue | 43 +++++++-
6 files changed, 248 insertions(+), 50 deletions(-)
diff --git a/src/api/experiment/project/index.ts b/src/api/experiment/project/index.ts
index 27efbb2..1ea43c8 100644
--- a/src/api/experiment/project/index.ts
+++ b/src/api/experiment/project/index.ts
@@ -41,6 +41,21 @@
data: params
});
},
+ //暂存
+ temporaryProject: (params: object) => {
+ return request({
+ url: import.meta.env.VITE_API_URL + '/experimentInfo/temporary',
+ method: 'post',
+ data: params
+ });
+ },
+ temporaryDevelop: (params: object) => {
+ return request({
+ url: import.meta.env.VITE_API_URL + '/experimentInfo/develop/temporary',
+ method: 'post',
+ data: params
+ });
+ },
applyProject: (params: object) => {
return request({
diff --git a/src/views/experiment/developing/components/developDialog.vue b/src/views/experiment/developing/components/developDialog.vue
index ac7c645..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>
@@ -273,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>
@@ -306,7 +310,7 @@
const selectEmergencyRef = ref()
const userInfo = useUserInfo()
const { userInfos } = storeToRefs(userInfo)
-
+const typeValue = ref([])
const projectDialogState = reactive<ProjectDialogType>({
title: '',
disabled: false,
@@ -315,6 +319,7 @@
id: null,
experimentName: "",
experimentType: null,
+ typeList: [],
liabilityUserId: null,
liabilityUserPhone: '',
safeLiabilityUser: '',
@@ -348,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' }],
@@ -396,6 +410,7 @@
id: null,
experimentName: "",
experimentType: null,
+ typeList: [],
liabilityUserId: null,
liabilityUserPhone: '',
safeLiabilityUser: '',
@@ -427,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
@@ -443,6 +459,7 @@
projectDialogState.projectForm[i] = value[i];
}
}
+ typeValue.value = projectDialogState.projectForm.typeList.map(item => item.typeId)
}
};
@@ -464,6 +481,43 @@
if(value == 2){
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 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() => {
@@ -551,8 +605,7 @@
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: '新增成功'
@@ -568,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: '整改已提交'
@@ -621,6 +673,11 @@
})
}
};
+const handleClose = () => {
+ typeValue.value = []
+ emit('refresh')
+ projectDialogState.projectDialogVisible = false;
+}
const emit = defineEmits(['refresh']);
diff --git a/src/views/experiment/developing/index.vue b/src/views/experiment/developing/index.vue
index 9500ff9..43cf64d 100644
--- a/src/views/experiment/developing/index.vue
+++ b/src/views/experiment/developing/index.vue
@@ -52,10 +52,10 @@
<span>{{scope.row.siteList.map(i=>i.siteName).join(',')}}</span>
</template>
</el-table-column>
- <el-table-column prop="experimentType" label="实验类别">
- <template #default="scope">
- <span>{{developState.experimentTypeList.find(i=>i.id == scope.row.experimentType)?.name}}</span>
- </template>
+ <el-table-column prop="experimentTypeName" label="实验类别" width="130">
+<!-- <template #default="scope">-->
+<!-- <span>{{developState.experimentTypeList.find(i=>i.id == scope.row.experimentType)?.name}}</span>-->
+<!-- </template>-->
</el-table-column>
<el-table-column prop="status" label="评估申请">
<template #default="scope">
@@ -92,11 +92,19 @@
<!-- <el-table-column prop="updateByUserName" label="最后修改人" show-overflow-tooltip></el-table-column>-->
<el-table-column label="操作" width="250" fixed="right">
<template #default="scope">
+ <div v-if="scope.row.stagingTag === 1">
<el-button size="small" text type="primary" :icon="View" @click="openProjectDialog('查看', scope.row)">查看</el-button>
<el-button size="small" text type="primary" :icon="View" v-if="scope.row.stage == 4" @click="openReportDialog('查看',scope.row)">查看评估报告</el-button>
<el-button size="small" :disabled="scope.row.stage == 2 ? true : false" text type="primary" :icon="Edit" @click="applyAccess( scope.row)">申请评估</el-button>
<el-button size="small" :disabled="(scope.row.status == 2 && scope.row.stage == 1) ? false : true" text type="warning" :icon="RefreshLeft" @click="cancelAccess( scope.row)">撤销评估</el-button>
<el-button size="small" type="warning" v-if="scope.row.rectifyStatus == 1" text :icon="Edit" @click="openProjectDialog('整改', scope.row)">整改</el-button>
+ <el-button size="small" text type="primary" :icon="Edit" @click="openProjectDialog('编辑', scope.row)">编辑</el-button>
+ </div>
+ <div v-else>
+ <el-button size="small" text type="primary" :icon="Edit" @click="openProjectDialog('编辑', scope.row)">编辑</el-button>
+ <el-button size="small" text type="primary" :icon="Finished" @click="saveDevelop(scope.row)">提交</el-button>
+ </div>
+
</template>
</el-table-column>
</el-table>
@@ -117,7 +125,7 @@
import {defineAsyncComponent, onMounted, reactive, ref} from "vue";
import {projectApi} from "/@/api/experiment/project";
import {ElMessage, ElMessageBox} from "element-plus";
-import { View,Edit, Plus, RefreshLeft } from '@element-plus/icons-vue';
+import { View,Edit, Plus, RefreshLeft,Finished } from '@element-plus/icons-vue';
import {roomApi} from "/@/api/basic/room";
const ReportDialog = defineAsyncComponent(() => import('../../analyse/assessApply/components/reportDialog.vue'));
const DevelopDialog = defineAsyncComponent(() => import('./components/developDialog.vue'));
@@ -236,7 +244,6 @@
type: 'warning'
})
.then(async () => {
- debugger
let res = await projectApi().deleteProjectById({ id: val.id });
if (res.data.code === 100) {
ElMessage({
@@ -255,6 +262,31 @@
.catch((error) => {
});
}
+const saveDevelop = async (data: any) => {
+ ElMessageBox.confirm(`此操作将提交该实验：“${data.experimentName}”，是否继续?`, '提示', {
+ confirmButtonText: '确认',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(async () => {
+ let res = await projectApi().addDevelop(data);
+ if(res.data.code === 100){
+ ElMessage({
+ type: 'success',
+ message: '提交成功'
+ })
+ await getdevelopData();
+ }else{
+ ElMessage({
+ type: 'warning',
+ message: res.data.msg,
+ });
+ }
+})
+.catch((error) => {
+});
+
+}
+
const onHandleSizeChange = (val: number) => {
developState.searchQuery.pageSize = val;
diff --git a/src/views/experiment/project/components/projectDialog.vue b/src/views/experiment/project/components/projectDialog.vue
index a48d851..15f901a 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,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>
@@ -272,7 +275,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>
@@ -302,7 +306,7 @@
const selectMaterialRef = ref()
const selectEmergencyRef = ref()
const selectDangerRef = ref()
-
+const typeValue = ref([])
const userInfo = useUserInfo();
const { userInfos } = storeToRefs(userInfo);
@@ -314,6 +318,7 @@
id: null,
experimentName: "",
experimentType: null,
+ typeList: [],
liabilityUserId: null,
liabilityUserPhone: '',
safeLiabilityUser: '',
@@ -342,9 +347,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' }],
@@ -382,6 +396,31 @@
// 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
@@ -395,6 +434,7 @@
id: null,
experimentName: "",
experimentType: null,
+ typeList: [],
liabilityUserId: null,
liabilityUserPhone: '',
safeLiabilityUser: '',
@@ -423,14 +463,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
@@ -439,12 +480,30 @@
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 = async() => {
ProjectFormRef.value.validate(async(valid: boolean) => {
@@ -530,8 +589,7 @@
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: '新增成功'
@@ -548,8 +606,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: '整改已提交'
diff --git a/src/views/experiment/project/index.ts b/src/views/experiment/project/index.ts
index ea7412d..12a630a 100644
--- a/src/views/experiment/project/index.ts
+++ b/src/views/experiment/project/index.ts
@@ -29,6 +29,10 @@
id: number,
name: string,
}
+declare interface eType {
+ typeId: number,
+ typeName: string,
+}
declare interface ProjectDialogType {
title: string,
@@ -37,7 +41,8 @@
projectForm: {
id: null | number,
experimentName: string,
- experimentType: null | number,
+ experimentType: null | number | any,
+ typeList: Array<eType>,
liabilityUserId: null | number,
safeLiabilityUser: string
liabilityUserPhone: string,
@@ -75,6 +80,7 @@
allPersonList: Array<AllPersonListType>
systemPersonList: Array<AllPersonListType>
allRoomList: Array<RoomType>
+ experimentTypeList: eType []
}
declare interface SelectDangerType {
diff --git a/src/views/experiment/project/index.vue b/src/views/experiment/project/index.vue
index 67edf14..c8b0239 100644
--- a/src/views/experiment/project/index.vue
+++ b/src/views/experiment/project/index.vue
@@ -52,11 +52,11 @@
<span>{{scope.row.siteList.map(i=>i.siteName).join(',')}}</span>
</template>
</el-table-column>
- <el-table-column prop="experimentType" label="实验类别">
- <template #default="scope">
- <span>{{projectState.experimentTypeList.find(i=>i.id == scope.row.experimentType)?.name}}</span>
- </template>
- </el-table-column>
+ <el-table-column prop="experimentTypeName" label="实验类别" width="130">
+ <!-- <template #default="scope">-->
+ <!-- <span>{{developState.experimentTypeList.find(i=>i.id == scope.row.experimentType)?.name}}</span>-->
+ <!-- </template>-->
+ </el-table-column>
<el-table-column prop="status" label="评估申请">
<template #default="scope">
<span>{{scope.row.status == 1?'未申请':scope.row.status == 2?'已申请':'--'}}</span>
@@ -92,12 +92,19 @@
<!-- <el-table-column prop="updateByUserName" label="最后修改人" show-overflow-tooltip></el-table-column>-->
<el-table-column label="操作" width="250" fixed="right">
<template #default="scope">
+ <div v-if="scope.row.stagingTag === 1">
<el-button size="small" text type="primary" :icon="View" @click="openProjectDialog('查看', scope.row)">查看</el-button>
<el-button size="small" text type="primary" :icon="View" v-if="scope.row.stage == 4" @click="openReportDialog('查看',scope.row)">查看评估报告</el-button>
<el-button size="small" text type="primary" :icon="Edit" @click="applyStart('申请开展', scope.row)">转为已开展</el-button>
<el-button size="small" :disabled="scope.row.stage == 2 ? true : false" text type="primary" :icon="Edit" @click="applyAccess( scope.row)">申请评估</el-button>
<el-button size="small" type="warning" v-if="scope.row.rectifyStatus == 1" text :icon="Edit" @click="openProjectDialog('整改', scope.row)">整改</el-button>
<el-button size="small" text type="danger" :icon="Delete" :disabled="scope.row.stage !== 1" @click="onDelProject(scope.row)">删除</el-button>
+ <el-button size="small" text type="primary" :icon="Edit" @click="openProjectDialog('编辑', scope.row)">编辑</el-button>
+ </div>
+ <div v-else>
+ <el-button size="small" text type="primary" :icon="Edit" @click="openProjectDialog('编辑', scope.row)">编辑</el-button>
+ <el-button size="small" text type="primary" :icon="Finished" @click="saveDevelop(scope.row)">提交</el-button>
+ </div>
</template>
</el-table-column>
</el-table>
@@ -118,7 +125,7 @@
import {defineAsyncComponent, onMounted, reactive, ref} from "vue";
import {projectApi} from "/@/api/experiment/project";
import {ElMessage, ElMessageBox} from "element-plus";
-import { View,Edit, Plus, Delete } from '@element-plus/icons-vue';
+import { View,Edit, Plus, Delete,Finished } from '@element-plus/icons-vue';
import {roomApi} from "/@/api/basic/room";
const ReportDialog = defineAsyncComponent(() => import('../../analyse/assessApply/components/reportDialog.vue'));
const ProjectDialog = defineAsyncComponent(() => import('./components/projectDialog.vue'));
@@ -208,6 +215,30 @@
.catch((error) => {
});
}
+const saveDevelop = async (data: any) => {
+ ElMessageBox.confirm(`此操作将提交该实验：“${data.experimentName}”，是否继续?`, '提示', {
+ confirmButtonText: '确认',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(async () => {
+ let res = await projectApi().addProject(data);
+ if(res.data.code === 100){
+ ElMessage({
+ type: 'success',
+ message: '提交成功'
+ })
+ await getProjectData();
+ }else{
+ ElMessage({
+ type: 'warning',
+ message: res.data.msg,
+ });
+ }
+ })
+ .catch((error) => {
+ });
+
+}
const onDelProject = (val: ProjectType) => {
ElMessageBox.confirm(`此操作将永久删除该实验：“${val.experimentName}”，是否继续?`, '提示', {
--
Gitblit v1.9.2