From e9717d6ebed478c4ff7ddbf539d1a591bbf5185a Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 12 六月 2024 10:49:24 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
admin/src/components/system/dict/DictDataManagerWindow.vue | 68 ++++++++++++++++++++++++++--------
1 files changed, 52 insertions(+), 16 deletions(-)
diff --git a/admin/src/components/system/dict/DictDataManagerWindow.vue b/admin/src/components/system/dict/DictDataManagerWindow.vue
index 29ead03..47040b9 100644
--- a/admin/src/components/system/dict/DictDataManagerWindow.vue
+++ b/admin/src/components/system/dict/DictDataManagerWindow.vue
@@ -1,9 +1,9 @@
<template>
<GlobalWindow
- :title="dictName + '鏁版嵁绠＄悊'"
- width="78%"
- :visible.sync="visible"
- :with-footer="false"
+ :title="dictName + '鏁版嵁绠＄悊'"
+ width="78%"
+ :visible.sync="visible"
+ :with-footer="false"
>
<TableLayout :with-breadcrumb="false">
<!-- 琛ㄦ牸鍜屽垎椤� -->
@@ -13,14 +13,21 @@
<li><el-button @click="deleteByIdInBatch" icon="el-icon-delete">鍒犻櫎</el-button></li>
</ul>
<el-table
- v-loading="isWorking.search"
- :data="tableData.list"
- stripe
- @selection-change="handleSelectionChange"
+ v-loading="isWorking.search"
+ :data="tableData.list"
+ stripe
+ @selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column prop="label" label="鏁版嵁鏍囩" min-width="100px"></el-table-column>
- <el-table-column prop="code" label="鏁版嵁鍊�" min-width="100px" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="code" label="鏁版嵁鍊�" min-width="100px">
+ <template slot-scope="{row}">
+ <div v-if="row.code || row.code.length>500" >
+ <el-button type="text" @click="showCode(row)" >鐐瑰嚮鏌ョ湅</el-button>
+ </div>
+ <div v-else>{{row.code}}</div>
+ </template>
+ </el-table-column>
<el-table-column prop="disabled" label="鐘舵��" min-width="100px">
<template slot-scope="{row}">{{row.disabled | disabledText}}</template>
</el-table-column>
@@ -33,24 +40,40 @@
<el-table-column prop="createTime" label="鍒涘缓鏃堕棿" min-width="100px"></el-table-column>
<el-table-column prop="updateTime" label="鏇存柊鏃堕棿" min-width="100px"></el-table-column>
<el-table-column
- label="鎿嶄綔"
- min-width="120"
- fixed="right"
+ label="鎿嶄綔"
+ min-width="120"
+ fixed="right"
>
<template slot-scope="{row}">
- <el-button type="text" @click="$refs.operaDictDataWindow.open('缂栬緫瀛楀吀鏁版嵁', dictId, row)" icon="el-icon-edit">缂栬緫</el-button>
+ <el-button type="text" @click="$refs.operaDictDataWindow.open('缂栬緫瀛楀吀鏁版嵁', searchForm.dictId, row)" icon="el-icon-edit">缂栬緫</el-button>
<el-button type="text" @click="deleteById(row)" icon="el-icon-delete">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
<pagination
- @size-change="handleSizeChange"
- @current-change="handlePageChange"
- :pagination="tableData.pagination"
+ @size-change="handleSizeChange"
+ @current-change="handlePageChange"
+ :pagination="tableData.pagination"
></pagination>
</template>
<!-- 鏂板缓/淇敼 -->
<OperaDictDataWindow ref="operaDictDataWindow" @success="handlePageChange(tableData.pagination.pageIndex)"/>
+
+ <el-dialog
+ class="center-title"
+ title="瀛楀吀鍊�"
+ width="70%"
+ height="70%"
+ text="瀛楀吀鍊�"
+ :visible.sync="visible1"
+ append-to-body
+ >
+ <div class="agree-list" v-html="agreement">
+ </div>
+ <template v-slot:footer>
+ <el-button @click="visible1=false">杩斿洖</el-button>
+ </template>
+ </el-dialog>
</TableLayout>
</GlobalWindow>
</template>
@@ -68,6 +91,8 @@
data () {
return {
visible: false,
+ visible1: false,
+ agreement: '',
searchForm: {
// 瀛楀吀ID
dictId: null
@@ -83,6 +108,10 @@
this.dictName = dictName
this.visible = true
this.search()
+ },
+ showCode(row){
+ this.agreement=row.code
+ this.visible1=true
}
},
created () {
@@ -95,6 +124,12 @@
</script>
<style scoped lang="scss">
+.agree-list{
+ height: 550px;
+ //max-height: 50%;
+ overflow: auto;
+}
+
/deep/ .window__body {
.table-content {
padding: 0;
@@ -102,5 +137,6 @@
padding-top: 0;
}
}
+
}
</style>
--
Gitblit v1.9.3