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/resourceDemand/standardMaterialAccept/index.vue | 38 +++++++++++++++++++++++---------------
1 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/standardMaterialAccept/index.vue b/src/views/CNAS/resourceDemand/standardMaterialAccept/index.vue
index 7d4585a..5028823 100644
--- a/src/views/CNAS/resourceDemand/standardMaterialAccept/index.vue
+++ b/src/views/CNAS/resourceDemand/standardMaterialAccept/index.vue
@@ -1,18 +1,18 @@
<template>
<div class="capacity-scope">
- <div class="search">
- <div>
- <el-form :model="form" ref="form" size="small" :inline="true">
- <el-form-item label="鐗╄川鍚嶇О">
- <el-input v-model="form.search"></el-input>
- </el-form-item>
- <el-form-item>
- <el-button @click="reset">閲� 缃�</el-button>
- <el-button type="primary" @click="getTableData">鏌� 璇�</el-button>
- </el-form-item>
- </el-form>
+ <div style="display: flex;justify-content: space-between">
+ <div style="display: flex;">
+ <div style="margin-bottom: 18px;margin-right: 10px;display: flex;align-items: center;line-height: 32px;">
+ <span style="width: 88px;font-size: 14px;font-weight: 700;color: #606266;">鐗╄川鍚嶇О</span>
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="form.name"
+ @keyup.enter.native="getTableData"></el-input>
+ </div>
+ <div style="line-height: 30px;">
+ <el-button type="primary" @click="getTableData" size="mini">鏌ヨ</el-button>
+ <el-button @click="reset" size="mini">閲嶇疆</el-button>
+ </div>
</div>
- <div>
+ <div style="line-height: 30px;">
<el-button icon="el-icon-plus" size="small" type="primary" @click="openDialog">娣诲姞楠屾敹</el-button>
<el-button size="small" type="primary" @click="exportExcel">瀵煎嚭</el-button>
</div>
@@ -43,7 +43,7 @@
data() {
return {
form: {
- search: undefined
+ name: undefined
},
addRecordRef: false,
columns: [
@@ -113,9 +113,13 @@
},
methods: {
getTableData() {
- getPageAcceptance(this.form).then(res => {
+ this.tableLoading = true
+ getPageAcceptance({...this.form, ...this.page}).then(res => {
+ this.tableLoading = false
this.tableData = res.data.records;
this.page.total = res.data.total;
+ }).catch(error => {
+ this.tableLoading = false
})
},
openDialog() {
@@ -135,7 +139,7 @@
})
},
reset() {
- this.form.search = undefined
+ this.form.name = undefined
this.getTableData()
},
async exportExcel() {
@@ -154,6 +158,10 @@
</script>
<style scoped>
+.capacity-scope {
+ padding: 20px !important;
+}
+
.search {
height: 46px;
display: flex;
--
Gitblit v1.9.3