From a598f579e21d4dcc30b5d8fa1737f24f4dd90012 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 27 七月 2023 17:38:16 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS-WEB/src/components/Tree/attrCrud.vue | 180 +++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 124 insertions(+), 56 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Tree/attrCrud.vue b/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
index 24b66f7..1dd85a5 100644
--- a/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
+++ b/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
@@ -1,7 +1,7 @@
<template>
<div>
- <div style="display: flex;flex-wrap: wrap;" v-if="this.crudArrayFlag"class="app">
-
+ <div style="display: flex;flex-wrap: wrap;" v-if="this.crudArrayFlag" class="app">
+ <el-button-group>
<!--鏂板-->
<el-button v-if="attrEditVisible == false && attrFlagChiledren==false && (!checkStatus || crudLCStatus=='Editing')" size="small" type="primary" icon="el-icon-plus" @click="busineHandle">娣诲姞 {{ msg }}</el-button>
<!-- 鍏ㄥ睆缂栬緫-->
@@ -10,31 +10,38 @@
<el-button v-if="!checkStatus || crudLCStatus=='Editing'" icon="el-icon-info" size="small" @click="ruleAddHandler">楠岃瘉瑙勫垯</el-button>
<!-- 灞炴�у垎缁�-->
<el-button v-if="!checkStatus || crudLCStatus=='Editing'" icon="el-icon-menu" size="small" @click="attrVisibleHandle">灞炴�у垎缁�</el-button>
-
-
+ </el-button-group>
+ <el-button-group>
+ <!--鏂板-->
<!-- 鍒嗙被娉ㄥ叆-->
<el-button v-if="!checkStatus || crudLCStatus=='Editing'" icon="el-icon-magic-stick" size="small" @click="injectBtn">鍒嗙被娉ㄥ叆</el-button>
<!-- 缁勫悎瑙勫垯-->
- <el-button v-if="!checkStatus || crudLCStatus=='Editing'" size="small" @click="isShowHandler">缁勫悎瑙勫垯</el-button>
+ <el-button v-if="!checkStatus || crudLCStatus=='Editing'" icon="el-icon-film" size="small" @click="isShowHandler">缁勫悎瑙勫垯</el-button>
<!-- 鏋氫妇娉ㄥ叆-->
- <el-button v-if="!checkStatus || crudLCStatus=='Editing'" size="small" @click="enmuVisHandle">鏋氫妇娉ㄥ叆</el-button>
+ <el-button v-if="!checkStatus || crudLCStatus=='Editing'" icon="el-icon-c-scale-to-original" size="small" @click="enmuVisHandle">鏋氫妇娉ㄥ叆</el-button>
<!-- 绾ц仈灞炴��-->
- <el-button v-if="!checkStatus|| crudLCStatus=='Editing'" size="small" @click="CascadeHandle">绾ц仈灞炴��</el-button>
+ <el-button v-if="!checkStatus|| crudLCStatus=='Editing'" icon="el-icon-coin" size="small" @click="CascadeHandle">绾ц仈灞炴��</el-button>
+ </el-button-group>
+ <el-button-group>
<!-- 棰勮鎺掑簭-->
<el-button size="small" @click="orderHandle" icon="el-icon-arrow-down">棰勮鎺掑簭</el-button>
-
-
+ <!--鏂板-->
<!-- 淇濆瓨-->
<el-button v-if="!checkStatus|| crudLCStatus=='Editing'" size="small" @click="addsHandler" icon="el-icon-check">淇濆瓨</el-button>
<!-- 鍒犻櫎-->
<el-button v-if="!checkStatus || crudLCStatus=='Editing'" size="small" @click="CrudRemove" icon="el-icon-delete">鍒犻櫎</el-button>
<!-- 閲嶇疆-->
<el-button size="small" @click="reset" icon="el-icon-refresh-right">閲嶇疆</el-button>
+ </el-button-group>
+ <el-button-group>
<!-- 鍚屾鍒板叾浠栨ā鏉�-->
<el-button size="small"@click="syncHandle" icon="el-icon-share">鍚屾鍒板叾浠栨ā鏉�</el-button>
+ </el-button-group>
+ <el-button-group>
<!-- 缂栫爜鐢宠棰勮-->
- <el-button size="small" @click="applicationHandle" style="">缂栫爜鐢宠棰勮</el-button>
+ <el-button size="small" icon="el-icon-view" @click="applicationHandle" style="">缂栫爜鐢宠棰勮</el-button>
+ </el-button-group>
<!-- 楠岃瘉瑙勫垯-->
</div>
<!-- 寮圭獥-->
@@ -115,23 +122,23 @@
<div style="padding-top: 15px;padding-left: 35px">
<el-form ref="injectForm" label-width="80px">
<el-form-item label="娉ㄥ叆绫诲瀷">
- <el-radio-group v-model="injectOption.type">
- <el-radio label="鍒嗙被鍚嶇О"></el-radio>
- <el-radio label="鍒嗙被浠ｅ彿"></el-radio>
+ <el-radio-group v-model="injectOption.classifyInvokeAttr">
+ <el-radio label="name">鍒嗙被鍚嶇О</el-radio>
+ <el-radio label="id">鍒嗙被浠ｅ彿</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="灞傜骇璁剧疆">
- <el-radio-group v-model="injectOption.set">
- <el-radio label="鏈�灏忓眰"></el-radio>
- <el-radio label="鎸囧畾灞�"></el-radio>
- <el-input-number v-if="this.injectOption.set == '鎸囧畾灞�'" v-model="injectOption.injectNum" :max="10" :min="0"
+ <el-radio-group v-model="injectOption.classifyInvokeLevel">
+ <el-radio label="min">鏈�灏忓眰</el-radio>
+ <el-radio label="max">鎸囧畾灞�</el-radio>
+ <el-input-number v-if="this.injectOption.classifyInvokeLevel == 'max'" v-model="injectOption.classifyNumber" :max="10" :min="0"
controls-position="right"></el-input-number>
</el-radio-group>
</el-form-item>
<el-form-item label="鍙慨鏀�">
- <el-radio-group v-model="injectOption.change">
- <el-radio label="鏄�"></el-radio>
- <el-radio label="鍚�"></el-radio>
+ <el-radio-group v-model="injectOption.classifyInvokeEditFlag">
+ <el-radio label="true">鏄�</el-radio>
+ <el-radio label="false">鍚�</el-radio>
</el-radio-group>
</el-form-item>
</el-form>
@@ -246,6 +253,7 @@
@selection-change="selectionChange"
v-if="this.crudArrayFlag"
ref="referAttrCrud"
+ v-loading="loading"
>
<el-table-column
type="selection"
@@ -354,10 +362,48 @@
},
deep:true,
immediate:true
- }
+ },
+ 'injectOption.classifyInvokeAttr': function(newVal) {
+ console.log('newVal',newVal)
+ if (newVal === "name") {
+ this.injectOption.classifyInvokeAttrName='鍒嗙被鍚嶇О'
+ } else if (newVal === "id") {
+ this.injectOption.classifyInvokeAttrName='鍒嗙被浠ｅ彿'
+ }
+ return '';
+ },
+ // ProData: {
+ // handler(newVal, oldVal) {
+ // if(this.initializing){
+ // this.ProData = newVal.map((item) => {
+ // if (item.classifyInvokeAttr !=='') { // 妫�鏌lassifyInvokeText灞炴�ф槸鍚﹀瓨鍦�
+ // item = {
+ // ...item,
+ // classifyInvokeText: {
+ // classifyInvokeText: {
+ // "娉ㄥ叆绫诲瀷": item.classifyInvokeAttr,
+ // "娉ㄥ叆绫诲瀷鍚嶇О": item.classifyInvokeAttrName,
+ // "灞傜骇璁剧疆": item.classifyInvokeLevel,
+ // "鏄惁鍙慨鏀�": item.classifyInvokeEditFlag
+ // }
+ // }
+ // }
+ // }
+ // return item;
+ // });
+ // }
+ // this.initializing = false;
+ // console.log('ProData',this.ProData)
+ // console.log('newVal',newVal)
+ // },
+ // deep: true,
+ // immediate:true
+ // },
},
data() {
return {
+ initializing:false,
+ loading:false,
referConfigText:"",
referConfigVisble:false,
referConfigOption:{
@@ -787,11 +833,12 @@
addvisible: false,
//鍒嗙被娉ㄥ叆option
injectOption: {
- type: "鍒嗙被鍚嶇О",
- set: "鏈�灏忓眰",
- change: "鏄�",
+ classifyInvokeAttrName:'鍒嗙被鍚嶇О',
+ classifyInvokeAttr: "name",
+ classifyInvokeEditFlag: "true",
+ classifyInvokeLevel:'min',
//鍒嗙被娉ㄥ叆璁℃暟鍣�
- injectNum: 0,
+ classifyNumber:0,
},
// 灞炴�ч獙璇佽緭鍏ユ
RulesForm: {
@@ -1220,15 +1267,9 @@
},
{
label: "鍒嗙被娉ㄥ叆",
- prop: "classifyInvokeLevelName",
+ prop: "classifyInvokeText",
cell: false,
edit: 'refer'
- },
- {
- label: "鍒嗙被娉ㄥ叆",
- prop: "classifyInvokeLevel",
- cell: false,
- edit: 'referName',
},
{
label: "鏋氫妇娉ㄥ叆",
@@ -1357,7 +1398,7 @@
oids.push(ele.oid);
});
return oids.join(",");
- }
+ },
},
mounted() {
},
@@ -1435,7 +1476,12 @@
CrudRend() {
if (this.crudOid != '') {
gridCodeClassifyTemplateAttr({'conditionMap[classifyTemplateOid]': this.crudOid}).then(res => {
- this.ProData = res.data.data;
+ this.loading=true
+ setTimeout(() => {
+ this.ProData = res.data.data;
+ this.loading=false
+ }, 1000);
+
}).catch(res => {
this.$message.error(res)
})
@@ -1579,7 +1625,7 @@
}
console.log('--',this.referConfigOption)
// this.$refs.referConfigFormDialog.onloadAttrData();
- }else if(column.property == 'classifyInvokeLevelName'){
+ }else if(column.property == 'classifyInvokeText'){
this.injectVisible=true;
}else if(column.property == 'componentRule'){
if(this.CurrentCell){
@@ -1730,35 +1776,58 @@
} else if (this.attrSelectList.length < 1) {
this.$message.warning('璇烽�夋嫨涓�鏉℃ā鏉挎暟鎹�')
} else if (this.attrSelectList.length === 1) {
+ console.log(this.injectOption)
this.injectVisible = true;
-
}
},
//鍒嗙被娉ㄥ叆淇濆瓨
injectAddHandle() {
+ // 瀹氫箟灞曠ず绫诲瀷
let data = {
- "娉ㄥ叆绫诲瀷": this.injectOption.type,
- "娉ㄥ叆绫诲瀷鍚嶇О": this.injectOption.set,
- "灞傜骇璁剧疆": this.injectOption.injectNum,
- "鏄惁鍙慨鏀�": this.injectOption.change
+ "娉ㄥ叆绫诲瀷": this.injectOption.classifyInvokeAttr,
+ "娉ㄥ叆绫诲瀷鍚嶇О": this.injectOption.classifyInvokeAttrName,
+ "灞傜骇璁剧疆": this.injectOption.classifyInvokeLevel=='max'?this.injectOption.classifyNumber :'min',
+ "鏄惁鍙慨鏀�": this.injectOption.classifyInvokeEditFlag
}
+ //鍗曞厓鏍肩紪杈戣祴鍊间竴閬�
if(this.CurrentCell){
- this.$set(this.CurrentCell, "classifyInvokeLevelName", data);
- this.$set(this.CurrentCell, "classifyInvokeLevel", JSON.stringify(this.injectOption));
+ //濡傛灉鏄寚瀹氬眰璧嬪�间负鏁板瓧
+ if(this.CurrentCell.classifyInvokeLevel!== 'min'){
+ this.CurrentCell.classifyInvokeLevel=this.injectOption.classifyNumber
+ }
+ //鍏朵綑姝ｅ父璧嬪��
+ this.CurrentCell.classifyInvokeAttr=this.injectOption.classifyInvokeAttr,
+ this.CurrentCell.classifyInvokeAttrName=this.injectOption.classifyInvokeAttrName,
+ this.CurrentCell.classifyInvokeEditFlag=this.injectOption.classifyInvokeEditFlag,
+ this.$set(this.CurrentCell, "classifyInvokeText", data);
this.injectHandleReset()
}else {
- this.$set(this.attrSelectList[0], 'classifyInvokeLevelName', data);
- this.$set(this.attrSelectList[0], 'classifyInvokeLevel', JSON.stringify(this.injectOption));
+ //鍕鹃�夋搷浣�
+ for (const key in this.injectOption) {
+ this.attrSelectList[0][key] = this.injectOption[key];
+ //濡傛灉鏄寚瀹氬眰璧嬪�间负鏁板瓧
+ if(this.injectOption.classifyInvokeLevel !== 'min'){
+ this.attrSelectList[0].classifyInvokeLevel=this.injectOption.classifyNumber
+ }
+ this.$set(this.attrSelectList[0],'classifyInvokeText',data)
+ }
this.injectHandleReset()
}
- this.injectVisible = false
+ if(this.injectOption.classifyInvokeLevel !== 'min'){
+ this.injectOption.classifyInvokeLevel=this.injectOption.classifyNumber;
+ }else {
+ this.injectOption.classifyNumber=0;
+ }
+ this.injectVisible = false;
+
},
//鍒嗙被娉ㄥ叆娓呯┖
injectHandleReset() {
- this.injectOption.type = "鍒嗙被鍚嶇О";
- this.injectOption.set = "鏈�灏忓眰";
- this.injectOption.change = "鏄�";
- this.injectOption.injectNum = "0";
+ this.injectOption.classifyInvokeAttrName = "鍒嗙被鍚嶇О";
+ this.injectOption.classifyInvokeAttr = "name";
+ this.injectOption.classifyInvokeLevel = "min";
+ this.injectOption.classifyInvokeEditFlag = "true";
+ this.injectOption.classifyNumber = "0";
},
// 鍒嗙被娉ㄥ叆鍙栨秷
injectRemove() {
@@ -1778,12 +1847,7 @@
},
//琛ㄦ牸閲嶇疆
reset() {
- // this.CrudRend(
- this.referConfigVisble=true;
- this.referConfigOption = {
- referConfig: 'confing',
- }
- console.log(this.referConfigOption)
+ this.CrudRend()
},
//鍚屾鍒板叾浠栨ā鏉�
syncHandle() {
@@ -1865,7 +1929,11 @@
<style scoped lang="scss" >
.app {
/deep/ .el-button {
- margin: 0 10px 10px 0;
+ //margin: 0 10px 10px 0;
}
}
+.el-button-group {
+ margin-right: 10px;
+ margin-bottom: 10px;
+}
</style>
--
Gitblit v1.9.3