From cc38b5ae62eebcd80aebe41457629b12e26b9e84 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 01 二月 2024 15:04:13 +0800
Subject: [PATCH] 整合代码
---
Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue | 105 +++++++++++++++++++---------------
Source/UBCS-WEB/src/views/wel/index.vue | 1
Source/UBCS-WEB/src/components/Theme/DataAuthDialog.vue | 20 +++---
Source/UBCS-WEB/src/views/MasterData/items.vue | 14 ++--
4 files changed, 77 insertions(+), 63 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Theme/DataAuthDialog.vue b/Source/UBCS-WEB/src/components/Theme/DataAuthDialog.vue
index d352de3..c7d9d60 100644
--- a/Source/UBCS-WEB/src/components/Theme/DataAuthDialog.vue
+++ b/Source/UBCS-WEB/src/components/Theme/DataAuthDialog.vue
@@ -128,10 +128,8 @@
this.loadAuthPage();
}
},
- classifyAuthData(newval){
-
- this.addIndex = newval.length <= 0 ? 0 :newval.length-1;
- console.log(this.addIndex)
+ classifyAuthData(newval) {
+ this.addIndex = newval.length <= 0 ? 0 : newval.length - 1;
}
},
computed: {},
@@ -144,7 +142,7 @@
if (code === "data_view") {
row.checkTheStatus = check;
} else if (!row.checkTheStatus) {
- this.$message.warning('璇峰厛鍕鹃�夋煡鐪嬫寜閽紒');
+ this.$message.warning('璇风‘璁ゆ槸鍚﹂厤缃煡鐪嬫寜閽紝濡傚凡閰嶇疆璇峰厛鍕鹃�夋煡鐪嬫寜閽紒');
// 鍦ㄦ潯浠朵笉婊¤冻鏃跺皢澶氶�夋鐘舵�佽缃负false
row[id] = false;
}
@@ -173,13 +171,15 @@
//鍜岃〃鏍煎垪杩涜瀵规瘮
this.classifyAuthHeader.forEach((item) => {
+ // if (item.code !== 'data_view') {
+ // this.$set(this.classifyAuthData[index].authButton, "allDisabled", true);
+ // }
const isMatched = filteredItems.some((x) => x.id === item.prop);
this.$nextTick(() => {
if (this.classifyAuthData[index]) {
if (isMatched) {
Object.keys(this.classifyAuthData[index]).forEach((key) => {
this.$set(this.classifyAuthData[index].authButton, item.code, true);
-
//娣诲姞 鈥滄煡鐪嬪叏閮ㄧ鐢ㄦ潯浠垛��
if (item.code === "data_view") {
this.$set(this.classifyAuthData[index].authButton, "allDisabled", true);
@@ -190,14 +190,14 @@
Object.keys(this.classifyAuthData[index]).forEach((key) => {
this.$set(this.classifyAuthData[index].authButton, item.code, false);
});
- if(item.code === "data_view"){
+ if (item.code === "data_view") {
this.classifyAuthData[index].authButton.allDisabled = false;
}
}
}
});
});
-
+ // console.log(this.classifyAuthData)
//寮哄埗鍒锋柊琛ㄦ牸
this.itemKey = uuidv4();
});
@@ -251,7 +251,7 @@
classifyItem: this.classifyData.label,
authButton: {},
uuid: uuidv4(),//鐢熸垚鍞竴鐨刬d,
- index: this.addIndex,
+ index: this.classifyAuthData.length -1,
}
//灏嗘寜閽缃繘鍘�
this.classifyAuthButton.forEach(data => {
@@ -259,7 +259,7 @@
})
//console.log(item)
this.classifyAuthData.push(item)
- this.roleHandlerMethods(this.roleList[0].id, 'add', this.addIndex)
+ this.roleHandlerMethods(this.roleList[0].id, 'add', this.classifyAuthData.length -1)
},
// 鍒犻櫎琛�
subClassifyAuth() {
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue b/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
index 27e9fda..2a101b6 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
@@ -1,6 +1,7 @@
<template>
<div>
- <div v-if="this.crudArrayFlag" class="app" style="display: flex;flex-wrap: wrap; display: inline-block;height: 80px">
+ <div v-if="this.crudArrayFlag" class="app"
+ style="display: flex;flex-wrap: wrap; display: inline-block;height: 80px">
<el-button-group>
<!--鏂板-->
<span v-if="permissionList.busineStatus">
@@ -320,12 +321,12 @@
></refer-config-dialog>
<!--杩戜箟璇嶆煡璇㈣鍒� -->
<el-dialog :visible.sync="synonymVisible" append-to-body title="杩戜箟璇嶆煡璇㈣鍒�">
- <avue-crud :data="synonymData" :option="synonymOption" v-loading="sysonymLoading" @selection-change="sysChange">
- <template slot="lcStatus" slot-scope="{row}">
- <el-tag v-if="row.lcStatus === 'Released'" type="success">鍚敤</el-tag>
- <el-tag v-else type="danger">鍋滅敤</el-tag>
- </template>
- </avue-crud>
+ <avue-crud v-loading="sysonymLoading" :data="synonymData" :option="synonymOption" @selection-change="sysChange">
+ <template slot="lcStatus" slot-scope="{row}">
+ <el-tag v-if="row.lcStatus === 'Released'" type="success">鍚敤</el-tag>
+ <el-tag v-else type="danger">鍋滅敤</el-tag>
+ </template>
+ </avue-crud>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="sysnonymSubmit">纭畾</el-button>
<el-button @click="sysnonymCancel">鍙栨秷</el-button>
@@ -414,7 +415,14 @@
</template>
<script>
-import {AttrByBtm, gridCodeClassifyTemplateAttr, batchAddSave, copyto, listByFlag,codeSynonym} from '@/api/template/templateAttr'
+import {
+ AttrByBtm,
+ gridCodeClassifyTemplateAttr,
+ batchAddSave,
+ copyto,
+ listByFlag,
+ codeSynonym
+} from '@/api/template/templateAttr'
import {getList} from "@/api/refer/table";
import func from "@/util/func";
import {getCurrentInstance} from "vue";
@@ -532,48 +540,48 @@
},
data() {
return {
- sysSelectData:[],
- sysonymLoading:false,
- synonymOption:{
- addBtn:false,
- editBtn:false,
- delBtn:false,
- refreshBtn:false,
- columnBtn:false,
- menu:false,
- selection:true,
- column:[
+ sysSelectData: [],
+ sysonymLoading: false,
+ synonymOption: {
+ addBtn: false,
+ editBtn: false,
+ delBtn: false,
+ refreshBtn: false,
+ columnBtn: false,
+ menu: false,
+ selection: true,
+ column: [
{
- label:'缂栫爜',
- prop:'id',
- align:'center'
+ label: '缂栫爜',
+ prop: 'id',
+ align: 'center'
},
{
- label:'鍚嶇О',
- prop:'name',
- align:'center'
+ label: '鍚嶇О',
+ prop: 'name',
+ align: 'center'
},
{
- label:'婧愬��',
- prop:'sourceValue',
- align:'center'
+ label: '婧愬��',
+ prop: 'sourceValue',
+ align: 'center'
},
{
- label:'鍚屼箟璇�',
- prop:'synonymValue',
- align:'center'
+ label: '鍚屼箟璇�',
+ prop: 'synonymValue',
+ align: 'center'
},
{
- label:'鍚仠鐘舵��',
- prop:'lcStatus',
- align:'center',
+ label: '鍚仠鐘舵��',
+ prop: 'lcStatus',
+ align: 'center',
slot: true
},
]
},
- synonymData:[],
+ synonymData: [],
//杩戜箟璇嶆煡璇㈣鍒�
- synonymVisible:false,
+ synonymVisible: false,
//琛ㄦ牸楂樺害
dynamicHeight: '',
// 淇濆瓨鍗曞厓鏍肩姸鎬�
@@ -1345,8 +1353,8 @@
edit: "switch"
},
{
- label:'杩戜箟璇嶆煡璇㈣鍒�',
- prop:'sysonymRuleOids',
+ label: '杩戜箟璇嶆煡璇㈣鍒�',
+ prop: 'sysonymRuleOidsText',
cell: false,
edit: 'refer'
},
@@ -1674,22 +1682,27 @@
},
methods: {
//杩戜箟璇嶆煡璇㈣鍒欏彇娑�
- sysnonymCancel(){
+ sysnonymCancel() {
this.synonymVisible = false;
},
//杩戜箟璇嶆煡璇㈣鍒欑‘瀹�
- sysnonymSubmit(){
- if(this.sysSelectData.length <= 0){
+ sysnonymSubmit() {
+ if (this.sysSelectData.length <= 0) {
this.$message.warning('璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹紒')
- }else {
+ } else {
const newArray = this.sysSelectData.map(obj => obj.oid);
const newString = newArray.join(',');
+ const newArrayName = this.sysSelectData.map(obj => obj.name);
+ const newStringName = newArrayName.join(',')
this.$set(this.CurrentCell, 'sysonymRuleOids', newString)
+ //text
+ this.$set(this.CurrentCell, 'sysonymRuleOidsText', newStringName)
this.AddCellFlag = true;
this.synonymVisible = false;
}
},
- sysChange(row){
+ sysChange(row) {
+ console.log(row)
this.sysSelectData = row;
},
//鏂板鎼滅储
@@ -2022,12 +2035,12 @@
this.attrModel = this.CurrentCell.attributeGroup
}
},
- sysonymRuleOids: () =>{
+ sysonymRuleOidsText: () => {
this.sysonymLoading = true
- codeSynonym('1','-1','Released').then(res=>{
+ codeSynonym('1', '-1', 'Released').then(res => {
this.synonymData = res.data.data.records;
this.sysonymLoading = false;
- }).catch(()=>{
+ }).catch(() => {
this.$message.error('璇锋鏌ユ帶鍒跺彴閿欒淇℃伅锛�')
})
this.synonymVisible = true;
diff --git a/Source/UBCS-WEB/src/views/MasterData/items.vue b/Source/UBCS-WEB/src/views/MasterData/items.vue
index fc9d781..f969265 100644
--- a/Source/UBCS-WEB/src/views/MasterData/items.vue
+++ b/Source/UBCS-WEB/src/views/MasterData/items.vue
@@ -10,14 +10,14 @@
@Treedata="TreedataList"
@codeClassifyOid="codeClassifyOidList"
@coderuleoid="coderuleoidList"
+ @loading="loadingHandler"
+ @nodeClickList="nodeClickLists"
@nodeClickTemplateOids="nodeClickTem"
@tableDataArray="tableDataArrays"
@tableHeadBttoms="tableHeadBttoms"
@tableHeadDataFateher="tableHeadDatas"
@tableHeadFindData="tableHeadFindDatas"
- @nodeClickList="nodeClickLists"
@total="totals"
- @loading="loadingHandler"
>
</master-tree>
</basic-container>
@@ -25,11 +25,13 @@
<el-main>
<!-- 琛ㄦ牸缁勪欢-->
<VciMasterCrud
+ ref="vciMasterCrud"
:TreeValue="TreeValue"
:Treedata="Treedata"
:codeClassifyOid="this.codeClassifyOid"
:coderuleoid="this.coderuleoid"
:isLoading="isLoading"
+ :nodeClickList="this.nodeClickList"
:page="this.page"
:tableDataArray="tableDataArray"
:tableHeadBtnData="masterVrBtnList"
@@ -37,10 +39,8 @@
:tableHeadFindData="tableHeadFindData"
:templateOid="templateOid"
:total="this.total"
- :nodeClickList="this.nodeClickList"
@currentPage="currentPages"
@pageSize="pageSizes"
- ref="vciMasterCrud"
>
</VciMasterCrud>
</el-main>
@@ -72,14 +72,14 @@
isLoading: false,
tableHeadFindData: {},
TreeValue: '',
- nodeClickList:[]
+ nodeClickList: []
}
},
created() {
},
methods: {
- nodeClickLists(val){
- this.nodeClickList=val;
+ nodeClickLists(val) {
+ this.nodeClickList = val;
// 鐐瑰嚮鏍戣妭鐐规椂閲嶇疆褰撳墠椤靛拰椤垫暟
this.page.pageSize = 100;
this.page.currentPage = 1;
diff --git a/Source/UBCS-WEB/src/views/wel/index.vue b/Source/UBCS-WEB/src/views/wel/index.vue
index cd5bbbe..f2fc16b 100644
--- a/Source/UBCS-WEB/src/views/wel/index.vue
+++ b/Source/UBCS-WEB/src/views/wel/index.vue
@@ -39,6 +39,7 @@
<!-- </el-collapse>-->
<!-- </basic-container>-->
<!-- </el-row>-->
+ <!-- -->
<!-- </el-col>-->
</el-row>
--
Gitblit v1.9.3