From a235a309cbb0290b2d929abe85d645cbfcd39f74 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 28 三月 2025 14:12:09 +0800
Subject: [PATCH] 全局修改-按回车搜索
---
src/views/CNAS/personnel/personnelInfo/tabs/personnelTraining.vue | 51 ++++----
src/views/system/customer/index.vue | 43 ++++--
src/views/CNAS/personnel/personalOverview/index.vue | 36 ++++-
src/views/CNAS/personnel/personnelInfo/tabs/personnel-list.vue | 24 ++-
src/views/CNAS/personnel/personnelInfo/tabs/training-record.vue | 20 ++-
src/views/business/rawMaterialInspection/index.vue | 2
src/views/CNAS/personnel/personnelInfo/components/Edit.vue | 2
src/views/business/productOrder/index.vue | 1
src/views/CNAS/personnel/personnelInfo/tabs/reward-punishment-record.vue | 41 +++---
src/views/business/materialOrder/index.vue | 2
src/views/standard/model/index.vue | 40 ++++-
src/views/system/user/index.vue | 2
src/views/CNAS/personnel/personnelInfo/tabs/job-responsibilities.vue | 20 +-
src/views/CNAS/personnel/personnelInfo/tabs/personnel-capacity.vue | 22 ++-
src/views/business/productSamplingInfo/index.vue | 39 ++++-
15 files changed, 212 insertions(+), 133 deletions(-)
diff --git a/src/views/CNAS/personnel/personalOverview/index.vue b/src/views/CNAS/personnel/personalOverview/index.vue
index d96566c..03266c7 100644
--- a/src/views/CNAS/personnel/personalOverview/index.vue
+++ b/src/views/CNAS/personnel/personalOverview/index.vue
@@ -1,15 +1,16 @@
<template>
<div class="capacity-scope">
- <div>
- <el-form :model="entity" ref="entity" size="small" :inline="true">
- <el-form-item label="浜哄憳鍚嶇О">
- <el-input v-model="entity.name" clearable></el-input>
- </el-form-item>
- <el-form-item>
+ <div style="display: flex;justify-content: space-between">
+ <div class="search_box">
+ <div class="search_item">
+ <span class="search_label">浜哄憳鍚嶇О</span>
+ <el-input v-model="entity.name" clearable @keyup.enter.native="currentPage= 1,list=[],finishLoding = false,keyMap = {},refreshTable()"></el-input>
+ </div>
+ <div class="search_button">
<el-button size="mini" type="primary" @click="currentPage= 1,list=[],finishLoding = false,keyMap = {},refreshTable()">鏌ヨ</el-button>
<el-button @click="refresh" size="mini">閲嶇疆</el-button>
- </el-form-item>
- </el-form>
+ </div>
+ </div>
</div>
<div class="table" v-loading="loading">
<scroll-pagination @load="refreshTable" :finishLoding="finishLoding" :list="list" v-if="list.length>0||loading">
@@ -199,4 +200,23 @@
line-height: 20px;
color: #fff;
}
+.search_box {
+ display: flex;
+}
+.search_item {
+ margin-bottom: 18px;
+ margin-right: 10px;
+ display: flex;
+ align-items: center;
+ line-height: 32px;
+}
+.search_label {
+ width: 88px;
+ font-size: 14px;
+ font-weight: 700;
+ color: #606266;
+}
+.search_button {
+ line-height: 30px;
+}
</style>
diff --git a/src/views/CNAS/personnel/personnelInfo/components/Edit.vue b/src/views/CNAS/personnel/personnelInfo/components/Edit.vue
index 717ca98..af8e822 100644
--- a/src/views/CNAS/personnel/personnelInfo/components/Edit.vue
+++ b/src/views/CNAS/personnel/personnelInfo/components/Edit.vue
@@ -28,7 +28,7 @@
<el-row style="margin: 15px 0">
<el-form>
<el-row>
- <el-col :span="5">
+ <el-col :span="6">
<el-form-item label="鍩硅鏃ユ湡:">
<el-date-picker v-model="trainingForm.openingTime" format="yyyy-MM-dd" :disabled="currentRow.state !== 3"
placeholder="閫夋嫨鏃ユ湡" size="small" value-format="yyyy-MM-dd"
diff --git a/src/views/CNAS/personnel/personnelInfo/tabs/job-responsibilities.vue b/src/views/CNAS/personnel/personnelInfo/tabs/job-responsibilities.vue
index a2c43ff..c048536 100644
--- a/src/views/CNAS/personnel/personnelInfo/tabs/job-responsibilities.vue
+++ b/src/views/CNAS/personnel/personnelInfo/tabs/job-responsibilities.vue
@@ -1,16 +1,18 @@
<!-- 宀椾綅鑱岃矗 -->
<template>
<div class="view">
- <div style="display: flex;justify-content: space-between;">
- <el-form ref="page" size="small" :inline="true">
- <el-form-item label="鍛樺伐">
- <el-input v-model="userName" clearable placeholder="璇疯緭鍏ュ憳宸�" size="small" style="width: 20vh;"></el-input>
- </el-form-item>
- <el-form-item>
+ <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: 50px;font-size: 14px;font-weight: 700;color: #606266;">鍛樺伐</span>
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="userName"
+ @keyup.enter.native="refreshTable"></el-input>
+ </div>
+ <div style="line-height: 30px;">
<el-button size="small" type="primary" @click="refreshTable">鏌ヨ</el-button>
- </el-form-item>
- </el-form>
- <div>
+ </div>
+ </div>
+ <div style="line-height: 30px;">
<el-button size="small" type="primary" @click="addPost">鏂板</el-button>
<!-- <el-button size="small" type="primary">瀵煎嚭excel</el-button>-->
</div>
diff --git a/src/views/CNAS/personnel/personnelInfo/tabs/personnel-capacity.vue b/src/views/CNAS/personnel/personnelInfo/tabs/personnel-capacity.vue
index eb1f50b..2dd7789 100644
--- a/src/views/CNAS/personnel/personnelInfo/tabs/personnel-capacity.vue
+++ b/src/views/CNAS/personnel/personnelInfo/tabs/personnel-capacity.vue
@@ -1,16 +1,18 @@
<!-- 浜哄憳鑳藉姏 -->
<template>
<div>
- <div style="display: flex;justify-content: space-between;">
- <el-form ref="page" size="small" :inline="true">
- <el-form-item label="濮撳悕">
- <el-input v-model="userName" placeholder="璇疯緭鍏ュ鍚�" size="small" clearable></el-input>
- </el-form-item>
- <el-form-item>
- <el-button size="mini" type="primary" @click="refreshTable">鏌ヨ</el-button>
- </el-form-item>
- </el-form>
- <div>
+ <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="userName"
+ @keyup.enter.native="refreshTable"></el-input>
+ </div>
+ <div style="line-height: 30px;">
+ <el-button type="primary" size="mini" @click="refreshTable">鏌ヨ</el-button>
+ </div>
+ </div>
+ <div style="line-height: 30px;">
<el-button v-if="!isDepartment" size="small" type="primary" @click="addAppointPost('add')">鏂板</el-button>
</div>
</div>
diff --git a/src/views/CNAS/personnel/personnelInfo/tabs/personnel-list.vue b/src/views/CNAS/personnel/personnelInfo/tabs/personnel-list.vue
index d468caf..aac448d 100644
--- a/src/views/CNAS/personnel/personnelInfo/tabs/personnel-list.vue
+++ b/src/views/CNAS/personnel/personnelInfo/tabs/personnel-list.vue
@@ -1,16 +1,18 @@
<template>
<div>
- <div style="display: flex;justify-content: space-between;">
- <el-form :model="entity" ref="entity" size="small" :inline="true">
- <el-form-item label="浜哄憳鍚嶇О">
- <el-input v-model="entity.name" clearable></el-input>
- </el-form-item>
- <el-form-item>
- <el-button size="mini" style="margin-left: 10px" @click="refresh()">閲嶇疆</el-button>
- <el-button size="mini" type="primary" @click="refreshTable()">鏌ヨ</el-button>
- </el-form-item>
- </el-form>
- <div>
+ <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="entity.name"
+ @keyup.enter.native="refreshTable"></el-input>
+ </div>
+ <div style="line-height: 30px;">
+ <el-button type="primary" size="mini" @click="refreshTable">鏌ヨ</el-button>
+ <el-button size="mini" @click="refresh">閲嶇疆</el-button>
+ </div>
+ </div>
+ <div style="line-height: 30px;">
<el-button :loading="outLoading" size="small" type="primary" @click="handleDown">瀵煎嚭</el-button>
<el-button size="small" type="primary" @click="openSelectUserDia">鏂板缓</el-button>
</div>
diff --git a/src/views/CNAS/personnel/personnelInfo/tabs/personnelTraining.vue b/src/views/CNAS/personnel/personnelInfo/tabs/personnelTraining.vue
index e594264..a003633 100644
--- a/src/views/CNAS/personnel/personnelInfo/tabs/personnelTraining.vue
+++ b/src/views/CNAS/personnel/personnelInfo/tabs/personnelTraining.vue
@@ -5,16 +5,18 @@
<div class="title">
<span style="font-weight: bold">骞村害璁″垝</span>
</div>
- <div style="display: flex;justify-content: space-between;">
- <el-form :model="page" ref="page" size="small" :inline="true">
- <el-form-item label="缂栧埗浜�">
- <el-input v-model="page.compilerName" clearable></el-input>
- </el-form-item>
- <el-form-item>
- <el-button size="mini" type="primary" @click="getYearPlanList(departId)">鏌ヨ</el-button>
- </el-form-item>
- </el-form>
- <div>
+ <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="page.compilerName"
+ @keyup.enter.native="getYearPlanList(departId)"></el-input>
+ </div>
+ <div style="line-height: 30px;">
+ <el-button type="primary" size="mini" @click="getYearPlanList(departId)">鏌ヨ</el-button>
+ </div>
+ </div>
+ <div style="line-height: 30px;">
<el-button size="small" type="primary" @click="uploadDia = true, getUserList()">瀵煎叆</el-button>
</div>
</div>
@@ -26,25 +28,22 @@
<div class="title">
<span style="font-weight: bold">骞村害璁″垝鏄庣粏</span>
</div>
- <div style="display: flex;justify-content: space-between;">
- <el-form :model="inDetailForm" ref="inDetailForm" size="small" :inline="true">
- <el-form-item label="鍩硅璁插笀">
- <el-input v-model="inDetailForm.trainingLecturerName" class="search" clearable placeholder="璇疯緭鍏�"
- size="small"></el-input>
- </el-form-item>
- <el-form-item label="鍩硅鏃ユ湡">
- <el-date-picker v-model="inDetailForm.trainingDate" clearable format="yyyy-MM-dd" placeholder="閫夋嫨鏃ユ湡"
- size="small" type="date" value-format="yyyy-MM-dd"></el-date-picker>
- </el-form-item>
- <el-form-item>
+ <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="inDetailForm.trainingLecturerName"
+ @keyup.enter.native="searchTable"></el-input>
+ </div>
+ <div style="line-height: 30px;">
<el-button size="mini" type="primary" @click="searchTable">鏌ヨ</el-button>
- </el-form-item>
- </el-form>
- <div>
+ </div>
+ </div>
+ <div style="line-height: 30px;">
<el-button v-if="isDepartment && currentChangeRow && isOperation" size="small"
- @click="batchDelete">鎵归噺鍒犻櫎</el-button>
+ @click="batchDelete">鎵归噺鍒犻櫎</el-button>
<el-button v-if="isDepartment && currentChangeRow && isOperation" size="small" type="primary"
- @click="addTrainingPlan('add')">鏂板</el-button>
+ @click="addTrainingPlan('add')">鏂板</el-button>
</div>
</div>
<lims-table :tableData="inDetailPlanTableData" :column="inDetailPlanColumn"
diff --git a/src/views/CNAS/personnel/personnelInfo/tabs/reward-punishment-record.vue b/src/views/CNAS/personnel/personnelInfo/tabs/reward-punishment-record.vue
index dfa7bd0..d902602 100644
--- a/src/views/CNAS/personnel/personnelInfo/tabs/reward-punishment-record.vue
+++ b/src/views/CNAS/personnel/personnelInfo/tabs/reward-punishment-record.vue
@@ -1,27 +1,28 @@
<!-- 濂栨儵璁板綍 -->
<template>
<div>
- <div class="view">
- <div style="display: flex;justify-content: space-between;">
- <el-form :model="search" ref="page" size="small" :inline="true">
- <el-form-item label="濮撳悕">
- <el-input v-model="search.userName" clearable placeholder="璇疯緭鍏ュ叧閿瓧" size="small"
- style="width: 20vh;"></el-input>
- </el-form-item>
- <el-form-item label="濂栨儵鏃ユ湡" class="dateTime">
- <el-date-picker v-model="search.searchTimeList" :picker-options="pickerOptions" align="right" clearable
- end-placeholder="缁撴潫鏃ユ湡" format="yyyy-MM-dd" range-separator="鑷�" size="small" start-placeholder="寮�濮嬫棩鏈�"
- style="width: 100%" type="daterange" unlink-panels value-format="yyyy-MM-dd 00:00:00">
- </el-date-picker>
- </el-form-item>
- <el-form-item>
- <el-button size="mini" type="primary" @click="getPersonnelTraining(departId)">鏌ヨ</el-button>
- </el-form-item>
- </el-form>
- <div>
- <el-button :loading="outLoading" size="small" type="primary" @click="handleDown">瀵煎嚭</el-button>
- <el-button size="small" type="primary" @click="addRow">鏂板</el-button>
+ <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="search.userName"
+ @keyup.enter.native="getPersonnelTraining(departId)"></el-input>
</div>
+ <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-date-picker v-model="search.searchTimeList" :picker-options="pickerOptions" align="right" clearable
+ @change="getPersonnelTraining(departId)"
+ end-placeholder="缁撴潫鏃ユ湡" format="yyyy-MM-dd" range-separator="鑷�" size="small" start-placeholder="寮�濮嬫棩鏈�"
+ style="width: 100%" type="daterange" unlink-panels value-format="yyyy-MM-dd 00:00:00">
+ </el-date-picker>
+ </div>
+ <div style="line-height: 30px;">
+ <el-button size="mini" type="primary" @click="getPersonnelTraining(departId)">鏌ヨ</el-button>
+ </div>
+ </div>
+ <div style="line-height: 30px;">
+ <el-button :loading="outLoading" size="small" type="primary" @click="handleDown">瀵煎嚭</el-button>
+ <el-button size="small" type="primary" @click="addRow">鏂板</el-button>
</div>
</div>
<div class="table">
diff --git a/src/views/CNAS/personnel/personnelInfo/tabs/training-record.vue b/src/views/CNAS/personnel/personnelInfo/tabs/training-record.vue
index 0ef8f2a..57c6947 100644
--- a/src/views/CNAS/personnel/personnelInfo/tabs/training-record.vue
+++ b/src/views/CNAS/personnel/personnelInfo/tabs/training-record.vue
@@ -6,15 +6,18 @@
<div class="title">
<span style="font-weight: bold">骞村害璁″垝</span>
</div>
- <div style="display: flex;justify-content: space-between;">
- <el-form :model="trainingPagination" ref="trainingPagination" size="small" :inline="true">
- <el-form-item label="濮撳悕">
- <el-input v-model="trainingPagination.userName" class="search" clearable placeholder="璇疯緭鍏�" size="small"></el-input>
- </el-form-item>
- <el-form-item>
+ <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 v-model="trainingPagination.userName" class="search"
+ @keyup.enter.native="getPersonnelTraining(departId)"
+ clearable placeholder="璇疯緭鍏�" size="small"></el-input>
+ </div>
+ <div style="line-height: 30px;">
<el-button size="small" type="primary" @click="getPersonnelTraining(departId)">鏌ヨ</el-button>
- </el-form-item>
- </el-form>
+ </div>
+ </div>
</div>
<lims-table :tableData="trainingTableData" :column="trainingColumn"
ref="trainingTableData"
@@ -34,6 +37,7 @@
clearable
format="yyyy"
placeholder="閫夋嫨骞�"
+ @change="queryPersonnelDetailsPage(currentChangeRow.userId)"
size="small"
type="year"
value-format="yyyy">
diff --git a/src/views/business/materialOrder/index.vue b/src/views/business/materialOrder/index.vue
index a263e75..a307a3e 100644
--- a/src/views/business/materialOrder/index.vue
+++ b/src/views/business/materialOrder/index.vue
@@ -49,7 +49,7 @@
</el-select>
</el-form-item>
<el-form-item label="涓嬪彂鏃堕棿" prop="date" v-if="(tabIndex === 2 || tabIndex === 3 || tabIndex === 4) && more">
- <el-date-picker v-model="entity.date" end-placeholder="缁撴潫鏃ユ湡" format="yyyy-MM-dd" placeholder="閫夋嫨鏃ユ湡"
+ <el-date-picker v-model="entity.date" end-placeholder="缁撴潫鏃ユ湡" format="yyyy-MM-dd" placeholder="閫夋嫨鏃ユ湡" @change="goSearch"
range-separator="鑷�" size="small" start-placeholder="寮�濮嬫棩鏈�" type="daterange" value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
diff --git a/src/views/business/productOrder/index.vue b/src/views/business/productOrder/index.vue
index d54ecff..d619ab2 100644
--- a/src/views/business/productOrder/index.vue
+++ b/src/views/business/productOrder/index.vue
@@ -17,6 +17,7 @@
</el-form-item>
<el-form-item label="涓嬪崟鏃堕棿" prop="createTime" v-if="more">
<el-date-picker v-model="entity.createTime" clearable format="yyyy-MM-dd" placeholder="閫夋嫨鏃ユ湡" size="small"
+ @change="refreshTable"
style="width:100%" type="date" value-format="yyyy-MM-dd HH:mm:ss">
</el-date-picker>
</el-form-item>
diff --git a/src/views/business/productSamplingInfo/index.vue b/src/views/business/productSamplingInfo/index.vue
index 666512e..9cf3667 100644
--- a/src/views/business/productSamplingInfo/index.vue
+++ b/src/views/business/productSamplingInfo/index.vue
@@ -1,17 +1,18 @@
<template>
<div class="capacity-scope">
<div style="display: flex;justify-content: space-between">
- <el-form :model="entity" ref="entity" size="small" :inline="true">
- <el-form-item label="缂栧彿" prop="quarterNo" v-show="tabIndex === 0">
+ <div class="search_box">
+ <div class="search_item">
+ <span class="search_label">缂栧彿</span>
<el-input v-model="entity.quarterNo" clearable placeholder="璇疯緭鍏�" size="small"
- @keyup.enter.native="refreshTable">
+ @keyup.enter.native="refreshTable()">
</el-input>
- </el-form-item>
- <el-form-item>
+ </div>
+ <div class="search_button">
<el-button type="primary" size="mini" @click="refreshTable">鏌ヨ</el-button>
<el-button size="mini" @click="refresh">閲嶇疆</el-button>
- </el-form-item>
- </el-form>
+ </div>
+ </div>
<div>
<el-button v-if="tabIndex === 1" size="small" type="primary" @click="yearSample('add')">骞村害鎶芥牱</el-button>
</div>
@@ -390,7 +391,7 @@
// 鏂规硶闆嗗悎
methods: {
// 鏌ヨ鍥炶皟
- refreshTable(e) {
+ refreshTable() {
if (this.tabIndex === 0) {
this.getQuarterPageList()
} else if (this.tabIndex === 1) {
@@ -593,9 +594,6 @@
// 鍒囨崲涓嬪崟tab琛ㄦ牸
handleTab(m, i) {
this.tabIndex = i;
- if (this.tabIndex === 0) {
- this.componentData.entity.quarterNo = this.entity.quarterNo
- }
this.refreshTable()
},
closeYearSampleDia() {
@@ -648,4 +646,23 @@
border-color: #3A7BFA;
color: #3A7BFA;
}
+.search_box {
+ display: flex;
+}
+.search_item {
+ margin-bottom: 18px;
+ margin-right: 10px;
+ display: flex;
+ align-items: center;
+ line-height: 32px;
+}
+.search_label {
+ width: 52px;
+ font-size: 14px;
+ font-weight: 700;
+ color: #606266;
+}
+.search_button {
+ line-height: 30px;
+}
</style>
diff --git a/src/views/business/rawMaterialInspection/index.vue b/src/views/business/rawMaterialInspection/index.vue
index c562ab8..bfb28d7 100644
--- a/src/views/business/rawMaterialInspection/index.vue
+++ b/src/views/business/rawMaterialInspection/index.vue
@@ -38,7 +38,7 @@
</el-form-item>
<el-form-item label="涓嬪彂鏃堕棿" prop="date" v-if="(tabIndex === 3 || tabIndex === 4) && more">
<el-date-picker v-model="componentData.date" end-placeholder="缁撴潫鏃ユ湡" format="yyyy-MM-dd" placeholder="閫夋嫨鏃ユ湡"
- range-separator="鑷�" size="small" start-placeholder="寮�濮嬫棩鏈�" style="width: 100%;" type="daterange"
+ range-separator="鑷�" size="small" start-placeholder="寮�濮嬫棩鏈�" style="width: 100%;" type="daterange" @change="refreshTable()"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
diff --git a/src/views/standard/model/index.vue b/src/views/standard/model/index.vue
index 19db4a1..6d3ce8f 100644
--- a/src/views/standard/model/index.vue
+++ b/src/views/standard/model/index.vue
@@ -1,17 +1,16 @@
<template>
<div class="capacity-scope">
<div class="search">
- <div>
- <el-form :model="queryParams" ref="queryParams" size="small" :inline="true">
- <el-form-item label="妯℃澘鍚嶇О" prop="name">
- <el-input v-model="queryParams.name" clearable placeholder="璇疯緭鍏�" size="small"
- @keyup.enter.native="refreshTable($event)"></el-input>
- </el-form-item>
- <el-form-item>
- <el-button type="primary" size="mini" @click="refreshTable">鏌ヨ</el-button>
- <el-button size="mini" @click="refresh">閲嶇疆</el-button>
- </el-form-item>
- </el-form>
+ <div class="search_box">
+ <div class="search_item">
+ <span class="search_label">妯℃澘鍚嶇О</span>
+ <el-input v-model="queryParams.name" clearable placeholder="璇疯緭鍏�" size="small"
+ @keyup.enter.native="refreshTable()"></el-input>
+ </div>
+ <div class="search_button">
+ <el-button type="primary" size="mini" @click="refreshTable">鏌ヨ</el-button>
+ <el-button size="mini" @click="refresh">閲嶇疆</el-button>
+ </div>
</div>
<div>
<el-button v-if="checkPermi(['standard:model:add'])" size="small" type="primary" @click="openAdd">鏂板</el-button>
@@ -381,4 +380,23 @@
display: flex;
justify-content: space-between;
}
+.search_box {
+ display: flex;
+}
+.search_item {
+ margin-bottom: 18px;
+ margin-right: 10px;
+ display: flex;
+ align-items: center;
+ line-height: 32px;
+}
+.search_label {
+ width: 88px;
+ font-size: 14px;
+ font-weight: 700;
+ color: #606266;
+}
+.search_button {
+ line-height: 26px;
+}
</style>
diff --git a/src/views/system/customer/index.vue b/src/views/system/customer/index.vue
index d7dd187..efe5f13 100644
--- a/src/views/system/customer/index.vue
+++ b/src/views/system/customer/index.vue
@@ -1,17 +1,16 @@
<template>
<div class="app-container">
- <div class="search">
- <div>
- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
- <el-form-item label="瀹㈡埛鍚嶇О" prop="company">
- <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="queryParams.company"
- @keyup.enter.native="getList"></el-input>
- </el-form-item>
- <el-form-item>
- <el-button type="primary" size="mini" @click="getList">鏌ヨ</el-button>
- <el-button size="mini" @click="refresh">閲嶇疆</el-button>
- </el-form-item>
- </el-form>
+ <div style="display: flex;justify-content: space-between">
+ <div class="search_box">
+ <div class="search_item">
+ <span class="search_label">瀹㈡埛鍚嶇О</span>
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="queryParams.company"
+ @keyup.enter.native="getList"></el-input>
+ </div>
+ <div class="search_button">
+ <el-button type="primary" size="mini" @click="getList">鏌ヨ</el-button>
+ <el-button size="mini" @click="refresh">閲嶇疆</el-button>
+ </div>
</div>
<div>
<el-button size="small" type="primary" @click="openFormDia('add')" icon="el-icon-plus">鏂板</el-button>
@@ -220,9 +219,23 @@
</script>
<style scoped>
-.search {
- height: 46px;
+.search_box {
display: flex;
- justify-content: space-between;
+}
+.search_item {
+ margin-bottom: 18px;
+ margin-right: 10px;
+ display: flex;
+ align-items: center;
+ line-height: 32px;
+}
+.search_label {
+ width: 88px;
+ font-size: 14px;
+ font-weight: 700;
+ color: #606266;
+}
+.search_button {
+ line-height: 30px;
}
</style>
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index b151160..e5e11ee 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -28,7 +28,7 @@
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="鐘舵��" prop="status">
- <el-select v-model="queryParams.status" placeholder="鐢ㄦ埛鐘舵��" clearable>
+ <el-select v-model="queryParams.status" placeholder="鐢ㄦ埛鐘舵��" clearable @change="handleQuery">
<el-option v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
--
Gitblit v1.9.3