diff --git a/src/views/processManagement/components/addTemplateDialog.vue b/src/views/processManagement/components/addTemplateDialog.vue index ac1c412..0472d2c 100644 --- a/src/views/processManagement/components/addTemplateDialog.vue +++ b/src/views/processManagement/components/addTemplateDialog.vue @@ -555,7 +555,7 @@ export default { let selected = this.processList.find(item => item.id == row.ppsId); row.processName = selected.name; row.processCode = selected.code; - row.ppsId = selected.code; + // row.ppsId = selected.code; }, // 获取工艺能力名字 craftChange(row, index) { diff --git a/src/views/processManagement/procepssPlanning.vue b/src/views/processManagement/procepssPlanning.vue index 619a45d..18c2b7c 100644 --- a/src/views/processManagement/procepssPlanning.vue +++ b/src/views/processManagement/procepssPlanning.vue @@ -224,6 +224,8 @@ export default { searchRange: true, startPlaceholder: '开始时间', endPlaceholder: '结束时间', + format: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'YYYY-MM-DD HH:mm:ss', }, { label: '维护人', @@ -332,6 +334,10 @@ export default { // 加载页面数据 onLoad(page, params = {}) { this.loading = true; + if(this.query.nextDue&&this.query.nextDue.length>0){ + this.query.startTime = this.query.nextDue[0] + this.query.endTime = this.query.nextDue[1] + } getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { this.data = res.data.data.records; this.loading = false;