From e312f308fc538e8769708954589560622330f2ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Fri, 14 Jul 2023 16:58:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E9=83=A8=E5=8A=A0=E4=B8=8A=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PC/InterFace.Dash/public/config.js            |  4 ++--
 .../src/utils/tableColumns_api/index.js       |  2 +-
 .../basicConfig/ExportCustomUserSetting.vue   | 22 +++----------------
 .../src/views/interfaceBoard/IncomingData.vue | 11 ++--------
 .../interfaceBoard/IncomingDataHistory.vue    | 11 ++--------
 .../interfaceBoard/MesProductL7PartsNote.vue  | 11 ++--------
 .../views/interfaceBoard/MessageReceive.vue   | 11 ++--------
 .../src/views/interfaceBoard/OutgoingData.vue | 11 ++--------
 .../interfaceBoard/OutgoingDataHistory.vue    | 11 ++--------
 .../interfaceBoard/demo_detail_addbase.vue    | 13 ++++-------
 .../src/views/interfaceBoard/demo_read.vue    | 11 ++--------
 11 files changed, 24 insertions(+), 94 deletions(-)

diff --git a/PC/InterFace.Dash/public/config.js b/PC/InterFace.Dash/public/config.js
index a0d0f9a..22fc6b8 100644
--- a/PC/InterFace.Dash/public/config.js
+++ b/PC/InterFace.Dash/public/config.js
@@ -1,6 +1,6 @@
 // dev_win
-window.SITE_CONFIG['base'] = 'http://dev.ccwin-in.com:60068'
-// window.SITE_CONFIG['base'] = 'http://192.168.0.197:60068'
+// window.SITE_CONFIG['base'] = 'http://dev.ccwin-in.com:60068'
+window.SITE_CONFIG['base'] = 'http://192.168.0.197:60068'
 window.SITE_CONFIG['columnsApiNames'] = '/api/abp/application-localization'
 // window.SITE_CONFIG['columnsApiNames'] = '/api/abp/application-configuration'
 window.SITE_CONFIG['columnsApiNamesZh'] = 'Z'
diff --git a/PC/InterFace.Dash/src/utils/tableColumns_api/index.js b/PC/InterFace.Dash/src/utils/tableColumns_api/index.js
index 4ef0160..8b07b68 100644
--- a/PC/InterFace.Dash/src/utils/tableColumns_api/index.js
+++ b/PC/InterFace.Dash/src/utils/tableColumns_api/index.js
@@ -4,7 +4,7 @@ import { initFromApiColumnsLable } from '@/utils/index'
 
 // ExportCustomUserSetting
 export const ExportCustomUserSetting = [
-  { label: initFromApiColumnsLable('ExportCustomUserSettingCustomUserSetting'), prop: "customUserSetting", type:'name' },
+  { label: initFromApiColumnsLable('ExportCustomUserSettingCustomUserSetting'), prop: "customUserSetting" },
   { label: initFromApiColumnsLable('ExportCustomUserSettingExportColumnName'), prop: "exportColumnName" },
   { label: initFromApiColumnsLable('ExportCustomUserSettingExportTableName'), prop: "exportTableName" },
   // { label: initFromApiColumnsLable('ExportCustomUserSettingExportUserId'), prop: "exportUserId" },
diff --git a/PC/InterFace.Dash/src/views/basicConfig/ExportCustomUserSetting.vue b/PC/InterFace.Dash/src/views/basicConfig/ExportCustomUserSetting.vue
index 9e4764d..a85e09c 100644
--- a/PC/InterFace.Dash/src/views/basicConfig/ExportCustomUserSetting.vue
+++ b/PC/InterFace.Dash/src/views/basicConfig/ExportCustomUserSetting.vue
@@ -25,6 +25,7 @@
         :primarySearchOption="primarySearchOption"
         @overallSearchFormClick="overallSearchFormClick"
         :httpOverallSearchData="httpOverallSearchData"
+        :buttonOperationList="operationButtonsTable"
       >
         <!-- <div slot="tableTopSlot">
           上方按钮插槽位置预留
@@ -136,6 +137,7 @@
         //常用按钮数据
         currenButtonData: [
           this.defaultAddBtn(),//新增
+          this.defaultFieldSettingBtn(),//字段设置
           this.defaultFreshBtn(),//刷新
           this.defaultFilterBtn(),//筛选
         ],
@@ -179,27 +181,9 @@
       };
     },
     mounted () {
-      this.initApiColumns()
+      this.initApiColumns(tableColumns_api,tabsDesTions_api,detailsTableColumns_api)
       this.paging();
     },
-    methods:{
-      // 获取通过api的表头数据，不可以在初始化处理，因为接口返回问题
-      initApiColumns(){
-        this.apiColumns_Table = tableColumns_api[this.$route.name]
-        this.apiColumns_DesTions = tabsDesTions_api[this.$route.name]
-        this.apiColumns_DetailsTable = detailsTableColumns_api[this.$route.name]
-      },
-      //渲染数据
-      // paging(callback) {
-      //     this.Loading.tableLoading = true;
-      //     getExportConfigList('TestSchool').then(res => {
-      //         this.tableData = res
-      //         this.pagingCallback(callback)
-      //     }).catch(err => {
-      //         this.Loading.tableLoading = false
-      //     })
-      // },
-    }
   };
   </script>
   <style lang="scss" scoped>
diff --git a/PC/InterFace.Dash/src/views/interfaceBoard/IncomingData.vue b/PC/InterFace.Dash/src/views/interfaceBoard/IncomingData.vue
index d28db2b..48189fc 100644
--- a/PC/InterFace.Dash/src/views/interfaceBoard/IncomingData.vue
+++ b/PC/InterFace.Dash/src/views/interfaceBoard/IncomingData.vue
@@ -77,23 +77,16 @@ export default {
           isRedundance:true,
           isDetailExport:true
         }),//导出
+        this.defaultFieldSettingBtn(),//字段设置
         this.defaultFreshBtn(),//刷新
         this.defaultFilterBtn(),//筛选
       ],
     };
   },
   mounted() {
-    this.initApiColumns()
+    this.initApiColumns(tableColumns_api,tabsDesTions_api,detailsTableColumns_api)
     this.paging();
   },
-  methods: {
-    // 获取通过api的表头数据，不可以在初始化处理，因为接口返回问题
-    initApiColumns(){
-      this.apiColumns_Table = tableColumns_api[this.$route.name]
-      this.apiColumns_DesTions = tabsDesTions_api[this.$route.name]
-      this.apiColumns_DetailsTable = detailsTableColumns_api[this.$route.name]
-    },
-  }
 }
 </script>
 <style lang="scss" scoped>
diff --git a/PC/InterFace.Dash/src/views/interfaceBoard/IncomingDataHistory.vue b/PC/InterFace.Dash/src/views/interfaceBoard/IncomingDataHistory.vue
index 2e1d8a8..49cdf4a 100644
--- a/PC/InterFace.Dash/src/views/interfaceBoard/IncomingDataHistory.vue
+++ b/PC/InterFace.Dash/src/views/interfaceBoard/IncomingDataHistory.vue
@@ -77,23 +77,16 @@ export default {
           isRedundance:true,
           isDetailExport:true
         }),//导出
+        this.defaultFieldSettingBtn(),//字段设置
         this.defaultFreshBtn(),//刷新
         this.defaultFilterBtn(),//筛选
       ],
     };
   },
   mounted() {
-    this.initApiColumns()
+    this.initApiColumns(tableColumns_api,tabsDesTions_api,detailsTableColumns_api)
     this.paging();
   },
-  methods: {
-    // 获取通过api的表头数据，不可以在初始化处理，因为接口返回问题
-    initApiColumns(){
-      this.apiColumns_Table = tableColumns_api[this.$route.name]
-      this.apiColumns_DesTions = tabsDesTions_api[this.$route.name]
-      this.apiColumns_DetailsTable = detailsTableColumns_api[this.$route.name]
-    },
-  }
 }
 </script>
 <style lang="scss" scoped>
diff --git a/PC/InterFace.Dash/src/views/interfaceBoard/MesProductL7PartsNote.vue b/PC/InterFace.Dash/src/views/interfaceBoard/MesProductL7PartsNote.vue
index c5df6ee..a62e52f 100644
--- a/PC/InterFace.Dash/src/views/interfaceBoard/MesProductL7PartsNote.vue
+++ b/PC/InterFace.Dash/src/views/interfaceBoard/MesProductL7PartsNote.vue
@@ -77,23 +77,16 @@ export default {
           isRedundance:true,
           isDetailExport:true
         }),//导出
+        this.defaultFieldSettingBtn(),//字段设置
         this.defaultFreshBtn(),//刷新
         this.defaultFilterBtn(),//筛选
       ],
     };
   },
   mounted() {
-    this.initApiColumns()
+    this.initApiColumns(tableColumns_api,tabsDesTions_api,detailsTableColumns_api)
     this.paging();
   },
-  methods: {
-    // 获取通过api的表头数据，不可以在初始化处理，因为接口返回问题
-    initApiColumns(){
-      this.apiColumns_Table = tableColumns_api[this.$route.name]
-      this.apiColumns_DesTions = tabsDesTions_api[this.$route.name]
-      this.apiColumns_DetailsTable = detailsTableColumns_api[this.$route.name]
-    },
-  }
 }
 </script>
 <style lang="scss" scoped>
diff --git a/PC/InterFace.Dash/src/views/interfaceBoard/MessageReceive.vue b/PC/InterFace.Dash/src/views/interfaceBoard/MessageReceive.vue
index 24607d9..c130cf3 100644
--- a/PC/InterFace.Dash/src/views/interfaceBoard/MessageReceive.vue
+++ b/PC/InterFace.Dash/src/views/interfaceBoard/MessageReceive.vue
@@ -77,23 +77,16 @@ export default {
           isRedundance:true,
           isDetailExport:true
         }),//导出
+        this.defaultFieldSettingBtn(),//字段设置
         this.defaultFreshBtn(),//刷新
         this.defaultFilterBtn(),//筛选
       ],
     };
   },
   mounted() {
-    this.initApiColumns()
+    this.initApiColumns(tableColumns_api,tabsDesTions_api,detailsTableColumns_api)
     this.paging();
   },
-  methods: {
-    // 获取通过api的表头数据，不可以在初始化处理，因为接口返回问题
-    initApiColumns(){
-      this.apiColumns_Table = tableColumns_api[this.$route.name]
-      this.apiColumns_DesTions = tabsDesTions_api[this.$route.name]
-      this.apiColumns_DetailsTable = detailsTableColumns_api[this.$route.name]
-    },
-  }
 }
 </script>
 <style lang="scss" scoped>
diff --git a/PC/InterFace.Dash/src/views/interfaceBoard/OutgoingData.vue b/PC/InterFace.Dash/src/views/interfaceBoard/OutgoingData.vue
index 40c7874..7dd8bab 100644
--- a/PC/InterFace.Dash/src/views/interfaceBoard/OutgoingData.vue
+++ b/PC/InterFace.Dash/src/views/interfaceBoard/OutgoingData.vue
@@ -77,23 +77,16 @@ export default {
           isRedundance:true,
           isDetailExport:true
         }),//导出
+        this.defaultFieldSettingBtn(),//字段设置  
         this.defaultFreshBtn(),//刷新
         this.defaultFilterBtn(),//筛选
       ],
     };
   },
   mounted() {
-    this.initApiColumns()
+    this.initApiColumns(tableColumns_api,tabsDesTions_api,detailsTableColumns_api)
     this.paging();
   },
-  methods: {
-    // 获取通过api的表头数据，不可以在初始化处理，因为接口返回问题
-    initApiColumns(){
-      this.apiColumns_Table = tableColumns_api[this.$route.name]
-      this.apiColumns_DesTions = tabsDesTions_api[this.$route.name]
-      this.apiColumns_DetailsTable = detailsTableColumns_api[this.$route.name]
-    },
-  }
 }
 </script>
 <style lang="scss" scoped>
diff --git a/PC/InterFace.Dash/src/views/interfaceBoard/OutgoingDataHistory.vue b/PC/InterFace.Dash/src/views/interfaceBoard/OutgoingDataHistory.vue
index f47d101..967d029 100644
--- a/PC/InterFace.Dash/src/views/interfaceBoard/OutgoingDataHistory.vue
+++ b/PC/InterFace.Dash/src/views/interfaceBoard/OutgoingDataHistory.vue
@@ -77,23 +77,16 @@ export default {
           isRedundance:true,
           isDetailExport:true
         }),//导出
+        this.defaultFieldSettingBtn(),//字段设置
         this.defaultFreshBtn(),//刷新
         this.defaultFilterBtn(),//筛选
       ],
     };
   },
   mounted() {
-    this.initApiColumns()
+    this.initApiColumns(tableColumns_api,tabsDesTions_api,detailsTableColumns_api)
     this.paging();
   },
-  methods: {
-    // 获取通过api的表头数据，不可以在初始化处理，因为接口返回问题
-    initApiColumns(){
-      this.apiColumns_Table = tableColumns_api[this.$route.name]
-      this.apiColumns_DesTions = tabsDesTions_api[this.$route.name]
-      this.apiColumns_DetailsTable = detailsTableColumns_api[this.$route.name]
-    },
-  }
 }
 </script>
 <style lang="scss" scoped>
diff --git a/PC/InterFace.Dash/src/views/interfaceBoard/demo_detail_addbase.vue b/PC/InterFace.Dash/src/views/interfaceBoard/demo_detail_addbase.vue
index b6fabc7..dd61419 100644
--- a/PC/InterFace.Dash/src/views/interfaceBoard/demo_detail_addbase.vue
+++ b/PC/InterFace.Dash/src/views/interfaceBoard/demo_detail_addbase.vue
@@ -24,6 +24,8 @@
       :primarySearchOption="primarySearchOption"
       @overallSearchFormClick="overallSearchFormClick"
       :httpOverallSearchData="httpOverallSearchData"
+      @buttonOperationClick="buttonOperationClick"
+      :buttonOperationList="operationButtonsTable"
     ></tablePagination>
     <curren-Drawer
       :title="apiColumns_DesTions"
@@ -111,6 +113,7 @@ export default {
           isRedundance:true,
           isDetailExport:true
         }),//导出
+        this.defaultFieldSettingBtn(),//字段设置
         this.defaultFreshBtn(),//刷新
         this.defaultFilterBtn(),//筛选
         this.defaultFilterForDetailBtn()//明细查询按钮
@@ -164,17 +167,9 @@ export default {
     };
   },
   mounted() {
-    this.initApiColumns()
+    this.initApiColumns(tableColumns_api,tabsDesTions_api,detailsTableColumns_api)
     this.paging();
   },
-  methods: {
-    // 获取通过api的表头数据，不可以在初始化处理，因为接口返回问题
-    initApiColumns(){
-      this.apiColumns_Table = tableColumns_api[this.$route.name]
-      this.apiColumns_DesTions = tabsDesTions_api[this.$route.name]
-      this.apiColumns_DetailsTable = detailsTableColumns_api[this.$route.name]
-    },
-  }
 }
 </script>
 <style lang="scss" scoped>
diff --git a/PC/InterFace.Dash/src/views/interfaceBoard/demo_read.vue b/PC/InterFace.Dash/src/views/interfaceBoard/demo_read.vue
index e14fc92..3aadfe7 100644
--- a/PC/InterFace.Dash/src/views/interfaceBoard/demo_read.vue
+++ b/PC/InterFace.Dash/src/views/interfaceBoard/demo_read.vue
@@ -86,6 +86,7 @@ export default {
           isRedundance:true,
           isDetailExport:true
         }),//导出
+        this.defaultFieldSettingBtn(),//字段设置
         this.defaultFreshBtn(),//刷新
         this.defaultFilterBtn(),//筛选
         this.defaultFilterForDetailBtn()//明细查询按钮
@@ -95,17 +96,9 @@ export default {
     };
   },
   mounted() {
-    this.initApiColumns()
+    this.initApiColumns(tableColumns_api,tabsDesTions_api,detailsTableColumns_api)
     this.paging();
   },
-  methods: {
-    // 获取通过api的表头数据，不可以在初始化处理，因为接口返回问题
-    initApiColumns(){
-      this.apiColumns_Table = tableColumns_api[this.$route.name]
-      this.apiColumns_DesTions = tabsDesTions_api[this.$route.name]
-      this.apiColumns_DetailsTable = detailsTableColumns_api[this.$route.name]
-    },
-  }
 }
 </script>
 <style lang="scss" scoped>