From a742877cef30e16c5a96c7d7906e6e509364bcb0 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期三, 30 八月 2023 11:33:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/docking/infoForm.vue | 44 ++++++++++++++++++++++++++++++++++----------
1 files changed, 34 insertions(+), 10 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/docking/infoForm.vue b/Source/UBCS-WEB/src/views/docking/infoForm.vue
index 8bd4c89..cb35816 100644
--- a/Source/UBCS-WEB/src/views/docking/infoForm.vue
+++ b/Source/UBCS-WEB/src/views/docking/infoForm.vue
@@ -10,7 +10,7 @@
</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>
@@ -65,7 +65,24 @@
</el-form-item>
</div>
<div v-else>
- <el-form-item label="鍒嗙被閫夋嫨" prop="classifyName" style="display: none">
+<!-- <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
+ :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
@@ -85,8 +102,6 @@
></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">
@@ -105,7 +120,7 @@
<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 v-if="formData.interfaceType=='http'" label="璇锋眰鏂瑰紡" prop="requestMethod">
@@ -239,7 +254,7 @@
dataFlowTypeList: [{
label: '鎺ㄩ��', value: 'push'
}, {
- label: '鎺ュ彈', value: 'accept'
+ label: '鎺ユ敹', value: 'accept'
}],
//鎺ㄩ�佺被鍨�
pushTypeList: [{value: '1', label: '鏁版嵁鎺ㄩ��'},
@@ -375,6 +390,13 @@
}
}
},
+ watch:{
+ formData:{
+ handler(newval,oldval){
+ console.log('newval',newval.dataFlowTypeText)
+ }
+ }
+ },
created() {
//this.geDictData('interfaceType', this.interfaceTypeList)
},
@@ -418,10 +440,11 @@
this.showSubmitDialog = false;
},
resetForm() {
- this.formData = {
- sysIntParamVOs: [],
- sysIntHeaderVOs: []
- };
+ this.formData={}
+ // this.formData = {
+ // sysIntParamVOs: [],
+ // sysIntHeaderVOs: []
+ // };
this.$refs.form.resetFields();
},
setReferValue(data) {
@@ -502,6 +525,7 @@
add(that.formData).then(res => {
that.$message.success("淇濆瓨鎴愬姛");
that.showSubmitDialog = false;
+ this.$refs.form.resetFields();
this.formData = {
sysIntParamVOs: [],
sysIntHeaderVOs: []
--
Gitblit v1.9.3