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/developing/components/developDialog.vue | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/src/views/experiment/developing/components/developDialog.vue b/src/views/experiment/developing/components/developDialog.vue
index 7edbbe1..ac7c645 100644
--- a/src/views/experiment/developing/components/developDialog.vue
+++ b/src/views/experiment/developing/components/developDialog.vue
@@ -39,9 +39,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>
@@ -296,8 +304,8 @@
const selectMaterialRef = ref()
const selectDangerRef = ref()
const selectEmergencyRef = ref()
-const userInfo = useUserInfo();
-const { userInfos } = storeToRefs(userInfo);
+const userInfo = useUserInfo()
+const { userInfos } = storeToRefs(userInfo)
const projectDialogState = reactive<ProjectDialogType>({
title: '',
@@ -307,7 +315,7 @@
id: null,
experimentName: "",
experimentType: null,
- liabilityUserId: Number(userInfos.value.uid),
+ liabilityUserId: null,
liabilityUserPhone: '',
safeLiabilityUser: '',
safeLiabilityUserPhone: '',
@@ -388,7 +396,7 @@
id: null,
experimentName: "",
experimentType: null,
- liabilityUserId: Number(userInfos.value.uid),
+ liabilityUserId: null,
liabilityUserPhone: '',
safeLiabilityUser: '',
safeLiabilityUserPhone: '',
@@ -458,7 +466,7 @@
}
}
-const onSubmitProject = () => {
+const onSubmitProject = async() => {
ProjectFormRef.value.validate(async(valid: boolean) => {
if(valid){
if(projectDialogState.projectForm.timeout == 2){
@@ -537,7 +545,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}))
+ 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);
@@ -591,7 +600,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