diff --git a/src/views/basicdata/brand/basicBrand.vue b/src/views/basicdata/brand/basicBrand.vue index 59ee0406..23296119 100644 --- a/src/views/basicdata/brand/basicBrand.vue +++ b/src/views/basicdata/brand/basicBrand.vue @@ -432,10 +432,12 @@ export default { this.$message({ type: 'success', message: '操作成功!', - }).finally(() => { - this.loadingObj.detailLoading = false; - }); + }) this.imageUrl = null; + }).catch(e=>{ + console.log(e); + }).finally(()=>{ + this.loadingObj.detailLoading = false; }); } else { update(this.form) @@ -446,6 +448,8 @@ export default { type: 'success', message: '操作成功!', }); + }).catch(e=>{ + console.log(e); }) .finally(() => { this.loadingObj.detailLoading = false; diff --git a/src/views/warehouse/warehousingentry/warehouseWarehousingEntry.vue b/src/views/warehouse/warehousingentry/warehouseWarehousingEntry.vue index 2ad2f9ac..63c60f86 100644 --- a/src/views/warehouse/warehousingentry/warehouseWarehousingEntry.vue +++ b/src/views/warehouse/warehousingentry/warehouseWarehousingEntry.vue @@ -485,7 +485,7 @@ export default { page: { currentPage: 1, pageSize: 30, - total: 40, + total: 0, }, // 表单数据 form: {}, @@ -885,25 +885,32 @@ export default { }, currentChange(currentPage) { this.page.currentPage = currentPage; + console.log(currentPage,'currentPage'); + this.onLoad(this.page); + console.log(this.page.currentPage,'this.page.currentPage'); + }, sizeChange(pageSize) { this.page.pageSize = pageSize; this.onLoad(this.page); }, - onLoad(page, params = {}) { + onLoad(page=this.page, params = {}) { this.loading = true; - const submitData = {query: this.page, warehouseWarehousingEntry: {...params, ...this.query} } + const submitData = {query:page, warehouseWarehousingEntry: {...params, ...this.query} } if (getObjType(submitData.warehouseWarehousingEntry.receiptDate) === 'array' && submitData.warehouseWarehousingEntry.receiptDate.length > 0) { submitData.warehouseWarehousingEntry.receiptDateStart = submitData.warehouseWarehousingEntry.receiptDate[0] submitData.warehouseWarehousingEntry.receiptDateStartEnd = submitData.warehouseWarehousingEntry.receiptDate[1] } - delete submitData.query.total + delete submitData.warehouseWarehousingEntry.receiptDate + // 获取列表数据 getList(submitData).then(res => { + console.log(res,'res+++'); + const data = res.data.data; console.log('data :>> ', data); this.page.total = data.total; @@ -926,7 +933,7 @@ export default { }); this.data = data.records; this.loading = false; - this.selectionClear(); + // this.selectionClear(); }); }, },