Merge branch 'main' of http://xny.yj-3d.com:3000/taoge/new_project into ljx
This commit is contained in:
@ -373,7 +373,7 @@
|
||||
<div class="image_upload" v-for="(item, index) in uploadPath" :key="item.value">
|
||||
<div class="title">{{ item.label }}</div>
|
||||
<div class="file_upload_all" v-if="item.value != 7">
|
||||
<file-upload v-model="item.path" isConstruction :isShowTip="false" :limit="10" :file-type="['pdf']" :file-size="50" />
|
||||
<file-upload v-model="item.path" isConstruction show-file-list :isShowTip="false" :limit="10" :file-type="['pdf']" :file-size="50" />
|
||||
</div>
|
||||
</div>
|
||||
<template #footer>
|
||||
@ -485,7 +485,7 @@
|
||||
<el-select
|
||||
v-model="personnelAllocationObject.teamId"
|
||||
:disabled="!personnelAllocationObject.projectId"
|
||||
placeholder="请选择分包单位"
|
||||
placeholder="请选择班组"
|
||||
style="width: 240px"
|
||||
>
|
||||
<el-option v-for="item in teamList" :key="item.id" :label="item.teamName" :value="item.id" />
|
||||
@ -1027,7 +1027,7 @@ const handleExit = async (row: ConstructionUserVO) => {
|
||||
|
||||
//上传按钮
|
||||
const handleUpload = async (row: ConstructionUserVO) => {
|
||||
const _id = row?.id || ids.value[0];
|
||||
const _id = row?.sysUserId;
|
||||
currentUserId.value = _id;
|
||||
const res = await listConstructionUserFile({ userId: _id });
|
||||
fileList.value = res.data;
|
||||
@ -1163,7 +1163,11 @@ const listeningProject = watch(
|
||||
const handleAssign = async (row: ConstructionUserVO) => {
|
||||
const _id = row?.id || ids.value[0];
|
||||
currentUserId.value = _id;
|
||||
personnelAllocationObject.projectId = '';
|
||||
personnelAllocationObject.postId = '';
|
||||
personnelAllocationObject.teamId = '';
|
||||
personnelAllocationObject.memberId = row?.sysUserId;
|
||||
skipName.value = row?.userName;
|
||||
personnelAllocation.value = true;
|
||||
};
|
||||
// 选择项目1
|
||||
|
Reference in New Issue
Block a user