From f94ded5d0a6545bb564f986bc2db03a989fae662 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 12 三月 2024 10:17:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/views/docking/info.vue |   46 +++++++++++++++++++++++++++++++++-------------
 1 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/Source/UBCS-WEB/src/views/docking/info.vue b/Source/UBCS-WEB/src/views/docking/info.vue
index fe9d9f2..08f7265 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";
@@ -72,7 +72,7 @@
   data() {
     return {
       //涓嬫媺鎬荤被鍨�
-      DropDownTheTotalType:[],
+      DropDownTheTotalType: [],
       //鎺ュ彛绫诲瀷涓嬫媺
       interfaceTypeList: [{
         label: 'webService', value: 'webService'
@@ -93,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: '鍒嗙被鎺ㄩ��'},
@@ -102,7 +110,7 @@
         {value: '6', label: '鍚鍒欎俊鎭殑鍒嗙被鏌ヨ'},
         {value: '7', label: '鏁版嵁鏌ヨ'}],
       page: {
-        pageSize: 10,
+        pageSize: 20,
         currentPage: 1,
         total: 100
       },
@@ -121,9 +129,9 @@
         index: true,
         selection: true,
         indexFixed: false,
-        selectionFixed:false,
+        selectionFixed: false,
         searchShow: false,
-        refreshBtn:false,
+        refreshBtn: false,
         searchMenuSpan: 6,
         rowKey: "id",
         tabs: true,
@@ -154,7 +162,7 @@
           prop: 'isGroupCodeFlag',
           sortable: true,
           width: 150,
-          formatter: res => res.isGroupCodeFlag ? '闆嗗洟鐮�' : '浼佷笟缂栫爜'
+          formatter: res => res.isGroupCodeFlag === 'true' ? '闆嗗洟鐮�' : '浼佷笟缂栫爜'
         }, {
           label: '鎺ュ彛绫诲瀷',
           prop: 'dataFlowTypeText',
@@ -250,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,9 +282,6 @@
     };
   },
   created() {
-    HeaderRequest().then(res => {
-      console.log(res)
-    })
   },
   computed: {
     ...mapGetters(["permission"]),
@@ -365,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("鍒犻櫎鏁版嵁灏嗘棤娉曡鎭㈠, 鏄惁缁х画?", "鎻愮ず", {
@@ -457,7 +477,7 @@
       if (JSON.stringify(conditionMaps) != '{}') {
         this.query = conditionMaps;
         this.onLoad(this.page);
-      }else {
+      } else {
         this.query = {};
         this.onLoad(this.page, this.query);
       }

--
Gitblit v1.10.0