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/nvr/index.vue | 36 ++++++++++++++++++++++--------------
1 files changed, 22 insertions(+), 14 deletions(-)
diff --git a/src/views/construction/nvr/index.vue b/src/views/construction/nvr/index.vue
index 82d71a7..0e9809e 100644
--- a/src/views/construction/nvr/index.vue
+++ b/src/views/construction/nvr/index.vue
@@ -17,19 +17,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>
@@ -86,9 +91,9 @@
<el-table-column label="瀹夎浣嶇疆" align="center" min-width="240" prop="buildingId_dictText"/>
<el-table-column label="鎵�灞炲崟浣�" align="center" min-width="200" prop="organizationId_dictText"/>
<el-table-column label="鏂藉伐鎵规" 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="鍨嬪彿" align="center" min-width="180" prop="model"/>
+ <el-table-column label="鐢熶骇鍘傚晢" align="center" min-width="200" prop="manufacturerId_dictText"/>
<el-table-column label="鎿嶄綔" align="center" fixed="right" width="220" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@@ -242,6 +247,7 @@
import organization from '../../components/organization'
import constructionBatch from '../../components/constructionBatch'
import manufacturer from '../../components/manufacturer'
+import ShowMore from "@/views/components/showMore";
export default {
name: "Nvr",
@@ -250,7 +256,8 @@
building,
organization,
constructionBatch,
- manufacturer
+ manufacturer,
+ ShowMore
},
props: {
schoolId: {
@@ -355,7 +362,8 @@
]
},
disabled: false,
- fileOpen: false
+ fileOpen: false,
+ showMoreCondition: false
};
},
watch: {
--
Gitblit v1.9.1