diff --git a/src/views/productionSchedulingPlan/schedulingDashboard/container.vue b/src/views/productionSchedulingPlan/schedulingDashboard/container.vue
index 6eb9b47..32b5583 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 {
@@ -1921,7 +1925,7 @@ export default {
line-height: 20px;
.label {
- width: 60px;
+ width: 80px;
color: #666;
font-weight: 500;
text-align: right;
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') {