From 3e17faf676860e7b65079bed632b552bc4be2fc1 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期三, 24 一月 2024 15:29:14 +0800
Subject: [PATCH] 主题库定义表格调整
---
Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue | 58 +++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 37 insertions(+), 21 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue b/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
index 5e44b6a..383068f 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
@@ -277,7 +277,7 @@
<!-- 鍏ㄥ睆缂栬緫-->
<el-dialog :before-close="escEdit" :visible.sync="attrEditVisible" append-to-body fullscreen="true">
<attrCrud :ProData="this.ProData" :attrFlagChiledren="this.attrFlag" :crudArrayFlag="this.crudArrayFlag"
- :editOpenFlag="editOpenFlag" :editStyleFlag="editStyleFlag"
+ :editOpenFlag="editOpenFlag" :editStyleFlag="editStyleFlag" :btnAuthList="btnAuthList"
@editCloseChildren="editClose"></attrCrud>
</el-dialog>
<!-- 缁勫悎瑙勫垯-->
@@ -326,6 +326,7 @@
v-loading="loading"
:data="ProData"
:height="this.tableHeight"
+ :header-cell-style="{background:'#FAFAFA',color:'#505050'}"
border
style="width: 100%"
@select="selectHandle"
@@ -375,7 +376,7 @@
</el-option>
</el-select>
<el-switch
- v-if="item.edit === 'switch'" v-model="row[item.prop]" :disabled="!editOpenFlag" active-value="true" v-show="!AddCellFlag"
+ v-if="item.edit === 'switch'" v-model="row[item.prop]" :disabled="!editOpenFlag" active-value="true"
inactive-value="false">
</el-switch>
<span v-else>{{ row[item.prop] }}</span>
@@ -450,6 +451,9 @@
type: Boolean,
default: false
},
+ btnAuthList: {
+ type:Array
+ }
},
watch: {
crudOid: {
@@ -1108,6 +1112,8 @@
index: true,
indexFixed:false,
selectionFixed:false,
+ columnBtn: false,
+ refreshBtn:false,
border: true,
addBtn: false,
menu: false,
@@ -1557,20 +1563,20 @@
...mapGetters(["permission"]),
permissionList() {
return {
- busineStatus: this.vaildData(this.permission.classifyTree.attr_add, false),
- fullscreenStatus: this.vaildData(this.permission.classifyTree.attr_view_edit, false),
- ruleStatus: this.vaildData(this.permission.classifyTree.attr_rule, false),
- attrStatus: this.vaildData(this.permission.classifyTree.attr_group, false),
- saveStatus: this.vaildData(this.permission.classifyTree.attr_save, false),
- resetStatus: this.vaildData(this.permission.classifyTree.attr_reset, false),
- injectStatus: this.vaildData(this.permission.classifyTree.attr_inject, false),
- isShowStatus: this.vaildData(this.permission.classifyTree.attr_formrule, false),
- enumStatus: this.vaildData(this.permission.classifyTree.attr_enum, false),
- cascadStatus: this.vaildData(this.permission.classifyTree.attr_parentcode, false),
- syncStatus: this.vaildData(this.permission.classifyTree.attr_sync, false),
- applicationStatus: this.vaildData(this.permission.classifyTree.attr_application, false),
- orderStatus: this.vaildData(this.permission.classifyTree.attr_sort, false),
- removeStatus: this.vaildData(this.permission.classifyTree.attr_delete, false),
+ busineStatus: this.vaildData(this.btnAuthList.attr_add, false) ,
+ fullscreenStatus: this.vaildData(this.btnAuthList.attr_view_edit, false),
+ ruleStatus: this.vaildData(this.btnAuthList.attr_rule, false),
+ attrStatus: this.vaildData(this.btnAuthList.attr_group, false),
+ saveStatus: this.vaildData(this.btnAuthList.attr_save, false),
+ resetStatus: this.vaildData(this.btnAuthList.attr_reset, false),
+ injectStatus: this.vaildData(this.btnAuthList.attr_inject, false),
+ isShowStatus: this.vaildData(this.btnAuthList.attr_formrule, false),
+ enumStatus: this.vaildData(this.btnAuthList.attr_enum, false),
+ cascadStatus: this.vaildData(this.btnAuthList.attr_parentcode, false),
+ syncStatus: this.vaildData(this.btnAuthList.attr_sync, false),
+ applicationStatus: this.vaildData(this.btnAuthList.attr_application, false),
+ orderStatus: this.vaildData(this.btnAuthList.attr_sort, false),
+ removeStatus: this.vaildData(this.btnAuthList.attr_delete, false),
}
},
attrOids() {
@@ -1591,7 +1597,7 @@
if (this.editStyleFlag) {
return '800px'
} else {
- return 'calc(100vh - 595px)'
+ return 'calc(100vh - 565px)'
}
}
},
@@ -1717,7 +1723,10 @@
attrTableWidth: 120,
ts: ""
})
- this.ProData.push(JSON.parse(JSON.stringify(this.busineAddList)))
+ // 灏嗚嫳鏂囩紪鍙疯浆鎹负灏忓啓
+ let { id, ...res } = this.busineAddList;
+ this.busineAddList = { id: id.toLowerCase(), ...res };
+ this.ProData.push(JSON.parse(JSON.stringify(this.busineAddList)));
}
})
this.addVisible = false;
@@ -2063,16 +2072,23 @@
const regex = new RegExp(this.rulesData.ruleRowBds);
if (regex.test(this.RulesForm.TestContent)) {
this.$message.success('鏍￠獙鎴愬姛')
+ }else {
+ this.$message.error('鏍￠獙澶辫触')
}
},
//鐐瑰嚮鍒嗙被娉ㄥ叆鎸夐挳
injectBtn() {
if (this.attrSelectList.length > 1) {
this.$message.warning('鍙兘閫夋嫨涓�鏉℃ā鏉挎暟鎹�')
- } else if (this.attrSelectList.length < 1) {
+ return;
+ }
+ if (this.attrSelectList.length < 1) {
this.$message.warning('璇烽�夋嫨涓�鏉℃ā鏉挎暟鎹�')
- } else if (this.attrSelectList.length === 1) {
+ return;;
+ }
+ if (this.attrSelectList.length === 1) {
this.injectVisible = true;
+ return;
}
},
//鍒嗙被娉ㄥ叆淇濆瓨
@@ -2228,7 +2244,7 @@
<style lang="scss" scoped>
//鍥哄畾鍒楅珮搴�
/deep/ .el-table__fixed {
- height: calc(100vh - 612px) !important;
+ height: calc(100vh - 584px) !important;
}
///deep/ .el-table__fixed[v-if='editStyleFlag'] {
--
Gitblit v1.9.3