From abe9f2de85ff402a4c989dbc1427807b4e3a59f4 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 06 七月 2023 13:56:17 +0800
Subject: [PATCH] 代码提交
---
Source/UBCS-WEB/src/components/Tree/attrCrud.vue | 189 +++++++++++++++++++++++++++++-----------------
1 files changed, 119 insertions(+), 70 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Tree/attrCrud.vue b/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
index c149993..257dd8b 100644
--- a/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
+++ b/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
@@ -2,35 +2,41 @@
<div>
<div style="display: flex;flex-wrap: wrap;" v-if="this.crudArrayFlag">
<!--鏂板-->
- <el-button v-if="attrEditVisible == false && attrFlagChiledren==false" size="small" type="primary"
- @click="busineHandle">锛� 娣诲姞 {{ msg }}
- </el-button>
+ <el-button v-if="attrEditVisible == false && attrFlagChiledren==false" size="small" type="primary" icon="el-icon-plus" @click="busineHandle">娣诲姞 {{ msg }}</el-button>
<!-- 鍏ㄥ睆缂栬緫-->
- <el-button v-if=" attrEditVisible == false && attrFlagChiledren==false" size="small" @click="fullscreenHandle">
- 鍏ㄥ睆缂栬緫
- </el-button>
- <!-- 缁勫悎瑙勫垯-->
- <el-button size="small" @click="isShowHandler">缁勫悎瑙勫垯</el-button>
+ <el-button v-if=" attrEditVisible == false && attrFlagChiledren==false" size="small" @click="fullscreenHandle" icon="el-icon-full-screen">鍏ㄥ睆缂栬緫</el-button>
<!-- 楠岃瘉瑙勫垯-->
<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 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">棰勮鎺掑簭</el-button>
+ <el-button size="small" @click="orderHandle" icon="el-icon-arrow-down">棰勮鎺掑簭</el-button>
<!-- 淇濆瓨-->
- <el-button size="small" @click="addsHandler">淇濆瓨</el-button>
+ <el-button size="small" @click="addsHandler" icon="el-icon-check">淇濆瓨</el-button>
<!-- 鍒犻櫎-->
- <el-button size="small" @click="CrudRemove">鍒犻櫎</el-button>
+ <el-button size="small" @click="CrudRemove" icon="el-icon-delete">鍒犻櫎</el-button>
<!-- 閲嶇疆-->
- <el-button size="small" @click="reset">閲嶇疆</el-button>
+ <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">鍚屾鍒板叾浠栨ā鏉�</el-button>
<!-- 缂栫爜鐢宠棰勮-->
<el-button size="small" @click="applicationHandle" style="">缂栫爜鐢宠棰勮</el-button>
<!-- 楠岃瘉瑙勫垯-->
@@ -92,7 +98,7 @@
</el-table-column>
<el-table-column fixed="right" label="鎿嶄綔" width="120">
<template slot-scope="scope">
- <el-button size="small" type="text" @click.native.prevent="enumDeleteRow(scope.$index, tableData)">
+ <el-button size="small" type="text" plain @click="enumDeleteRow">
绉婚櫎
</el-button>
</template>
@@ -224,12 +230,13 @@
</avue-crud>
<div style="display: flex;justify-content: flex-end;margin-top: 15px">
<el-button size="small" type="primary" @click="busineAddHandle">淇濆瓨</el-button>
- <el-button size="small" type="primary">鍙栨秷</el-button>
+ <el-button size="small" type="primary" @click="addVisible=false">鍙栨秷</el-button>
</div>
</el-dialog>
</div>
<el-table :data="ProData"
style="width: 100%"
+ height="280"
@cell-click="handleCellClicks"
@select="selectHandle"
@selection-change="selectionChange"
@@ -244,20 +251,26 @@
:label="item.label"
:prop="item.prop"
:formatter="formAttr"
- :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 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-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
@@ -275,11 +288,10 @@
</el-table-column>
</el-table>
</div>
- <!-- </avue-crud>-->
</template>
<script>
-import {AttrByBtm, gridCodeClassifyTemplateAttr, batchAddSave, copyto} from '@/api/template/templateAttr'
+import {AttrByBtm, gridCodeClassifyTemplateAttr, batchAddSave, copyto,listByFlag} from '@/api/template/templateAttr'
export default {
name: "attrCrud .vue",
@@ -436,6 +448,8 @@
isShowformulaEdit: false,
// 绾ц仈鍗曢��
selectRow: '',
+ //绾ц仈鍗曢�夋暟缁�
+ selectRowArr:[],
// 绾ц仈data
CascadeData: [],
// 绾ц仈option
@@ -902,11 +916,27 @@
},
{
label: "鏁版嵁绫诲瀷",
- prop: "attrDataType"
+ prop: "attrDataType",
+ formatter:function(row,column){
+ let vciFieldTypeMap = {
+ VTBoolean: "甯冨皵鍨�",
+ VTClob: "闀挎枃鏈�",
+ VTDate: "鏃ユ湡",
+ VTDateTime: "鏃ユ湡鏃堕棿",
+ VTTime: "鏃堕棿",
+ VTLong: "闀挎暣鍨�",
+ VTDouble: "閲戦/鍙岀簿搴�",
+ VTInteger: "鏁村舰",
+ VTFilePath: "鏂囦欢",
+ VTString: "瀛楃涓�"
+ }
+ return vciFieldTypeMap[row.attrDataType];
+ }
},
{
label: "鍙┖",
- prop: "nullableFlag"
+ prop: "nullableFlag",
+ formatter:function(row,column){return row.nullableFlag=='true' || row.nullableFlag=='1'?'鏄�':'鍚�'}
},
{
label: "榛樿鍊�",
@@ -926,11 +956,25 @@
},
{
label: "鍙傜収",
- prop: "referFlag"
+ prop: "referFlag",
+ formatter: function (d) {
+ if (!d.referFlag) {
+ return '';
+ } else {
+ return d.referBtmTypeId
+ }
+ }
},
{
label: "鏋氫妇",
- prop: "enumFlag"
+ prop: "enumFlag",
+ formatter: function (d) {
+ if (!d.enumFlag) {
+ return '';
+ } else {
+ return d.enumId
+ }
+ }
},
]
},
@@ -960,7 +1004,7 @@
label: '鎺掑簭鍙�',
sortable: true,
edit: 'number',
- width: 60,
+ width: 90,
fixed: true
}, {
label: "灞炴�ц嫳鏂囩紪鍙�",
@@ -976,7 +1020,7 @@
prop: "name",
fixed: true,
cell: false,
- width: 125,
+ width: 145,
edit: 'text',
sortable: true
},
@@ -1017,14 +1061,14 @@
{
label: "楂樼骇鏌ヨ灞炴��",
prop: "seniorQueryAttrFlag",
- width: 95,
+ width: 110,
cell: false,
edit: "switch"
},
{
label: "鐩镐技鏌ラ噸灞炴��",
prop: "sameRepeatAttrFlag",
- width: 95,
+ width: 110,
cell: false,
edit: "switch"
},
@@ -1106,7 +1150,7 @@
label: "鏃堕棿鏍煎紡",
prop: "codeDateFormat",
sortable: true,
- width: 105,
+ width: 135,
edit: 'select',
cell: false,
},
@@ -1221,7 +1265,9 @@
VTInteger: "鏁村舰",
VTFilePath: "鏂囦欢",
VTString: "瀛楃涓�"
- }
+ },
+ //鏃堕棿鏍煎紡涓嬫媺妗�
+ codeDataFlag:false,
}
},
computed:{
@@ -1249,9 +1295,18 @@
formAttr(row, column) {
console.log(row,column)
},
+ //鏃堕棿涓嬫媺鏍煎紡
+ DataChangeHandler(){
+ debugger
+ listByFlag({comboxKey: 'codedateformat',
+ id: 'codedateformat',
+ namespace: 'codeclstempattr',
+ flag: 'dateFormates'}).then(res=>{
+ console.log(res)
+ })
+ },
//灞炴�у垎缁勬寜閽�
attrVisibleHandle() {
-
if (this.attrSelectList.length > 1) {
this.$message.warning('鍙兘閫夋嫨涓�鏉℃ā鏉垮睘鎬�')
} else if (this.attrSelectList < 1) {
@@ -1286,7 +1341,6 @@
this.$message.warning('璇烽�夋嫨灞炴�ч泦');
return false;
}
-debugger;
let ordernum = this.ProData.length;
this.busineSelectList.forEach((citem) => {
let isCopy = false;
@@ -1321,8 +1375,6 @@
this.ProData.push(JSON.parse(JSON.stringify(this.busineAddList)))
}
})
-
-
this.addVisible = false;
},
@@ -1351,14 +1403,32 @@
'conditionMap[classifyTemplateOid]': this.Formlist[0].oid,
'conditionMap[oid_notequal]': this.attrOid
}).then(res => {
+ console.log(res)
this.CascadeData = res.data.data;
})
}
+ },
+ //绾ц仈淇濆瓨
+ 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) {
@@ -1370,29 +1440,20 @@
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;
+ console.log('1321')
},
// 鏋氫妇娉ㄥ叆娣诲姞涓�琛岀┖鏁版嵁
addRow() {
@@ -1408,7 +1469,7 @@
},
//鏋氫妇娉ㄥ叆鍒犻櫎
enumDeleteRow(row) {
- this.tableData.splice(row, 1)
+ this.tableData.splice(row.$index, 1)
},
//鏋氫妇娉ㄥ叆鎸夐挳
enmuVisHandle() {
@@ -1468,7 +1529,14 @@
},
//鍒嗙被娉ㄥ叆淇濆瓨
injectAddHandle() {
- this.$set(this.attrRow, 'classifyInvokeLevel', this.injectOption);
+ let data = {
+ "娉ㄥ叆绫诲瀷": this.injectOption.type,
+ "娉ㄥ叆绫诲瀷鍚嶇О": this.injectOption.set,
+ "灞傜骇璁剧疆": this.injectOption.injectNum,
+ "鏄惁鍙慨鏀�": this.injectOption.change
+ }
+ console.log(this.injectOption)
+ this.$set(this.attrRow, 'classifyInvokeLevel', data);
this.injectVisible = false
},
//鍒嗙被娉ㄥ叆娓呯┖
@@ -1483,25 +1551,6 @@
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)
--
Gitblit v1.9.3