From 13a60da2424da8cd50e52e35e0126e23e34ea6f3 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期日, 16 三月 2025 15:58:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/CNAS/resourceDemand/standardMaterialAccept/index.vue | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/standardMaterialAccept/index.vue b/src/views/CNAS/resourceDemand/standardMaterialAccept/index.vue
index 7d4585a..2e2f6be 100644
--- a/src/views/CNAS/resourceDemand/standardMaterialAccept/index.vue
+++ b/src/views/CNAS/resourceDemand/standardMaterialAccept/index.vue
@@ -4,7 +4,7 @@
<div>
<el-form :model="form" ref="form" size="small" :inline="true">
<el-form-item label="鐗╄川鍚嶇О">
- <el-input v-model="form.search"></el-input>
+ <el-input v-model="form.name"></el-input>
</el-form-item>
<el-form-item>
<el-button @click="reset">閲� 缃�</el-button>
@@ -43,7 +43,7 @@
data() {
return {
form: {
- search: undefined
+ name: undefined
},
addRecordRef: false,
columns: [
@@ -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;
})
@@ -135,7 +135,7 @@
})
},
reset() {
- this.form.search = undefined
+ this.form.name = undefined
this.getTableData()
},
async exportExcel() {
@@ -154,6 +154,10 @@
</script>
<style scoped>
+.capacity-scope {
+ padding: 20px !important;
+}
+
.search {
height: 46px;
display: flex;
--
Gitblit v1.9.3