From 8ac27687ea17f9fd86d5e567ac906ad203466ea3 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期四, 06 七月 2023 14:40:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Tree/attrCrud.vue | 94 +++++++++++++++++++++++++++++------------------
1 files changed, 58 insertions(+), 36 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Tree/attrCrud.vue b/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
index 257dd8b..5c286cb 100644
--- a/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
+++ b/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
@@ -1,6 +1,7 @@
<template>
<div>
<div style="display: flex;flex-wrap: wrap;" v-if="this.crudArrayFlag">
+ <el-button-group>
<!--鏂板-->
<el-button v-if="attrEditVisible == false && attrFlagChiledren==false" size="small" type="primary" icon="el-icon-plus" @click="busineHandle">娣诲姞 {{ msg }}</el-button>
<!-- 鍏ㄥ睆缂栬緫-->
@@ -9,16 +10,8 @@
<el-button icon="el-icon-info" size="small" @click="rulesVisible=true">楠岃瘉瑙勫垯</el-button>
<!-- 灞炴�у垎缁�-->
<el-button icon="el-icon-menu" size="small" @click="attrVisibleHandle">灞炴�у垎缁�</el-button>
- <!-- 鍒嗙被娉ㄥ叆-->
- <el-button icon="el-icon-magic-stick" size="small" @click="injectBtn">鍒嗙被娉ㄥ叆</el-button>
- <!-- 缁勫悎瑙勫垯-->
- <el-button size="small" @click="isShowHandler">缁勫悎瑙勫垯</el-button>
- <!-- 鏋氫妇娉ㄥ叆-->
- <el-button size="small" @click="enmuVisHandle">鏋氫妇娉ㄥ叆</el-button>
- <!-- 绾ц仈灞炴��-->
- <el-button size="small" @click="CascadeHandle">绾ц仈灞炴��</el-button>
- <!-- 棰勮鎺掑簭-->
- <el-button size="small" icon="el-icon-arrow-down">棰勮鎺掑簭</el-button>
+ </el-button-group>
+ <el-button-group>
<!-- 鍒嗙被娉ㄥ叆-->
<el-button icon="el-icon-magic-stick" size="small" @click="injectBtn">鍒嗙被娉ㄥ叆</el-button>
<!-- 缁勫悎瑙勫垯-->
@@ -28,7 +21,9 @@
<!-- 绾ц仈灞炴��-->
<el-button size="small" @click="CascadeHandle">绾ц仈灞炴��</el-button>
<!-- 棰勮鎺掑簭-->
- <el-button size="small" @click="orderHandle" icon="el-icon-arrow-down">棰勮鎺掑簭</el-button>
+ <el-button size="small" @click="orderHandle" icon="el-icon-arrow-down">棰勮鎺掑簭</el-button>
+ </el-button-group>
+ <el-button-group>
<!-- 淇濆瓨-->
<el-button size="small" @click="addsHandler" icon="el-icon-check">淇濆瓨</el-button>
<!-- 鍒犻櫎-->
@@ -36,7 +31,8 @@
<!-- 閲嶇疆-->
<el-button size="small" @click="reset" icon="el-icon-refresh-right">閲嶇疆</el-button>
<!-- 鍚屾鍒板叾浠栨ā鏉�-->
- <el-button size="small" @click="syncHandle">鍚屾鍒板叾浠栨ā鏉�</el-button>
+ <el-button size="small"@click="syncHandle" icon="el-icon-share">鍚屾鍒板叾浠栨ā鏉�</el-button>
+ </el-button-group>
<!-- 缂栫爜鐢宠棰勮-->
<el-button size="small" @click="applicationHandle" style="">缂栫爜鐢宠棰勮</el-button>
<!-- 楠岃瘉瑙勫垯-->
@@ -241,42 +237,47 @@
@select="selectHandle"
@selection-change="selectionChange"
v-if="this.crudArrayFlag"
+ ref="referAttrCrud"
>
<el-table-column
type="selection"
- width="55">
+ width="55" fixed>
</el-table-column>
<!--<el-table-column fixed label="搴忓彿" type="index" width="55"></el-table-column>-->
- <el-table-column v-for="item in this.option.column" :key="item.id"
+ <el-table-column v-for="(item,index) in this.option.column" :key="item.id"
:label="item.label"
:prop="item.prop"
:formatter="formAttr"
:width="item.width||(item.label.length >=4 ?'160':item.label.length==3 ?'130':'100')"
:show-overflow-tooltip="true"
:sortable="item.sortable"
+ :fixed="item.fixed"
align="center"
>
<template slot-scope="{ row }">
- <el-input v-if="editingRows === row && editShows== item.prop && item.prop != 'codeDateFormat' && (item.edit == 'text' || item.edit == 'select' ||item.edit == 'refer' )" v-model="row[item.prop]"
+ <el-input v-if="editingRows === row && editShows== item.prop && item.prop != 'codeDateFormat' && (item.edit == 'text' ||item.edit == 'refer' )" v-model="row[item.prop]"
@blur="saveRows"></el-input>
- <el-input-number controls-position="right" v-if="editingRows === row && editShows== item.prop && item.edit == 'number'" v-model="row[item.prop]"
- @blur="saveRows"></el-input-number>
- <el-select v-model="row[item.prop]" slot="prepend" v-if="editingRows === row && editShows== item.prop && item.prop == 'codeDateFormat' && row[item.prop] ==''" @focus="DataChangeHandler">
- <el-option label="椁愬巺鍚�" value="1"></el-option>
- <el-option label="璁㈠崟鍙�" value="2"></el-option>
- <el-option label="鐢ㄦ埛鐢佃瘽" value="3"></el-option>
+ <el-input-number size="small" controls-position="right" v-if="editingRows === row && editShows== item.prop && item.edit == 'number'" v-model="row[item.prop]"
+ @blur="saveRows" :style="{width:(item.width-10)+'px'}"></el-input-number>
+ <el-select v-model="row[item.prop]" filterable allow-create default-first-option slot="prepend" v-if="editingRows === row && editShows== item.prop && item.edit == 'select' " @focus="DataChangeHandler(item.editConfig,index)">
+ <el-option
+ v-for="optionItem in item.data"
+ :key="optionItem.key"
+ :label="optionItem.value"
+ :value="optionItem.key">
+ </el-option>
</el-select>
<el-switch
v-if="item.edit === 'switch'" v-model="row[item.prop]" active-value="true"
inactive-value="false">
</el-switch>
- <span v-else >{{ row[item.prop] }}</span>
+ <span v-else>{{ row[item.prop] }}</span>
</template>
</el-table-column>
<el-table-column
fixed="right"
label="鎿嶄綔"
- width="120">
+ width="70">
<template slot-scope="scope">
<el-button
size="small"
@@ -1121,6 +1122,12 @@
prop: "prefixValue",
sortable: true,
edit: 'select',
+ editConfig: {
+ extraParams: {
+ code: 'codeclstempattr',
+ dictKey: 'prefix'
+ }
+ },
cell: false,
},
{
@@ -1128,6 +1135,12 @@
prop: "suffixValue",
sortable: true,
edit: 'select',
+ editConfig: {
+ extraParams: {
+ code: 'codeclstempattr',
+ dictKey: 'suffix'
+ }
+ },
cell: false,
},
{
@@ -1152,6 +1165,12 @@
sortable: true,
width: 135,
edit: 'select',
+ editConfig: {
+ extraParams: {
+ code: 'codeclstempattr',
+ dictKey: 'dateFormates'
+ }
+ },
cell: false,
},
{
@@ -1296,13 +1315,10 @@
console.log(row,column)
},
//鏃堕棿涓嬫媺鏍煎紡
- DataChangeHandler(){
- debugger
- listByFlag({comboxKey: 'codedateformat',
- id: 'codedateformat',
- namespace: 'codeclstempattr',
- flag: 'dateFormates'}).then(res=>{
- console.log(res)
+ DataChangeHandler(editConfig,index){
+ listByFlag(editConfig.extraParams).then(res=>{
+ console.log(res);
+ this.option.column[index].data=res;
})
},
//灞炴�у垎缁勬寜閽�
@@ -1365,11 +1381,11 @@
precisionLength: (citem.precisionLength ? citem.precisionLength : '') + (citem.scaleLength ? '(' + citem.scaleLength + ')' : ''),
classifyTemplateOid: this.crudOid,
classifytemplateoid: this.crudOid,
- formDisplayFlag: true,
- tableDisplayFlag: true,
- sortAttrFlag: false,
- queryAttrFlag: true,
- seniorQueryAttrFlag: true,
+ formDisplayFlag: 'true',
+ tableDisplayFlag: 'true',
+ sortAttrFlag: 'false',
+ queryAttrFlag: 'true',
+ seniorQueryAttrFlag: 'true',
attrTableWidth: 120
})
this.ProData.push(JSON.parse(JSON.stringify(this.busineAddList)))
@@ -1423,6 +1439,10 @@
CascaderowClick(row) {
this.selectRow = row.$index;
this.selectRowArr=row
+ },
+ // 鎺掑簭棰勮鎸夐挳
+ orderHandle(){
+ this.$refs.referAttrCrud.sort("orderNum");
},
//琛ㄦ牸鍗曢��
selectHandle(selection, row) {
@@ -1557,7 +1577,9 @@
},
//琛ㄦ牸鍒犻櫎
CrudRemove() {
- this.ProData.splice(this.attrRow.$index, 1)
+ this.attrSelectList.forEach((item)=>{
+ this.ProData.splice(item.$index, 1)
+ })
},
//琛ㄦ牸閲嶇疆
reset() {
--
Gitblit v1.9.3