From 4c4651b8688052069725c14ca58e520cb8e7f8a8 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Tue, 20 Dec 2022 17:42:49 +0800 Subject: [PATCH 1/6] =?UTF-8?q?--=20=E8=B5=84=E6=BA=90=E5=BD=92=E5=B1=9E?= =?UTF-8?q?=E4=B8=8D=E9=9A=8F=E9=A1=B9=E7=9B=AE=E7=BB=8F=E7=90=86=E5=B8=A6?= =?UTF-8?q?=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/projectcenter/ProjectAdd.vue | 3 +++ src/views/projectcenter/ProjectManage.vue | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue index cdd74c79..9f389f12 100644 --- a/src/views/projectcenter/ProjectAdd.vue +++ b/src/views/projectcenter/ProjectAdd.vue @@ -499,6 +499,9 @@ export default { }; function managerChange(e, l, d, t) { + if (routers.query.parentId) { + return; + } !state.projectInfo.sourceBelongId && (state.projectInfo.sourceBelongId = d); !state.projectInfo.sourceBelongName && diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue index dcab22e5..8f4c0cac 100644 --- a/src/views/projectcenter/ProjectManage.vue +++ b/src/views/projectcenter/ProjectManage.vue @@ -1804,6 +1804,10 @@ export default { ); function managerChange(e, l, d, t) { + if (state.projectInfo.parentId) { + return; + } + !state.projectInfo.sourceBelongId && (state.projectInfo.sourceBelongId = d); !state.projectInfo.sourceBelongName && From 2407561e9b010ae7f5f175e3af48cef4c687123f Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Tue, 20 Dec 2022 17:52:11 +0800 Subject: [PATCH 2/6] -- loading --- src/views/projectcenter/ProjectAdd.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue index 9f389f12..ead2234a 100644 --- a/src/views/projectcenter/ProjectAdd.vue +++ b/src/views/projectcenter/ProjectAdd.vue @@ -259,6 +259,7 @@
取消 { + state.loading = true console.log("保存", state.projectInfo); if (!validate(state.projectInfo, errorMsgs)) { return; @@ -483,6 +486,7 @@ export default { state.projectInfo.type = 3; state.projectInfo.courseSyncFlag = state.courseSyncFlag ? 1 : 0; api.createProject(state.projectInfo).then((res) => { + state.loading = false state.projectInfo.projectId || changeOwnership("project", res.data.data.projectId, [ { id: res.data.data.createId, name: res.data.data.createName }, From 11b50cc89da275bf50169ed172309af78096189a Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Tue, 20 Dec 2022 17:56:13 +0800 Subject: [PATCH 3/6] -- bug --- src/views/projectcenter/SonProject.vue | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/views/projectcenter/SonProject.vue b/src/views/projectcenter/SonProject.vue index 5a2e88dd..30aab7eb 100644 --- a/src/views/projectcenter/SonProject.vue +++ b/src/views/projectcenter/SonProject.vue @@ -284,7 +284,7 @@ export default { currentPage1: 1, //项目经理 pageSize1: 10, //项目经理 projectInfo: {}, - courseSyncFlag:false + courseSyncFlag: false }); const projectPic = computed(() => store.state.projectPic.map((e) => ({ @@ -304,8 +304,8 @@ export default { state.projectInfo.projectId = routers.query.projectId; (state.projectInfo.projectId || state.projectInfo.parentId) && api.getProjectDetail({ - projectId: state.projectInfo.projectId, - }) + projectId: state.projectInfo.projectId, + }) .then((res) => { state.projectInfo = res.data.data.projectInfo; state.projectInfo.rangeTime = [ @@ -386,8 +386,16 @@ export default { }); }; + function managerChange(e, l, d, t) { + !state.projectInfo.sourceBelongId && + (state.projectInfo.sourceBelongId = d); + !state.projectInfo.sourceBelongName && + (state.projectInfo.sourceBelongName = t); + } + return { ...toRefs(state), + managerChange, timeChange, projectPic, createProject, From d9f8f7569c433a4aa81ec3d127bc661e3686dd7f Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Tue, 20 Dec 2022 18:06:14 +0800 Subject: [PATCH 4/6] -- bug --- src/components/project/ProjectManagerNew.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/components/project/ProjectManagerNew.vue b/src/components/project/ProjectManagerNew.vue index 5f5ba8ab..afa0baf1 100644 --- a/src/components/project/ProjectManagerNew.vue +++ b/src/components/project/ProjectManagerNew.vue @@ -92,6 +92,8 @@ function getMemberData() { isOpen.value = false return; } + console.log(1111111111111) + console.log(props.value) const list = res.data.data.rows.filter(e => !(props.value + '').includes(e.id)).map(e => ({ label: e.realName + e.userNo, value: e.id, @@ -131,7 +133,7 @@ function change(e, l) { Array.isArray(selectOptions.value) && emit('onChange', e, l, selectOptions.value.find(e => e.deptId)?.deptId, selectOptions.value.find(e => e.deptId)?.departName) if (Array.isArray(l)) { emit('update:name', l.map(t => t.label).join(',')) - emit('update:value', l.map(t => t.label).join(',')) + emit('update:value', l.map(t => t.value).join(',')) } else { emit('update:name', l?.label) emit('update:value', l?.value) From 6cd7eb3bdc14a4b1efe065daf3a81749bac9489b Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Tue, 20 Dec 2022 18:24:42 +0800 Subject: [PATCH 5/6] =?UTF-8?q?--=20=E5=B1=8F=E8=94=BD=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E9=80=89=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/student/CommonStudent.vue | 156 +++++++++++------------ 1 file changed, 78 insertions(+), 78 deletions(-) diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue index 5b03382f..3b375e58 100644 --- a/src/components/student/CommonStudent.vue +++ b/src/components/student/CommonStudent.vue @@ -71,44 +71,44 @@
- -
-
- - - - - 搜索 - - 重置 - -
-
- - -
-
- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
收起<
-
添加组织
-
-
-
-
{{ item.name }}
-
-
-
-
-
-
-
{{ item.name }}
-
-
-
- -
- -
-
查看更多>
-
收起<
+ + + + + + + + + + + + + + + + + + + + + @@ -290,8 +290,8 @@