From 9ca73b463e490867e52182748d86c2a1a46e454d Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 29 二月 2024 15:00:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/docking/infoForm.vue | 64 ++++++++++++++++++++++----------
1 files changed, 44 insertions(+), 20 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/docking/infoForm.vue b/Source/UBCS-WEB/src/views/docking/infoForm.vue
index 10fb23c..de69e9c 100644
--- a/Source/UBCS-WEB/src/views/docking/infoForm.vue
+++ b/Source/UBCS-WEB/src/views/docking/infoForm.vue
@@ -22,15 +22,23 @@
</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
+ key="classifyName" data-key="classifyName"
:referConfig="{
title: '鍒嗙被閫夋嫨',
showField: 'classifyName',
@@ -48,6 +56,7 @@
</el-form-item>
<el-form-item label="闆嗘垚绯荤粺" prop="targetSystemName">
<vciWebRefer
+ key="targetSystemName" data-key="targetSystemName"
:referConfig="{
title: '闆嗘垚绯荤粺',
showField: 'targetSystemName',
@@ -69,6 +78,7 @@
<!-- </el-form-item>-->
<el-form-item label="鍒嗙被閫夋嫨" prop="classifyName" v-if="formData.pushType !='5' && formData.pushType !='6'">
<vciWebRefer
+ key="classifyName" data-key="classifyName"
:referConfig="{
title: '鍒嗙被閫夋嫨',
showField: 'classifyName',
@@ -86,6 +96,7 @@
</el-form-item>
<el-form-item label="闆嗘垚绯荤粺" prop="sourceSystemName">
<vciWebRefer
+ key="sourceSystemName" data-key="sourceSystemName"
:referConfig="{
title: '闆嗘垚绯荤粺',
showField: 'sourceSystemName',
@@ -101,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>
@@ -150,6 +149,18 @@
<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">
<avue-crud :option="param.option"
@@ -229,6 +240,7 @@
components: { vciWebRefer },
data() {
return {
+ referUrl:'/api/ubcs-code/dockingManagement/gridDockingSystem',
showSubmitDialog: false,
//鎺ュ彛绫诲瀷涓嬫媺
interfaceTypeList: [{
@@ -250,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'
}, {
@@ -280,13 +300,13 @@
{required: true, message: '璇烽�夋嫨鎺ㄩ�佺被鍨�', trigger: 'blur'}
],
classifyName: [
- {required: true, message: '璇烽�夋嫨', trigger: 'sbumit'}
+ {required: true, message: '璇烽�夋嫨', trigger: 'submit'}
],
sourceSystemName: [
- {required: true, message: '璇烽�夋嫨', trigger: 'sbumit'}
+ {required: true, message: '璇烽�夋嫨', trigger: 'submit'}
],
targetSystemName: [
- {required: true, message: '璇烽�夋嫨', trigger: 'sbumit'}
+ {required: true, message: '璇烽�夋嫨', trigger: 'submit'}
],
classPath: [
{required: true, message: '璇疯緭鍏ョ被璺緞', trigger: 'blur'}
@@ -311,6 +331,9 @@
],
cxfaxis: [
{required: true, message: '璇疯緭鍏xfaxis', trigger: 'blur'}
+ ],
+ contentType: [
+ {required: true, message: 'contentType', trigger: 'blur'}
]
},
// 琛ㄦ牸閰嶇疆
@@ -473,6 +496,7 @@
closeSubmitDialog() {
// this.resetForm();
this.showSubmitDialog = false;
+ this.$refs.form.resetFields()
},
resetForm() {
this.formData = {
@@ -544,7 +568,7 @@
})
this.$nextTick(function (){
if(pass){
- that.formData.sysIntParamDTOs=this.formData.sysIntParamVOs.map(item=>{
+ that.formData.sysIntParamDTOS=this.formData.sysIntParamVOs.map(item=>{
return {
...item,
ordernNo:item.$index
--
Gitblit v1.10.0