From 4508f5eb86b063a0f3ec01e6ad68c6ce8ccd1392 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 29 二月 2024 14:34:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/docking/info.vue | 34 +++++++++++++++++++++++-----------
1 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/docking/info.vue b/Source/UBCS-WEB/src/views/docking/info.vue
index a41c744..4a6681e 100644
--- a/Source/UBCS-WEB/src/views/docking/info.vue
+++ b/Source/UBCS-WEB/src/views/docking/info.vue
@@ -59,7 +59,7 @@
<script>
import {
- getList, add, edit, del, push, updateStatus,HeaderRequest,ParmRequest
+ getList, add, edit, del, push, updateStatus, HeaderRequest, ParmRequest
} from "@/api/docking/info";
import {getDictionary} from "@/api/omd/enum";
import infoForm from "./infoForm.vue";
@@ -72,7 +72,7 @@
data() {
return {
//涓嬫媺鎬荤被鍨�
- DropDownTheTotalType:[],
+ DropDownTheTotalType: [],
//鎺ュ彛绫诲瀷涓嬫媺
interfaceTypeList: [{
label: 'webService', value: 'webService'
@@ -92,6 +92,14 @@
label: 'xml', value: 'xml'
}, {
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: '鏁版嵁鎺ㄩ��'},
@@ -121,9 +129,9 @@
index: true,
selection: true,
indexFixed: false,
- selectionFixed:false,
+ selectionFixed: false,
searchShow: false,
- refreshBtn:false,
+ refreshBtn: false,
searchMenuSpan: 6,
rowKey: "id",
tabs: true,
@@ -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
@@ -266,7 +282,6 @@
};
},
created() {
-
},
computed: {
...mapGetters(["permission"]),
@@ -366,17 +381,14 @@
this.$refs.infoForm.formData = this.editAttribute;
this.$refs.infoForm.showSubmitDialog = true;
//header瀵硅薄
-
- HeaderRequest(1,-1,{'conditionMap[oid]':row.oid}).then(res => {
+ HeaderRequest(1, -1, {'conditionMap[infoOid]': row.oid}).then(res => {
this.$refs.infoForm.formData.sysIntHeaderVOs = res.data.data.records;
})
//鍙傛暟瀵硅薄
- ParmRequest(1,-1,{'conditionMap[oid]':row.oid}).then(res=>{
+ ParmRequest(1, -1, {'conditionMap[infoOid]': row.oid}).then(res => {
this.$refs.infoForm.formData.sysIntParamVOs = res.data.data.records;
})
},
-
-
deleteSave(row, index) {
this.$confirm("鍒犻櫎鏁版嵁灏嗘棤娉曡鎭㈠, 鏄惁缁х画?", "鎻愮ず", {
iconClass: 'el-icon-question',
@@ -464,7 +476,7 @@
if (JSON.stringify(conditionMaps) != '{}') {
this.query = conditionMaps;
this.onLoad(this.page);
- }else {
+ } else {
this.query = {};
this.onLoad(this.page, this.query);
}
--
Gitblit v1.9.3