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/process/nonconformingWork/nonconformingItem/index.vue |   22 ++++++++++++----------
 1 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/views/CNAS/process/nonconformingWork/nonconformingItem/index.vue b/src/views/CNAS/process/nonconformingWork/nonconformingItem/index.vue
index 89c7d20..1f6ffc5 100644
--- a/src/views/CNAS/process/nonconformingWork/nonconformingItem/index.vue
+++ b/src/views/CNAS/process/nonconformingWork/nonconformingItem/index.vue
@@ -1,15 +1,17 @@
 <template>
   <div class="capacity-scope">
-    <div>
-      <el-form :model="searchForm" ref="searchForm" size="small" :inline="true">
-        <el-form-item label="鍙戠敓閮ㄩ棬" prop="occurrenceDepartment">
-          <el-input v-model="searchForm.occurrenceDepartment" clearable size="small"></el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" icon="el-icon-search" size="mini" @click="searchList">鏌� 璇�</el-button>
-          <el-button icon="el-icon-refresh" 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: 88px;font-size: 14px;font-weight: 700;color: #606266;">鍙戠敓閮ㄩ棬</span>
+          <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="searchForm.occurrenceDepartment"
+                    @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 class="table">
       <limsTable :column="tableColumn" :height="'calc(100vh - 19em)'" :table-data="tableData"

--
Gitblit v1.9.3