diff --git a/src/views/processManagement/taskDispatch.vue b/src/views/processManagement/taskDispatch.vue index aa2f3ff..8724c98 100644 --- a/src/views/processManagement/taskDispatch.vue +++ b/src/views/processManagement/taskDispatch.vue @@ -278,43 +278,16 @@ export default { }, // 加载页面数据 onLoad(page, params = {}) { - this.loading = false; + this.loading = true; - // getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { - // this.data = res.data.data.records; + getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { + this.data = res.data.data.records; - // this.loading = false; - // this.page.total = res.data.data.total; - // this.selectionClear(); - // }); - this.data = [ - { - children: [ - { - partCode: '123', - partName: '123', - partNo: '123', - partQty: '123', - partStatus: '123', - partType: '123', - partUnit: '123', - partWorkCenter: '123', - partWorkCenterName: '123', - partWorkCenterType: '123', - partWorkCenterTypeName: '123', - - } - ], - partCode: '123', - partName: '123', - taskType: '123', - pdmCreateTime: '123', - pdmWay: '123', - wayDetails: '123', - wipTake: '123', - remarks: '123', - }, - ]; + this.loading = false; + this.page.total = res.data.data.total; + this.selectionClear(); + }); + }, }, }; diff --git a/src/views/productionManagement/sinTerWorkOrder/index.vue b/src/views/productionManagement/sinTerWorkOrder/index.vue index 6315c10..684d36c 100644 --- a/src/views/productionManagement/sinTerWorkOrder/index.vue +++ b/src/views/productionManagement/sinTerWorkOrder/index.vue @@ -107,6 +107,15 @@ :itemData="itemData" @closeDialog="closeDialog" > + + + + @@ -118,6 +127,8 @@ import abnormalDialog from '../components/abnormalDialog.vue'; import productionMonitoringDialog from '../components/productionMonitoringDialog.vue'; import { getList, interlocking } from '@/api/productionManagement/sinTerWorkOrder'; +import workRate from '@/views/workRate/index.vue'; + export default { components: { productionDialog, @@ -125,11 +136,12 @@ export default { closedDialog, abnormalDialog, productionMonitoringDialog, + workRate }, data() { return { itemData: [], - +isWorkRateOpen: false, isPriorityOpen: false, showAbnormal: false, showRadio: true, @@ -557,8 +569,8 @@ export default { }, // 生产监控 clickProduction(row) { - this.rowItem = row; - this.monitorDialog = true; + this.rowItem = row; + this.isWorkRateOpen = true; }, // 打印标签 handlePrintTags() { @@ -613,6 +625,7 @@ export default { this.showClose = false; this.showAbnormal = false; this.isPriorityOpen = false; + this.isWorkRateOpen = false; // if (type) { this.onLoad(this.page, this.query); // }