From 4001279159dd37942b3cf4c83ab537f95832a82d Mon Sep 17 00:00:00 2001
From: liuchengxin <13104445455@163.com>
Date: 星期一, 06 六月 2022 13:33:21 +0800
Subject: [PATCH] BUG修改
---
src/views/construction/system/index.vue | 97 ++++++++++++++++++++++++++++++++----------------
1 files changed, 65 insertions(+), 32 deletions(-)
diff --git a/src/views/construction/system/index.vue b/src/views/construction/system/index.vue
index f0ee5d2..026e8d9 100644
--- a/src/views/construction/system/index.vue
+++ b/src/views/construction/system/index.vue
@@ -1,5 +1,5 @@
<template>
- <div class="app-container">
+ <div class="construction-view">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="90px">
<el-form-item label="杞欢鍚嶇О" prop="name">
<el-input
@@ -16,12 +16,15 @@
<el-form-item label="鏂藉伐鎵规" prop="constructionBatchId">
<construction-batch v-model="queryParams.constructionBatchId" :schoolId="schoolId"></construction-batch>
</el-form-item>
- <el-form-item label="鐢熶骇鍘傚晢" prop="manufacturerId">
+ <el-form-item v-if="showMoreCondition" label="鐢熶骇鍘傚晢" prop="manufacturerId">
<manufacturer v-model="queryParams.manufacturerId"></manufacturer>
</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>
+ <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>
@@ -33,7 +36,6 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
- v-hasPermi="['oa:system:add']"
>鏂板
</el-button>
</el-col>
@@ -45,7 +47,6 @@
size="mini"
:disabled="single"
@click="handleUpdate"
- v-hasPermi="['oa:system:edit']"
>淇敼
</el-button>
</el-col>
@@ -57,7 +58,6 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
- v-hasPermi="['oa:system:remove']"
>鍒犻櫎
</el-button>
</el-col>
@@ -70,16 +70,20 @@
<span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
</template>
</el-table-column>
- <el-table-column label="杞欢鍚嶇О" align="center" prop="name"/>
- <el-table-column label="鐗堟湰" align="center" prop="edition"/>
- <el-table-column label="鍔熻兘鎻忚堪" align="center" prop="functionDescription"/>
- <el-table-column label="鎺堟潈鏂瑰紡" align="center" prop="authorizationMethod_dictText"/>
- <el-table-column label="鎺堟潈鏁伴噺" align="center" prop="authorizedQuantity"/>
- <el-table-column label="杞戒綋鏈嶅姟鍣�" align="center" prop="serverId_dictText"/>
- <el-table-column label="鏂藉伐鎵规" align="center" prop="constructionBatchId_dictText"/>
- <el-table-column label="鐢熶骇鍘傚晢" align="center" prop="manufacturerId_dictText"/>
- <el-table-column label="澶囨敞" align="center" prop="remarks"/>
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+ <el-table-column label="杞欢鍚嶇О" align="center" min-width="180" prop="name" show-overflow-tooltip/>
+ <el-table-column label="鐗堟湰" min-width="180" align="center" prop="edition" show-overflow-tooltip/>
+ <el-table-column label="鎺堟潈鏂瑰紡" min-width="180" align="center" prop="authorizationMethod_dictText" show-overflow-tooltip/>
+ <el-table-column label="鎺堟潈鏁伴噺" min-width="180" align="center" prop="authorizedQuantity" show-overflow-tooltip/>
+ <el-table-column label="杞戒綋鏈嶅姟鍣�" align="center" width="180" prop="serverId_dictText" show-overflow-tooltip>
+ <template slot-scope="scope">
+ <el-link type="primary" @click="serverClick(scope.row)">{{scope.row.serverId_dictText}}</el-link>
+ </template>
+ </el-table-column>
+ <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="functionDescription" show-overflow-tooltip/>
+<!-- <el-table-column label="鏂藉伐鎵规" min-width="180" align="center" prop="constructionBatchId_dictText"/>-->
+<!-- <el-table-column label="澶囨敞" align="center" min-width="180" prop="remarks"/>-->
+ <el-table-column label="鎿嶄綔" align="center" fixed="right" width="220" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
@@ -93,7 +97,6 @@
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
- v-hasPermi="['oa:system:edit']"
>淇敼
</el-button>
<el-button
@@ -109,7 +112,6 @@
class="del-btn"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
- v-hasPermi="['oa:system:remove']"
>鍒犻櫎
</el-button>
</template>
@@ -140,7 +142,7 @@
</el-col>
</el-row>
<el-form-item label="鍔熻兘鎻忚堪" prop="functionDescription">
- <el-input v-model="form.functionDescription" :rows="8" maxlength="64" show-word-limit type="textarea"
+ <el-input v-model="form.functionDescription" :rows="3" maxlength="512" show-word-limit type="textarea"
placeholder="璇疯緭鍏ュ唴瀹�"/>
</el-form-item>
<el-row>
@@ -162,9 +164,6 @@
</el-form-item>
</el-col>
</el-row>
- <el-form-item label="杞戒綋鏈嶅姟鍣�" prop="serverId">
- <server v-if="open" v-model="form.serverId" :schoolId="schoolId"/>
- </el-form-item>
<el-row>
<el-col :span="12">
<el-form-item label="鏂藉伐鎵规" prop="constructionBatchId">
@@ -178,8 +177,23 @@
</el-form-item>
</el-col>
</el-row>
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="璐﹀彿/瀵嗙爜" prop="account">
+ <el-input v-model="form.account" maxlength="64" show-word-limit placeholder="璇疯緭鍏ヨ处鍙�/瀵嗙爜"/>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="杞戒綋鏈嶅姟鍣�" prop="serverId">
+ <server v-if="open" v-model="form.serverId" :schoolId="schoolId"/>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-form-item label="璁块棶鍦板潃" prop="address">
+ <el-input v-model="form.address" maxlength="512" show-word-limit placeholder="璇疯緭鍏ュ唴瀹�"/>
+ </el-form-item>
<el-form-item label="澶囨敞" prop="remarks">
- <el-input v-model="form.remarks" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�"/>
+ <el-input v-model="form.remarks" :rows="3" maxlength="512" show-word-limit type="textarea" placeholder="璇疯緭鍏ュ唴瀹�"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -200,6 +214,14 @@
<el-button @click="cancel">鍙� 娑�</el-button>
</div>
</Dialog>
+
+ <!-- 鏈嶅姟鍣� -->
+ <Dialog title="鏈嶅姟鍣�" :visible.sync="serverOpen" width="700px" :append-to-body="true" :destroy-on-close="true">
+ <server-form v-if="serverOpen" :serverId="serverId"></server-form>
+ <div slot="footer" class="dialog-footer">
+ <el-button @click="serverOpen = false">鍏� 闂�</el-button>
+ </div>
+ </Dialog>
</div>
</template>
@@ -211,6 +233,8 @@
import manufacturer from "../../components/manufacturer";
import nvr from "../../components/nvr";
import server from '../../components/server'
+import serverForm from '../../components/server/form'
+import ShowMore from "@/views/components/showMore";
export default {
name: "System",
@@ -221,7 +245,9 @@
constructionBatch,
manufacturer,
nvr,
- server
+ server,
+ serverForm,
+ ShowMore
},
props: {
schoolId: {
@@ -292,9 +318,18 @@
constructionBatchId: [
{required: true, message: "鏂藉伐鎵规涓嶈兘涓虹┖", trigger: "blur"}
],
+ account: [
+ {required: true, message: "璐﹀彿/瀵嗙爜涓嶈兘涓虹┖", trigger: "blur"}
+ ],
+ address: [
+ {required: true, message: "璁块棶鍦板潃涓嶈兘涓虹┖", trigger: "blur"}
+ ],
},
disabled: false,
- fileOpen: false
+ fileOpen: false,
+ serverOpen: false,
+ serverId: undefined,
+ showMoreCondition: false
};
},
created() {
@@ -427,7 +462,7 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const ids = row.id || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎杞欢绯荤粺缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(() => {
+ this.$modal.confirm('鏄惁纭鍒犻櫎锛�').then(() => {
this.loading = true;
return delSystem(ids);
}).then(() => {
@@ -438,11 +473,9 @@
this.loading = false;
});
},
- /** 瀵煎嚭鎸夐挳鎿嶄綔 */
- handleExport() {
- this.download('oa/system/export', {
- ...this.queryParams
- }, `system_${new Date().getTime()}.xlsx`)
+ serverClick(row) {
+ this.serverId = row.serverId;
+ this.serverOpen = true;
}
}
};
--
Gitblit v1.9.1