From b11b45122d2b6903e8970e8d55712f7a6a657e22 Mon Sep 17 00:00:00 2001 From: ludc Date: 星期三, 10 一月 2024 00:01:10 +0800 Subject: [PATCH] defaultReferDataGrid接口修改,实现兼容高级查询sql拼接;修改流水处理接口,增加流水处理跳出判断 --- Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue | 42 ++++++++++++++++++++++++++---------------- 1 files changed, 26 insertions(+), 16 deletions(-) diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue b/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue index e576ea9..9462ea6 100644 --- a/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue +++ b/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue @@ -451,6 +451,9 @@ type: Boolean, default: false }, + btnAuthList: { + type:Array + } }, watch: { crudOid: { @@ -1560,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() { @@ -2069,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; } }, //鍒嗙被娉ㄥ叆淇濆瓨 -- Gitblit v1.9.3