From e9f139bd71644a2cffdfbff44c12915a5780e56a Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期三, 05 七月 2023 19:35:28 +0800
Subject: [PATCH] 主题库定义bug
---
Source/UBCS-WEB/src/components/Tree/attrCrud.vue | 91 +++++++++++++++++++--------------------------
1 files changed, 38 insertions(+), 53 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Tree/attrCrud.vue b/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
index 069888e..57cc374 100644
--- a/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
+++ b/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
@@ -237,7 +237,6 @@
@select="selectHandle"
@selection-change="selectionChange"
v-if="this.crudArrayFlag"
- ref="referAttrCrud"
>
<el-table-column
type="selection"
@@ -248,17 +247,18 @@
:label="item.label"
:prop="item.prop"
:formatter="formAttr"
- :width="item.width||(item.label.length >=4 ?'150':item.label.length==3 ?'120':'90')"
+ :width="item.width||(item.label.length >=4 ?'160':item.label.length==3 ?'130':'100')"
:show-overflow-tooltip="true"
+ :sortable="item.sortable"
align="center"
>
<template slot-scope="{ row }">
- <el-input v-if="editingRows === row && editShows== item.prop && (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 == 'select' ||item.edit == 'refer' )" v-model="row[item.prop]"
@blur="saveRows"></el-input>
- <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-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-switch
- v-if="item.edit === 'switch'" v-model="row[item.prop]" active-value="true"
+ v-if="item.edit === 'switch'" v-model="row[item.sortableprop]" active-value="true"
inactive-value="false">
</el-switch>
<span v-else>{{ row[item.prop] }}</span>
@@ -267,7 +267,7 @@
<el-table-column
fixed="right"
label="鎿嶄綔"
- width="70">
+ width="120">
<template slot-scope="scope">
<el-button
size="small"
@@ -440,6 +440,8 @@
isShowformulaEdit: false,
// 绾ц仈鍗曢��
selectRow: '',
+ //绾ц仈鍗曢�夋暟缁�
+ selectRowArr:[],
// 绾ц仈data
CascadeData: [],
// 绾ц仈option
@@ -994,7 +996,7 @@
label: '鎺掑簭鍙�',
sortable: true,
edit: 'number',
- width: 100,
+ width: 90,
fixed: true
}, {
label: "灞炴�ц嫳鏂囩紪鍙�",
@@ -1010,7 +1012,7 @@
prop: "name",
fixed: true,
cell: false,
- width: 125,
+ width: 145,
edit: 'text',
sortable: true
},
@@ -1140,7 +1142,7 @@
label: "鏃堕棿鏍煎紡",
prop: "codeDateFormat",
sortable: true,
- width: 105,
+ width: 135,
edit: 'select',
cell: false,
},
@@ -1255,7 +1257,9 @@
VTInteger: "鏁村舰",
VTFilePath: "鏂囦欢",
VTString: "瀛楃涓�"
- }
+ },
+ //鏃堕棿鏍煎紡涓嬫媺妗�
+ codeDataFlag:false,
}
},
computed:{
@@ -1285,7 +1289,6 @@
},
//灞炴�у垎缁勬寜閽�
attrVisibleHandle() {
-
if (this.attrSelectList.length > 1) {
this.$message.warning('鍙兘閫夋嫨涓�鏉℃ā鏉垮睘鎬�')
} else if (this.attrSelectList < 1) {
@@ -1382,18 +1385,32 @@
'conditionMap[classifyTemplateOid]': this.Formlist[0].oid,
'conditionMap[oid_notequal]': this.attrOid
}).then(res => {
+ console.log(res)
this.CascadeData = res.data.data;
})
}
},
- // 鎺掑簭棰勮鎸夐挳
- orderHandle(){
- this.$refs.referAttrCrud.sort("orderNum");
+ //绾ц仈淇濆瓨
+ CascadeAddHandle() {
+ let CascadeString = "";
+ CascadeString = this.selectRowArr.id + (this.selectRowArr.name);
+ this.$set(this.attrRow, 'parentCode', CascadeString)
+ this.CascadeVisible = false;
+ },
+ //绾ц仈灞炴�ф竻闄�
+ casRemove() {
+ this.selectRow = ""
+ },
+ // 绾ц仈灞炴�ц鍗曢��
+ CascaderowClick(row) {
+ this.selectRow = row.$index;
+ this.selectRowArr=row
},
//琛ㄦ牸鍗曢��
selectHandle(selection, row) {
this.attrOid = row.oid;
this.attrRow = row;
+ console.log(row)
},
//琛ㄦ牸閫夋嫨
selectionChange(list) {
@@ -1405,26 +1422,16 @@
this.$message.success('淇濆瓨鎴愬姛')
})
},
- //绾ц仈淇濆瓨
- CascadeAddHandle() {
- let CascadeString = "";
- CascadeString = this.attrRow.id + (this.attrRow.name);
- this.$set(this.attrRow, 'parentCode', CascadeString)
- this.CascadeVisible = false;
- },
- //绾ц仈灞炴�ф竻闄�
- casRemove() {
- this.selectRow = ""
- },
- // 绾ц仈灞炴�ц鍗曢��
- CascaderowClick(row) {
- this.selectRow = row.$index
- },
+
//琛ㄦ牸琛岀紪杈�
handleCellClicks(row, column) {
this.editingRows = row;
this.editShows = column.property;
this.rowOid = row.oid;
+ console.log(row,column)
+ if(column.property == 'codeDateFormat' ){
+
+ }
},
saveRows() {
this.editingRows = null;
@@ -1518,35 +1525,13 @@
this.injectVisible = false
},
//灞炴�фā鏉胯〃鏍煎崟鍏冩牸鐐瑰嚮浜嬩欢
- handleRowClick(row, column, cell, event) {
- //鍒ゆ柇鐐瑰嚮涓嶆槸鎿嶄綔鏍忔墠鍙墽琛�
- if (column.property != "menu") {
- // 褰撳墠琛屽彉涓哄彲缂栬緫鐘舵��
- this.rowList = row
- row.$cellEdit = true
- // 姣忎竴涓崟鍏冩牸鍔犱笂cell涓簍rue鎵嶆槸缂栬緫鐘舵��
- //鎷垮埌姣忎釜columnKey锛岀偣鍑绘椂璁剧疆涓簍rue锛屽氨瀹炵幇鍗曞厓鏍肩紪杈戠姸鎬佷簡
- this.rowCellList = this.findObject(this.option.column, column.columnKey)
- this.rowCellList.cell = true
- if (this.List.indexOf(column.columnKey) == -1) {
- this.List.push(column.columnKey)
- }
- // if(this.List.length >= 2){
- // const cellName=this.List[0]
- //
- // }
- }
- },
//琛ㄦ牸鎿嶄綔鏍忓垹闄�
CrudRowDel(row) {
this.ProData.splice(row.$index, 1)
},
//琛ㄦ牸鍒犻櫎
CrudRemove() {
- this.attrSelectList.forEach((item)=>{
- this.ProData.splice(item.$index, 1)
- })
-
+ this.ProData.splice(this.attrRow.$index, 1)
},
//琛ㄦ牸閲嶇疆
reset() {
--
Gitblit v1.9.3