合并
This commit is contained in:
@ -47,9 +47,9 @@
|
||||
<el-row :gutter="8" class="mb-3 font-medium text-gray-700 whitespace-nowrap">
|
||||
<el-col :span="4">专业</el-col>
|
||||
<el-col :span="5">设计人员(可多选)</el-col>
|
||||
<el-col :span="5">校审人员(可多选)</el-col>
|
||||
<el-col :span="5">审定人员(可多选)</el-col>
|
||||
<el-col :span="4">审核人员(可多选)</el-col>
|
||||
<el-col :span="5">校审人员</el-col>
|
||||
<el-col :span="5">审定人员</el-col>
|
||||
<el-col :span="4">审核人员</el-col>
|
||||
<el-col :span="3"></el-col>
|
||||
</el-row>
|
||||
|
||||
@ -65,7 +65,7 @@
|
||||
>
|
||||
<el-row :gutter="8" class="items-top">
|
||||
<!-- 1. 专业选择(核心:统一所有角色的专业来源) -->
|
||||
<el-col :span="3" class="mb-4 sm:mb-0 pl-4">
|
||||
<el-col :span="3" class="mb-4 sm:mb-0 pl-4" style="margin-top:8px;">
|
||||
<el-form-item
|
||||
:prop="`designers.${configIndex}.userMajor`"
|
||||
:rules="[
|
||||
@ -76,7 +76,7 @@
|
||||
label-width="60px"
|
||||
label="专业"
|
||||
>
|
||||
<el-select
|
||||
<el-select filterable
|
||||
v-model="form.designers[configIndex].userMajor"
|
||||
placeholder="请选择专业"
|
||||
class="w-full transition-all duration-300 border-gray-300"
|
||||
@ -109,7 +109,7 @@
|
||||
label="设计"
|
||||
label-width="50px"
|
||||
>
|
||||
<el-select
|
||||
<el-select filterable
|
||||
v-model="person.userId"
|
||||
placeholder="选择人员"
|
||||
class="w-full transition-all duration-300 border-gray-300"
|
||||
@ -165,7 +165,7 @@
|
||||
label="校审"
|
||||
label-width="50px"
|
||||
>
|
||||
<el-select
|
||||
<el-select filterable
|
||||
v-model="person.userId"
|
||||
placeholder="选择人员"
|
||||
class="w-full transition-all duration-300 border-gray-300"
|
||||
@ -174,7 +174,7 @@
|
||||
<el-option v-for="item in userList" :key="`user-${item.userId}`" :label="item.nickName" :value="item.userId" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<div class="flex gap-1">
|
||||
<!-- <div class="flex gap-1">
|
||||
<el-button
|
||||
type="danger"
|
||||
size="small"
|
||||
@ -193,7 +193,7 @@
|
||||
>
|
||||
<el-icon :size="14"><Plus /></el-icon>
|
||||
</el-button>
|
||||
</div>
|
||||
</div> -->
|
||||
</div>
|
||||
</div>
|
||||
<div
|
||||
@ -221,7 +221,7 @@
|
||||
label="审定"
|
||||
label-width="50px"
|
||||
>
|
||||
<el-select
|
||||
<el-select filterable
|
||||
v-model="person.userId"
|
||||
placeholder="选择人员"
|
||||
class="w-full transition-all duration-300 border-gray-300"
|
||||
@ -230,7 +230,7 @@
|
||||
<el-option v-for="item in userList" :key="`user-${item.userId}`" :label="item.nickName" :value="item.userId" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<div class="flex gap-1">
|
||||
<!-- <div class="flex gap-1">
|
||||
<el-button
|
||||
type="danger"
|
||||
size="small"
|
||||
@ -249,7 +249,7 @@
|
||||
>
|
||||
<el-icon :size="14"><Plus /></el-icon>
|
||||
</el-button>
|
||||
</div>
|
||||
</div> -->
|
||||
</div>
|
||||
</div>
|
||||
<div
|
||||
@ -277,7 +277,7 @@
|
||||
label="审核"
|
||||
label-width="50px"
|
||||
>
|
||||
<el-select
|
||||
<el-select filterable
|
||||
v-model="person.userId"
|
||||
placeholder="选择人员"
|
||||
class="w-full transition-all duration-300 border-gray-300"
|
||||
@ -286,7 +286,7 @@
|
||||
<el-option v-for="item in userList" :key="`user-${item.userId}`" :label="item.nickName" :value="item.userId" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<div class="flex gap-1">
|
||||
<!-- <div class="flex gap-1">
|
||||
<el-button
|
||||
type="danger"
|
||||
size="small"
|
||||
@ -305,7 +305,7 @@
|
||||
>
|
||||
<el-icon :size="14"><Plus /></el-icon>
|
||||
</el-button>
|
||||
</div>
|
||||
</div> -->
|
||||
</div>
|
||||
</div>
|
||||
<div
|
||||
@ -436,6 +436,8 @@ const disabledForm = ref(true); // 初始禁用表单(编辑时开启)
|
||||
|
||||
/** 查询当前部门的所有用户(确保用户列表有效) */
|
||||
const getDeptAllUser = async (deptId: number | undefined) => {
|
||||
console.log(1111111111111);
|
||||
|
||||
if (!deptId) {
|
||||
ElMessage.warning('请先选择部门');
|
||||
return;
|
||||
|
Reference in New Issue
Block a user