diff --git a/src/api/productionManagement/frontTooling.js b/src/api/productionManagement/frontTooling.js index e4b3ffd..32f7501 100644 --- a/src/api/productionManagement/frontTooling.js +++ b/src/api/productionManagement/frontTooling.js @@ -2,7 +2,7 @@ import request from '@/axios'; //列表接口 export const getList = (current, size, params) => { return request({ - url: '/blade-desk/sjWorkOrder/queryByReadStatus', + url: '/blade-desk//sjWorkOrder/queryByReadStatus', method: 'get', params: { ...params, diff --git a/src/views/productionManagement/blbWorkOrder/components/glass.vue b/src/views/productionManagement/blbWorkOrder/components/glass.vue index 3e1d6bc..2bcae45 100644 --- a/src/views/productionManagement/blbWorkOrder/components/glass.vue +++ b/src/views/productionManagement/blbWorkOrder/components/glass.vue @@ -571,7 +571,7 @@ export default { getList( page.currentPage, page.pageSize, - Object.assign(params, this.query, { yieldType: '3' }) + Object.assign(params, this.query, { yieldType: '12003' }) ).then(res => { this.data = res.data.data.records; this.loading = false; diff --git a/src/views/productionManagement/blbWorkOrder/components/others.vue b/src/views/productionManagement/blbWorkOrder/components/others.vue index 717810c..223e465 100644 --- a/src/views/productionManagement/blbWorkOrder/components/others.vue +++ b/src/views/productionManagement/blbWorkOrder/components/others.vue @@ -571,7 +571,7 @@ export default { getList( page.currentPage, page.pageSize, - Object.assign(params, this.query, { yieldType: '4,5,6' }) + Object.assign(params, this.query, { yieldType: '12004,12005,12006' }) ).then(res => { this.data = res.data.data.records; this.loading = false; diff --git a/src/views/productionManagement/frontTooling.vue b/src/views/productionManagement/frontTooling.vue index dd522a1..4e4c9b7 100644 --- a/src/views/productionManagement/frontTooling.vue +++ b/src/views/productionManagement/frontTooling.vue @@ -45,7 +45,6 @@ export default { calcHeight: 32, rowKey: 'rlsId', tip: false, - size: 'medium', simplePage: true, searchShow: true, searchMenuSpan: 6, @@ -89,57 +88,28 @@ export default { column: [ { label: '准备状态', - prop: 'readStatusTiTle', + prop: 'readStatus', type: 'select', width: 200, search: true, sortable: true, overHidden: true, - rules: [ - { - required: true, - message: '请输入准备状态', - trigger: 'blur', - }, - ], - dicData: [ - { - value: 1, - label: '已准备', - }, - ], }, { label: '生产计划号', - prop: 'poCode', - bind: 'pjYieldOrder.poCode', + prop: 'ypCode', width: 200, search: false, sortable: true, overHidden: true, - rules: [ - { - required: true, - message: '请输入生产计划号', - trigger: 'blur', - }, - ], }, { label: '生产订单号', prop: 'yoCode', - bind: 'pjYieldOrder.yoCode', width: 200, search: false, sortable: true, overHidden: true, - rules: [ - { - required: true, - message: '请输入生产订单号', - trigger: 'blur', - }, - ], }, { label: '车间订单号', @@ -148,45 +118,22 @@ export default { search: true, sortable: true, overHidden: true, - rules: [ - { - required: true, - message: '请输入车间订单号', - trigger: 'blur', - }, - ], }, { label: '零件号', prop: 'partCode', - bind: 'pjYieldOrder.partCode', width: 200, search: true, sortable: true, overHidden: true, - rules: [ - { - required: true, - message: '请输入零件号', - trigger: 'blur', - }, - ], }, { label: '零件名称', prop: 'partName', - bind: 'pjYieldOrder.partName', width: 200, search: true, sortable: true, overHidden: true, - rules: [ - { - required: true, - message: '请输入零件名称', - trigger: 'blur', - }, - ], }, { label: '流程卡号', @@ -195,13 +142,6 @@ export default { search: true, sortable: true, overHidden: true, - rules: [ - { - required: true, - message: '请输入流程卡号', - trigger: 'blur', - }, - ], }, { label: '批次号', @@ -210,45 +150,22 @@ export default { search: true, sortable: true, overHidden: true, - rules: [ - { - required: true, - message: '请输入批次号', - trigger: 'blur', - }, - ], }, { label: '镀种信息', prop: 'plate', - bind: 'pjYieldOrder.plate', width: 200, search: true, sortable: true, overHidden: true, - rules: [ - { - required: true, - message: '请输入镀种信息', - trigger: 'blur', - }, - ], }, { label: '生产标识', prop: 'prodIdent', - bind: 'pjYieldOrder.prodIdent', width: 200, search: true, sortable: true, overHidden: true, - rules: [ - { - required: true, - message: '请输入生产标识', - trigger: 'blur', - }, - ], }, { label: '生产数量', @@ -257,29 +174,14 @@ export default { search: false, sortable: true, overHidden: true, - rules: [ - { - required: true, - message: '请输入生产数量', - trigger: 'blur', - }, - ], }, { label: '面积(dm²)', prop: 'poArea', - bind: 'pjYieldOrder.poArea', width: 200, search: false, sortable: true, overHidden: true, - rules: [ - { - required: true, - message: '请输入面积(dm²)', - trigger: 'blur', - }, - ], }, { label: '订单优先级', @@ -289,13 +191,7 @@ export default { search: true, sortable: true, overHidden: true, - rules: [ - { - required: true, - message: '请输入订单优先级', - trigger: 'blur', - }, - ], + dicUrl: '/blade-system/dict/dictionary?code=orderPriority', props: { label: 'dictValue', @@ -304,7 +200,7 @@ export default { }, { label: '计划下达时间', - prop: 'createTime', + prop: 'releaseDate', type: 'date', searchRange: true, startPlaceholder: '开始时间', @@ -313,13 +209,6 @@ export default { search: true, sortable: true, overHidden: true, - rules: [ - { - required: true, - message: '请输入计划下达时间', - trigger: 'blur', - }, - ], }, { label: '需求交期', @@ -332,13 +221,6 @@ export default { search: true, sortable: true, overHidden: true, - rules: [ - { - required: true, - message: '请输入需求交期', - trigger: 'blur', - }, - ], }, { label: '石墨模具号', @@ -347,13 +229,6 @@ export default { search: false, sortable: true, overHidden: true, - rules: [ - { - required: true, - message: '请输入石墨模具号', - trigger: 'blur', - }, - ], }, { label: '库位号', @@ -362,13 +237,6 @@ export default { search: false, sortable: true, overHidden: true, - rules: [ - { - required: true, - message: '请输入库位号', - trigger: 'blur', - }, - ], }, { label: '待出库数量', @@ -377,13 +245,6 @@ export default { search: false, sortable: true, overHidden: true, - rules: [ - { - required: true, - message: '请输入待出库数量', - trigger: 'blur', - }, - ], }, { label: '玻璃饼', @@ -392,13 +253,6 @@ export default { search: false, sortable: true, overHidden: true, - rules: [ - { - required: true, - message: '请输入玻璃饼', - trigger: 'blur', - }, - ], }, { label: '待出库数量', @@ -407,13 +261,6 @@ export default { search: false, sortable: true, overHidden: true, - rules: [ - { - required: true, - message: '请输入待出库数量', - trigger: 'blur', - }, - ], }, { label: '压饼模具号', @@ -422,13 +269,6 @@ export default { search: false, sortable: true, overHidden: true, - rules: [ - { - required: true, - message: '请输入压饼模具号', - trigger: 'blur', - }, - ], }, { label: '库位号', @@ -437,13 +277,6 @@ export default { search: false, sortable: true, overHidden: true, - rules: [ - { - required: true, - message: '请输入库位号', - trigger: 'blur', - }, - ], }, { label: '待出库数量', @@ -452,13 +285,6 @@ export default { search: false, sortable: true, overHidden: true, - rules: [ - { - required: true, - message: '请输入待出库数量', - trigger: 'blur', - }, - ], }, { label: '备注', @@ -467,13 +293,6 @@ export default { search: false, sortable: true, overHidden: true, - rules: [ - { - required: true, - message: '请输入备注', - trigger: 'blur', - }, - ], }, ], }, @@ -532,17 +351,13 @@ export default { this.$refs.crud.toggleSelection(); }, onLoad(page, params = {}) { - // this.loading = true; - // getList( - // page.currentPage, - // page.pageSize, - // Object.assign(params, this.query, { yieldType: '1' }) - // ).then(res => { - // this.data = res.data.data.records; - // this.loading = false; - // this.page.total = res.data.data.total; - // this.selectionClear(); - // }); + this.loading = true; + 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(); + }); }, }, }; diff --git a/src/views/productionManagement/productionMonitoring.vue b/src/views/productionManagement/productionMonitoring.vue index 808376e..de91796 100644 --- a/src/views/productionManagement/productionMonitoring.vue +++ b/src/views/productionManagement/productionMonitoring.vue @@ -731,7 +731,7 @@ export default { getList( page.currentPage, page.pageSize, - Object.assign(params, this.query, { yieldType: '1' }) + Object.assign(params, this.query, { yieldType: '12001' }) ).then(res => { this.data = res.data.data.records; this.loading = false; diff --git a/src/views/productionManagement/sinTerWorkOrder/index.vue b/src/views/productionManagement/sinTerWorkOrder/index.vue index 605d0ac..77e7d06 100644 --- a/src/views/productionManagement/sinTerWorkOrder/index.vue +++ b/src/views/productionManagement/sinTerWorkOrder/index.vue @@ -615,7 +615,7 @@ export default { getList( page.currentPage, page.pageSize, - Object.assign(params, this.query, { yieldType: '2' }) + Object.assign(params, this.query, { yieldType: '12002' }) ).then(res => { this.data = res.data.data.records; this.loading = false; diff --git a/src/views/productionSchedulingPlan/schedulingDashboard/container.vue b/src/views/productionSchedulingPlan/schedulingDashboard/container.vue index 0f0176a..cde572c 100644 --- a/src/views/productionSchedulingPlan/schedulingDashboard/container.vue +++ b/src/views/productionSchedulingPlan/schedulingDashboard/container.vue @@ -938,17 +938,25 @@ export default { } }, updateTime(type) { - // 设置默认时间范围为今天到后两天 const today = new Date(); - const endDay = new Date(today); - endDay.setDate(today.getDate() + 2); - // 设置日期范围,格式为 YYYY-MM-DD - const startDate = today.toISOString().split('T')[0]; - const endDate = endDay.toISOString().split('T')[0]; - - this.formLabelAlign.timeRange = [startDate, endDate]; - - this.handleLegendChange(type); + const startDate = new Date(today); + startDate.setDate(today.getDate() - 3); // 前3天 + const endDate = new Date(today); + endDate.setDate(today.getDate() + 3); // 后3天 + + // 格式化为 YYYY-MM-DD + const format = date => date.toISOString().split('T')[0]; + this.formLabelAlign.timeRange = [format(startDate), format(endDate)]; + + // 如果是重置操作,也应触发图例状态同步 + if (type === 'reset') { + this.legendStatus.completed = false; + this.legendStatus.processing = true; + this.legendStatus.pending = true; + this.handleLegendChange('reset'); + } else { + this.handleLegendChange(); // 触发数据加载 + } }, // 处理图例状态变化 handleLegendChange(type) { @@ -964,7 +972,6 @@ export default { this.formLabelAlign.planStatusList.push('1'); } if (type == 'reset') { - } this.getData(); @@ -1181,7 +1188,7 @@ export default { woReleaseMap[order.woCode] = order.receiveTime; }); - // 3. 对 tasks 按其所属订单的 receiveTime + // 3. 对 tasks 按其所属订单的 receiveTime tasks.sort((a, b) => { const dateA = new Date(woReleaseMap[a.woCode] || '1970-01-01'); const dateB = new Date(woReleaseMap[b.woCode] || '1970-01-01'); @@ -1298,7 +1305,7 @@ export default { receiveTime: '', //接收时间 partCode: '', //订单号 batchNo: '', //批次号 - planStatusList: ['1','2','3'], + planStatusList: ['1', '2', '3'], }; this.legendStatus.completed = false; this.legendStatus.processing = true; diff --git a/src/views/workbench/afterPlaReceive/index.vue b/src/views/workbench/afterPlaReceive/index.vue new file mode 100644 index 0000000..daf83ca --- /dev/null +++ b/src/views/workbench/afterPlaReceive/index.vue @@ -0,0 +1,214 @@ + + + diff --git a/src/views/workbench/taskCope/index.vue b/src/views/workbench/taskCope/index.vue new file mode 100644 index 0000000..daf83ca --- /dev/null +++ b/src/views/workbench/taskCope/index.vue @@ -0,0 +1,214 @@ + + + diff --git a/src/views/workbench/workReport/index.vue b/src/views/workbench/workReport/index.vue new file mode 100644 index 0000000..daf83ca --- /dev/null +++ b/src/views/workbench/workReport/index.vue @@ -0,0 +1,214 @@ + + +