From 8a50beb54ddba0ba94c9ef131b2794bc5c95efc5 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 28 三月 2025 15:02:22 +0800
Subject: [PATCH] 资源要求-查询加上按回车搜索功能
---
src/views/CNAS/resourceDemand/facilitiesEnvironment/component/three-wastes-treatment.vue | 26 ++++++-------
src/views/CNAS/resourceDemand/facilitiesEnvironment/component/Personnel-management.vue | 2
src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/temperature-humidity-record.vue | 15 +++++--
src/views/CNAS/resourceDemand/standardMaterialAccept/index.vue | 28 ++++++++------
4 files changed, 39 insertions(+), 32 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/Personnel-management.vue b/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/Personnel-management.vue
index a94f87b..bfa51b8 100644
--- a/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/Personnel-management.vue
+++ b/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/Personnel-management.vue
@@ -5,7 +5,7 @@
<el-form :model="searchForm" ref="searchForm" size="small" :inline="true">
<el-form-item label="鏃ユ湡" prop="registerDate">
<el-date-picker v-model="searchForm.registerDate" clearable format="yyyy-MM-dd" placeholder="閫夋嫨鏃ユ湡"
- size="small" style="width: 100%" type="date" value-format="yyyy-MM-dd">
+ @change="searchList" size="small" style="width: 100%" type="date" value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
<el-form-item>
diff --git a/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/temperature-humidity-record.vue b/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/temperature-humidity-record.vue
index 2fc53ba..dc6ddb0 100644
--- a/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/temperature-humidity-record.vue
+++ b/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/temperature-humidity-record.vue
@@ -4,11 +4,16 @@
<el-col :span="12">
<div class="header">
<div>璇曢獙鍖哄煙</div>
- <div>
- 鍚嶇О锛�
- <el-input v-model="search.testAreaName" clearable size="small" style="width: 120px"></el-input>
- <el-button size="small" type="primary" @click="initData">鏌ヨ</el-button>
- <el-button size="small" type="primary" @click="clickAdd">鏂� 澧�</el-button>
+ <div style="display: flex;">
+ <div style="margin-bottom: 18px;margin-right: 10px;display: flex;align-items: center;line-height: 32px;">
+ <span style="width: 48px;font-size: 14px;font-weight: 700;color: #606266;">鍚嶇О</span>
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="search.testAreaName"
+ @keyup.enter.native="initData"></el-input>
+ </div>
+ <div style="line-height: 30px;">
+ <el-button size="mini" type="primary" @click="initData">鏌ヨ</el-button>
+ <el-button size="mini" type="primary" @click="clickAdd">鏂� 澧�</el-button>
+ </div>
</div>
</div>
<el-table :data="tableData" height="calc(100vh - 18em)" highlight-current-row style="width: 100%"
diff --git a/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/three-wastes-treatment.vue b/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/three-wastes-treatment.vue
index af5297d..05d5b6d 100644
--- a/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/three-wastes-treatment.vue
+++ b/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/three-wastes-treatment.vue
@@ -1,22 +1,20 @@
<template>
<div>
- <div class="search">
- <div>
- <el-form :model="searchForm" ref="searchForm" size="small" :inline="true">
- <el-form-item label="澶囨敞" prop="remark">
- <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="searchForm.remark">
- </el-input>
- </el-form-item>
- <el-form-item>
- <el-button type="primary" size="mini" @click="searchList">鏌ヨ</el-button>
- <el-button size="mini" @click="resetSearchForm">閲嶇疆</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: 48px;font-size: 14px;font-weight: 700;color: #606266;">澶囨敞</span>
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="searchForm.remark"
+ @keyup.enter.native="searchList"></el-input>
+ </div>
+ <div style="line-height: 30px;">
+ <el-button type="primary" size="mini" @click="searchList">鏌ヨ</el-button>
+ <el-button size="mini" @click="resetSearchForm">閲嶇疆</el-button>
+ </div>
</div>
- <div>
+ <div style="line-height: 30px;">
<el-button size="small" type="primary" @click="openFormDia('add')">鏂� 澧�</el-button>
</div>
-
</div>
<div class="table">
<lims-table :tableData="tableData" :column="tableColumn" :height="'calc(100vh - 250px)'" @pagination="pagination"
diff --git a/src/views/CNAS/resourceDemand/standardMaterialAccept/index.vue b/src/views/CNAS/resourceDemand/standardMaterialAccept/index.vue
index 7b2180f..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.name"></el-input>
- </el-form-item>
- <el-form-item>
- <el-button type="primary" @click="getTableData" size="mini">鏌ヨ</el-button>
- <el-button @click="reset" size="mini">閲嶇疆</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>
@@ -113,9 +113,13 @@
},
methods: {
getTableData() {
+ 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() {
--
Gitblit v1.9.3