From e405b861b9521f5ea38c5402203a5b05988f9de2 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 04 十二月 2024 10:47:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/views/authority/ui/dataAuthorization/index.vue | 114 ++++++++++++++++++++++++++++++--------------------------
1 files changed, 61 insertions(+), 53 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/views/authority/ui/dataAuthorization/index.vue b/Source/plt-web/plt-web-ui/src/views/authority/ui/dataAuthorization/index.vue
index 3ed864f..f8c8799 100644
--- a/Source/plt-web/plt-web-ui/src/views/authority/ui/dataAuthorization/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/authority/ui/dataAuthorization/index.vue
@@ -26,16 +26,16 @@
:option="option"
:table-loading="tableLoading"
@refresh-change="handleRefresh"
- @selection-change="selectChange"
- @row-click="rowClickHandler">
+ @current-row-change="rowClickHandler">
<template slot="menuLeft">
<el-button icon="el-icon-plus" size="small" type="primary" @click="addHandler">娣诲姞</el-button>
+ <el-button icon="el-icon-plus" size="small" type="primary" @click="editHandler">淇敼</el-button>
<el-button icon="el-icon-delete" plain size="small" type="danger" @click="delHandler">鍒犻櫎</el-button>
<el-button icon="el-icon-view" plain size="small" type="primary" @click="chekView">鏌ョ湅鎺堟潈缁撴灉</el-button>
</template>
</avue-crud>
<div style="margin-top: 15px;">
- <data-view key="dataView" :btmNode="nodeRow" :data="viewData" :actionDic="actionMap" :readOnly="true" :height="clientHeight-260-220"></data-view>
+ <data-view key="dataView" :btmNode="nodeRow" :selectRow="selectRow" :actionMap="actionMap" :readOnly="true" :height="clientHeight-260-220"></data-view>
</div>
<!-- 鏂板 && 缂栬緫 -->
<el-dialog
@@ -47,7 +47,7 @@
width="70%"
@close="addDialogClose">
<div>
- <data-view ref="editView" key="editView" :btmNode="nodeRow" :data="viewData" :actionDic="actionMap" :readOnly="false" :height="clientHeight-340"></data-view>
+ <data-view ref="editView" key="editView" :btmNode="nodeRow" :selectRow="selectRow" :actionMap="actionMap" :readOnly="false" :height="clientHeight-340"></data-view>
</div>
<span slot="footer" class="dialog-footer">
<el-button size="small" type="primary" @click="addDialogSavaHandler">纭� 瀹�</el-button>
@@ -107,10 +107,11 @@
nodeRow: {},
treeData: [],
tableLoading: false,
- selectList: [],
+ selectRow: {},
option: {
...basicOption,
height:280,
+ highlightCurrentRow:true,
addBtn: false,
editBtn: false,
delBtn: false,
@@ -118,27 +119,32 @@
columnBtn:false,
gridBtn:false,
tip: false,
- align: 'left',
+ index:false,
+ selection:false,
menu:false,
- column: [
- {
- label: '瑙勫垯鍚嶇О',
- prop: 'plCode',
- overHidden: true
- },
- {
- label: '瑙勫垯绫诲瀷',
- prop: 'plName',
- overHidden: true
- }
- ]
+ align:'center',
+ column: [{
+ label: '瑙勫垯鍚嶇О',
+ prop: 0,
+ overHidden: true
+ },{
+ label: '瑙勫垯绫诲瀷',
+ prop: 1,
+ overHidden: true
+ }]
},
data: [],
- viewData:{},
title: '',
visible: false,
form:{},
- actionMap:{}
+ actionMap:{},
+ switchDic:[{
+ label:'',
+ value:false
+ },{
+ label:'',
+ value:true
+ }]
}
},
created() {
@@ -163,13 +169,40 @@
}
},
getTableList() {
- getData({
- 'typeName': this.nodeRow.attributes.name,
- }).then(res => {
+ getData(this.nodeRow.attributes.name).then(res => {
+ /*if(typeof res.data == 'string'){
+ res.data=eval('('+res.data +')')
+ }*/
+ if(res.data.obj.tableHeader){
+ this.option.column=[ {
+ label: '瑙勫垯鍚嶇О',
+ prop: 0,
+ overHidden: true
+ },{
+ label: '瑙勫垯绫诲瀷',
+ prop: 1,
+ overHidden: true
+ }];
+ res.data.obj.tableHeader.forEach((item,i)=>{
+ if(i<=1) return;
+ if(i=='rules') return;
+ this.option.column.push({
+ label: item,
+ prop: i,
+ overHidden: true,
+ width:'auto',
+ html:true,
+ formatter:(val)=> {
+ return '<label class="el-checkbox is-disabled ' + (val[i] == true ? 'is-checked' : '') + '"><span class="el-checkbox__input is-disabled ' + (val[i] == true ? 'is-checked' : '') + '"><span class="el-checkbox__inner"></span><input type="checkbox" aria-hidden="false" class="el-checkbox__original" value="' + val[i] + '"></span></label>'
+ }
+ })
+ })
+ }
this.data = res.data.obj.rowList;
this.$refs.crud.clearSelection();
this.tableLoading = false;
- this.actionMap=res.data.obj.actionMap
+ this.actionMap=res.data.obj.actionMap;
+ this.selectRow={}
})
},
handleRefresh() {
@@ -177,41 +210,16 @@
},
// 琛岀偣鍑�
rowClickHandler(row) {
- func.rowClickHandler(
- row,
- this.$refs.crud,
- this.lastIndex,
- (newIndex) => {
- this.lastIndex = newIndex;
- },
- () => {
- this.selectList = [row];
- }
- );
- this.getViewData(row)
- },
- // 閫夋嫨妗�
- selectChange(row) {
- this.selectList = row;
- },
- //鑾峰彇涓嬫柟鏁版嵁
- getViewData(row){
- this.viewData={
- oid:row.plOId
- };
+ this.selectRow=row
},
// 鏌ョ湅鎺堟潈缁撴灉
chekView() {
- if (this.selectList.length <= 0) {
- this.$message.warning('璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�');
- return;
- }
- if (this.selectList.length > 1) {
- this.$message.warning('鍙兘閫夋嫨涓�鏉℃暟鎹繘琛屾煡鐪�');
+ if (this.selectRow=={}) {
+ this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹�');
return;
}
- getUsedEnumList({enumName: this.selectList[0].id}).then(res => {
+ getUsedEnumList({enumName: this.selectRow.id}).then(res => {
if (res.data.code === 200) {
this.checkViewVisible = true;
this.checkViewData = res.data.data;
--
Gitblit v1.9.3