From bc80908241e17a99b0704fed672565f2075f6283 Mon Sep 17 00:00:00 2001 From: 马宇豪 <978517621@qq.com> Date: 星期一, 28 八月 2023 15:19:12 +0800 Subject: [PATCH] 修改 --- src/views/experiment/project/components/projectDialog.vue | 31 +++++++++++++++---------------- 1 files changed, 15 insertions(+), 16 deletions(-) diff --git a/src/views/experiment/project/components/projectDialog.vue b/src/views/experiment/project/components/projectDialog.vue index 9248096..a48d851 100644 --- a/src/views/experiment/project/components/projectDialog.vue +++ b/src/views/experiment/project/components/projectDialog.vue @@ -45,17 +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%" 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 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> @@ -314,7 +314,7 @@ id: null, experimentName: "", experimentType: null, - liabilityUserId: Number(userInfos.value.uid), + liabilityUserId: null, liabilityUserPhone: '', safeLiabilityUser: '', safeLiabilityUserPhone: '', @@ -395,7 +395,7 @@ id: null, experimentName: "", experimentType: null, - liabilityUserId: Number(userInfos.value.uid), + liabilityUserId: null, liabilityUserPhone: '', safeLiabilityUser: '', safeLiabilityUserPhone: '', @@ -446,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){ @@ -524,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) -- Gitblit v1.9.2