diff --git a/src/api/productionManagement/returnPrWorkOrder.js b/src/api/productionManagement/returnPrWorkOrder.js index 8e7357e4..9daab423 100644 --- a/src/api/productionManagement/returnPrWorkOrder.js +++ b/src/api/productionManagement/returnPrWorkOrder.js @@ -21,14 +21,10 @@ export const returnThisProcess = (params) => { // 回退记录 -export const getWorkPlanPreserve = (current, size, params) => { +export const getWorkPlanPreserve = ( params) => { return request({ url: '/blade-desk/disTasking/getWorkPlanPreserve', method: 'get', - params: { - ...params, - current, - size, - } + params: params }) } \ No newline at end of file diff --git a/src/views/productionManagement/returnManagement/components/preserveLog.vue b/src/views/productionManagement/returnManagement/components/preserveLog.vue index 1321851e..c98b3fa5 100644 --- a/src/views/productionManagement/returnManagement/components/preserveLog.vue +++ b/src/views/productionManagement/returnManagement/components/preserveLog.vue @@ -32,7 +32,7 @@ export default { props: { cardNo: { type: String, - default: '', + default: null, }, }, components: {}, @@ -175,7 +175,6 @@ export default { }; }, methods: { - searchReset() { this.query = {}; this.onLoad(this.page); @@ -215,19 +214,22 @@ export default { onLoad(page, params = {}) { this.loading = true; - getWorkPlanPreserve(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { - this.data = res.data.data; - this.loading = false; - this.page.total = res.data.data.total; - }).catch(err=>{ - this.loading = false - }) + getWorkPlanPreserve(Object.assign(params, this.query)) + .then(res => { + this.data = res.data.data; + this.loading = false; + // this.page.total = res.data.data.total; + }) + .catch(err => { + this.loading = false; + }); }, }, mounted() { - console.log(8989898,this.cardNo) - this.query.cardNo = this.cardNo - this.onLoad(this.page, this.query); + if (this.cardNo != '') { + this.query.cardNo = this.cardNo; + this.onLoad(this.page, this.query); + } }, }; diff --git a/src/views/productionManagement/returnManagement/returnPrWorkOrder.vue b/src/views/productionManagement/returnManagement/returnPrWorkOrder.vue index 1b346e8d..ee2bf66c 100644 --- a/src/views/productionManagement/returnManagement/returnPrWorkOrder.vue +++ b/src/views/productionManagement/returnManagement/returnPrWorkOrder.vue @@ -31,7 +31,7 @@ export default { methods: { handleClick() { if (this.activeName == 'preserveLog') { - + this.cardNo = '' // this.$refs.preserveLog.openss(this.cardNo); } },