diff --git a/src/api/indexTemplate.js b/src/api/indexTemplate.js index be42523c..ef8b4745 100644 --- a/src/api/indexTemplate.js +++ b/src/api/indexTemplate.js @@ -19,3 +19,6 @@ export const editTask = (obj) => http.post('/admin/project/template/editTask',ob export const handleTemplates = (obj) => http.post('/admin/project/template/handle',obj); // 模板库列表 export const templateList = (obj) => http.post(`/admin/project/template/list`,obj); +// 发布项目公告 +export const publishNotice = (obj) => http.post(`/admin/project/template/publishNotice`,obj); + diff --git a/src/views/projectcenter/LibraryAdd.vue b/src/views/projectcenter/LibraryAdd.vue index 8f698d99..71bef498 100644 --- a/src/views/projectcenter/LibraryAdd.vue +++ b/src/views/projectcenter/LibraryAdd.vue @@ -33,7 +33,7 @@
-
返回
@@ -802,23 +802,9 @@ export default defineComponent({ // 发布公告 const addNotice = () => { let obj = { - "beginTime": 0, - "boeFlag": 0, - "category": 0, - "courseSyncFlag": 0, - "endTime": 0, - "level": 0, - "manager": "", - "managerId": "", - "name": "", "notice": state.projectInfo.notice, - "noticeFlag": 0, - "picUrl": "", - "projectTemplateId": store.state.projectTemplateId, - "remark": "", - "sourceBelongId": 0, - "status": 0, - "systemId": 0 + "projectId": store.state.projectTemplateId, + "title": "" }; api.templateEdit(obj).methods(obj).then(res => { message.success("公告发布成功") diff --git a/src/views/projectcenter/TemplateLibrary.vue b/src/views/projectcenter/TemplateLibrary.vue index 68654ef3..08e768c6 100644 --- a/src/views/projectcenter/TemplateLibrary.vue +++ b/src/views/projectcenter/TemplateLibrary.vue @@ -184,12 +184,14 @@ export default defineComponent({ // 获取模板列表 const getLibraryList = () => { - let date = Math.ceil(new Date(state.time).getTime() / 1000); + let date = Math.ceil(new Date(state.time).getTime() / 1000); + let obj = { + // "create_time": state.time, "createTime" : date==0?null:date, "name": state.value1, "pageNo": pagination.current, - "pageSize": state.pageSize, + "pageSize": state.pageSize } api.templateList(obj).then((res) => { state.tableData1 = [] diff --git a/src/views/projectcenter/temTask.vue b/src/views/projectcenter/temTask.vue index e334703e..79c83c22 100644 --- a/src/views/projectcenter/temTask.vue +++ b/src/views/projectcenter/temTask.vue @@ -1528,13 +1528,16 @@ let stageList = res.data.data.stageList; //阶段数组 let result = stageList.find((item) => item.templateStageId == stage); console.log("又找到了", result); + changebgc(res.data.data.stageList[0].templateStageId); getTableData(result.taskList); + } else { let arr = res.data.data.stageList[0].taskList; console.log("任务列表", arr); + changebgc(res.data.data.stageList[0].templateStageId); getTableData(arr); // state.isActive = true; - changebgc(res.data.data.stageList[0].templateStageId); + } // 每次都获取了第一条taskList @@ -1542,7 +1545,6 @@ // console.log("任务列表", stage, arr); // getTableData(arr); } - let stagearr = res.data.data.stageList; let arrlist = state.curLevel; console.log(stagearr, 111111); diff --git a/src/views/projectcenter/templateAdd.vue b/src/views/projectcenter/templateAdd.vue index faab4b1c..6ba7468f 100644 --- a/src/views/projectcenter/templateAdd.vue +++ b/src/views/projectcenter/templateAdd.vue @@ -47,7 +47,6 @@ } " v-model:value="projectInfo.category" - placeholder="管理者" style="width: 100%" :options="classifyList" @change="classificationChange" @@ -121,7 +120,8 @@
@@ -141,7 +141,8 @@ return triggerNode.parentNode || document.body; } " - :value="projectInfo.manager" + + :value="classifySelect1" mode="multiple" placeholder="请选择项目经理" style="width: 100%" @@ -319,6 +320,7 @@ import * as api from "../../api/indexTemplate"; import { storage } from "../../api/storage"; import {useStore} from "vuex"; // import { toDate } from "../../api/method"; +import dayjs from "dayjs"; export default { name: "projectAdd", @@ -358,7 +360,7 @@ export default { valueE: null, valueE1: null, valueE2: null, - classifySelect1: [], + classifySelect1: ['李俊国'], classifySelect2: [], classifySelect3: [], classifySelect4: [], @@ -370,16 +372,16 @@ export default { totalPages: 0, //总页数 viewDetail: routers.query.viewDetail ? routers.query.viewDetail : null, projectInfo:{ - beginTime:null, - endTime:null, + choosedTime:'', name: null, manager: null, notice: null, - sourceBelongId: null, + sourceBelongId: 1, + category:1, remark: "", courseSyncFlag: false, - level: null, - systemId: null, + level: 1, + systemId: 2, boeFlag: false, } }); @@ -468,7 +470,7 @@ export default { } if (info.file.status === "error") { loading.value = false; - message.error("upload error"); + message.error("upload error"); } }; @@ -628,9 +630,9 @@ export default { "name": state.projectInfo.name, "category": state.projectInfo.category, "picUrl": "x", - "beginTime": state.projectInfo.rangevalue || 1, - "endTime": state.projectInfo.rangevalue || 1, - "manager": state.projectInfo.manager, + "beginTime": Number(dayjs(state.projectInfo.choosedTime[0]).format("YYYY-MM-DD")) || 1, + "endTime": Number(dayjs(state.projectInfo.choosedTime[1]).format("YYYY-MM-DD")) || 1, + "manager": state.classifySelect1.toString(), "managerId": state.projectInfo.managerId || 0, "sourceBelongId": state.projectInfo.sourceBelongId, "level": state.projectInfo.level,