+
@@ -112,7 +112,6 @@ import { onMounted, reactive, toRefs } from "vue";
import ProjectAudit from "../../components/drawers/ProjectAudit";
import { projlist } from "../../api/indexAudit";
import { toDate } from "@/api/method";
-import dayjs from "dayjs";
export default {
name: "ProjectViewedN",
components: { ProjectAudit },
@@ -131,7 +130,7 @@ export default {
valueproj: null,
valuecreater: null,
valuename: null,
- valueDate: [],
+ valueDate: undefined,
ProjAuditvisible: false,
currentPage: 1,
total: null,
@@ -211,15 +210,6 @@ export default {
},
],
tableData1: [
- {
- number: "1",
- name: "课程1",
- belong: "管理者进阶/管理者进阶腾飞班",
- manager: "黄华，刘军",
- status: "待审核",
- creater: "管理员",
- time: "-",
- },
],
});
const showProjAudit = (id, createId, creater) => {
@@ -228,15 +218,15 @@ export default {
state.chooseCreateId = createId;
state.chooseCreater = creater;
};
- const getProjList = (obj) => {
- let objn = obj || {
- beginTime: 0,
- createName: "",
- endTime: 0,
- manager: "",
- name: "",
+ const getProjList = () => {
+ let objn = {
+ beginTime: state.valueDate == undefined ? "" : Date.parse(state.valueDate[0]) ,
+ createName: state.valuecreater,
+ endTime: state.valueDate == undefined ? "" : Date.parse(state.valueDate[1]),
+ manager: state.valuename,
+ name: state.valueproj,
pageNo: state.currentPage,
- pageSize: 10,
+ pageSize: state.pageSize,
status: 1,
};
projlist(objn)
@@ -244,9 +234,7 @@ export default {
console.log("获取待审核项目成功", res);
let result = res.data.data;
state.total = result.total;
- if (result.total > 0) {
setProjList(result.rows);
- }
})
.catch((err) => {
console.log("获取待审核项目失败", err);
@@ -255,11 +243,13 @@ export default {
const setProjList = (tableData) => {
let data = tableData;
let array = [];
- data.map((item) => {
+ data.map((item,index) => {
+ if(item.type == 3){
let obj = {
+ key:index+1,
number: item.projectId,
- name: getName(item),
- belong: getBelong(item),
+ name: item.name,
+ belong: item.parentId,
manager: item.manager || "-",
status:
item.status == 0
@@ -281,52 +271,38 @@ export default {
createId: item.createId,
};
array.push(obj);
+ } else {
+ let obj = {
+ key:index+1,
+ number: item.projectId,
+ name: item.name,
+ belong: item.parentId,
+ manager: item.manager || "-",
+ status:
+ item.status == 0
+ ? "草稿"
+ : item.status == 1
+ ? "待审核"
+ : item.status == 2
+ ? "通过"
+ : item.status == 3
+ ? "发布"
+ : item.status == -1
+ ? "已结束"
+ : item.status == -2
+ ? "拒绝"
+ : "-",
+ creater: item.createName,
+ time: toDate(item.createTime, "Y-M-D h-m"),
+ projectId: item.projectId,
+ createId: item.createId,
+ children: item.subList ? setProjList(item.subList) : [] ,
+ };
+ array.push(obj);
+ }
});
- state.tableData1 = [];
- };
- const getName = (item) => {
- if (
- Object.prototype.hasOwnProperty.call(item.subList[0], "name") &&
- !Object.prototype.hasOwnProperty.call(
- item.subList[0].subList[0],
- "name"
- )
- ) {
- // 两层
- return item.subList[0].name;
- } else if (
- Object.prototype.hasOwnProperty.call(item.subList[0], "name") &&
- Object.prototype.hasOwnProperty.call(item.subList[0].subList[0], "name")
- ) {
- //三层
- return item.subList[0].subList[0].name;
- // return item.name
- } else {
- // 单层
- return item.name;
- }
- };
- const getBelong = (item) => {
- if (
- Object.prototype.hasOwnProperty.call(item.subList[0], "name") &&
- !Object.prototype.hasOwnProperty.call(
- item.subList[0].subList[0],
- "name"
- )
- ) {
- // 两层
- return item.name;
- } else if (
- Object.prototype.hasOwnProperty.call(item.subList[0], "name") &&
- Object.prototype.hasOwnProperty.call(item.subList[0].subList[0], "name")
- ) {
- //三层
- return item.subList[0].name + "/" + item.subList[0].subList[0].name;
- // return item.name
- } else {
- // 单层
- return item.name;
- }
+ state.tableData1 = array
+ return array
};
const changePagination = (pagina) => {
state.currentPage = pagina;
@@ -339,19 +315,6 @@ export default {
(state.valueDate = []);
getProjList();
};
- const search = () => {
- let obj = {
- beginTime: dayjs(state.valueDate[0]).format("YYYY-MM-DD"),
- createName: state.valuecreater,
- endTime: dayjs(state.valueDate[1]).format("YYYY-MM-DD"),
- manager: state.valuename,
- name: state.valueproj,
- pageNo: state.currentPage,
- pageSize: 10,
- status: 1,
- };
- getProjList(obj);
- };
onMounted(() => {
getProjList();
});
@@ -360,11 +323,8 @@ export default {
showProjAudit,
getProjList,
setProjList,
- getName,
- getBelong,
changePagination,
reset,
- search,
};
},
};