From a5ccbaa5d79220bdee88b1f484efa1bc184cd875 Mon Sep 17 00:00:00 2001 From: xiejun <xj@2023> Date: 星期二, 29 八月 2023 14:58:35 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/UBCS-WEB/src/views/docking/info.vue | 37 +++++++++++++++++++------------------ 1 files changed, 19 insertions(+), 18 deletions(-) diff --git a/Source/UBCS-WEB/src/views/docking/info.vue b/Source/UBCS-WEB/src/views/docking/info.vue index 7535d25..99d2c3c 100644 --- a/Source/UBCS-WEB/src/views/docking/info.vue +++ b/Source/UBCS-WEB/src/views/docking/info.vue @@ -121,6 +121,12 @@ sortable: true, width: 150 },{ + label: '鍒嗙被閫夋嫨', + prop: 'classifyName', + align:'center', + // sortable: true, + width: 150 + },{ label: '缂栫爜绫诲瀷', prop: 'isGroupCodeFlag', sortable: true, @@ -155,23 +161,6 @@ hide:true, sortable: true, width: 150 - }, { - label: '鎺ュ彛鍑芥暟', - prop: 'interfaceFunction', - sortable: true, - align:'center', - width: 150 - }, { - label: '鍛藉悕绌洪棿', - prop: 'nameSpace', - sortable: true, - width: 150 - },{ - label: '鍒嗙被閫夋嫨', - prop: 'classifyName', - align:'center', - // sortable: true, - width: 150 },{ label: '鎺ュ彛鏂瑰紡', prop: 'interfaceType', @@ -203,6 +192,12 @@ prop: 'requestUrl', sortable: true, width: 150 + }, { + label: '鎺ュ彛鍑芥暟', + prop: 'interfaceFunction', + sortable: true, + align:'center', + width: 150 }, { label: '鍙傛暟鍚嶇О', prop: 'targName', @@ -225,6 +220,11 @@ return this.returnTypeList[d.returnType] } }, { + label: '鍛藉悕绌洪棿', + prop: 'nameSpace', + sortable: true, + width: 150 + },{ label: '绯荤粺鎻忚堪', prop: 'description', width: 150 @@ -255,7 +255,6 @@ //鍗曞厓鏍兼牱寮� cellStyle(row,column,rowIndex,columnIndex){ if(row.columnIndex==2) { - console.log(row) if(row.row.usedFlag == 'false'){ return { color: 'red', @@ -319,6 +318,8 @@ this.editAttribute.sysIntHeaderVOs = row.sysIntHeaderVOs || []; this.$refs.infoForm.formData = this.editAttribute; this.$refs.infoForm.showSubmitDialog = true; + console.log('row',row.dataFlowTypeText) + console.log('editAttribute',this.editAttribute.dataFlowTypeText) }, deleteSave(row, index) { this.$confirm("鍒犻櫎鏁版嵁灏嗘棤娉曡鎭㈠, 鏄惁缁х画?", "鎻愮ず", { -- Gitblit v1.9.3