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

-- 项目自动带出组织

Browse Source
This commit is contained in:
yuping
2022-12-06 23:51:55 +08:00
parent 19d110d910
commit e83e0afed3
3 changed files with 112 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,7 +9,7 @@
:placeholder="placeholder" :placeholder="placeholder"
:filterOption="false" :filterOption="false"
style="width: 100%" style="width: 100%"
:options="options" :options="isOpen?options:selectOptions"
allowClear allowClear
showSearch showSearch
:mode="mode" :mode="mode"
@@ -39,13 +39,17 @@ const props = defineProps({
default: '' default: ''
}, },
disabled: Boolean, disabled: Boolean,
placeholder: String, placeholder: {
type: String,
default: "请输入搜索关键字",
},
mode: String mode: String
}) })
const options = ref([]) const options = ref([])
const selectOptions = ref([])
const managerArray = computed(() => props.mode === 'select' ? props.value : (props.value ? props.value.split(',') : [])) const managerArray = computed(() => props.mode === 'select' ? props.value : (props.value ? props.value.split(',') : []))
const emit = defineEmits({}) const emit = defineEmits({})
@@ -61,10 +65,10 @@ watch(() => memberParam.value.pageNo, throttle(getPageMember, 500))
watch(props, init) watch(props, init)
function init() { function init() {
props.value && (options.value = props.value.split(',').map((e, i) => ({ //第一次进来 编辑赋值
value: e, if (props.value && (props.value + '') !== selectOptions.value.map(e => e.value).join(',')) {
label: props.name.split(',')[i] selectOptions.value = (props.value + '').split(',').map((e, i) => ({label: props.name.split(',')[i], value: e}))
}))) }
} }
onMounted(() => { onMounted(() => {
@@ -94,7 +98,8 @@ function getMemberData() {
} }
const list = res.data.data.rows.filter(e => !(props.value + '').includes(e.id)).map(e => ({ const list = res.data.data.rows.filter(e => !(props.value + '').includes(e.id)).map(e => ({
label: e.realName, label: e.realName,
value: e.id value: e.id,
deptId: e.departId
})); }));
memberParam.value.pageNo === 1 && props.value ? (options.value = list) : options.value.push(...list) memberParam.value.pageNo === 1 && props.value ? (options.value = list) : options.value.push(...list)
loading.value = false loading.value = false
@@ -117,16 +122,10 @@ const searchMember = (keyWord) => {
}; };
function change(e, l) { function change(e, l) {
console.log('change', l) selectOptions.value = l
isOpen.value = false isOpen.value = false
emit('onChange', e, l, selectOptions.value.find(e => e.deptId)?.deptId)
if (Array.isArray(l)) { if (Array.isArray(l)) {
// const selectIds = l.filter(t => t.value).map(t => t.value).join(',')
// const arr = props.value ? props.value.split(',').filter(e => !selectIds.includes(e)).map((e, i) => ({
// value: e,
// name: props.name.split(',')[i]
// })) : []
// l.push(...arr)
// l=l.filter(t => t.label)
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(','))
} else { } else {

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

@@ -3,13 +3,13 @@
<div class="projectAdd"> <div class="projectAdd">
<div class="header"> <div class="header">
<span class="title" <span class="title"
>{{ projectInfo.parentId ? "编辑" : "创建" }}项目</span >{{ projectInfo.parentId ? "编辑" : "创建" }}项目</span
> >
<div <div
@click="backPage" @click="backPage"
style="cursor: pointer" style="cursor: pointer"
to="/projectmanage" to="/projectmanage"
class="goback" class="goback"
> >
<span class="return"></span><span class="returntext">返回</span> <span class="return"></span><span class="returntext">返回</span>
</div> </div>
@@ -19,8 +19,8 @@
<div class="name" v-if="projectInfo.parentName"> <div class="name" v-if="projectInfo.parentName">
<div class="namebox"> <div class="namebox">
<img <img
class="nameimg" class="nameimg"
src="../../assets/images/basicinfo/asterisk.png" src="../../assets/images/basicinfo/asterisk.png"
/> />
<div class="inname">项目归属</div> <div class="inname">项目归属</div>
</div> </div>
@@ -33,26 +33,26 @@
<div class="name"> <div class="name">
<div class="namebox"> <div class="namebox">
<img <img
class="nameimg" class="nameimg"
src="../../assets/images/basicinfo/asterisk.png" src="../../assets/images/basicinfo/asterisk.png"
/> />
<div class="inname">项目名称</div> <div class="inname">项目名称</div>
</div> </div>
<div class="in"> <div class="in">
<a-input <a-input
v-model:value="projectInfo.name" v-model:value="projectInfo.name"
placeholder="请输入项目名称" placeholder="请输入项目名称"
show-count show-count
:maxlength="30" :maxlength="30"
:disabled="viewDetail ? true : false" :disabled="viewDetail ? true : false"
/> />
</div> </div>
</div> </div>
<div class="name"> <div class="name">
<div class="namebox"> <div class="namebox">
<img <img
class="nameimg" class="nameimg"
src="../../assets/images/basicinfo/asterisk.png" src="../../assets/images/basicinfo/asterisk.png"
/> />
<div class="inname">分类</div> <div class="inname">分类</div>
</div> </div>
@@ -63,8 +63,8 @@
<div class="name flex-top"> <div class="name flex-top">
<div class="namebox" style="margin-top:10px"> <div class="namebox" style="margin-top:10px">
<img <img
class="nameimg" class="nameimg"
src="../../assets/images/basicinfo/asterisk.png" src="../../assets/images/basicinfo/asterisk.png"
/> />
<div class="inname">封面图</div> <div class="inname">封面图</div>
</div> </div>
@@ -98,53 +98,54 @@
<div class="name"> <div class="name">
<div class="namebox"> <div class="namebox">
<img <img
class="nameimg" class="nameimg"
src="../../assets/images/basicinfo/asterisk.png" src="../../assets/images/basicinfo/asterisk.png"
/> />
<div class="inname">项目时间</div> <div class="inname">项目时间</div>
</div> </div>
<div class="in"> <div class="in">
<a-range-picker <a-range-picker
separator="至" separator="至"
:placeholder="[' 开始时间', ' 结束时间']" :placeholder="[' 开始时间', ' 结束时间']"
v-model:value="projectInfo.rangeTime" v-model:value="projectInfo.rangeTime"
style="width: 100%; height: 40px; border-radius: 5px" style="width: 100%; height: 40px; border-radius: 5px"
valueFormat="YYYY-MM-DD HH:mm:ss" valueFormat="YYYY-MM-DD HH:mm:ss"
@change="timeChange" @change="timeChange"
:disabled="viewDetail ? true : false" :disabled="viewDetail ? true : false"
/> />
</div> </div>
</div> </div>
<div class="name"> <div class="name">
<div class="namebox"> <div class="namebox">
<img <img
class="nameimg" class="nameimg"
src="../../assets/images/basicinfo/asterisk.png" src="../../assets/images/basicinfo/asterisk.png"
/> />
<div class="inname">项目经理</div> <div class="inname">项目经理</div>
</div> </div>
<div class="in"> <div class="in">
<ProjectManager <ProjectManager
v-model:value="projectInfo.managerId" v-model:value="projectInfo.managerId"
v-model:name="projectInfo.manager" v-model:name="projectInfo.manager"
mode="multiple" @change="managerChange"
mode="multiple"
></ProjectManager> ></ProjectManager>
</div> </div>
</div> </div>
<div class="name"> <div class="name">
<div class="namebox"> <div class="namebox">
<img <img
class="nameimg" class="nameimg"
src="../../assets/images/basicinfo/asterisk.png" src="../../assets/images/basicinfo/asterisk.png"
/> />
<div class="inname">资源归属</div> <div class="inname">资源归属</div>
</div> </div>
<div class="in select"> <div class="in select">
<OrgClass <OrgClass
v-model:value="projectInfo.sourceBelongId" v-model:value="projectInfo.sourceBelongId"
v-model:name="projectInfo.sourceBelongName" v-model:name="projectInfo.sourceBelongName"
></OrgClass> ></OrgClass>
</div> </div>
</div> </div>
@@ -154,12 +155,12 @@
</div> </div>
<div class="in"> <div class="in">
<a-textarea <a-textarea
v-model:value="projectInfo.remark" v-model:value="projectInfo.remark"
style="height: 80px" style="height: 80px"
placeholder="请输入说明" placeholder="请输入说明"
show-count show-count
:maxlength="200" :maxlength="200"
:disabled="viewDetail ? true : false" :disabled="viewDetail ? true : false"
/> />
</div> </div>
</div> </div>
@@ -169,16 +170,16 @@
</div> </div>
<div class="in"> <div class="in">
<a-checkbox <a-checkbox
v-model:checked="courseSyncFlag" v-model:checked="courseSyncFlag"
:disabled="viewDetail ? true : false" :disabled="viewDetail ? true : false"
><span ><span
style=" style="
width: 100%; width: 100%;
color: rgba(109, 117, 132, 1); color: rgba(109, 117, 132, 1);
font-size: 14px; font-size: 14px;
" "
>同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
></a-checkbox ></a-checkbox
> >
<!-- <a-switch <!-- <a-switch
v-model:checked="projectInfo.courseSyncFlag" v-model:checked="projectInfo.courseSyncFlag"
@@ -199,8 +200,8 @@
<div class="name"> <div class="name">
<div class="namebox"> <div class="namebox">
<img <img
class="nameimg" class="nameimg"
src="../../assets/images/basicinfo/asterisk.png" src="../../assets/images/basicinfo/asterisk.png"
/> />
<div class="inname">项目级别</div> <div class="inname">项目级别</div>
</div> </div>
@@ -211,8 +212,8 @@
<div class="name"> <div class="name">
<div class="namebox"> <div class="namebox">
<img <img
class="nameimg" class="nameimg"
src="../../assets/images/basicinfo/asterisk.png" src="../../assets/images/basicinfo/asterisk.png"
/> />
<div class="inname">培训分类</div> <div class="inname">培训分类</div>
</div> </div>
@@ -227,8 +228,8 @@
<!-- src="../../assets/images/basicinfo/asterisk.png"--> <!-- src="../../assets/images/basicinfo/asterisk.png"-->
<!-- />--> <!-- />-->
<img <img
class="nameimg" class="nameimg"
src="../../assets/images/basicinfo/asterisk.png" src="../../assets/images/basicinfo/asterisk.png"
/> />
<div class="inname">是否BOEU实施</div> <div class="inname">是否BOEU实施</div>
</div> </div>
@@ -240,8 +241,8 @@
:disabled="viewDetail ? true : false" :disabled="viewDetail ? true : false"
></a-switch> --> ></a-switch> -->
<a-radio-group <a-radio-group
v-model:value="projectInfo.boeFlag" v-model:value="projectInfo.boeFlag"
:disabled="viewDetail ? true : false" :disabled="viewDetail ? true : false"
> >
<a-radio :style="radioStyle" :value="1">是</a-radio> <a-radio :style="radioStyle" :value="1">是</a-radio>
<a-radio :style="radioStyle" :value="0">否</a-radio> <a-radio :style="radioStyle" :value="0">否</a-radio>
@@ -254,19 +255,19 @@
<div class="inname" style="width: 50px">模版</div> <div class="inname" style="width: 50px">模版</div>
<div class="in select" style="margin-left: 2px"> <div class="in select" style="margin-left: 2px">
<a-select <a-select
:getPopupContainer=" :getPopupContainer="
(triggerNode) => { (triggerNode) => {
return triggerNode.parentNode || document.body; return triggerNode.parentNode || document.body;
} }
" "
v-model:value="classifySelect5" v-model:value="classifySelect5"
placeholder="请选择模版" placeholder="请选择模版"
:size="size" :size="size"
style="width: 100%" style="width: 100%"
:options="classifyList5" :options="classifyList5"
@change="classificationChange5" @change="classificationChange5"
@popupScroll="templateScroll" @popupScroll="templateScroll"
:fieldNames="{ :fieldNames="{
label: 'name', label: 'name',
value: 'projectTemplateId', value: 'projectTemplateId',
}" }"
@@ -279,7 +280,7 @@
<div class="footer"> <div class="footer">
<div class="btn"> <div class="btn">
<a-button v-on:click="createProject" type="primary" class="btn1" <a-button v-on:click="createProject" type="primary" class="btn1"
>确定 >确定
</a-button> </a-button>
<a-button @click="backPage" class="btn2">取消</a-button> <a-button @click="backPage" class="btn2">取消</a-button>
</div> </div>
@@ -287,11 +288,11 @@
</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";
@@ -330,7 +331,7 @@ export default {
}); });
onMounted(() => { onMounted(() => {
state.projectPic = store.state.projectPic.map((e) => ({value:e.dictValue,label:e.dictName})); state.projectPic = store.state.projectPic.map((e) => ({value: e.dictValue, label: e.dictName}));
state.viewDetail = routers.query.viewDetail; state.viewDetail = routers.query.viewDetail;
getProjectInfo(); getProjectInfo();
getTemplate(); getTemplate();
@@ -351,18 +352,18 @@ export default {
return; return;
} }
api api
.getProjectDetail({ projectId: routers.query.projectId }) .getProjectDetail({projectId: routers.query.projectId})
.then((res) => { .then((res) => {
state.projectInfo = res.data.data.projectInfo; state.projectInfo = res.data.data.projectInfo;
state.projectInfo.rangeTime = [ state.projectInfo.rangeTime = [
state.projectInfo.beginTime, state.projectInfo.beginTime,
state.projectInfo.endTime, state.projectInfo.endTime,
]; ];
state.projectInfo.parentName = routers.query.parentName; state.projectInfo.parentName = routers.query.parentName;
state.courseSyncFlag = state.projectInfo.courseSyncFlag state.courseSyncFlag = state.projectInfo.courseSyncFlag
? true ? true
: false; : false;
}); });
} }
const backPage = () => { const backPage = () => {
@@ -458,8 +459,13 @@ export default {
}); });
}; };
function managerChange(e, l, d) {
state.projectInfo.sourceBelongId = d
}
return { return {
...toRefs(state), ...toRefs(state),
managerChange,
timeChange, timeChange,
classificationChange, classificationChange,
classificationChange5, classificationChange5,
@@ -471,9 +477,10 @@ export default {
}; };
</script> </script>
<style lang="scss"> <style lang="scss">
.flex-top{ .flex-top {
align-items: flex-start !important; align-items: flex-start !important;
} }
.projectAdd { .projectAdd {
width: 100%; width: 100%;
// height: inherit; // height: inherit;

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

@@ -9,7 +9,6 @@
v-model:value="searchParam.name" v-model:value="searchParam.name"
style="width: 270px; height: 40px; border-radius: 8px" style="width: 270px; height: 40px; border-radius: 8px"
placeholder="请输入项目名称" placeholder="请输入项目名称"
@change="sProjectNameChange"
allowClear allowClear
showSearch showSearch
> >
@@ -20,7 +19,6 @@
v-model:value="searchParam.manager" v-model:value="searchParam.manager"
style="width: 270px; height: 40px; border-radius: 8px" style="width: 270px; height: 40px; border-radius: 8px"
placeholder="请输入项目经理" placeholder="请输入项目经理"
@change="sProjectOrderChange"
allowClear allowClear
showSearch showSearch
> >
@@ -31,7 +29,6 @@
v-model:value="searchParam.createName" v-model:value="searchParam.createName"
style="width: 270px; height: 40px; border-radius: 8px" style="width: 270px; height: 40px; border-radius: 8px"
placeholder="请输入项目创建人" placeholder="请输入项目创建人"
@change="sProjectCreateChange"
allowClear allowClear
showSearch showSearch
> >
@@ -212,6 +209,7 @@
<ProjectManager <ProjectManager
v-model:value="projectInfo.managerId" v-model:value="projectInfo.managerId"
v-model:name="projectInfo.manager" v-model:name="projectInfo.manager"
@onChange="managerChange"
mode="multiple" mode="multiple"
></ProjectManager> ></ProjectManager>
</div> </div>
@@ -1753,10 +1751,16 @@ export default {
}); });
} }
); );
function managerChange(e, l, d) {
state.projectInfo.sourceBelongId = d
}
return { return {
...toRefs(state), ...toRefs(state),
dayjs, dayjs,
moment, moment,
managerChange,
reFinashedProject, reFinashedProject,
showBackFinashModal, showBackFinashModal,
timeChange, timeChange,