From 07fc90c659a0b1ff344db992f18e493cdeeec0a0 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期一, 03 三月 2025 15:31:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/business/rawMaterialInspection/index.vue | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/views/business/rawMaterialInspection/index.vue b/src/views/business/rawMaterialInspection/index.vue
index a993bac..7573f89 100644
--- a/src/views/business/rawMaterialInspection/index.vue
+++ b/src/views/business/rawMaterialInspection/index.vue
@@ -549,7 +549,7 @@
// 寰呮姤妫�銆佸緟涓嬪崟鏌ヨ
getWarehouseSubmitApi () {
this.tableLoading = true
- const params = {...this.componentData, isInspect: this.tabIndex, state: this.tabIndex === 0 ? null : 0}
+ const params = {...this.componentData, isInspect: this.tabIndex, state: this.tabIndex === 0 ? null : 0, ...this.page}
getWarehouseSubmit(params).then(res => {
this.tableLoading = false
if (res.code === 200) {
@@ -563,7 +563,7 @@
// 宸插畬鎴愰儴鏌ヨ
getIfsByFinishList () {
this.tableLoading1 = true
- getIfsByFinish({...this.componentData}).then(res => {
+ getIfsByFinish({...this.componentData, ...this.page1}).then(res => {
this.tableLoading1 = false
if (res.code === 200) {
this.tableData1 = res.data.records
@@ -576,7 +576,7 @@
// 鍏ㄩ儴鏌ヨ
getIfsByAllList () {
this.tableLoading1 = true
- getIfsByAll({...this.componentData}).then(res => {
+ getIfsByAll({...this.componentData, ...this.page1}).then(res => {
this.tableLoading1 = false
if (res.code === 200) {
this.tableData1 = res.data.records
--
Gitblit v1.9.3