mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git
synced 2025-12-15 05:46:45 +08:00
-- 组织添加路径
This commit is contained in:
@@ -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">
|
||||||
|
|||||||
@@ -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)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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(','))
|
||||||
|
|||||||
@@ -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>
|
||||||
|
|||||||
@@ -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>
|
||||||
@@ -272,21 +274,21 @@
|
|||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<script>
|
<script>
|
||||||
import { onMounted, reactive, toRefs, watch } from "vue";
|
import {onMounted, reactive, toRefs, watch} from "vue";
|
||||||
import { message } from "ant-design-vue";
|
import {message} from "ant-design-vue";
|
||||||
import { useRoute, useRouter } from "vue-router";
|
import {useRoute, useRouter} from "vue-router";
|
||||||
import * as api from "../../api/index";
|
import * as api from "../../api/index";
|
||||||
import { useStore } from "vuex";
|
import {useStore} from "vuex";
|
||||||
// import ProjectClass from "@/components/project/ProjectClass";
|
// import ProjectClass from "@/components/project/ProjectClass";
|
||||||
import TrainClass from "@/components/project/TrainClass";
|
import TrainClass from "@/components/project/TrainClass";
|
||||||
import OrgClass from "@/components/project/OrgClass";
|
import OrgClass from "@/components/project/OrgClass";
|
||||||
import ProjectManager from "@/components/project/ProjectManagerNew";
|
import ProjectManager from "@/components/project/ProjectManagerNew";
|
||||||
import NameInput from "@/components/project/NameInput";
|
import NameInput from "@/components/project/NameInput";
|
||||||
import ProjectLevel from "@/components/project/ProjectLevel";
|
import ProjectLevel from "@/components/project/ProjectLevel";
|
||||||
import { changeOwnership, scrollLoad } from "@/api/method";
|
import {changeOwnership, scrollLoad} from "@/api/method";
|
||||||
import { storage } from "../../api/storage";
|
import {storage} from "../../api/storage";
|
||||||
import * as api2 from "../../api/indexAudit";
|
import * as api2 from "../../api/indexAudit";
|
||||||
import { validateName } from "@/api/index1";
|
import {validateName} from "@/api/index1";
|
||||||
import dayjs from "dayjs";
|
import dayjs from "dayjs";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
@@ -304,7 +306,7 @@ export default {
|
|||||||
const routers = useRoute();
|
const routers = useRoute();
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
const state = reactive({
|
const state = reactive({
|
||||||
loading:false,
|
loading: false,
|
||||||
currentPage: 1, //当前页
|
currentPage: 1, //当前页
|
||||||
tableDataTotal: -1, //模版列表总数
|
tableDataTotal: -1, //模版列表总数
|
||||||
pageSize: 10, //每页10条数据
|
pageSize: 10, //每页10条数据
|
||||||
@@ -491,23 +493,25 @@ export default {
|
|||||||
state.loading = false
|
state.loading = false
|
||||||
state.projectInfo.projectId ||
|
state.projectInfo.projectId ||
|
||||||
changeOwnership("project", res.data.data.projectId, [
|
changeOwnership("project", res.data.data.projectId, [
|
||||||
{ id: res.data.data.createId, name: res.data.data.createName },
|
{id: res.data.data.createId, name: res.data.data.createName},
|
||||||
]);
|
]);
|
||||||
message.destroy();
|
message.destroy();
|
||||||
message.success(state.projectInfo.projectId ? "编辑成功" : "创建成功");
|
message.success(state.projectInfo.projectId ? "编辑成功" : "创建成功");
|
||||||
// router.back();
|
// router.back();
|
||||||
router.push({
|
router.push({
|
||||||
path: "/taskpage",
|
path: "/taskpage",
|
||||||
query: { projectId: res.data.data.projectId },
|
query: {projectId: res.data.data.projectId},
|
||||||
});
|
});
|
||||||
storage.set("projectId", res.data.data.projectId);
|
storage.set("projectId", res.data.data.projectId);
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
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');
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -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 {
|
||||||
|
|||||||
@@ -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');
|
||||||
|
|||||||
@@ -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);
|
||||||
|
|||||||
@@ -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">
|
||||||
|
|||||||
Reference in New Issue
Block a user