diff --git a/src/views/processManagement/taskDispatch.vue b/src/views/processManagement/taskDispatch.vue index 8724c98..6930877 100644 --- a/src/views/processManagement/taskDispatch.vue +++ b/src/views/processManagement/taskDispatch.vue @@ -65,6 +65,7 @@ export default { height: 'auto', calcHeight: 32, tip: false, + rowKey:'id', simplePage: true, searchShow: true, searchMenuSpan: 12, @@ -74,7 +75,6 @@ export default { border: true, index: true, selection: true, - selectable: false, viewBtn: false, delBtn: false, editBtn: false, diff --git a/src/views/productionManagement/beforeAndAfterPlating/afterPlating.vue b/src/views/productionManagement/beforeAndAfterPlating/afterPlating.vue index 6c6f5fd..be53256 100644 --- a/src/views/productionManagement/beforeAndAfterPlating/afterPlating.vue +++ b/src/views/productionManagement/beforeAndAfterPlating/afterPlating.vue @@ -153,7 +153,7 @@ export default { searchChange(params, done) { this.query = params; this.page.currentPage = 1; - this.onLoad(this.page, params); + this.onLoad(this.page, this.query); done(); }, currentChange(currentPage) { @@ -191,6 +191,12 @@ export default { }, onLoad(page, params = {}) { this.loading = true; + if(this.tabPosition == 'beforePlatingEntry'){ + this.query.paType=1 + } + if(this.tabPosition == 'beforePlatingBound'){ + this.query.paType=2 + } getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { this.data = res.data.data.records; this.loading = false; diff --git a/src/views/productionManagement/beforeAndAfterPlating/index.vue b/src/views/productionManagement/beforeAndAfterPlating/index.vue index 8eb0717..62d1430 100644 --- a/src/views/productionManagement/beforeAndAfterPlating/index.vue +++ b/src/views/productionManagement/beforeAndAfterPlating/index.vue @@ -165,7 +165,7 @@ export default { searchChange(params, done) { this.query = params; this.page.currentPage = 1; - this.onLoad(this.page, params); + this.onLoad(this.page, this.query); done(); }, currentChange(currentPage) { @@ -196,6 +196,7 @@ export default { }, onLoad(page, params = {}) { this.loading = true; + this.query.paType=3 getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { this.data = res.data.data.records; this.loading = false;