From 245c828706f18a6043bc28cf3c34a23b586266a9 Mon Sep 17 00:00:00 2001 From: zhangdi <15053473693@163.com> Date: Wed, 7 Jan 2026 14:14:53 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=8E=92=E4=BA=A7=E5=88=86=E6=9E=90?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E9=80=BB=E8=BE=91=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/orderDialog.vue | 50 +++++++++++++++++-- .../statisticalAnalysis/index.vue | 4 ++ 2 files changed, 50 insertions(+), 4 deletions(-) diff --git a/src/views/productionSchedulingPlan/statisticalAnalysis/components/orderDialog.vue b/src/views/productionSchedulingPlan/statisticalAnalysis/components/orderDialog.vue index daca134..d130613 100644 --- a/src/views/productionSchedulingPlan/statisticalAnalysis/components/orderDialog.vue +++ b/src/views/productionSchedulingPlan/statisticalAnalysis/components/orderDialog.vue @@ -57,6 +57,10 @@ export default { type: String, default: '', }, + searchQuery: { + type: Object, + default: () => {}, + }, }, data() { return { @@ -144,6 +148,15 @@ export default { format: 'YYYY-MM-DD', valueFormat: 'YYYY-MM-DD', }, + { + label: '异常原因', + prop: 'errorInfo', + search: false, + sortable: true, + hide:true, + width: 250, + span: 12, + }, { label: '调度员', prop: 'dispatcher', @@ -302,17 +315,38 @@ export default { }, mounted() { this.openShow = this.showDialog; + console.log(this.showType); + if(this.showAll=='all'){ this.option.column[0].search = true; this.option.column[1].search = true; this.option.header=true // this.option.column[0].search = true; + if(this.searchQuery.cycledate && this.searchQuery.cycledate.length>0){ + this.query.cycledate = [ this.searchQuery.cycledate[0], this.searchQuery.cycledate[1]]; + this.query.startTime = this.searchQuery.cycledate[0]; + this.query.endTime = this.searchQuery.cycledate[1]; + + } + }else{ + this.query.workCenterId = this.rowData.workCenterId; + } + if(this.showType=='10006'){ + this.option.column.forEach((item)=>{ + if(item.prop=='errorInfo'){ + item.hide = false; + } + }) + this.option.column[3].hide = true; } - this.query.workCenterId = this.rowData.workCenterId; + this.onLoad(this.page, this.query); }, methods: { + submit(){ + this.closeDialog() + }, closeDialog() { this.openShow = false; this.$emit('closeDialog'); @@ -357,10 +391,18 @@ export default { onLoad(page, params = {}) { this.loading = true; this.data = []; - if (!!params.cycledate) { - this.query.startTime = params.cycledate[0]; - this.query.endTime = params.cycledate[1]; + + + if(this.searchQuery.cycledate && this.searchQuery.cycledate.length>0){ + this.query.startTime = this.searchQuery.cycledate[0]; + this.query.endTime = this.searchQuery.cycledate[1]; } + // if (!!params.cycledate) { + // this.query.startTime = params.cycledate[0]; + // this.query.endTime = params.cycledate[1]; + // } + + getYieldOrderList( page.currentPage, diff --git a/src/views/productionSchedulingPlan/statisticalAnalysis/index.vue b/src/views/productionSchedulingPlan/statisticalAnalysis/index.vue index 1b2a958..b1fe357 100644 --- a/src/views/productionSchedulingPlan/statisticalAnalysis/index.vue +++ b/src/views/productionSchedulingPlan/statisticalAnalysis/index.vue @@ -86,6 +86,7 @@ @close="closeDialog" :rowData="rowData" :showAll="showAll" + :searchQuery="searchQuery" /> @@ -219,6 +220,7 @@ export default { showType: '', rowData: {}, columnWidthsData: [], + searchQuery:{} }; }, methods: { @@ -255,6 +257,8 @@ export default { showOrderDetail(row, type, all) { this.rowData = row; this.showDialog = true; + this.searchQuery = {...this.query} + console.log(9999,this.query) this.showAll=all // 总订单 if (type == 'totalCount') { From e44cde6bd58735204a2575ae5823b62d8aaa25a8 Mon Sep 17 00:00:00 2001 From: zhangdi <15053473693@163.com> Date: Wed, 7 Jan 2026 15:12:05 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=82=B9=E5=87=BB=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E5=92=8C=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../schedulingDashboard/container.vue | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/views/productionSchedulingPlan/schedulingDashboard/container.vue b/src/views/productionSchedulingPlan/schedulingDashboard/container.vue index 6eb9b47..35c27c3 100644 --- a/src/views/productionSchedulingPlan/schedulingDashboard/container.vue +++ b/src/views/productionSchedulingPlan/schedulingDashboard/container.vue @@ -168,7 +168,7 @@ lineHeight: getRowHeight(order.woCode) + 'px', }" > -
+
{{ index + 1 }}
@@ -303,7 +303,7 @@ v-for="(task, taskIndex) in layer" :key="taskIndex" class="task-bar" - @click="showTaskDetail(task)" + :class="{ 'task-bar-narrow': getWidthPercent(task.planStartTime, task.planEndTime) < 2.1, @@ -1620,6 +1620,10 @@ export default { .info-item { display: flex; height: 100%; + cursor: pointer; +} +.info-item:hover { + background-color: #e9ecef; } .info-cell { From 2cd35dc96fc90c79c8ae1fdf797fa8179bc63e3c Mon Sep 17 00:00:00 2001 From: zhangdi <15053473693@163.com> Date: Thu, 8 Jan 2026 09:06:38 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=BC=B9=E6=A1=86=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionSchedulingPlan/schedulingDashboard/container.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/productionSchedulingPlan/schedulingDashboard/container.vue b/src/views/productionSchedulingPlan/schedulingDashboard/container.vue index 35c27c3..32b5583 100644 --- a/src/views/productionSchedulingPlan/schedulingDashboard/container.vue +++ b/src/views/productionSchedulingPlan/schedulingDashboard/container.vue @@ -1925,7 +1925,7 @@ export default { line-height: 20px; .label { - width: 60px; + width: 80px; color: #666; font-weight: 500; text-align: right;