hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-10 19:36:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

-- 组织添加路径

Browse Source
This commit is contained in:
yuping
2022-12-26 19:15:57 +08:00
parent d674c660e8
commit 8b7c4aabaf
9 changed files with 116 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/drawers/ProjectAudit.vue
View File

@@ -39,7 +39,7 @@
<div class="set_content"> <div class="set_content">
<div class="setc_name"><span>资源归属：</span></div> <div class="setc_name"><span>资源归属：</span></div>
<div class="setc_main"> <div class="setc_main">
<span style="color: #999999">{{ projectInfo.sourceBelongName }}</span> <span style="color: #999999">{{ (projectInfo.sourceBelongFullName || '')+projectInfo.sourceBelongName }}</span>
</div> </div>
</div> </div>
<div class="set_content"> <div class="set_content">

4
src/components/project/OrgClass.vue
View File

@@ -43,9 +43,9 @@ const id = computed(() => {
return props.value return props.value
}) })
function change(key, obj) { function change(key, obj, {triggerNode: {props: {namePath}}}) {
console.log(obj[0], key, props.value);
emit('update:name', obj[0]) emit('update:name', obj[0])
emit('update:fullName', namePath)
emit('update:value', key) emit('update:value', key)
} }

2
src/components/project/ProjectManagerNew.vue
View File

@@ -107,7 +107,7 @@ function change(e, l) {
memberParam.value.page = 1 memberParam.value.page = 1
isOpen.value = false isOpen.value = false
Array.isArray(l) && (selectOptions.value = l) Array.isArray(l) && (selectOptions.value = l)
Array.isArray(selectOptions.value) && emit('onChange', e, l, selectOptions.value.find(e => e.departId)?.departId, selectOptions.value.find(e => e.departId)?.departName) Array.isArray(selectOptions.value) && emit('onChange', e, l, selectOptions.value.find(e => e.departId)?.departId, selectOptions.value.find(e => e.departId)?.departName, selectOptions.value.find(e => e.departId)?.orgName)
if (Array.isArray(l)) { if (Array.isArray(l)) {
emit('update:name', l.map(t => t.label).join(',')) emit('update:name', l.map(t => t.label).join(','))
emit('update:value', l.map(t => t.value).join(',')) emit('update:value', l.map(t => t.value).join(','))

2
src/views/projectcenter/LibraryAdd.vue
View File

@@ -536,7 +536,7 @@
<div class="setc_name"><span>资源归属：</span></div> <div class="setc_name"><span>资源归属：</span></div>
<div class="setc_main"> <div class="setc_main">
<span style="color: #999999">{{ <span style="color: #999999">{{
projectInfo.sourceBelongName (projectInfo.sourceBelongFullName || '') + projectInfo.sourceBelongName
}}</span> }}</span>
</div> </div>
</div> </div>

8
src/views/projectcenter/ProjectAdd.vue
View File

@@ -3,7 +3,8 @@
<div class="projectAdd"> <div class="projectAdd">
<div class="header"> <div class="header">
<span class="title" <span class="title"
>{{ projectInfo.projectId ? "编辑" : "创建" >{{
projectInfo.projectId ? "编辑" : "创建"
}}{{ ptojectType == "3" ? "班级" : "项目" }}</span }}{{ ptojectType == "3" ? "班级" : "项目" }}</span
> >
<div <div
@@ -141,6 +142,7 @@
<OrgClass <OrgClass
v-model:value="projectInfo.sourceBelongId" v-model:value="projectInfo.sourceBelongId"
v-model:name="projectInfo.sourceBelongName" v-model:name="projectInfo.sourceBelongName"
v-model:fullName="projectInfo.sourceBelongFullName"
></OrgClass> ></OrgClass>
</div> </div>
</div> </div>
@@ -504,10 +506,12 @@ export default {
}); });
}; };
function managerChange(e, l, d, t) { function managerChange(e, l, d, t, orgName) {
state.projectInfo.sourceBelongId = d state.projectInfo.sourceBelongId = d
state.projectInfo.sourceBelongName = t state.projectInfo.sourceBelongName = t
state.projectInfo.sourceBelongFullName = orgName
} }
const disabledDate = (current) => { const disabledDate = (current) => {
return current && current < dayjs().startOf('day'); return current && current < dayjs().startOf('day');
}; };

4
src/views/projectcenter/ProjectManage.vue
View File

@@ -231,6 +231,7 @@
<OrgClass <OrgClass
v-model:value="projectInfo.sourceBelongId" v-model:value="projectInfo.sourceBelongId"
v-model:name="projectInfo.sourceBelongName" v-model:name="projectInfo.sourceBelongName"
v-model:fullName="projectInfo.sourceBelongFullName"
></OrgClass> ></OrgClass>
</div> </div>
</div> </div>
@@ -1803,9 +1804,10 @@ export default {
} }
); );
function managerChange(e, l, d, t) { function managerChange(e, l, d, t,orgName) {
state.projectInfo.sourceBelongId = d state.projectInfo.sourceBelongId = d
state.projectInfo.sourceBelongName = t state.projectInfo.sourceBelongName = t
state.projectInfo.sourceBelongFullName = orgName
} }
return { return {

5
src/views/projectcenter/SonProject.vue
View File

@@ -83,7 +83,7 @@
</div> </div>
<div class="in select"> <div class="in select">
<OrgClass v-model:value="projectInfo.sourceBelongId" v-model:name="projectInfo.sourceBelongName"></OrgClass> <OrgClass v-model:value="projectInfo.sourceBelongId" v-model:name="projectInfo.sourceBelongName" v-model:fullName="projectInfo.sourceBelongFullName"></OrgClass>
</div> </div>
</div> </div>
<div class="name"> <div class="name">
@@ -313,9 +313,10 @@ export default {
}); });
}; };
function managerChange(e, l, d, t) { function managerChange(e, l, d, t,orgName) {
state.projectInfo.sourceBelongId = d state.projectInfo.sourceBelongId = d
state.projectInfo.sourceBelongName = t state.projectInfo.sourceBelongName = t
state.projectInfo.sourceBelongFullName = orgName
} }
const disabledDate = (current) => { const disabledDate = (current) => {
return current && current < dayjs().startOf('day'); return current && current < dayjs().startOf('day');

4
src/views/projectcenter/TaskPage.vue
View File

@@ -3380,7 +3380,7 @@ export default {
let end = info.endTime; let end = info.endTime;
state.tstartTime = info.beginTime; state.tstartTime = info.beginTime;
state.tendTime = info.endTime; state.tendTime = info.endTime;
state.tsourceBelong = info.sourceBelongName; state.tsourceBelong = (info.sourceBelongFullName || '')+info.sourceBelongName;
state.parentId = info.parentId; state.parentId = info.parentId;
state.name = info.name; state.name = info.name;
state.startTime = start; state.startTime = start;
@@ -3407,7 +3407,7 @@ export default {
// state.attach = info.attach; // state.attach = info.attach;
// state.templateId = info.templateId; // state.templateId = info.templateId;
state.sourceBelong = info.sourceBelongName; state.sourceBelong = (info.sourceBelongFullName || '')+info.sourceBelongName;
// state.fileList=info.attach.split(",") // state.fileList=info.attach.split(",")
let d = info.attach.indexOf(","); let d = info.attach.indexOf(",");
// console.log(info.attach, "xgo", info.attach.length); // console.log(info.attach, "xgo", info.attach.length);

4
src/views/projectcenter/templateAdd.vue
View File

@@ -119,6 +119,7 @@
<OrgClass <OrgClass
v-model:value="projectInfo.sourceBelongId" v-model:value="projectInfo.sourceBelongId"
v-model:name="projectInfo.sourceBelongName" v-model:name="projectInfo.sourceBelongName"
v-model:fullName="projectInfo.sourceBelongFullName"
></OrgClass> ></OrgClass>
</div> </div>
</div> </div>
@@ -296,9 +297,10 @@ const createProject = () => {
}); });
}; };
function managerChange(e, l, d, t) { function managerChange(e, l, d, t,orgName) {
projectInfo.value.valuesourceBelongId = d; projectInfo.value.valuesourceBelongId = d;
projectInfo.value.sourceBelongName = t; projectInfo.value.sourceBelongName = t;
projectInfo.value.sourceBelongFullName = orgName
} }
</script> </script>
<style lang="scss"> <style lang="scss">