diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue
index f229e533..a1ab3221 100644
--- a/src/views/projectcenter/ProjectAdd.vue
+++ b/src/views/projectcenter/ProjectAdd.vue
@@ -58,7 +58,7 @@
@@ -290,7 +289,6 @@ export default {
},
classifyList5: [],
courseSyncFlag: false,
- picUrlName: "请选择封面图",
});
// 封面图选择
@@ -315,39 +313,16 @@ export default {
});
function getProjectInfo() {
- if (!routers.query.projectId) {
- state.projectInfo = {
- parentName: routers.query.parentName,
- parentId: routers.query.parentId,
- };
- return;
- }
- api
- .getProjectDetail({projectId: routers.query.projectId})
- .then((res) => {
- state.projectInfo = res.data.data.projectInfo;
-
- console.log(res);
- let picurl = res.data.data.projectInfo.picUrl;
- let dates = store.state.projectPic.map((e) => ({
- value: e.dictValue,
- label: e.dictName,
- }));
- console.log(dates, picurl);
- for (let i = 0; i < dates.length; i++) {
- if (dates[i].value == picurl) {
- state.picUrlName = dates[i].label;
- }
- }
-
- state.projectInfo.rangeTime = [
- state.projectInfo.beginTime,
- state.projectInfo.endTime,
- ];
- state.projectInfo.parentName = routers.query.parentName;
- state.courseSyncFlag = state.projectInfo.courseSyncFlag
- ? true
- : false;
+ let projectId;
+ routers.query.parentId && (projectId = routers.query.parentId)
+ routers.query.projectId && (projectId = routers.query.projectId)
+ state.projectInfo.parentName = routers.query.parentName;
+ state.projectInfo.parentId = routers.query.parentId;
+ projectId && api.getProjectDetail({projectId})
+ .then(res => {
+ state.projectInfo = {...state.projectInfo, ...res.data.data.projectInfo};
+ state.projectInfo.rangeTime = [state.projectInfo.beginTime, state.projectInfo.endTime,];
+ state.courseSyncFlag = !!state.projectInfo.courseSyncFlag;
});
}
@@ -395,7 +370,6 @@ export default {
const errorMsgs = {
name: "请输入项目名称",
- category: "请选择项目分类",
picUrl: "请上传项目封面图",
beginTime: "请选择项目开始时间",
endTime: "请选择项目结束时间",
diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue
index 9e9901f5..266eaef9 100644
--- a/src/views/projectcenter/ProjectManage.vue
+++ b/src/views/projectcenter/ProjectManage.vue
@@ -195,9 +195,9 @@
src="../../assets/images/basicinfo/asterisk.png"
/>
- 分类:
+ 培训分类:
@@ -823,6 +823,7 @@ import * as api1 from "../../api/index1";
import {storage} from "../../api/storage";
import ProjectManager from "@/components/project/ProjectManagerNew";
import ProjectClass from "@/components/project/ProjectClass";
+import TrainClass from "@/components/project/TrainClass";
import OrgClass from "@/components/project/OrgClass";
import dayjs from "dayjs";
import * as moment from "moment";
@@ -837,6 +838,7 @@ export default {
ProjectManager,
ProjectClass,
OrgClass,
+ TrainClass,
// ProjManageShip
},
setup() {
@@ -1541,6 +1543,12 @@ export default {
state.projectInfo = {
parentName: value.record.name,
parentId: value.record.projectId,
+ name: value.record.name,
+ sourceBelongId: value.record.sourceBelongId,
+ sourceBelongame: value.record.sourceBelongName,
+ manager: value.record.manager,
+ managerId: value.record.managerId,
+ systemId: value.record.systemId,
type: 2,
};
state.reminderModal = true;