diff --git a/src/views/examine/ProjectReviewed.vue b/src/views/examine/ProjectReviewed.vue index 70321bb4..c9ca8734 100644 --- a/src/views/examine/ProjectReviewed.vue +++ b/src/views/examine/ProjectReviewed.vue @@ -68,7 +68,7 @@
-
+
搜索
@@ -151,7 +151,6 @@ import { reactive, toRefs, onMounted } from "vue"; import { listView, auditList } from "../../api/indexAudit"; import { toDate } from "@/api/method"; -import dayjs from "dayjs"; export default { name: "ProjectViewed", @@ -168,10 +167,10 @@ export default { label: "rose", }, ], - valueproj: null, - valuecreater: null, - valuename: null, - valueDate: [], + valueproj: "", + valuecreater: "", + valuename: "", + valueDate: undefined, valuestate: null, currentPage: 1, total: null, @@ -265,7 +264,6 @@ export default { dataIndex: "belong", key: "belong", align: "center", - // width: "10%", }, { @@ -284,28 +282,17 @@ export default { ], //审核记录的数据 tableDataAudit: [], - tableData1: [ - { - number: "1", - name: "课程1", - belong: "管理者进阶/管理者进阶腾飞班", - manager: "黄华,刘军", - status: "通过", - creater: "管理员", - time: "-", - msg: "-", - }, - ], + tableData1: [], }); - const getProjList = (obj) => { - let objn = obj || { - beginTime: 0, - createName: "", - endTime: "", - manager: "", - name: "", + const getProjList = () => { + let objn = { + beginTime: state.valueDate == undefined ? "" : Date.parse(state.valueDate[0]) , + endTime: state.valueDate == undefined ? "" : Date.parse(state.valueDate[1]), + createName: state.valuecreater, + manager: state.valuename, + name: state.valueproj, pageNo: state.currentPage, - pageSize: 10, + pageSize: state.pageSize, status: 0, }; listView(objn) @@ -313,9 +300,7 @@ export default { console.log("获取已审核项目成功", res.data.data.rows); let result = res.data.data; state.total = res.data.data.total; - if (result.total > 0) { setTableData(result.rows); - } }) .catch((err) => { console.log("获取已审核项目失败", err); @@ -324,26 +309,21 @@ export default { const setTableData = (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: "", 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.beginTime, "Y-M-D h:m"), @@ -351,70 +331,81 @@ export default { id: item.projectId, }; array.push(obj); + } else { + let obj = { + key:index+1, + number: item.projectId, + name: item.name, + belong: "", + manager: item.manager || "-", + status: + item.status == 0 + ? "草稿" + : item.status == 1 + ? "已发布" + : item.status == 2 + ? "已结束" + : "-", + creater: item.createName, + time: toDate(item.beginTime, "Y-M-D h:m"), + msg: item.description || "-", + id: item.projectId, + children: item.subList ? setTableData(item.subList) : [] , + }; + array.push(obj); + } }); state.tableData1 = array; + return array }; - 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; - } - }; + // 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; + // } + // }; const changePagination = (pagina) => { state.currentPage = pagina; 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: 0, - }; - getProjList(obj); - }; const reset = () => { state.valueproj = null; state.valuecreater = null; @@ -436,9 +427,7 @@ export default { .then((res) => { console.log("获取到了审核日志列表", res); let result = res.data.data; - // if (result.total > 0) { setAudit(result.rows); - // } }) .catch((err) => { console.log("审核日志列表获取失败", err); @@ -474,10 +463,7 @@ export default { ...toRefs(state), getProjList, setTableData, - getName, - getBelong, changePagination, - search, reset, closeProjAuditModal, showProjAuditModal, diff --git a/src/views/examine/ProjectReviewedN.vue b/src/views/examine/ProjectReviewedN.vue index 92d52cb8..246f17f7 100644 --- a/src/views/examine/ProjectReviewedN.vue +++ b/src/views/examine/ProjectReviewedN.vue @@ -309,10 +309,10 @@ export default { getProjList(); }; const reset = () => { - (state.valueproj = null), - (state.valuecreater = null), - (state.valuename = null), - (state.valueDate = []); + state.valueproj = "", + state.valuecreater = "", + state.valuename = "", + state.valueDate = undefined; getProjList(); }; onMounted(() => {