From fdff80eeba9f882abcad3d62f915e95de1a8f6f4 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 30 十一月 2023 10:59:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/docking/infoForm.vue | 188 +++++++++++++++++++++++++++++++++-------------
1 files changed, 134 insertions(+), 54 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/docking/infoForm.vue b/Source/UBCS-WEB/src/views/docking/infoForm.vue
index 37ee342..d8f88c9 100644
--- a/Source/UBCS-WEB/src/views/docking/infoForm.vue
+++ b/Source/UBCS-WEB/src/views/docking/infoForm.vue
@@ -4,13 +4,13 @@
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-select v-model="formData.dataFlowType" placeholder="璇烽�夋嫨" @change="dataFlowTypeChange">
+ <el-form-item label="鎺ュ彛绫诲瀷" prop="dataFlowType">
+ <el-select v-model="formData.dataFlowType" placeholder="璇烽�夋嫨" @change="dataFlowTypeChange" :disabled="formData.type == 'edit'">
<el-option v-for="item in dataFlowTypeList" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</el-form-item>
- <el-form-item :label="formData.dataFlowType=='push'?'鎺ㄩ�佺被鍨�':'鎺ュ彈绫诲瀷'" prop="pushType">
+ <el-form-item :label="formData.dataFlowType=='push'?'鎺ㄩ�佺被鍨�':'鎺ユ敹绫诲瀷'" prop="pushType">
<el-select v-model="formData.pushType" placeholder="璇烽�夋嫨" @change="pushTypeChange">
<el-option v-for="item in pushTypeList" :key="item.value" :label="item.label" :value="item.value">
</el-option>
@@ -28,9 +28,11 @@
</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
+ key="classifyName" data-key="classifyName"
+ :referConfig="{
title: '鍒嗙被閫夋嫨',
showField: 'classifyName',
field: 'classifyOid',
@@ -38,16 +40,17 @@
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
+ key="targetSystemName" data-key="targetSystemName"
+ :referConfig="{
title: '闆嗘垚绯荤粺',
showField: 'targetSystemName',
field: 'targetSystemOid',
@@ -55,29 +58,59 @@
placeholder: '璇烽�夋嫨',
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=='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="classifyName" v-if="formData.pushType !='5' && formData.pushType !='6'">
+ <vciWebRefer
+ key="classifyName" data-key="classifyName"
+ :referConfig="{
+ title: '鍒嗙被閫夋嫨',
+ showField: 'classifyName',
+ field: 'classifyOid',
+ fieldMap:{'classifyId':'id'},
+ 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 label="闆嗘垚绯荤粺" prop="sourceSystemName">
+ <vciWebRefer
+ key="sourceSystemName" data-key="sourceSystemName"
+ :referConfig="{
title: '闆嗘垚绯荤粺',
showField: 'sourceSystemName',
field: 'sourceSystemOid',
fieldMap:{'sourceSystemId':'id'},
placeholder: '璇烽�夋嫨',
- options: {isMuti: false, type: 'default', url: 'api/ubcs-code/dockingManagement/gridDockingSystem'},
+ options: {isMuti: false, type: 'default', url: referUrl},
}"
- :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>
@@ -91,14 +124,8 @@
<el-form-item v-if="formData.pushType=='7'" label="鏄惁鏌ヨ闆嗗洟鐮�" prop="isGroupCodeFlag">
<el-switch v-model="formData.isGroupCodeFlag" ></el-switch>
</el-form-item>
- <el-form-item label="绯荤粺鎻忚堪" style="width: 850px;">
+ <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>
- <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="璇烽�夋嫨">
@@ -118,8 +145,8 @@
<el-form-item v-if="formData.interfaceType=='webService'" label="soapAction" prop="soapAction">
<el-input v-model="formData.soapAction" ></el-input>
</el-form-item>
- <el-form-item v-if="formData.interfaceType=='webService'" label="鍙傛暟鍚嶇О" prop="targName">
- <el-input v-model="formData.targName" ></el-input>
+ <el-form-item v-if="formData.interfaceType=='webService'" label="鍙傛暟鍚嶇О" prop="targetName">
+ <el-input v-model="formData.targetName" ></el-input>
</el-form-item>
<el-form-item v-if="formData.interfaceType=='webService'" label="cxfaxis" prop="cxfaxis">
<el-input v-model="formData.cxfaxis" ></el-input>
@@ -180,7 +207,6 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitAttribute">纭畾</el-button>
- <el-button @click="cancelSubmit">鍙栨秷</el-button>
</div>
</el-dialog>
@@ -207,6 +233,7 @@
components: { vciWebRefer },
data() {
return {
+ referUrl:'/api/ubcs-code/dockingManagement/gridDockingSystem',
showSubmitDialog: false,
//鎺ュ彛绫诲瀷涓嬫媺
interfaceTypeList: [{
@@ -229,9 +256,9 @@
label: 'Json', value: 'json'
}],
dataFlowTypeList: [{
- label: 'push', value: 'push'
+ label: '鎺ㄩ��', value: 'push'
}, {
- label: 'accept', value: 'accept'
+ label: '鎺ユ敹', value: 'accept'
}],
//鎺ㄩ�佺被鍨�
pushTypeList: [{value: '1', label: '鏁版嵁鎺ㄩ��'},
@@ -284,7 +311,7 @@
soapAction: [
{required: true, message: '璇疯緭鍏oapAction', trigger: 'blur'}
],
- targName: [
+ targetName: [
{required: true, message: '璇疯緭鍏ュ弬鏁板悕绉�', trigger: 'blur'}
],
cxfaxis: [
@@ -363,9 +390,52 @@
// 閫夊畾琛�
selectRow: ''
},
- dictEnums: []
+ dictEnums: [],
+
}
}
+ },
+ watch:{
+ formData: {
+ handler(newval, oldval) {
+ // console.log(newval)
+ if (newval && newval.type === 'edit') {
+ if (this.formData.dataFlowType == 'accept') {
+ this.pushTypeList = [
+ { value: '3', label: '缂栫爜鐢宠' },
+ { value: '4', label: '缂栫爜鏇存敼锛堢姸鎬併�佸洖鏀讹級' },
+ { value: '5', label: '鍒嗙被鏌ヨ' },
+ { value: '6', label: '鍚鍒欎俊鎭殑鍒嗙被鏌ヨ' },
+ { value: '7', label: '鏁版嵁鏌ヨ' }
+ ];
+ this.$nextTick(() => {
+ // 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.$nextTick(() => {
+ this.formData.pushType = '1';
+ this.formData.sourceSystemName = '缂栫爜绯荤粺';
+ this.formData.sourceSystemOid = 'code00000001';
+ this.formData.sourceSystemId = 'CODE';
+ // this.formData.targetSystemName = '';
+ // this.formData.targetSystemOid = '';
+ // this.formData.targetSystemId = '';
+ });
+ }
+ }
+ }
+ },
},
created() {
//this.geDictData('interfaceType', this.interfaceTypeList)
@@ -384,7 +454,7 @@
{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';
@@ -406,7 +476,7 @@
},
methods: {
closeSubmitDialog() {
- this.resetForm();
+ // this.resetForm();
this.showSubmitDialog = false;
},
resetForm() {
@@ -461,20 +531,25 @@
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;
+ }
this.$refs.form.validateField(['paramType','returnType','dataFlowType','pushType','classPath','requestMethod','requestUrl',
- 'interfaceFunction','nameSpace','soapAction','targName','cxfaxis'],function (errormsg, field) {
+ 'interfaceFunction','nameSpace','soapAction','targetName','cxfaxis'],function (errormsg, field) {
if (errormsg) {
pass=false
}
})
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
@@ -486,14 +561,19 @@
ordernNo:item.$index
}
})
- add(that.formData).then(res => {
- that.$message.success("淇濆瓨鎴愬姛");
+ const apiCall = that.formData.type == 'edit' ? edit : add;
+ const Message = that.formData.type == 'edit' ? "淇敼鎴愬姛" : "淇濆瓨鎴愬姛";
+ // console.log( that.formData)
+ apiCall(that.formData).then(res => {
+ that.$message.success(Message);
that.showSubmitDialog = false;
+ this.$refs.form.resetFields();
this.formData = {
sysIntParamVOs: [],
sysIntHeaderVOs: []
};
that.$emit('refreshTable');
+ that.formData.type=null;
});
}
})
--
Gitblit v1.9.3