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/server/index.vue | 36 ++++++++++++++++++++++--------------
1 files changed, 22 insertions(+), 14 deletions(-)
diff --git a/src/views/construction/server/index.vue b/src/views/construction/server/index.vue
index 29e19a9..e274cbc 100644
--- a/src/views/construction/server/index.vue
+++ b/src/views/construction/server/index.vue
@@ -10,21 +10,26 @@
<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="model">
+ <el-input
v-model="queryParams.model"
placeholder="璇疯緭鍏ュ瀷鍙�"
clearable
size="small"
@keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label="鐢熶骇鍘傚晢" prop="manufacturerId">
- <manufacturer v-model="queryParams.manufacturerId"></manufacturer>
- </el-form-item>
+ />
+ </el-form-item>
+ <el-form-item label="鐢熶骇鍘傚晢" prop="manufacturerId">
+ <manufacturer v-model="queryParams.manufacturerId"></manufacturer>
+ </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>
@@ -84,11 +89,11 @@
<el-table-column label="鏈烘灦鍙�" align="center" prop="rackNumber"/>
<el-table-column label="鎵�灞炲崟浣�" align="center" min-width="180" prop="organizationId_dictText"/>
<el-table-column label="鏂藉伐鎵规" align="center" min-width="180" prop="constructionBatchId_dictText"/>
- <el-table-column label="搴忓垪鍙�" align="center" prop="serialNumber"/>
+ <el-table-column label="搴忓垪鍙�" align="center" min-width="180" prop="serialNumber"/>
<el-table-column label="鍨嬪彿" align="center" min-width="180" prop="model"/>
<el-table-column label="鐢熶骇鍘傚晢" align="center" min-width="220" prop="manufacturerId_dictText"/>
- <el-table-column label="鎬ц兘鎸囨爣" align="center" prop="performanceIndex"/>
- <el-table-column label="澶囨敞" align="center" prop="remarks"/>
+ <el-table-column label="鎬ц兘鎸囨爣" align="center" min-width="120" prop="performanceIndex"/>
+ <el-table-column label="澶囨敞" align="center" min-width="120" prop="remarks"/>
<!-- <el-table-column label="闄勪欢" align="center" prop="filePath" />-->
<el-table-column label="鎿嶄綔" align="center" fixed="right" width="220" class-name="small-padding fixed-width">
<template slot-scope="scope">
@@ -243,6 +248,7 @@
import constructionBatch from "../../components/constructionBatch";
import manufacturer from "../../components/manufacturer";
import nvr from "../../components/nvr";
+import ShowMore from "@/views/components/showMore";
export default {
name: "Server",
@@ -252,7 +258,8 @@
organization,
constructionBatch,
manufacturer,
- nvr
+ nvr,
+ ShowMore
},
props: {
schoolId: {
@@ -338,7 +345,8 @@
],
},
disabled: false,
- fileOpen: false
+ fileOpen: false,
+ showMoreCondition: false
};
},
created() {
--
Gitblit v1.9.1