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/infoForm.vue |   50 ++++++++++++++++++++++++++++++++++----------------
 1 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/Source/UBCS-WEB/src/views/docking/infoForm.vue b/Source/UBCS-WEB/src/views/docking/infoForm.vue
index 2651165..de69e9c 100644
--- a/Source/UBCS-WEB/src/views/docking/infoForm.vue
+++ b/Source/UBCS-WEB/src/views/docking/infoForm.vue
@@ -22,12 +22,19 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="杩斿洖鍊肩被鍨�" prop="returnType">
-          <el-select v-model="formData.returnType" placeholder="璇烽�夋嫨">
-            <el-option v-for="item in returnTypeList" :key="item.value" :label="item.label" :value="item.value">
+          <el-form-item label="杩斿洖鍊肩被鍨�" prop="returnType">
+            <el-select v-model="formData.returnType" placeholder="璇烽�夋嫨">
+              <el-option v-for="item in returnTypeList" :key="item.value" :label="item.label" :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        <el-form-item label="鍐呭绫诲瀷" prop="contentType">
+          <el-select v-model="formData.contentType" placeholder="璇烽�夋嫨">
+            <el-option v-for="item in contentTypeList" :key="item.value" :label="item.label" :value="item.value">
             </el-option>
           </el-select>
         </el-form-item>
+        <el-divider></el-divider>
         <div v-if="formData.dataFlowType=='push'">
           <el-form-item  label="鍒嗙被閫夋嫨" prop="classifyName">
             <vciWebRefer
@@ -105,25 +112,13 @@
               @setReferValue="setReferValue"
             ></vciWebRefer>
           </el-form-item>
-        </div>
         <el-form-item label="鎺ュ彛鏂瑰紡" prop="interfaceType">
           <el-select v-model="formData.interfaceType" clearable placeholder="璇烽�夋嫨">
             <el-option v-for="item in interfaceTypeList" :key="item.value" :label="item.label" :value="item.value">
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item v-if="formData.pushType=='1'" label="鏄惁鎺ㄩ�侀泦鍥㈢爜" prop="isGroupCodeFlag">
-          <el-switch v-model="formData.isGroupCodeFlag" ></el-switch>
-        </el-form-item>
-        <el-form-item v-if="formData.pushType=='3'" label="鏄惁鐢宠闆嗗洟鐮�" prop="isGroupCodeFlag">
-          <el-switch v-model="formData.isGroupCodeFlag" ></el-switch>
-        </el-form-item>
-        <el-form-item  v-if="formData.pushType=='4'" label="鏄惁缁存姢闆嗗洟鐮�" prop="isGroupCodeFlag">
-          <el-switch v-model="formData.isGroupCodeFlag" ></el-switch>
-        </el-form-item>
-        <el-form-item  v-if="formData.pushType=='7'" label="鏄惁鏌ヨ闆嗗洟鐮�" prop="isGroupCodeFlag">
-          <el-switch v-model="formData.isGroupCodeFlag" ></el-switch>
-        </el-form-item>
+        </div>
         <el-form-item label="绯荤粺鎻忚堪"  style="width: 850px;" prop="description">
           <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 5}" v-model="formData.description" style="width: 740px;"></el-input>
         </el-form-item>
@@ -153,6 +148,18 @@
         </el-form-item>
         <el-form-item v-if="formData.interfaceType=='classPath'" label="绫昏矾寰�" prop="classPath">
           <el-input v-model="formData.classPath" ></el-input>
+        </el-form-item>
+        <el-form-item v-if="formData.pushType=='1'" label="鏄惁鎺ㄩ�侀泦鍥㈢爜" prop="isGroupCodeFlag">
+          <el-switch v-model="formData.isGroupCodeFlag" ></el-switch>
+        </el-form-item>
+        <el-form-item v-if="formData.pushType=='3'" label="鏄惁鐢宠闆嗗洟鐮�" prop="isGroupCodeFlag">
+          <el-switch v-model="formData.isGroupCodeFlag" ></el-switch>
+        </el-form-item>
+        <el-form-item  v-if="formData.pushType=='4'" label="鏄惁缁存姢闆嗗洟鐮�" prop="isGroupCodeFlag">
+          <el-switch v-model="formData.isGroupCodeFlag" ></el-switch>
+        </el-form-item>
+        <el-form-item  v-if="formData.pushType=='7'" label="鏄惁鏌ヨ闆嗗洟鐮�" prop="isGroupCodeFlag">
+          <el-switch v-model="formData.isGroupCodeFlag" ></el-switch>
         </el-form-item>
         <el-tabs v-model="activeName" @tab-click="tabClick">
           <el-tab-pane label="鍙傛暟瀵硅薄" name="paramTab">
@@ -255,6 +262,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'
+      }],
       dataFlowTypeList: [{
         label: '鎺ㄩ��', value: 'push'
       }, {
@@ -316,6 +331,9 @@
         ],
         cxfaxis: [
           {required: true, message: '璇疯緭鍏xfaxis', trigger: 'blur'}
+        ],
+        contentType: [
+          {required: true, message: 'contentType', trigger: 'blur'}
         ]
       },
       // 琛ㄦ牸閰嶇疆

--
Gitblit v1.9.3