From dd21903e8a24ed4ce02f9fa6dfc8ac398c128ef1 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 28 三月 2025 14:48:10 +0800
Subject: [PATCH] 全局修改-按回车搜索

---
 src/views/CNAS/resourceDemand/device/component/equipmentCalibrationPlan.vue  |    6 ++-
 src/views/CNAS/resourceDemand/device/component/deviceOverview.vue            |   27 ++++++++-----
 src/views/CNAS/resourceDemand/device/component/management.vue                |    3 +
 src/views/CNAS/resourceDemand/device/component/usingExternalInstruments.vue  |   24 ++++++------
 src/views/CNAS/resourceDemand/device/component/equipmentVerificationPlan.vue |    6 ++-
 5 files changed, 38 insertions(+), 28 deletions(-)

diff --git a/src/views/CNAS/resourceDemand/device/component/deviceOverview.vue b/src/views/CNAS/resourceDemand/device/component/deviceOverview.vue
index 1bdd8e4..edae3ac 100644
--- a/src/views/CNAS/resourceDemand/device/component/deviceOverview.vue
+++ b/src/views/CNAS/resourceDemand/device/component/deviceOverview.vue
@@ -1,22 +1,27 @@
 <!-- 璁惧鎬昏 -->
 <template>
   <div class="role_manage">
-    <div>
-      <el-form :model="entity" inline label-position="right">
-        <el-form-item label="鐘舵��:">
-          <el-select v-model="entity.deviceStatus" placeholder="鍏ㄩ儴" size="small" clearable>
+    <div style="display: flex;justify-content: space-between;margin-top: 10px;">
+      <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-select v-model="entity.deviceStatus" placeholder="鍏ㄩ儴"
+                     @change="currentPage = 1, keyMap = {}, list = [], finishLoding = false, refreshTable()"
+                     size="small" clearable>
             <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
             </el-option>
           </el-select>
-        </el-form-item>
-        <el-form-item label="璁惧鍚嶇О:">
-          <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="entity.deviceName"></el-input>
-        </el-form-item>
-        <el-form-item>
+        </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-input size="small" placeholder="璇疯緭鍏�" clearable v-model="entity.deviceName"
+                    @keyup.enter.native="currentPage = 1, keyMap = {}, list = [], finishLoding = false, refreshTable()"></el-input>
+        </div>
+        <div style="line-height: 30px;">
           <el-button size="mini" type="primary" @click="currentPage = 1, keyMap = {}, list = [], finishLoding = false, refreshTable()">鏌ヨ</el-button>
           <el-button size="mini" @click="refresh()">閲嶇疆</el-button>
-        </el-form-item>
-      </el-form>
+        </div>
+      </div>
     </div>
     <div class="table" v-loading="loading">
       <scroll-pagination @load="refreshTable()" :finishLoding="finishLoding" :list="list"
diff --git a/src/views/CNAS/resourceDemand/device/component/equipmentCalibrationPlan.vue b/src/views/CNAS/resourceDemand/device/component/equipmentCalibrationPlan.vue
index 7bdf1f2..7f4a545 100644
--- a/src/views/CNAS/resourceDemand/device/component/equipmentCalibrationPlan.vue
+++ b/src/views/CNAS/resourceDemand/device/component/equipmentCalibrationPlan.vue
@@ -61,10 +61,12 @@
         <div>
           <el-form :model="searchForm" ref="searchForm" size="small" :inline="true">
             <el-form-item label="璁惧鍚嶇О鍙婂瀷鍙�" prop="deviceName">
-              <el-input v-model="searchForm.deviceName" clearable size="small"></el-input>
+              <el-input v-model="searchForm.deviceName" clearable
+                        @keyup.enter.native="getYearTableDetailData(currentRow)" size="small"></el-input>
             </el-form-item>
             <el-form-item label="浠櫒缂栧彿" prop="deviceNumber">
-              <el-input v-model="searchForm.deviceNumber" clearable size="small"></el-input>
+              <el-input v-model="searchForm.deviceNumber"
+                        @keyup.enter.native="getYearTableDetailData(currentRow)" clearable size="small"></el-input>
             </el-form-item>
             <el-form-item>
               <el-button type="primary" size="mini" @click="getYearTableDetailData(currentRow)">鏌ヨ</el-button>
diff --git a/src/views/CNAS/resourceDemand/device/component/equipmentVerificationPlan.vue b/src/views/CNAS/resourceDemand/device/component/equipmentVerificationPlan.vue
index 95cb357..84c3aba 100644
--- a/src/views/CNAS/resourceDemand/device/component/equipmentVerificationPlan.vue
+++ b/src/views/CNAS/resourceDemand/device/component/equipmentVerificationPlan.vue
@@ -65,10 +65,12 @@
         <div>
           <el-form :model="searchForm" ref="searchForm" size="small" :inline="true">
             <el-form-item label="璁惧缂栧彿" prop="deviceNumber">
-              <el-input v-model="searchForm.deviceNumber" clearable size="small"></el-input>
+              <el-input v-model="searchForm.deviceNumber" clearable size="small"
+                        @keyup.enter.native="getYearTableDetailData(currentRow)"></el-input>
             </el-form-item>
             <el-form-item label="璁惧鍚嶇О" prop="deviceName">
-              <el-input v-model="searchForm.deviceName" clearable size="small"></el-input>
+              <el-input v-model="searchForm.deviceName" clearable size="small"
+                        @keyup.enter.native="getYearTableDetailData(currentRow)"></el-input>
             </el-form-item>
             <el-form-item>
               <el-button type="primary" size="mini" @click="getYearTableDetailData(currentRow)">鏌ヨ</el-button>
diff --git a/src/views/CNAS/resourceDemand/device/component/management.vue b/src/views/CNAS/resourceDemand/device/component/management.vue
index b5b83c1..5e09090 100644
--- a/src/views/CNAS/resourceDemand/device/component/management.vue
+++ b/src/views/CNAS/resourceDemand/device/component/management.vue
@@ -5,7 +5,8 @@
       <div>
         <el-form :model="queryParams" ref="queryParams" size="small" :inline="true">
           <el-form-item label="鐘舵��" prop="deviceStatus" class="form-item">
-            <el-select v-model="queryParams.deviceStatus" placeholder="鍏ㄩ儴" size="small">
+            <el-select v-model="queryParams.deviceStatus" clearable
+                       placeholder="鍏ㄩ儴" size="small" @change="refreshTable">
               <el-option v-for="item in deviceStatusList" :key="item.value" :label="item.label" :value="item.value">
               </el-option>
             </el-select>
diff --git a/src/views/CNAS/resourceDemand/device/component/usingExternalInstruments.vue b/src/views/CNAS/resourceDemand/device/component/usingExternalInstruments.vue
index d1bb7b2..0dcf6fb 100644
--- a/src/views/CNAS/resourceDemand/device/component/usingExternalInstruments.vue
+++ b/src/views/CNAS/resourceDemand/device/component/usingExternalInstruments.vue
@@ -1,19 +1,19 @@
 <template>
   <div>
     <div>
-      <div class="title">
-        <div>
-          <el-form :model="searchForm" ref="searchForm" size="small" :inline="true">
-            <el-form-item label="鍗曚綅鍚嶇О" prop="unitName">
-              <el-input v-model="searchForm.unitName" clearable size="small"></el-input>
-            </el-form-item>
-            <el-form-item>
-              <el-button type="primary" size="mini" @click="getYearTableDetailData">鏌ヨ</el-button>
-              <el-button size="mini" @click="reset">閲嶇疆</el-button>
-            </el-form-item>
-          </el-form>
+      <div style="display: flex;justify-content: space-between;margin-top: 10px;">
+        <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="searchForm.unitName"
+                      @keyup.enter.native="getYearTableDetailData"></el-input>
+          </div>
+          <div style="line-height: 30px;">
+            <el-button type="primary" size="mini" @click="getYearTableDetailData">鏌ヨ</el-button>
+            <el-button size="mini" @click="reset">閲嶇疆</el-button>
+          </div>
         </div>
-        <div>
+        <div style="line-height: 30px;">
           <el-button size="small" type="primary" @click="handleForm('')">鏂板</el-button>
         </div>
       </div>

--
Gitblit v1.9.3