From 344ada5bc3e41c5fb42ae0e8ac590b64b7cb04ca Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期六, 24 二月 2024 20:30:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/docking/info.vue | 62 +++++++++++++-----------------
1 files changed, 27 insertions(+), 35 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/docking/info.vue b/Source/UBCS-WEB/src/views/docking/info.vue
index 973fcd7..eea767b 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'
@@ -119,12 +120,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,
@@ -266,15 +269,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() {
@@ -361,8 +364,14 @@
this.editAttribute.type = 'edit';
this.$refs.infoForm.formData = this.editAttribute;
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 +447,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 +460,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