From f1ac5a72688faa6324fe2510a0f47b5eeb3b93aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com>
Date: Wed, 26 Mar 2025 11:43:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=96=E5=91=BC=E8=AE=B0=E5=BD=95=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E6=9D=A1=E4=BB=B6=E6=89=B9=E6=AC=A1=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/SearchForm.vue          |  2 +-
 src/views/manage/components/sn.vue           |  9 +++++--
 src/views/manage/patientInfoImport/index.vue | 27 ++++++++++++++++----
 3 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/src/views/components/SearchForm.vue b/src/views/components/SearchForm.vue
index 73fb799..fad5a17 100644
--- a/src/views/components/SearchForm.vue
+++ b/src/views/components/SearchForm.vue
@@ -727,7 +727,7 @@ export default {
       this.maxShow = Math.floor(this.$refs.searchFilter.offsetWidth / this.labelWidths)
       const group = window.document.querySelectorAll(`#searchFilter .el-form-item.el-form-item--${this.size}`)
       const len = group?.length ? group?.length - 1 : 0
-      if (this.maxShow < len) {
+      if (this.maxShow <= len) {
         group.forEach((item, index) => {
           item.hidden = false
           if (index > this.maxShow - 1) {
diff --git a/src/views/manage/components/sn.vue b/src/views/manage/components/sn.vue
index a98ad3f..89284e4 100644
--- a/src/views/manage/components/sn.vue
+++ b/src/views/manage/components/sn.vue
@@ -21,6 +21,9 @@
                 style="width: 220px" value-format="yyyy-MM-dd" end-placeholder="结束日期">
               </el-date-picker>
             </el-form-item>
+            <el-form-item label="流水号" prop="sn">
+              <el-input v-model="queryParams.sn" placeholder="请输入流水号" clearable style="width: 200px" />
+            </el-form-item>
             <el-form-item label="批次名称" prop="importName">
               <el-input v-model="queryParams.importName" placeholder="请输入批次名称" clearable style="width: 200px" />
             </el-form-item>
@@ -31,13 +34,13 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="院区" prop="">
+            <!-- <el-form-item label="院区" prop="">
               <el-select v-model="queryParams.campusAgencyId" filterable placeholder="请选择院区" style="width:220px"
                 clearable @clear="clearcampusAgency">
                 <el-option v-for="item in campusAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
                 </el-option>
               </el-select>
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item>
               <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
               <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -174,6 +177,7 @@ export default {
         importTimeEnd: "",
         campusAgencyId: null,
         importName: null,
+        sn: null,
       },
       patientInfoList: [],
       departmentlist: [],
@@ -379,6 +383,7 @@ export default {
         importTimeStart: "",
         importTimeEnd: "",
         campusAgencyId: null,
+        sn: null,
       }
       this.createTime = '';
       this.handleQuery();
diff --git a/src/views/manage/patientInfoImport/index.vue b/src/views/manage/patientInfoImport/index.vue
index bf60a74..b34c6d0 100644
--- a/src/views/manage/patientInfoImport/index.vue
+++ b/src/views/manage/patientInfoImport/index.vue
@@ -1,14 +1,22 @@
 <template>
   <div class="app-container" ref="layout">
     <div ref="topform" class="form">
-      <SearchFilter labelWidth="90px" :labelWidths="310" size="small" @search="handleQuery" @handleRules="getList"
-        patientUploadButtonVisible="true" @reset="resetQuery" @minShowCtrol="getMaxTableHeight">
-        <el-form-item label="导入日期" prop="" label-width="120px">
+      <SearchFilter :labelWidths="310" size="small" @search="handleQuery" @handleRules="getList"
+        patientUploadButtonVisible="true" @reset="resetQuery" @minShowCtrol="getMaxTableHeight" v-show="showSearch">
+        <el-form-item label="导入日期" prop="" label-width="90px">
           <el-date-picker v-model="createTime" type="daterange" range-separator="至" start-placeholder="开始日期"
             style="width: 220px" value-format="yyyy-MM-dd" end-placeholder="结束日期">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="医院" prop="">
+        <el-form-item label="流水号" prop="sn" label-width="90px">
+          <el-input v-model="queryParams.sn" placeholder="请输入流水号" style="width: 220px" clearable>
+          </el-input>
+        </el-form-item>
+        <el-form-item label="批次名称" prop="importName" label-width="90px">
+          <el-input v-model="queryParams.importName" placeholder="请输入批次名称" style="width: 220px" clearable>
+          </el-input>
+        </el-form-item>
+        <el-form-item label="医院" prop="" label-width="90px">
           <el-select v-model="queryParams.hospitalAgencyId" filterable placeholder="请选择医院" style="width: 220px"
             clearable @clear="clearhospitalAgency" @change="changehospitalAgency">
             <el-option v-for="item in hospitalAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
@@ -57,6 +65,7 @@
             </el-button>
           </template>
         </el-table-column>
+        <el-table-column label="批次名称" align="center" prop="importName" width="150" />
         <el-table-column label="患者数" align="center" prop="patientCount" width="150" />
         <el-table-column label="操作人" align="center" prop="createBy" />
         <el-table-column label="导入日期" align="center" prop="createTime">
@@ -194,6 +203,8 @@ export default {
         importTimeStart: "",
         importTimeEnd: "",
         campusAgencyId: null,
+        sn: "",
+        importName: "",
       },
       // 表单参数
       form: {},
@@ -326,7 +337,13 @@ export default {
     resetQuery() {
       this.queryParams = {
         pageNum: 1,
-        pageSize: 10
+        pageSize: 10,
+        hospitalAgencyId: null,
+        importTimeStart: "",
+        importTimeEnd: "",
+        campusAgencyId: null,
+        sn: "",
+        importName: "",
       }
       this.createTime = '';
       // this.resetForm("queryForm");