From e5454b769d44a34af423bf87ac8a740bf8c20341 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 29 四月 2025 13:25:29 +0800
Subject: [PATCH] Merge branch 'dev' into dev_tides
---
src/views/CNAS/externalService/supplierManage/index.vue | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/src/views/CNAS/externalService/supplierManage/index.vue b/src/views/CNAS/externalService/supplierManage/index.vue
index ec7cba1..35e2f1b 100644
--- a/src/views/CNAS/externalService/supplierManage/index.vue
+++ b/src/views/CNAS/externalService/supplierManage/index.vue
@@ -7,14 +7,14 @@
<el-input v-model="searchForm.supplierName" clearable size="small"></el-input>
</el-form-item>
<el-form-item>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="getTableData">鏌� 璇�</el-button>
- <el-button icon="el-icon-refresh" size="mini" @click="resetSearchForm">閲� 缃�</el-button>
+ <el-button type="primary" size="mini" @click="getTableData">鏌ヨ</el-button>
+ <el-button size="mini" @click="resetSearchForm">閲嶇疆</el-button>
</el-form-item>
</el-form>
</div>
<div>
<!-- <el-button size="medium" @click="exportExcel">瀵� 鍑�</el-button>-->
- <el-button size="medium" type="primary" @click="showDialog('add')">鏂� 澧�</el-button>
+ <el-button size="small" type="primary" @click="showDialog('add')">鏂� 澧�</el-button>
</div>
</div>
<div class="table">
@@ -26,9 +26,6 @@
</template>
<script>
-// import ZTTable from "../caorui/ZTTable/index.vue";
-// import TableCard from "../caorui/TableCard/index.vue";
-// import axios from "axios";
import FormDia from "../supplierManage/component/formDia.vue";
import limsTable from '@/components/Table/lims-table.vue'
import {
@@ -38,7 +35,7 @@
} from '@/api/cnas/externalService/supplierManage/supplierManage'
export default {
- name: "a6-supplier-manage-new",
+ name: "SupplierManage",
// import 寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
components: {
limsTable,
@@ -114,7 +111,7 @@
// 鑾峰彇琛ㄦ牸鏁版嵁
async getTableData() {
this.tableLoading = true;
- selectQualifiedSupplierManagementPage(this.searchForm).then(res => {
+ selectQualifiedSupplierManagementPage({...this.searchForm, ...this.page}).then(res => {
this.tableLoading = false;
if (res.code === 200) {
this.tableData = res.data.records;
@@ -126,8 +123,8 @@
},
// 閲嶇疆
resetSearchForm() {
- this.pagination.current = 1
- this.pagination.pageSize = 20
+ this.page.current = 1
+ this.page.size = 10
this.searchForm.supplierName = ''
this.getTableData()
},
--
Gitblit v1.9.3