From f1f40e9a28fafab5d884630b8900b11060ebe9fc Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期二, 31 十月 2023 08:53:35 +0800
Subject: [PATCH] 修改
---
src/views/experiment/project/components/projectDialog.vue | 33 ++++++++++++++++++++-------------
1 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/src/views/experiment/project/components/projectDialog.vue b/src/views/experiment/project/components/projectDialog.vue
index e9fa759..a48d851 100644
--- a/src/views/experiment/project/components/projectDialog.vue
+++ b/src/views/experiment/project/components/projectDialog.vue
@@ -45,9 +45,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>
@@ -306,7 +314,7 @@
id: null,
experimentName: "",
experimentType: null,
- liabilityUserId: Number(userInfos.value.uid),
+ liabilityUserId: null,
liabilityUserPhone: '',
safeLiabilityUser: '',
safeLiabilityUserPhone: '',
@@ -369,10 +377,10 @@
projectDialogState.projectForm.liabilityUserPhone = data.phone
}
-const getSafeLiabilityUserPhone = (value: number)=>{
- const data = projectDialogState.allPersonList.find(item => item.id === 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 showProjectDialog = (title: string, value: ProjectType, allRoomList: RoomType []) => {
projectDialogState.projectDialogVisible = true;
@@ -387,7 +395,7 @@
id: null,
experimentName: "",
experimentType: null,
- liabilityUserId: Number(userInfos.value.uid),
+ liabilityUserId: null,
liabilityUserPhone: '',
safeLiabilityUser: '',
safeLiabilityUserPhone: '',
@@ -438,7 +446,7 @@
return key in object;
};
-const onSubmitProject = () => {
+const onSubmitProject = async() => {
ProjectFormRef.value.validate(async(valid: boolean) => {
if(valid){
if(projectDialogState.projectForm.timeout === 2){
@@ -516,9 +524,8 @@
}
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)
@@ -573,7 +580,7 @@
realName: ''
}
});
- if(res.data.code === 200){
+ if(res.data.code === 100){
projectDialogState.systemPersonList = JSON.parse(JSON.stringify(res.data.data));
}else{
ElMessage({
--
Gitblit v1.9.2