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 |   23 ++++++++++++++++++-----
 1 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/Source/UBCS-WEB/src/views/docking/info.vue b/Source/UBCS-WEB/src/views/docking/info.vue
index c51db2b..4a6681e 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: '鍒嗙被鎺ㄩ��'},
@@ -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
@@ -365,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',

--
Gitblit v1.9.3