From dab59f7624a2fb8d4114bb67b554ff09d91f810c Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期四, 10 四月 2025 13:07:36 +0800
Subject: [PATCH] Merge branch 'radio-frequency-cable' of http://114.132.189.42:9002/r/lims-ruoyi-before into radio-frequency-cable
---
src/views/CNAS/resourceDemand/standardMaterialAccept/index.vue | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/standardMaterialAccept/index.vue b/src/views/CNAS/resourceDemand/standardMaterialAccept/index.vue
index 80106ab..7b2180f 100644
--- a/src/views/CNAS/resourceDemand/standardMaterialAccept/index.vue
+++ b/src/views/CNAS/resourceDemand/standardMaterialAccept/index.vue
@@ -7,8 +7,8 @@
<el-input v-model="form.name"></el-input>
</el-form-item>
<el-form-item>
- <el-button @click="reset">閲� 缃�</el-button>
- <el-button type="primary" @click="getTableData">鏌� 璇�</el-button>
+ <el-button type="primary" @click="getTableData" size="mini">鏌ヨ</el-button>
+ <el-button @click="reset" size="mini">閲嶇疆</el-button>
</el-form-item>
</el-form>
</div>
@@ -113,7 +113,7 @@
},
methods: {
getTableData() {
- getPageAcceptance(this.form).then(res => {
+ getPageAcceptance({...this.form, ...this.page}).then(res => {
this.tableData = res.data.records;
this.page.total = res.data.total;
})
--
Gitblit v1.9.3