@@ -144,6 +149,7 @@
import { onMounted, reactive, toRefs } from "vue";
import { auditedlist } from "../../api/indexAudit";
import * as moment from "moment";
+import dayjs from "dayjs";
export default {
name: "ProjectViewed",
@@ -324,8 +330,8 @@ export default {
const getProjList = () => {
state.loading=true
let objn = {
- beginTime: state.valueDate ? state.valueDate[0] : "",
- endTime: state.valueDate ? state.valueDate[1] : "",
+ beginTime: state.valueDate ? dayjs(state.valueDate[0]).format("YYYY-MM-DD") : "",
+ endTime: state.valueDate ? dayjs(state.valueDate[1]).format("YYYY-MM-DD") : "",
createName: state.valuecreater,
manager: state.valuename,
name: state.valueproj,
@@ -408,6 +414,7 @@ export default {
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index 632693a9..f6279f78 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -851,7 +851,7 @@
编辑
-->
-
+
@@ -1442,14 +1442,7 @@
>
- {{ element.cretime }}分钟
+ {{ element.cretime ? element.cretime + "分钟" : "-" }}
@@ -1389,7 +1388,7 @@ export default {
? "投票"
: "-",
creater: value.name,
- cretime: Number(value.duration) > 0 ? value.duration : "-",
+ cretime: value.duration || value.duration == 0 ? value.duration : "-",
checked1: value.flag ? true : false,
checked: false, //是否选中类型
courseId: value.courseId,
@@ -1402,12 +1401,16 @@ export default {
state.tableData = array;
console.log("state.tableData", state.tableData);
};
- //把阶段放到level里
- const getStageData = (tableData) => {
+ //把阶段放到level里
+ const getStageData = (tableData) => {
let data = tableData;
let array = [];
data.map((value) => {
- console.log("dd",Number(value.templateStageId) ,Number(value.templateStageId) > 0);
+ console.log(
+ "dd",
+ Number(value.templateStageId),
+ Number(value.templateStageId) > 0
+ );
if (Number(value.templateStageId) > 0) {
let obj = {
id: value.templateStageId,
@@ -1623,20 +1626,48 @@ export default {
console.log("获取任务列表失败", err);
});
};*/
-
- //获取任务列表
- const getTask = async () => {
-
- await api
- .templateDetail(localStorage.getItem("projectTemplateId")).then((res) => {
- console.log("22222", res.data.data.stageList);
- state.projectTitle = res.data.data.projectTemplateInfo.name;
- state.picUrl = res.data.data.projectTemplateInfo.picUrl;
- state.stageList = res.data.data.stageList;
- getStageData(res.data.data.stageList);
- updateStageChoosd();
-
- });
+ // 删除所有阶段
+ const removeAllLevel = () => {
+ // state.cancelModal = false;
+ console.log(state.level);
+ let removeArr = state.level;
+ for (let i = 0; i < removeArr.length; i++) {
+
+ api
+ .deleteStage(removeArr[i].id)
+ .then((res) => {
+ console.log("删除阶段成功", res);
+ if (removeArr.length - 1 == i) {
+ message.destroy();
+ message.success("删除全部阶段成功");
+ closeDeleteStage();
+ localStorage.setItem("stageId", "");
+ getTask();
+ state.cancelModal = false;
+ }
+ })
+ .catch((err) => {
+ if (removeArr.length - 1 == i) {
+ console.log("删除阶段失败", err);
+ message.destroy();
+ message.success("删除全部阶段失败");
+ state.cancelModal = false;
+ }
+ });
+ }
+ };
+ //获取任务列表
+ const getTask = async () => {
+ await api
+ .templateDetail(localStorage.getItem("projectTemplateId"))
+ .then((res) => {
+ console.log("22222", res.data.data.stageList);
+ state.projectTitle = res.data.data.projectTemplateInfo.name;
+ state.picUrl = res.data.data.projectTemplateInfo.picUrl;
+ state.stageList = res.data.data.stageList;
+ getStageData(res.data.data.stageList);
+ updateStageChoosd();
+ });
};
function updateStageChoosd() {
@@ -1659,9 +1690,15 @@ export default {
getTableData(state.stageList[0].taskList);
return;
}
- console.log(state.chooseStageId,state.stageList.find((e) => e.templateStageId == state.chooseStageId)?.taskList,state.stageList);
+ console.log(
+ state.chooseStageId,
+ state.stageList.find((e) => e.templateStageId == state.chooseStageId)
+ ?.taskList,
+ state.stageList
+ );
getTableData(
- state.stageList.find((e) => e.templateStageId == state.chooseStageId)?.taskList
+ state.stageList.find((e) => e.templateStageId == state.chooseStageId)
+ ?.taskList
);
}
@@ -1956,10 +1993,9 @@ export default {
console.log("state.level", id, state.level);
state.chooseStageId = id;
let final = state.level.find((item) => item.id === id);
- if(final !=null){
+ if (final != null) {
getTableData(final.taskList);
}
-
};
//选择单个任务
@@ -2154,6 +2190,7 @@ export default {
getTableData,
deleteTask,
editStage,
+ removeAllLevel,
updateTableData,
changeVData,
changeRow,
diff --git a/src/views/projectcenter/templateAdd.vue b/src/views/projectcenter/templateAdd.vue
index b4186361..11556ece 100644
--- a/src/views/projectcenter/templateAdd.vue
+++ b/src/views/projectcenter/templateAdd.vue
@@ -78,6 +78,7 @@
route.query.projectTemplateId &&
api.templateDetail(route.query.projectTemplateId).then((res) => {
projectInfo.value = res.data.data.projectTemplateInfo;
- projectInfo.value.rangeTime = [
- projectInfo.value.beginTime,
- projectInfo.value.endTime,
+ projectInfo.value.rangeTime = [dayjs(projectInfo.value.beginTime).format("YYYY-MM-DD HH:mm"),
+ dayjs(projectInfo.value.endTime).format("YYYY-MM-DD HH:mm"),
];
projectInfo.value.courseSyncFlag = !!projectInfo.value.courseSyncFlag
});
@@ -253,8 +253,8 @@ const backPage = () => {
function timeChange(e) {
if (e && e.length === 2) {
- projectInfo.value.beginTime = e[0];
- projectInfo.value.endTime = e[1];
+ projectInfo.value.beginTime = dayjs(e[0]).format("YYYY-MM-DD HH:mm"),
+ projectInfo.value.endTime =dayjs(e[1]).format("YYYY-MM-DD HH:mm")
}
}
@@ -281,6 +281,8 @@ const createProject = () => {
}
}
projectInfo.value.courseSyncFlag = courseSyncFlag.value ? 1 : 0;
+ projectInfo.value.beginTime = dayjs(projectInfo.value.beginTime).format("YYYY-MM-DD HH:mm"),
+ projectInfo.value.endTime =dayjs(projectInfo.value.endTime).format("YYYY-MM-DD HH:mm")
api
.templateEdit({
...projectInfo.value,
diff --git a/src/views/research/ResearchManage.vue b/src/views/research/ResearchManage.vue
index 00cbb91d..97688ba0 100644
--- a/src/views/research/ResearchManage.vue
+++ b/src/views/research/ResearchManage.vue
@@ -24,12 +24,17 @@
>
+
+