From 0d68be1fa109b0f55fa0b4c023baf4b66dcc9f28 Mon Sep 17 00:00:00 2001
From: liuchengxin <13104445455@163.com>
Date: 星期四, 09 六月 2022 14:06:39 +0800
Subject: [PATCH] BUG修改
---
src/views/construction/exchange/index.vue | 122 +++++++++++++++++++++-------------------
1 files changed, 63 insertions(+), 59 deletions(-)
diff --git a/src/views/construction/exchange/index.vue b/src/views/construction/exchange/index.vue
index 1e98493..e050300 100644
--- a/src/views/construction/exchange/index.vue
+++ b/src/views/construction/exchange/index.vue
@@ -10,61 +10,66 @@
<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 label="缃戠粶绔彛" prop="networkPort">
- <el-select v-model="queryParams.networkPort" placeholder="璇烽�夋嫨缃戠粶绔彛" clearable size="small">
- <el-option
+ />
+ </el-form-item>
+ <el-form-item label="鐢熶骇鍘傚晢" prop="manufacturerId">
+ <manufacturer v-model="queryParams.manufacturerId"></manufacturer>
+ </el-form-item>
+ <el-form-item label="缃戠粶绔彛" prop="networkPort">
+ <el-select v-model="queryParams.networkPort" placeholder="璇烽�夋嫨缃戠粶绔彛" clearable size="small">
+ <el-option
v-for="dict in dict.type.DICT113"
:key="dict.value"
:label="dict.label"
:value="dict.value"
- />
- </el-select>
- </el-form-item>
- <el-form-item label="鎸囨爣A" prop="idnexA">
- <el-select v-model="queryParams.idnexA" placeholder="璇烽�夋嫨鎸囨爣A" clearable size="small">
- <el-option
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鎸囨爣A" prop="idnexA">
+ <el-select v-model="queryParams.idnexA" placeholder="璇烽�夋嫨鎸囨爣A" clearable size="small">
+ <el-option
v-for="dict in dict.type.DICT114"
:key="dict.value"
:label="dict.label"
:value="dict.value"
- />
- </el-select>
- </el-form-item>
- <el-form-item label="绾ц仈绔彛" prop="cascadePort">
- <el-select v-model="queryParams.cascadePort" placeholder="璇烽�夋嫨绾ц仈绔彛" clearable size="small">
- <el-option
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="绾ц仈绔彛" prop="cascadePort">
+ <el-select v-model="queryParams.cascadePort" placeholder="璇烽�夋嫨绾ц仈绔彛" clearable size="small">
+ <el-option
v-for="dict in dict.type.DICT113"
:key="dict.value"
:label="dict.label"
:value="dict.value"
- />
- </el-select>
- </el-form-item>
- <el-form-item label="鎸囨爣B" prop="indexB">
- <el-select v-model="queryParams.indexB" placeholder="璇烽�夋嫨鎸囨爣B" clearable size="small">
- <el-option
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鎸囨爣B" prop="indexB">
+ <el-select v-model="queryParams.indexB" placeholder="璇烽�夋嫨鎸囨爣B" clearable size="small">
+ <el-option
v-for="dict in dict.type.DICT114"
:key="dict.value"
:label="dict.label"
:value="dict.value"
- />
- </el-select>
- </el-form-item>
+ />
+ </el-select>
+ </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>
@@ -76,7 +81,6 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
- v-hasPermi="['oa:exchange:add']"
>鏂板
</el-button>
</el-col>
@@ -88,7 +92,6 @@
size="mini"
:disabled="single"
@click="handleUpdate"
- v-hasPermi="['oa:exchange:edit']"
>淇敼
</el-button>
</el-col>
@@ -100,7 +103,6 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
- v-hasPermi="['oa:exchange:remove']"
>鍒犻櫎
</el-button>
</el-col>
@@ -113,32 +115,33 @@
<span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
</template>
</el-table-column>
- <el-table-column label="缃戠粶绔彛" align="center" prop="networkPort">
+ <el-table-column label="缃戠粶绔彛" align="center" prop="networkPort" show-overflow-tooltip>
<template slot-scope="scope">
- <dict-tag :options="dict.type.DICT113" :value="scope.row.networkPort"/>
+ <dict-tag :options="dict.type.DICT113" :value="scope.row.networkPort" show-overflow-tooltip/>
</template>
</el-table-column>
- <el-table-column label="鎸囨爣A" align="center" prop="idnexA">
+ <el-table-column label="鎸囨爣A" align="center" prop="idnexA" show-overflow-tooltip>
<template slot-scope="scope">
- <dict-tag :options="dict.type.DICT114" :value="scope.row.idnexA"/>
+ <dict-tag :options="dict.type.DICT114" :value="scope.row.idnexA" show-overflow-tooltip/>
</template>
</el-table-column>
- <el-table-column label="绾ц仈绔彛" align="center" prop="cascadePort">
+ <el-table-column label="绾ц仈绔彛" align="center" prop="cascadePort" show-overflow-tooltip>
<template slot-scope="scope">
- <dict-tag :options="dict.type.DICT113" :value="scope.row.cascadePort"/>
+ <dict-tag :options="dict.type.DICT113" :value="scope.row.cascadePort" show-overflow-tooltip/>
</template>
</el-table-column>
- <el-table-column label="鎸囨爣B" align="center" prop="indexB">
+ <el-table-column label="鎸囨爣B" align="center" prop="indexB" show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.DICT114" :value="scope.row.indexB"/>
</template>
</el-table-column>
- <el-table-column label="瀹夎浣嶇疆" min-width="180" align="center" prop="buildingId_dictText"/>
- <el-table-column label="鍏蜂綋浣嶇疆" min-width="220" align="center" prop="address"/>
- <el-table-column label="鎵�灞炲崟浣�" min-width="180" align="center" prop="organizationId_dictText"/>
- <el-table-column label="鏂藉伐鎵规" min-width="180" align="center" prop="constructionBatchId_dictText"/>
- <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="搴忓垪鍙�" min-width="180" align="center" prop="serialNumber" show-overflow-tooltip/>
+ <el-table-column label="鐢熶骇鍘傚晢" min-width="220" align="center" prop="manufacturerId_dictText" show-overflow-tooltip/>
+ <el-table-column label="瀹夎浣嶇疆" min-width="180" align="center" prop="buildingId_dictText" show-overflow-tooltip/>
+<!-- <el-table-column label="鍏蜂綋浣嶇疆" min-width="220" align="center" prop="address"/>-->
+<!-- <el-table-column label="鎵�灞炲崟浣�" min-width="180" align="center" prop="organizationId_dictText"/>-->
+<!-- <el-table-column label="鏂藉伐鎵规" min-width="180" align="center" prop="constructionBatchId_dictText"/>-->
+<!-- <el-table-column label="鍨嬪彿" min-width="180" align="center" prop="model"/>-->
<el-table-column label="鎿嶄綔" align="center" fixed="right" width="220" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@@ -153,7 +156,6 @@
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
- v-hasPermi="['oa:exchange:edit']"
>淇敼
</el-button>
<el-button
@@ -169,7 +171,6 @@
class="del-btn"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
- v-hasPermi="['oa:exchange:remove']"
>鍒犻櫎
</el-button>
</template>
@@ -190,7 +191,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="缃戠粶绔彛" prop="networkPort">
- <el-select v-model="form.networkPort" placeholder="璇烽�夋嫨缃戠粶绔彛">
+ <el-select v-model="form.networkPort" placeholder="璇烽�夋嫨缃戠粶绔彛" style="width: 100%;">
<el-option
v-for="dict in dict.type.DICT113"
:key="dict.value"
@@ -202,7 +203,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="鎸囨爣A" prop="idnexA">
- <el-select v-model="form.idnexA" placeholder="璇烽�夋嫨鎸囨爣A">
+ <el-select v-model="form.idnexA" placeholder="璇烽�夋嫨鎸囨爣A" style="width: 100%;">
<el-option
v-for="dict in dict.type.DICT114"
:key="dict.value"
@@ -216,7 +217,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="绾ц仈绔彛" prop="cascadePort">
- <el-select v-model="form.cascadePort" placeholder="璇烽�夋嫨绾ц仈绔彛">
+ <el-select v-model="form.cascadePort" placeholder="璇烽�夋嫨绾ц仈绔彛" style="width: 100%;">
<el-option
v-for="dict in dict.type.DICT113"
:key="dict.value"
@@ -228,7 +229,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="鎸囨爣B" prop="indexB">
- <el-select v-model="form.indexB" placeholder="璇烽�夋嫨鎸囨爣B">
+ <el-select v-model="form.indexB" placeholder="璇烽�夋嫨鎸囨爣B" style="width: 100%;">
<el-option
v-for="dict in dict.type.DICT114"
:key="dict.value"
@@ -243,7 +244,7 @@
<building v-if="open" v-model="form.buildingId" :schoolId="schoolId"></building>
</el-form-item>
<el-form-item label="鍏蜂綋浣嶇疆" prop="address">
- <el-input v-model="form.address" maxlength="512" show-word-limit type="textarea" :rows="8" placeholder="璇疯緭鍏ュ叿浣撲綅缃�""/>
+ <el-input v-model="form.address" maxlength="512" show-word-limit type="textarea" :rows="3" placeholder="璇疯緭鍏ュ叿浣撲綅缃�""/>
</el-form-item>
<el-form-item label="鎵�灞炲崟浣�" prop="organizationId">
<organization v-if="open" v-model="form.organizationId" :schoolId="schoolId"></organization>
@@ -295,6 +296,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: "Exchange",
@@ -304,7 +306,8 @@
organization,
constructionBatch,
manufacturer,
- nvr
+ nvr,
+ ShowMore
},
props: {
schoolId: {
@@ -382,7 +385,8 @@
],
},
disabled: false,
- fileOpen: false
+ fileOpen: false,
+ showMoreCondition: false
};
},
created() {
@@ -516,7 +520,7 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const ids = row.id || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎浜ゆ崲璁惧缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(() => {
+ this.$modal.confirm('鏄惁纭鍒犻櫎锛�').then(() => {
this.loading = true;
return delExchange(ids);
}).then(() => {
--
Gitblit v1.9.1