diff --git a/src/views/modules/sys/sceneExceptionRuleConfig.vue b/src/views/modules/sys/sceneExceptionRuleConfig.vue
index f3710ef..51dfb92 100644
--- a/src/views/modules/sys/sceneExceptionRuleConfig.vue
+++ b/src/views/modules/sys/sceneExceptionRuleConfig.vue
@@ -29,10 +29,10 @@
align="center"
width="50">
-
-
-
-
+
+
+
+
diff --git a/src/views/modules/yieldReport/produce_order.vue b/src/views/modules/yieldReport/produce_order.vue
index 88d7e90..d91b965 100644
--- a/src/views/modules/yieldReport/produce_order.vue
+++ b/src/views/modules/yieldReport/produce_order.vue
@@ -136,7 +136,6 @@
-
-
+
+
{
- this.height = window.innerHeight - 235
+ this.height = window.innerHeight - 243
})
},
methods: {
@@ -1819,15 +1832,35 @@ export default {
}
// 开始真的查询;
this.searchData.searchFlag = true
+ this.searchData.page = this.pageIndex
+ this.searchData.limit = this.pageSize
+ this.searchData.exportFlag = 'N'
+ this.dataListLoading = true
getProduceScheduleList(this.searchData).then(({data}) => {
// 设置查询数据
- this.produceScheduleList = data.rows
+ this.produceScheduleList = data.rows || []
+ this.totalPage = data.total || 0
+ this.currentRow = {}
+ }).finally(() => {
+ this.dataListLoading = false
})
},
/* 刷新页面table */
refreshPageTables() {
this.currentRow = {}
+ this.pageIndex = 1
+ this.getProduceScheduleList()
+ },
+ // 主表分页大小改变
+ sizeChangeHandle(val) {
+ this.pageSize = val
+ this.pageIndex = 1
+ this.getProduceScheduleList()
+ },
+ // 主表当前页改变
+ currentChangeHandle(val) {
+ this.pageIndex = val
this.getProduceScheduleList()
},
/* 设置选中行的参数 */
@@ -2287,12 +2320,7 @@ export default {
const hasSeqNo = this.searchData.seqNo && this.searchData.seqNo.trim() !== ''
const hasOrderNo = this.searchData.orderNo && this.searchData.orderNo.trim() !== ''
if (hasResourceId || hasSeqNo || hasOrderNo) {
- this.searchData.searchFlag = true;
- getProduceScheduleList(this.searchData).then(({data}) => {
- // 设置查询数据
- this.searchData.exportFlag = 'N';
- this.produceScheduleList = data.rows
- })
+ this.getProduceScheduleList()
}
})