From e64b0867b240da35b9173cea5b09df4a7a57953a Mon Sep 17 00:00:00 2001 From: zhangdi <15053473693@163.com> Date: Mon, 29 Dec 2025 11:03:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/equipmentCapacity.vue | 11 +++++- .../basic/personnelCapacity.vue | 11 ++++++ .../basic/principalProducer.vue | 10 ++++++ .../basic/qualityGrade.vue | 13 +++++-- .../basic/sintTempCurve.vue | 34 ++++++------------- .../schedulingDashboard/index.vue | 22 ++++++------ 6 files changed, 63 insertions(+), 38 deletions(-) diff --git a/src/views/productionSchedulingPlan/basic/equipmentCapacity.vue b/src/views/productionSchedulingPlan/basic/equipmentCapacity.vue index 6b66286..6e4d90d 100644 --- a/src/views/productionSchedulingPlan/basic/equipmentCapacity.vue +++ b/src/views/productionSchedulingPlan/basic/equipmentCapacity.vue @@ -17,6 +17,7 @@ @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad" + :before-open="beforeOpen" > @@ -170,7 +171,7 @@ export default { }, { label: '普通设备', - value: 1, + value: '1', }, ], }, @@ -265,6 +266,14 @@ export default { }; }, methods: { + beforeOpen(done, type) { + if (['edit', 'view'].includes(type)) { + // this.form.processId = this.form.processId+'' + // this.form.craftId = this.form.craftId+'' + this.form.workCenterId = this.form.workCenterId+'' + } + done(); + }, onChangeData(val, type) { if (val&&type == 'workCenterId') { this.form.workCenterName = val.wcCode; diff --git a/src/views/productionSchedulingPlan/basic/personnelCapacity.vue b/src/views/productionSchedulingPlan/basic/personnelCapacity.vue index 3e39645..49fc7a1 100644 --- a/src/views/productionSchedulingPlan/basic/personnelCapacity.vue +++ b/src/views/productionSchedulingPlan/basic/personnelCapacity.vue @@ -17,6 +17,8 @@ @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad" + :before-open="beforeOpen" + > @@ -191,6 +193,7 @@ export default { search: false, sortable: true, span: 12, + width:250, labelWidth: 220, type: 'number', }, @@ -210,6 +213,14 @@ export default { }; }, methods: { + beforeOpen(done, type) { + if (['edit', 'view'].includes(type)) { + this.form.processId = this.form.processId+'' + this.form.craftId = this.form.craftId+'' + this.form.workCenterId = this.form.workCenterId+'' + } + done(); + }, onChangeData(val, type) { if (val && type == 'workCenterId') { this.form.workCenterName = val.wcName; diff --git a/src/views/productionSchedulingPlan/basic/principalProducer.vue b/src/views/productionSchedulingPlan/basic/principalProducer.vue index 2c6d4aa..4c686b7 100644 --- a/src/views/productionSchedulingPlan/basic/principalProducer.vue +++ b/src/views/productionSchedulingPlan/basic/principalProducer.vue @@ -17,6 +17,7 @@ @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad" + :before-open="beforeOpen" > @@ -149,6 +150,15 @@ export default { }; }, methods: { + + beforeOpen(done, type) { + if (['edit', 'view'].includes(type)) { + this.form.processId = this.form.processId+'' + // this.form.craftId = this.form.craftId+'' + this.form.workCenterId = this.form.workCenterId+'' + } + done(); + }, onChangeData(val, type) { if (val&&type == 'processId') { this.form.processName = val.name; diff --git a/src/views/productionSchedulingPlan/basic/qualityGrade.vue b/src/views/productionSchedulingPlan/basic/qualityGrade.vue index a2415ed..d4f6864 100644 --- a/src/views/productionSchedulingPlan/basic/qualityGrade.vue +++ b/src/views/productionSchedulingPlan/basic/qualityGrade.vue @@ -17,6 +17,7 @@ @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad" + :before-open="beforeOpen" > @@ -106,15 +107,15 @@ export default { dicData:[ { label:'军品', - value:1 + value:'1' }, { label:'商飞', - value:2 + value:'2' }, { label:'宇航', - value:3 + value:'3' } ] }, @@ -126,6 +127,12 @@ export default { }; }, methods: { + beforeOpen(done, type) { + if (['edit', 'view'].includes(type)) { + + } + done(); + }, rowSave(row, done, loading) { addGualityGrade(row).then( () => { diff --git a/src/views/productionSchedulingPlan/basic/sintTempCurve.vue b/src/views/productionSchedulingPlan/basic/sintTempCurve.vue index 490142f..b4e7ce6 100644 --- a/src/views/productionSchedulingPlan/basic/sintTempCurve.vue +++ b/src/views/productionSchedulingPlan/basic/sintTempCurve.vue @@ -17,6 +17,7 @@ @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad" + :before-open="beforeOpen" > @@ -115,32 +116,12 @@ export default { hide: true, display: false, }, - { - label: '设备编码', - prop: 'equipCode', - search: true, - sortable: true, - span: 12, - width: 120, - type: 'select', - filterable: true, - dicUrl: '/blade-scheduling/equipment/findList', - props: { - label: 'deviceCode', - value: 'deviceCode', - }, - change: val => { - this.onChangeData(val.item, 'equipName'); - }, - }, { label: '设备名称', prop: 'equipName', search: false, sortable: true, span: 12, - width: 120, - disabled: true, }, { @@ -149,7 +130,6 @@ export default { search: false, sortable: true, span: 12, - width: 120, type: 'select', dicData: [ { @@ -158,7 +138,7 @@ export default { }, { label: '普通设备', - value: 1, + value: '1', }, ], }, @@ -168,8 +148,6 @@ export default { search: false, sortable: true, span: 12, - hide: true, - display: false, }, { @@ -195,6 +173,14 @@ export default { }; }, methods: { + beforeOpen(done, type) { + if (['edit', 'view'].includes(type)) { + this.form.processId = this.form.processId+'' + // this.form.craftId = this.form.craftId+'' + // this.form.workCenterId = this.form.workCenterId+'' + } + done(); + }, onChangeData(val, type) { if (val && type == 'workCenterId') { this.form.workCenterName = val.wcCode; diff --git a/src/views/productionSchedulingPlan/schedulingDashboard/index.vue b/src/views/productionSchedulingPlan/schedulingDashboard/index.vue index 68fafe9..c2926f0 100644 --- a/src/views/productionSchedulingPlan/schedulingDashboard/index.vue +++ b/src/views/productionSchedulingPlan/schedulingDashboard/index.vue @@ -108,6 +108,7 @@ 搜索 清空 + 导出 @@ -117,9 +118,9 @@
-
+
- 进行中 + + 进行中
- 已完成 + 已完成
@@ -1116,10 +1118,10 @@ export default { getStatusColor(row) { switch (row.planStatus) { case '5': - return '#28a745'; + return '#007bff'; case '2': case '3': - return '#007bff'; + return '#28a745'; case '1': return '#6c757d'; case '6': @@ -1131,10 +1133,10 @@ export default { getStatusTagType(row) { switch (row.planStatus) { case '5': - return 'success'; + return 'primary'; case '2': case '3': - return 'primary'; + return 'success'; case '1': return 'info'; case '6':