From d6f94d02fd033c1c0a68fe2d4e987eb233d2afb1 Mon Sep 17 00:00:00 2001
From: 田源 <tianyuan@vci-tech.com>
Date: 星期三, 05 三月 2025 18:05:03 +0800
Subject: [PATCH] 整合代码
---
Source/UBCS-WEB/src/views/docking/info.vue | 85 +++++++++++++++++++++++-------------------
1 files changed, 47 insertions(+), 38 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/docking/info.vue b/Source/UBCS-WEB/src/views/docking/info.vue
index 973fcd7..08f7265 100644
--- a/Source/UBCS-WEB/src/views/docking/info.vue
+++ b/Source/UBCS-WEB/src/views/docking/info.vue
@@ -40,8 +40,7 @@
<el-button v-if="permissionList.sync" icon="el-icon-share" size="small" @click="PUSH">鍚� 姝�
</el-button>
<el-button v-if="permissionList.query" icon="el-icon-search" size="small"
- @click="openAdvancedQuery">鏌�
- 璇�
+ @click="openAdvancedQuery">鏌� 璇�
</el-button>
</template>
</avue-crud>
@@ -60,7 +59,7 @@
<script>
import {
- getList, add, edit, del, push, updateStatus
+ getList, add, edit, del, push, updateStatus, HeaderRequest, ParmRequest
} from "@/api/docking/info";
import {getDictionary} from "@/api/omd/enum";
import infoForm from "./infoForm.vue";
@@ -72,6 +71,8 @@
data() {
return {
+ //涓嬫媺鎬荤被鍨�
+ DropDownTheTotalType: [],
//鎺ュ彛绫诲瀷涓嬫媺
interfaceTypeList: [{
label: 'webService', value: 'webService'
@@ -92,6 +93,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'
+ }],
//鎺ㄩ�佺被鍨�
pushTypeList: [{value: '1', label: '鏁版嵁鎺ㄩ��'},
{value: '2', label: '鍒嗙被鎺ㄩ��'},
@@ -101,7 +110,7 @@
{value: '6', label: '鍚鍒欎俊鎭殑鍒嗙被鏌ヨ'},
{value: '7', label: '鏁版嵁鏌ヨ'}],
page: {
- pageSize: 10,
+ pageSize: 20,
currentPage: 1,
total: 100
},
@@ -119,12 +128,14 @@
border: true,
index: true,
selection: true,
+ indexFixed: false,
+ selectionFixed: false,
searchShow: false,
+ refreshBtn: false,
searchMenuSpan: 6,
rowKey: "id",
tabs: true,
stripe: true,
- indexFixed: false,
menuWidth: 180,
highlightCurrentRow: true,
addBtn: false,
@@ -151,7 +162,7 @@
prop: 'isGroupCodeFlag',
sortable: true,
width: 150,
- formatter: res => res.isGroupCodeFlag ? '闆嗗洟鐮�' : '浼佷笟缂栫爜'
+ formatter: res => res.isGroupCodeFlag === 'true' ? '闆嗗洟鐮�' : '浼佷笟缂栫爜'
}, {
label: '鎺ュ彛绫诲瀷',
prop: 'dataFlowTypeText',
@@ -247,6 +258,14 @@
sortable: true,
width: 150
}, {
+ label: '鍐呭绫诲瀷',
+ prop: 'contentType',
+ sortable: true,
+ width: 150,
+ formatter: (d) => {
+ return this.contentTypeList[d.contentType]
+ }
+ },{
label: '绯荤粺鎻忚堪',
prop: 'description',
width: 150
@@ -266,15 +285,15 @@
},
computed: {
...mapGetters(["permission"]),
- permissionList(){
- return{
- sync:this.vaildData(this.permission.info.info_sync,false),
- add:this.vaildData(this.permission.info.info_add,false),
- query:this.vaildData(this.permission.info.info_query,false),
- edit:this.vaildData(this.permission.info.info_edit,false),
- delete:this.vaildData(this.permission.info.info_delete,false),
- enable:this.vaildData(this.permission.info.info_enable,false),
- stop:this.vaildData(this.permission.info.info_stop,false),
+ permissionList() {
+ return {
+ sync: this.vaildData(this.permission.info.info_sync, false),
+ add: this.vaildData(this.permission.info.info_add, false),
+ query: this.vaildData(this.permission.info.info_query, false),
+ edit: this.vaildData(this.permission.info.info_edit, false),
+ delete: this.vaildData(this.permission.info.info_delete, false),
+ enable: this.vaildData(this.permission.info.info_enable, false),
+ stop: this.vaildData(this.permission.info.info_stop, false),
}
},
oids() {
@@ -359,10 +378,17 @@
this.editAttribute.sysIntParamVOs = row.sysIntParamVOs || [];
this.editAttribute.sysIntHeaderVOs = row.sysIntHeaderVOs || [];
this.editAttribute.type = 'edit';
- this.$refs.infoForm.formData = this.editAttribute;
+ this.$refs.infoForm.formData = row;
+ this.$refs.infoForm.groupCode = row.isGroupCodeFlag === 'true' ? true : false;
this.$refs.infoForm.showSubmitDialog = true;
- // console.log('row',this.editAttribute.pushType)
- // console.log('editAttribute',this.editAttribute.dataFlowTypeText)
+ //header瀵硅薄
+ HeaderRequest(1, -1, {'conditionMap[infoOid]': row.oid}).then(res => {
+ this.$refs.infoForm.formData.sysIntHeaderVOs = res.data.data.records;
+ })
+ //鍙傛暟瀵硅薄
+ ParmRequest(1, -1, {'conditionMap[infoOid]': row.oid}).then(res => {
+ this.$refs.infoForm.formData.sysIntParamVOs = res.data.data.records;
+ })
},
deleteSave(row, index) {
this.$confirm("鍒犻櫎鏁版嵁灏嗘棤娉曡鎭㈠, 鏄惁缁х画?", "鎻愮ず", {
@@ -438,26 +464,6 @@
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
- // const Props = {
- // paramType: '',
- // returnType: '',
- // dataFlowType: '',
- // pushType: '',
- // classifyName: '',
- // sourceSystemName: '',
- // targetSystemName: '',
- // classPath:'',
- // requestMethod:'',
- // requestUrl:'',
- // interfaceFunction:'',
- // nameSpace:'',
- // soapAction:'',
- // targetName:'',
- // cxfaxis:''
- // };
- // this.pushTypeList.forEach(item => {
- // Object.assign(item, Props);
- // });
this.loading = false;
});
},
@@ -471,6 +477,9 @@
if (JSON.stringify(conditionMaps) != '{}') {
this.query = conditionMaps;
this.onLoad(this.page);
+ } else {
+ this.query = {};
+ this.onLoad(this.page, this.query);
}
},
openAdvancedQuery() {
--
Gitblit v1.9.3