diff --git a/src/views/modules/longtron/screen-renovation-progress.vue b/src/views/modules/longtron/screen-renovation-progress.vue index 033a389e..71c76ba8 100644 --- a/src/views/modules/longtron/screen-renovation-progress.vue +++ b/src/views/modules/longtron/screen-renovation-progress.vue @@ -46,7 +46,7 @@ 第 {{ renovationPage + 1 }}/{{ renovationPageCount }} 页 · 显示 {{ displayRenovationList.length }} / 共 {{ renovationList.length }} 条 - + @@ -65,7 +65,7 @@ 第 {{ cableCopPage + 1 }}/{{ cableCopPageCount }} 页 · 显示 {{ displayCableCopList.length }} / 共 {{ cableCopList.length }} 条 - + - @@ -91,7 +90,7 @@ 第 {{ machiningPage + 1 }}/{{ machiningPageCount }} 页 · 显示 {{ displayMachiningList.length }} / 共 {{ machiningList.length }} 条 - + @@ -102,9 +101,6 @@ {{ scope.row.status }} - - - @@ -116,6 +112,7 @@ import { getCableCopTaskList, getMachiningTaskList, getRenovationOrderList } fro import { getScreenInnerHeight } from '@/utils/screenAdapt' const STATUS_ALLOW_LIST = ['已排产', '进行中', '已完成'] +const STATUS_EXCLUDE_FROM_LIST = ['已完成'] const RENOVATION_NODE_TEMPLATE = ['stocking', 'assy', 'inspect', 'pack'] const CABLE_COP_NODE_TEMPLATE = ['lineProduction', 'copProduction'] const BOARD_PAGE_SIZE = 6 @@ -207,12 +204,17 @@ export default { getCableCopTaskList(params).catch(() => null), getMachiningTaskList(params).catch(() => null) ]).then(([renovationRes, cableCopRes, machiningRes]) => { - this.renovationList = this.buildRenovationList(this.getListFromResponse(renovationRes)) - this.cableCopList = this.buildCableCopList(this.getListFromResponse(cableCopRes)) - this.machiningList = this.buildMachiningList(this.getListFromResponse(machiningRes)) - this.renovationKpi = this.buildKpi(this.renovationList) - this.cableCopKpi = this.buildKpi(this.cableCopList) - this.machiningKpi = this.buildKpi(this.machiningList) + const renovationFullList = this.buildRenovationList(this.getListFromResponse(renovationRes)) + const cableCopFullList = this.buildCableCopList(this.getListFromResponse(cableCopRes)) + const machiningFullList = this.buildMachiningList(this.getListFromResponse(machiningRes)) + + this.renovationKpi = this.buildKpi(renovationFullList) + this.cableCopKpi = this.buildKpi(cableCopFullList) + this.machiningKpi = this.buildKpi(machiningFullList) + + this.renovationList = this.excludeFinishedList(renovationFullList) + this.cableCopList = this.excludeFinishedList(cableCopFullList) + this.machiningList = this.excludeFinishedList(machiningFullList) this.normalizeCarouselPage() }).finally(() => { this.loading = false @@ -259,6 +261,9 @@ export default { const list = data && data.code === 0 && data.page && Array.isArray(data.page.list) ? data.page.list : null return list || this.getMockList() }, + excludeFinishedList(list) { + return (list || []).filter(item => !STATUS_EXCLUDE_FROM_LIST.includes(item.status)) + }, buildRenovationList(sourceList) { return (sourceList || []) .filter(item => STATUS_ALLOW_LIST.includes(item.status)) diff --git a/src/views/modules/longtron/screen-whole-lift-progress.vue b/src/views/modules/longtron/screen-whole-lift-progress.vue index 0f475cdd..0f5ae9d2 100644 --- a/src/views/modules/longtron/screen-whole-lift-progress.vue +++ b/src/views/modules/longtron/screen-whole-lift-progress.vue @@ -29,7 +29,6 @@ - @@ -39,6 +38,7 @@ import { getHomeLiftOrderList } from '@/api/longchuang/productionPlan' import { getScreenInnerHeight } from '@/utils/screenAdapt' const NODE_TEMPLATE = ['stocking', 'platformDebug', 'bgCeiling', 'doorAssy', 'pack'] +const DISPLAY_STATUS_LIST = ['已排产', '进行中'] export default { name: 'ScreenWholeLiftProgress', @@ -83,8 +83,7 @@ export default { loadBoardData() { if (this.loading) return this.loading = true - let statusList = ['已排产', '进行中', '已完成'] - getHomeLiftOrderList({ page: 1, limit: 300,statusList: statusList}).then(({data}) => { + getHomeLiftOrderList({ page: 1, limit: 300, statusList: DISPLAY_STATUS_LIST }).then(({data}) => { this.loading = false const source = (data && data.code === 0 && data.page && data.page.list) ? data.page.list : this.getMockList() this.boardList = this.buildBoardList(source) @@ -94,7 +93,7 @@ export default { }) }, buildBoardList(sourceList) { - const statusAllow = ['已排产', '进行中', '已完成'] + const statusAllow = DISPLAY_STATUS_LIST return sourceList.filter(item => statusAllow.includes(item.status)).map(item => ({ projectNo: item.projectNo || '', modelNo: item.modelNo || '',