From 759356b8085e9e85ccb576b088138c9eb27b54c2 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 24 八月 2023 18:16:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/docking/infoForm.vue | 161 +++++++++++++++++++++++++++--------------------------
1 files changed, 83 insertions(+), 78 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/docking/infoForm.vue b/Source/UBCS-WEB/src/views/docking/infoForm.vue
index c36b5b7..8bd4c89 100644
--- a/Source/UBCS-WEB/src/views/docking/infoForm.vue
+++ b/Source/UBCS-WEB/src/views/docking/infoForm.vue
@@ -4,7 +4,7 @@
style="height: 110vh;" top="-5%">
<el-form ref="form" :model="formData" show-message="true" inline size="medium" label-suffix=":"
class="dockingForm" :rules="rules" status-icon="true">
- <el-form-item label="dataFlowType" prop="dataFlowType">
+ <el-form-item label="鎺ュ彛绫诲瀷" prop="dataFlowType">
<el-select v-model="formData.dataFlowType" placeholder="璇烽�夋嫨" @change="dataFlowTypeChange">
<el-option v-for="item in dataFlowTypeList" :key="item.value" :label="item.label" :value="item.value">
</el-option>
@@ -28,9 +28,10 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="鍒嗙被閫夋嫨" prop="classifyName">
- <vciWebRefer
- :referConfig="{
+ <div v-if="formData.dataFlowType=='push'">
+ <el-form-item label="鍒嗙被閫夋嫨" prop="classifyName">
+ <vciWebRefer
+ :referConfig="{
title: '鍒嗙被閫夋嫨',
showField: 'classifyName',
field: 'classifyOid',
@@ -38,80 +39,59 @@
placeholder: '璇烽�夋嫨鍒嗙被閫夋嫨',
options: {isMuti: false, type: 'tree', url: 'api/ubcs-code/codeClassify/treeCodeClassify'},
}"
- :value="formData.classifyOid"
- :text="formData.classifyName"
- :disabled="false"
- :display="true"
- @setReferValue="setReferValue"
- ></vciWebRefer>
- </el-form-item>
- <el-form-item v-if="formData.dataFlowType=='push'" label="闆嗘垚绯荤粺" prop="targetSystemName">
- <vciWebRefer
- :referConfig="{
+ :value="formData.classifyOid"
+ :text="formData.classifyName"
+ :disabled="false"
+ :display="true"
+ @setReferValue="setReferValue"
+ ></vciWebRefer>
+ </el-form-item>
+ <el-form-item label="闆嗘垚绯荤粺" prop="targetSystemName">
+ <vciWebRefer
+ :referConfig="{
title: '闆嗘垚绯荤粺',
showField: 'targetSystemName',
field: 'targetSystemOid',
fieldMap:{'targetSystemId':'id'},
placeholder: '璇烽�夋嫨',
- options: {isMuti: false, type: 'default', url: 'api/ubcs-code/codeBasicSecController/gridCodeBasicSec'},
+ options: {isMuti: false, type: 'default', url: 'api/ubcs-code/dockingManagement/gridDockingSystem'},
}"
- :value="formData.targetSystemOid"
- :text="formData.targetSystemName"
- :disabled="false"
- :display="true"
- @setReferValue="setReferValue"
- ></vciWebRefer>
- </el-form-item>
- <el-form-item v-if="formData.dataFlowType=='push'" label="缂栫爜绯荤粺" prop="sourceSystemName">
- <vciWebRefer
- :referConfig="{
- title: '缂栫爜绯荤粺',
- showField: 'sourceSystemName',
- field: 'sourceSystemOid',
- fieldMap:{'sourceSystemId':'id'},
- placeholder: '璇烽�夋嫨',
- options: {isMuti: false, type: 'default', url: 'api/ubcs-code/codeBasicSecController/gridCodeBasicSec'},
- }"
- :value="formData.sourceSystemOid"
- :text="formData.sourceSystemName"
- :disabled="false"
- :display="true"
- @setReferValue="setReferValue"
- ></vciWebRefer>
- </el-form-item>
- <el-form-item v-if="formData.dataFlowType=='accept'" label="缂栫爜绯荤粺" prop="targetSystemName">
- <vciWebRefer
- :referConfig="{
- title: '缂栫爜绯荤粺',
- showField: 'targetSystemName',
- field: 'targetSystemOid',
- fieldMap:{'targetSystemId':'id'},
- placeholder: '璇烽�夋嫨',
- options: {isMuti: false, type: 'default', url: 'api/ubcs-code/codeBasicSecController/gridCodeBasicSec'},
- }"
- :value="formData.targetSystemOid"
- :text="formData.targetSystemName"
- :disabled="false"
- :display="true"
- @setReferValue="setReferValue"
- ></vciWebRefer>
- </el-form-item>
- <el-form-item v-if="formData.dataFlowType=='accept'" label="闆嗘垚绯荤粺" prop="sourceSystemName">
- <vciWebRefer
- :referConfig="{
+ :value="formData.targetSystemOid"
+ :text="formData.targetSystemName"
+ :disabled="false"
+ :display="true"
+ @setReferValue="setReferValue"
+ ></vciWebRefer>
+ </el-form-item>
+ </div>
+ <div v-else>
+ <el-form-item label="鍒嗙被閫夋嫨" prop="classifyName" style="display: none">
+ </el-form-item>
+ <el-form-item label="闆嗘垚绯荤粺" prop="sourceSystemName">
+ <vciWebRefer
+ :referConfig="{
title: '闆嗘垚绯荤粺',
showField: 'sourceSystemName',
field: 'sourceSystemOid',
fieldMap:{'sourceSystemId':'id'},
placeholder: '璇烽�夋嫨',
- options: {isMuti: false, type: 'default', url: 'api/ubcs-code/codeBasicSecController/gridCodeBasicSec'},
+ options: {isMuti: false, type: 'default', url: 'api/ubcs-code/dockingManagement/gridDockingSystem'},
}"
- :value="formData.sourceSystemOid"
- :text="formData.sourceSystemName"
- :disabled="false"
- :display="true"
- @setReferValue="setReferValue"
- ></vciWebRefer>
+ :value="formData.sourceSystemOid"
+ :text="formData.sourceSystemName"
+ :disabled="false"
+ :display="true"
+ @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>
@@ -127,12 +107,6 @@
</el-form-item>
<el-form-item label="绯荤粺鎻忚堪" style="width: 850px;">
<el-input type="textarea" :autosize="{ minRows: 2, maxRows: 5}" v-model="formData.description" style="width: 740px;"></el-input>
- </el-form-item>
- <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.interfaceType=='http'" label="璇锋眰鏂瑰紡" prop="requestMethod">
<el-select v-model="formData.requestMethod" placeholder="璇烽�夋嫨">
@@ -263,9 +237,9 @@
label: 'Json', value: 'json'
}],
dataFlowTypeList: [{
- label: 'push', value: 'push'
+ label: '鎺ㄩ��', value: 'push'
}, {
- label: 'accept', value: 'accept'
+ label: '鎺ュ彈', value: 'accept'
}],
//鎺ㄩ�佺被鍨�
pushTypeList: [{value: '1', label: '鏁版嵁鎺ㄩ��'},
@@ -419,10 +393,23 @@
{value: '6', label: '鍚鍒欎俊鎭殑鍒嗙被鏌ヨ'},
{value: '7', label: '鏁版嵁鏌ヨ'}]
this.formData.pushType=''
+ this.formData.targetSystemName='缂栫爜绯荤粺';
+ this.formData.targetSystemOid='code00000001';
+ this.formData.targetSystemId='CODE';
+
+ this.formData.sourceSystemName='';
+ this.formData.sourceSystemOid='';
+ this.formData.sourceSystemId='';
}else {
this.pushTypeList=[{value: '1', label: '鏁版嵁鎺ㄩ��'},
{value: '2', label: '鍒嗙被鎺ㄩ��'}]
- this.formData.pushType='1'
+ this.formData.pushType='1' ;
+ this.formData.sourceSystemName='缂栫爜绯荤粺';
+ this.formData.sourceSystemOid='code00000001';
+ this.formData.sourceSystemId='CODE';
+ this.formData.targetSystemName='';
+ this.formData.targetSystemOid='';
+ this.formData.targetSystemId='';
}
},
methods: {
@@ -482,8 +469,13 @@
submitAttribute() {
const that = this;
let pass=true
- if(validatenull(this.formData.classifyName)||validatenull(this.formData.sourceSystemName)||validatenull(this.formData.targetSystemName)){
+ if(this.formData.dataFlowType=='push' && (validatenull(this.formData.classifyName)||validatenull(this.formData.targetSystemName))){
that.$message.error('蹇呭～椤逛笉鑳戒负绌�');
+ pass=false
+ return;
+ }
+ if(this.formData.dataFlowType=='accept' && (validatenull(this.formData.sourceSystemName))){
+ that.$message.error('闆嗘垚绯荤粺涓嶈兘涓虹┖');
pass=false
return;
}
@@ -539,7 +531,13 @@
if(value=='push'){
this.pushTypeList=[{value: '1', label: '鏁版嵁鎺ㄩ��'},
{value: '2', label: '鍒嗙被鎺ㄩ��'}]
- this.formData.pushType='鏁版嵁鎺ㄩ��'
+ this.formData.pushType='1';
+ this.formData.sourceSystemName='缂栫爜绯荤粺';
+ this.formData.sourceSystemOid='code00000001';
+ this.formData.sourceSystemId='CODE';
+ this.formData.targetSystemName='';
+ this.formData.targetSystemOid='';
+ this.formData.targetSystemId='';
}else if(value=='accept'){
this.pushTypeList=[
{value: '3', label: '缂栫爜鐢宠'},
@@ -547,7 +545,14 @@
{value: '5', label: '鍒嗙被鏌ヨ'},
{value: '6', label: '鍚鍒欎俊鎭殑鍒嗙被鏌ヨ'},
{value: '7', label: '鏁版嵁鏌ヨ'}]
- this.formData.pushType=''
+ this.formData.pushType='';
+ this.formData.targetSystemName='缂栫爜绯荤粺';
+ this.formData.targetSystemOid='code00000001';
+ this.formData.targetSystemId='CODE';
+
+ this.formData.sourceSystemName='';
+ this.formData.sourceSystemOid='';
+ this.formData.sourceSystemId='';
}else{
this.pushTypeList=[];
}
--
Gitblit v1.9.3