diff --git a/src/views/modules/schedule/order_schedule.vue b/src/views/modules/schedule/order_schedule.vue index dce899d..9e026ac 100644 --- a/src/views/modules/schedule/order_schedule.vue +++ b/src/views/modules/schedule/order_schedule.vue @@ -1935,7 +1935,7 @@ export default { }else if(val === 24){ strVal = this.pageData.workCenterNo; } - this.$refs.baseList.init(val,strVal) + this.$refs.baseList.init(val,strVal, " AND WorkCenterNo <> 'FQC'"); }) }, diff --git a/src/views/modules/schedule/order_schedule_expand.vue b/src/views/modules/schedule/order_schedule_expand.vue index be4382a..cf7629f 100644 --- a/src/views/modules/schedule/order_schedule_expand.vue +++ b/src/views/modules/schedule/order_schedule_expand.vue @@ -872,7 +872,7 @@ export default { }else if(val === 24){ strVal = this.pageData.workCenterNo; } - this.$refs.baseList.init(val,strVal) + this.$refs.baseList.init(val,strVal, " AND WorkCenterNo <> 'FQC'") }) }, diff --git a/src/views/modules/yieldReport/produce_order.vue b/src/views/modules/yieldReport/produce_order.vue index 4bd6cbc..65d5c28 100644 --- a/src/views/modules/yieldReport/produce_order.vue +++ b/src/views/modules/yieldReport/produce_order.vue @@ -283,10 +283,10 @@ export default { headerAlign: "center", align: "center", columnLabel: "已排料", - columnWidth: 60, + columnWidth: 80, columnHidden: false, columnImage: false, - columnSortable: false, + columnSortable: true, sortLv: 0, status: true, fixed: false @@ -301,10 +301,10 @@ export default { headerAlign: "center", align: "center", columnLabel: "刀模已发", - columnWidth: 60, + columnWidth: 90, columnHidden: false, columnImage: false, - columnSortable: false, + columnSortable: true, sortLv: 0, status: true, fixed: false @@ -319,10 +319,10 @@ export default { headerAlign: "center", align: "center", columnLabel: "印版已发", - columnWidth: 60, + columnWidth: 90, columnHidden: false, columnImage: false, - columnSortable: false, + columnSortable: true, sortLv: 0, status: true, fixed: false