From 64005f076c10294f71324de45d36c5004e6a6e47 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 31 八月 2023 15:06:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/docking/info.vue | 166 ++++++++++++++++++++++++++++++++-----------------------
1 files changed, 96 insertions(+), 70 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/docking/info.vue b/Source/UBCS-WEB/src/views/docking/info.vue
index 5d7cff7..ba7f8f1 100644
--- a/Source/UBCS-WEB/src/views/docking/info.vue
+++ b/Source/UBCS-WEB/src/views/docking/info.vue
@@ -8,11 +8,11 @@
@selection-change="selectionChange"
@current-change="currentChange"
@size-change="sizeChange"
- @refresh-change="refreshChange" @row-click="rowClick">
+ @refresh-change="refreshChange" @row-click="rowClick" :cell-style="cellStyle">
<template slot="menu" slot-scope="{row,index}">
- <el-button icon="el-icon-edit" size="small" type="text" @click="updateSave(row,index)">缂栬緫</el-button>
+ <el-button icon="el-icon-edit" size="small" type="text" @click="updateSave(row,index)" :disabled="row.usedFlag === 'true' ? false :true">缂栬緫</el-button>
<el-button icon="el-icon-delete" size="small" type="text" @click="deleteSave(row,index)">鍒犻櫎</el-button>
- <el-button v-if="row.usedflag=='false'" icon="el-icon-position" size="small" type="text"
+ <el-button v-if="row.usedFlag=='false' || row.usedFlag==''" icon="el-icon-position" size="small" type="text"
@click="ENABLE(row,index)">鍚敤
</el-button>
<el-button v-else icon="el-icon-finished" size="small" type="text" @click="DISABLE(row,index)">鍋滅敤
@@ -52,28 +52,6 @@
components: {infoForm},
data() {
return {
- add: [
- {
- pushType: '1',
- name: '灏忔槑',
- },
- {
- pushType: '1',
- name: '灏忔槑1',
- },
- {
- pushType: '2',
- name: '灏忔槑12',
- },
- {
- pushType: '5',
- name: '灏忔槑123',
- },
- {
- pushType: '2',
- name: '灏忕孩123',
- }
- ],
//鎺ュ彛绫诲瀷涓嬫媺
interfaceTypeList: [{
label: 'webService', value: 'webService'
@@ -132,45 +110,56 @@
editBtn: false,
delBtn: false,
columnBtn: false,
- column: [{
- label: '鎺ㄩ�佺被鍨�',
- prop: 'pushType',
- sortable: true,
- overHidden:true,
+ column: [ {
+ label: '鏄惁鍚敤',
+ prop: 'usedFlag',
width: 150,
- //pushTypeList浣滅敤鍩�
- formatter: (d) => {
- return this.pushTypeList[d.pushType]
- }
- }, {
- label: '绯荤粺缂栧彿',
- prop: 'id',
- sortable: true,
- width: 150
- }, {
- label: '绯荤粺鍚嶇О',
- prop: 'name',
- sortable: true,
- width: 150
- }, {
- label: '鎺ュ彛鍑芥暟',
- prop: 'interfaceFunction',
- sortable: true,
- width: 150
- }, {
- label: '鍛藉悕绌洪棿',
- prop: 'nameSpace',
+ formatter: res => res.usedFlag === "true" ? "鍚敤" : "鍋滅敤"
+ },{
+ label: '闆嗘垚绯荤粺',
+ prop: 'sysBaseName',
sortable: true,
width: 150
},{
label: '鍒嗙被閫夋嫨',
prop: 'classifyName',
+ align:'center',
// sortable: true,
width: 150
+ },{
+ label: '缂栫爜绫诲瀷',
+ prop: 'isGroupCodeFlag',
+ sortable: true,
+ width: 150,
+ formatter: res => res.isGroupCodeFlag ? '闆嗗洟鐮�' : '浼佷笟缂栫爜'
+ },{
+ label: '鎺ュ彛绫诲瀷',
+ prop:'dataFlowTypeText',
+ align:'center',
+ sortable: true,
+ width:150,
+ },{
+ label: '鎺ㄩ�佺被鍨�',
+ prop: 'pushTypeText',
+ sortable: true,
+ overHidden:true,
+ align:'center',
+ width: 150,
+ //pushTypeList浣滅敤鍩�
+ // formatter: (d) => {
+ // return this.pushTypeList[d.pushType]
+ // }
}, {
- label: '闆嗘垚绯荤粺',
- prop: 'targetSystemName',
- // sortable: true,
+ label: '绯荤粺缂栧彿',
+ prop: 'id',
+ sortable: true,
+ hide:true,
+ width: 150
+ }, {
+ label: '绯荤粺鍚嶇О',
+ prop: 'name',
+ hide:true,
+ sortable: true,
width: 150
},{
label: '鎺ュ彛鏂瑰紡',
@@ -185,14 +174,10 @@
},{
label: 'soapAction',
prop: 'soapAction',
+ overHidden:true,
sortable: true,
- width: 150
- }, {
- label: '鍙傛暟鍚嶇О',
- prop: 'targName',
- sortable: true,
- width: 150
- }, {
+ width: 200
+ }, {
label: '璋冪敤鏂瑰紡',
prop: 'cxfaxis',
sortable: true,
@@ -200,14 +185,27 @@
}, {
label: '璇锋眰鏂瑰紡',
prop: 'requestMethod',
+ align:'center',
// sortable: true,
width: 150
}, {
label: '璇锋眰鍦板潃',
prop: 'requestUrl',
sortable: true,
+ overHidden:true,
+ width: 200
+ }, {
+ label: '鎺ュ彛鍑芥暟',
+ prop: 'interfaceFunction',
+ sortable: true,
+ align:'center',
width: 150
}, {
+ label: '鍙傛暟鍚嶇О',
+ prop: 'targetName',
+ sortable: true,
+ width: 150
+ },{
label: '鍙傛暟绫诲瀷',
prop: 'paramType',
sortable: true,
@@ -224,6 +222,11 @@
return this.returnTypeList[d.returnType]
}
}, {
+ label: '鍛藉悕绌洪棿',
+ prop: 'nameSpace',
+ sortable: true,
+ width: 150
+ },{
label: '绯荤粺鎻忚堪',
prop: 'description',
width: 150
@@ -250,7 +253,27 @@
return oids.join(",");
}
},
+ watch:{
+ // editAttribute:{
+ // immediate: true,
+ // handler(newData) {
+ // this.$refs.infoForm.formData = Object.assign({}, newData);
+ // }
+ // }
+ },
methods: {
+ //鍗曞厓鏍兼牱寮�
+ cellStyle(row,column,rowIndex,columnIndex){
+ if(row.columnIndex==2) {
+ if(row.row.usedFlag == '' || row.row.usedFlag == 'false'){
+ return {
+ color: 'red',
+ fontWeight: 'bold',
+ fontSize: '20'
+ }
+ }
+ }
+ },
searchReset() {
this.query = {};
this.onLoad(this.page);
@@ -286,11 +309,11 @@
addSave() {
this.$refs.infoForm.showSubmitDialog = true;
this.$refs.infoForm.formData = {
- dataFlowType: 'push',
- pushType: '1',
- sourceSystemName: '缂栫爜绯荤粺',
- sourceSystemOid: 'code00000001',
- sourceSystemId: 'CODE',
+ dataFlowType: '',
+ pushType: '',
+ sourceSystemName: '',
+ sourceSystemOid: '',
+ sourceSystemId: '',
targetSystemName: '',
targetSystemOid: '',
targetSystemId: '',
@@ -303,8 +326,11 @@
this.editAttribute = row;
this.editAttribute.sysIntParamVOs = row.sysIntParamVOs || [];
this.editAttribute.sysIntHeaderVOs = row.sysIntHeaderVOs || [];
+ this.editAttribute.type = 'edit';
this.$refs.infoForm.formData = this.editAttribute;
this.$refs.infoForm.showSubmitDialog = true;
+ // console.log('row',this.editAttribute.pushType)
+ // console.log('editAttribute',this.editAttribute.dataFlowTypeText)
},
deleteSave(row, index) {
this.$confirm("鍒犻櫎鏁版嵁灏嗘棤娉曡鎭㈠, 鏄惁缁х画?", "鎻愮ず", {
@@ -314,7 +340,7 @@
showClose: true,
type: "warning"
}).then(() => {
- remove(row.oid).then(res => {
+ del({oids:row.oid}).then(res => {
this.$message.success("鍒犻櫎鎴愬姛");
this.refreshChange();
});
@@ -394,7 +420,7 @@
// interfaceFunction:'',
// nameSpace:'',
// soapAction:'',
- // targName:'',
+ // targetName:'',
// cxfaxis:''
// };
// this.pushTypeList.forEach(item => {
@@ -444,7 +470,7 @@
fieldType: 'text'
}, {
title: '鍙傛暟鍚嶇О',
- queryField: 'targName',
+ queryField: 'targetName',
fieldType: 'text'
}, {
title: '璋冪敤鏂瑰紡',
--
Gitblit v1.9.3