From 11bcbe08a52aa8f771234ffaedc9ef8c27833ccc Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期二, 18 三月 2025 10:54:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/business/productSamplingInfo/index.vue | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/views/business/productSamplingInfo/index.vue b/src/views/business/productSamplingInfo/index.vue
index 3b9720b..82c9d40 100644
--- a/src/views/business/productSamplingInfo/index.vue
+++ b/src/views/business/productSamplingInfo/index.vue
@@ -316,7 +316,7 @@
],
page: {
total: 0,
- size: 10,
+ size: 20,
current: 1
},
tableData1: [],
@@ -362,7 +362,7 @@
],
page1: {
total: 0,
- size: 10,
+ size: 20,
current: 1
},
yearSampleDia: false, // 骞村害鎶芥牱
@@ -610,7 +610,7 @@
return 'height: calc(100% - ' + '44' + 'px)'
},
getUserList() {
- selectUserCondition({ type: 0 }).then((res) => {
+ selectUserCondition().then((res) => {
this.userList = res.data;
})
},
--
Gitblit v1.9.3