From f94ded5d0a6545bb564f986bc2db03a989fae662 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 12 三月 2024 10:17:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/docking/info.vue | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/docking/info.vue b/Source/UBCS-WEB/src/views/docking/info.vue
index 58f31a4..08f7265 100644
--- a/Source/UBCS-WEB/src/views/docking/info.vue
+++ b/Source/UBCS-WEB/src/views/docking/info.vue
@@ -93,6 +93,14 @@
}, {
label: 'Json', value: 'json'
}],
+ //鍐呭绫诲瀷
+ contentTypeList: [{
+ label:'application/json',value:'application/json'
+ },{
+ label:'application/x-www-form-urlencoded',value:'application/x-www-form-urlencoded'
+ },{
+ label:'multipart/form-data',value:'multipart/form-data'
+ }],
//鎺ㄩ�佺被鍨�
pushTypeList: [{value: '1', label: '鏁版嵁鎺ㄩ��'},
{value: '2', label: '鍒嗙被鎺ㄩ��'},
@@ -102,7 +110,7 @@
{value: '6', label: '鍚鍒欎俊鎭殑鍒嗙被鏌ヨ'},
{value: '7', label: '鏁版嵁鏌ヨ'}],
page: {
- pageSize: 10,
+ pageSize: 20,
currentPage: 1,
total: 100
},
@@ -154,7 +162,7 @@
prop: 'isGroupCodeFlag',
sortable: true,
width: 150,
- formatter: res => res.isGroupCodeFlag ? '闆嗗洟鐮�' : '浼佷笟缂栫爜'
+ formatter: res => res.isGroupCodeFlag === 'true' ? '闆嗗洟鐮�' : '浼佷笟缂栫爜'
}, {
label: '鎺ュ彛绫诲瀷',
prop: 'dataFlowTypeText',
@@ -250,6 +258,14 @@
sortable: true,
width: 150
}, {
+ label: '鍐呭绫诲瀷',
+ prop: 'contentType',
+ sortable: true,
+ width: 150,
+ formatter: (d) => {
+ return this.contentTypeList[d.contentType]
+ }
+ },{
label: '绯荤粺鎻忚堪',
prop: 'description',
width: 150
@@ -362,7 +378,8 @@
this.editAttribute.sysIntParamVOs = row.sysIntParamVOs || [];
this.editAttribute.sysIntHeaderVOs = row.sysIntHeaderVOs || [];
this.editAttribute.type = 'edit';
- this.$refs.infoForm.formData = this.editAttribute;
+ this.$refs.infoForm.formData = row;
+ this.$refs.infoForm.groupCode = row.isGroupCodeFlag === 'true' ? true : false;
this.$refs.infoForm.showSubmitDialog = true;
//header瀵硅薄
HeaderRequest(1, -1, {'conditionMap[infoOid]': row.oid}).then(res => {
@@ -373,8 +390,6 @@
this.$refs.infoForm.formData.sysIntParamVOs = res.data.data.records;
})
},
-
-
deleteSave(row, index) {
this.$confirm("鍒犻櫎鏁版嵁灏嗘棤娉曡鎭㈠, 鏄惁缁х画?", "鎻愮ず", {
iconClass: 'el-icon-question',
--
Gitblit v1.9.3