taoge_xiaodi/td_official
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

根据选择项目跟新材料管理

Browse Source
This commit is contained in:
zhuer
2025-03-07 09:07:42 +08:00
parent d3986016fc
commit 55df453d4c
16 changed files with 1925 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/views/personnelManagement/project/project/index.vue
View File

@ -52,7 +52,7 @@
<el-form-item label="显示隐藏" prop="showHidden">
<el-input v-model="queryParams.showHidden" placeholder="请输入显示隐藏" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="是否删除" prop="isDelete">
<el-form-item label="是否删除" prop="isDelete">
<el-input v-model="queryParams.isDelete" placeholder="请输入是否删除" clearable @keyup.enter="handleQuery" />
</el-form-item> -->
<el-form-item>
@ -92,12 +92,12 @@
<el-table-column label="" align="center" prop="id" v-if="true" />
<el-table-column label="项目名称" align="center" prop="projectName" />
<el-table-column label="项目简称" align="center" prop="shortName" />
<el-table-column label="父项目id" align="center" prop="pId" />
<!-- <el-table-column label="父项目id" align="center" prop="pId" /> -->
<el-table-column label="状态" align="center" prop="status" />
<el-table-column label="项目图片" align="center" prop="picUrl" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="项目类型" align="center" prop="type" />
<el-table-column label="项目类型" align="center" prop="isType" />
<!-- <el-table-column label="项目类型" align="center" prop="isType" /> -->
<!-- <el-table-column label="删除时间" align="center" prop="deletedAt" width="180">
<template #default="scope">
<span>{{ parseTime(scope.row.deletedAt, '{y}-{m}-{d}') }}</span>
@ -111,10 +111,10 @@
<el-table-column label="开工时间" align="center" prop="onStreamTime" />
<el-table-column label="打卡范围" align="center" prop="punchRange" />
<el-table-column label="设计总量" align="center" prop="designTotal" />
<el-table-column label="安全协议书" align="center" prop="securityAgreement" />
<el-table-column label="排序字段" align="center" prop="sort" />
<el-table-column label="显示隐藏" align="center" prop="showHidden" />
<el-table-column label="是否删除" align="center" prop="isDelete" />
<!-- <el-table-column label="安全协议书" align="center" prop="securityAgreement" /> -->
<!-- <el-table-column label="排序字段" align="center" prop="sort" />/ -->
<!-- <el-table-column label="显示隐藏" align="center" prop="showHidden" /> -->
<!-- <el-table-column label="是否删除" align="center" prop="isDelete" /> -->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-tooltip content="修改" placement="top">
@ -138,9 +138,9 @@
<el-form-item label="项目简称" prop="shortName">
<el-input v-model="form.shortName" placeholder="请输入项目简称" />
</el-form-item>
<el-form-item label="父项目id" prop="pId">
<!-- <el-form-item label="父项目id" prop="pId">
<el-input v-model="form.pId" placeholder="请输入父项目id" />
</el-form-item>
</el-form-item> -->
<el-form-item label="项目图片" prop="picUrl">
<el-input v-model="form.picUrl" placeholder="请输入项目图片" />
</el-form-item>
@ -175,7 +175,7 @@
<el-form-item label="设计总量" prop="designTotal">
<el-input v-model="form.designTotal" placeholder="请输入设计总量" />
</el-form-item>
<el-form-item label="安全协议书" prop="securityAgreement">
<!-- <el-form-item label="安全协议书" prop="securityAgreement">
<el-input v-model="form.securityAgreement" placeholder="请输入安全协议书" />
</el-form-item>
<el-form-item label="排序字段" prop="sort">
@ -186,7 +186,7 @@
</el-form-item>
<el-form-item label="是否删除" prop="isDelete">
<el-input v-model="form.isDelete" placeholder="请输入是否删除" />
</el-form-item>
</el-form-item> -->
</el-form>
<template #footer>
<div class="dialog-footer">
@ -327,7 +327,7 @@ const handleAdd = () => {
reset();
dialog.visible = true;
dialog.title = '添加项目';
};
/** 修改按钮操作 */

11
src/views/personnelManagement/project/projectRelevancy/component/ShuttleFrame.vue
View File

@ -35,17 +35,20 @@ const getProjectList = async () => {
console.error('获取项目列表失败:', error);
}
};
const getUserProjects = async () => {
if (!props.userId) return;
try {
const res = await listUserProjects({ userId: props.userId });
// **确保 `res.rows` 是数组**
selectedProjects.value = Array.isArray(res.rows) ? res.rows.map((item) => item.projectId) : [];
// 修改这里，使用 res.records 而不是 res.rows
selectedProjects.value = Array.isArray(res.records)
? res.records.map((item) => item.projectId)
: [];
console.log('已加载用户关联项目:', selectedProjects.value);
} catch (error) {
console.error('获取用户关联的项目失败:', error);
selectedProjects.value = []; // **请求失败时清空列表**
selectedProjects.value = []; // 请求失败时清空列表
}
};

10
src/views/personnelManagement/project/projectRelevancy/index.vue
View File

@ -226,8 +226,8 @@ const selectedUserId = ref<number>();
const handleUpdate = (row?: ProjectRelevancyVO) => {
const currentRow = row || projectRelevancyList.value.find((item) => item.id === ids.value[0]);
if (currentRow) {
selectedUserId.value = currentRow.userId;
shuttleVisible.value = true;
selectedUserId.value = currentRow.userId;
shuttleVisible.value = true;
}
};
@ -268,9 +268,9 @@ const handleExport = () => {
);
};
const projectList = ref<any[]>([]);
const projectItem = new Map();
const selectedProject = ref<any | null>(null);
const projectList = ref<any[]>([]);
const projectItem = new Map();
const selectedProject = ref<any | null>(null);
// 获取项目列表的方法
const getProjectList = async () => {