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 | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/docking/info.vue b/Source/UBCS-WEB/src/views/docking/info.vue
index 4cc1fb3..eea767b 100644
--- a/Source/UBCS-WEB/src/views/docking/info.vue
+++ b/Source/UBCS-WEB/src/views/docking/info.vue
@@ -59,7 +59,7 @@
<script>
import {
- getList, add, edit, del, push, updateStatus,HeaderRequest
+ getList, add, edit, del, push, updateStatus, HeaderRequest, ParmRequest
} from "@/api/docking/info";
import {getDictionary} from "@/api/omd/enum";
import infoForm from "./infoForm.vue";
@@ -71,6 +71,8 @@
data() {
return {
+ //涓嬫媺鎬荤被鍨�
+ DropDownTheTotalType: [],
//鎺ュ彛绫诲瀷涓嬫媺
interfaceTypeList: [{
label: 'webService', value: 'webService'
@@ -119,9 +121,9 @@
index: true,
selection: true,
indexFixed: false,
- selectionFixed:false,
+ selectionFixed: false,
searchShow: false,
- refreshBtn:false,
+ refreshBtn: false,
searchMenuSpan: 6,
rowKey: "id",
tabs: true,
@@ -264,9 +266,6 @@
};
},
created() {
- HeaderRequest().then(res => {
- console.log(res)
- })
},
computed: {
...mapGetters(["permission"]),
@@ -365,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("鍒犻櫎鏁版嵁灏嗘棤娉曡鎭㈠, 鏄惁缁х画?", "鎻愮ず", {
@@ -455,7 +460,7 @@
if (JSON.stringify(conditionMaps) != '{}') {
this.query = conditionMaps;
this.onLoad(this.page);
- }else {
+ } else {
this.query = {};
this.onLoad(this.page, this.query);
}
--
Gitblit v1.9.3