From 1c01e669cca92f94eea5d1a73ff60f3bd34b9079 Mon Sep 17 00:00:00 2001
From: liuchengxin <13104445455@163.com>
Date: 星期一, 23 五月 2022 16:38:27 +0800
Subject: [PATCH] BUG修改

---
 src/views/construction/ipc/index.vue |   36 ++++++++++++++++++++++--------------
 1 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/src/views/construction/ipc/index.vue b/src/views/construction/ipc/index.vue
index 1d0aaf0..5206727 100644
--- a/src/views/construction/ipc/index.vue
+++ b/src/views/construction/ipc/index.vue
@@ -10,19 +10,24 @@
       <el-form-item label="鎵�灞炲崟浣�" prop="organizationId">
         <organization v-model="queryParams.organizationId" :schoolId="schoolId"></organization>
       </el-form-item>
-      <el-form-item label="鏂藉伐鎵规" prop="constructionBatchId">
-        <construction-batch v-model="queryParams.constructionBatchId" :schoolId="schoolId"></construction-batch>
-      </el-form-item>
-      <el-form-item label="鍨嬪彿" prop="model">
-        <el-input
+      <template v-if="showMoreCondition">
+        <el-form-item label="鏂藉伐鎵规" prop="constructionBatchId">
+          <construction-batch v-model="queryParams.constructionBatchId" :schoolId="schoolId"></construction-batch>
+        </el-form-item>
+        <el-form-item label="鍨嬪彿" prop="model">
+          <el-input
             v-model="queryParams.model"
             placeholder="璇疯緭鍏ュ瀷鍙�"
             @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+          />
+        </el-form-item>
+      </template>
       <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>
+        <div class="show-more-search">
+          <ShowMore :showMoreCondition.sync="showMoreCondition"></ShowMore>
+          <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>
+        </div>
       </el-form-item>
     </el-form>
 
@@ -81,9 +86,9 @@
       <el-table-column label="瀹夎浣嶇疆" min-width="240" align="center" prop="buildingId_dictText"/>
       <el-table-column label="鎵�灞炲崟浣�" min-width="200" align="center" prop="organizationId_dictText"/>
       <el-table-column label="鏂藉伐鎵规" min-width="120" align="center" prop="constructionBatchId_dictText"/>
-      <el-table-column label="搴忓垪鍙�" align="center" prop="serialNumber"/>
-      <el-table-column label="鍨嬪彿" align="center" prop="model"/>
-      <el-table-column label="鐢熶骇鍘傚晢" align="center" prop="manufacturerId_dictText"/>
+      <el-table-column label="搴忓垪鍙�" min-width="180" align="center" prop="serialNumber"/>
+      <el-table-column label="鍨嬪彿" min-width="180" align="center" prop="model"/>
+      <el-table-column label="鐢熶骇鍘傚晢" min-width="220" align="center" prop="manufacturerId_dictText"/>
       <el-table-column label="鎿嶄綔" align="center" fixed="right" width="180" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -213,6 +218,7 @@
 import manufacturer from "../../components/manufacturer";
 import nvr from '../../components/nvr'
 import nvrForm from '../../components/nvr/form'
+import ShowMore from "@/views/components/showMore";
 
 export default {
   name: "Ipc",
@@ -223,7 +229,8 @@
     constructionBatch,
     manufacturer,
     nvr,
-    nvrForm
+    nvrForm,
+    ShowMore
   },
   props: {
     schoolId: {
@@ -305,7 +312,8 @@
       },
       disabled: false,
       nvrOpen: false,
-      nvrId: undefined
+      nvrId: undefined,
+      showMoreCondition: false
     };
   },
   computed: {

--
Gitblit v1.9.1