From b5ab349b8fd15bd418b42bb65f868a9eecaed0eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Tue, 18 Jul 2023 10:02:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=8E=E7=BB=86=E6=B7=BB=E5=8A=A0=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E8=AE=BE=E7=BD=AE=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/filterForDetailPage/index.vue   | 12 ++++++++++--
 Code/Fe/src/components/tablePagination/index.vue   | 14 +++++++++++---
 Code/Fe/src/mixins/TableHeaderMixins.js            |  3 ++-
 Code/Fe/src/mixins/TableMixins.js                  | 11 ++++++-----
 Code/Fe/src/utils/detailsPageColumns_api/index.js  |  9 +++++++++
 Code/Fe/src/views/interfaceBoard/TestSchool.vue    | 13 ++++++-------
 6 files changed, 44 insertions(+), 18 deletions(-)
 create mode 100644 Code/Fe/src/utils/detailsPageColumns_api/index.js

diff --git a/Code/Fe/src/components/filterForDetailPage/index.vue b/Code/Fe/src/components/filterForDetailPage/index.vue
index ced8e1a..af563f2 100644
--- a/Code/Fe/src/components/filterForDetailPage/index.vue
+++ b/Code/Fe/src/components/filterForDetailPage/index.vue
@@ -20,6 +20,8 @@
                 :currenButtonData="currenButtonData"
                 :tableData="tableData"
                 :tableLoading="Loading.tableLoading"
+                @rowDrop="rowDropForDetail"
+                :rowSource="'detailPage_api'"
                 :tableColumns="listColumns"
                 :totalCount="totalCount"
                 :multipleSelection="multipleSelection"
@@ -46,7 +48,7 @@
                         label="操作"
                         :align="'center'"
                         width="150"
-                        fixed="right"
+                        fixed="left"
                     >
                         <template slot-scope="scope">
                             <span v-for="item in operaButtons" style="margin: 0 10px;">
@@ -181,7 +183,9 @@ props: {
     showHandleButtons:{
         type:Array,
         default:() => {
-            return ['showParent','fresh','filter'];//'add','edit'暂未处理操作 'delete'暂时隐藏
+            //'add','edit'暂未处理操作 'delete'暂时隐藏
+            // showParent查看主表信息，fresh刷新，filter筛选，field字段设置
+            return ['showParent','fresh','filter','field'];
         }
     },
     // 父级展现列数，默认为2列展现
@@ -215,6 +219,9 @@ mounted(){
     this.initHandleButtons()
 },
 methods: {
+    rowDropForDetail(data,type){
+        this.$emit("rowDropForDetail", data,type)
+    },
     // 初始化显示按钮
     initHandleButtons(){
         // 头部按钮
@@ -222,6 +229,7 @@ methods: {
         if(this.showHandleButtons.indexOf('add') >= 0){_arr_header.push(this.defaultAddBtn())}
         if(this.showHandleButtons.indexOf('fresh') >= 0){_arr_header.push(this.defaultFreshBtn())}
         if(this.showHandleButtons.indexOf('filter') >= 0){_arr_header.push(this.defaultFilterBtn())}
+        if(this.showHandleButtons.indexOf('field') >= 0){_arr_header.push(this.defaultFieldSettingBtn())}
         this.currenButtonData = _arr_header
 
         // 操作列按钮
diff --git a/Code/Fe/src/components/tablePagination/index.vue b/Code/Fe/src/components/tablePagination/index.vue
index 8c826c6..d36d219 100644
--- a/Code/Fe/src/components/tablePagination/index.vue
+++ b/Code/Fe/src/components/tablePagination/index.vue
@@ -34,6 +34,7 @@
       :tableColumns="tableColumns" 
       :visible="rowDropVisible"
       @closeRowDrop="closeRowDrop"
+      :source="rowSource"
     ></rowDrop>
     <!-- 列表 -->
     <div class="uTableOuter" ref="uTableOuterRef" :style="{height:uTableOuterHeight + 'px',overflow:'hidden'}">
@@ -194,6 +195,11 @@ export default {
       default: () => {
         return Function;
       }
+    },
+    // 字段设置来源（列表、列表-明细、明细页面）
+    rowSource:{
+      type:String,
+      default:'list_api'
     }
   },
   data () {
@@ -257,9 +263,11 @@ export default {
     })
   },
   methods: {
-    rowDrop(data) {
-      this.$emit('rowDrop',data)
-      this.isUpdate = !this.isUpdate
+    rowDrop(data,type) {
+      this.$emit('rowDrop',data,type)
+      this.$nextTick(()=>{
+        this.isUpdate = !this.isUpdate
+      })
     },
     //点击常用按钮
     topbutton (val,item) {
diff --git a/Code/Fe/src/mixins/TableHeaderMixins.js b/Code/Fe/src/mixins/TableHeaderMixins.js
index 62808fb..d30db46 100644
--- a/Code/Fe/src/mixins/TableHeaderMixins.js
+++ b/Code/Fe/src/mixins/TableHeaderMixins.js
@@ -301,12 +301,13 @@ export const TableHeaderMixins = {
      * 表头字段设置
      * @param {*} data 数据
      * @param {*} type 设置来源 
-     * list_api: 表头来自api的列表  detail_api: 表头来自api列表的明细
+     * list_api: 表头来自api的列表  detail_api: 表头来自api列表的明细 detailPage_api表头来自api的明细页面列表
      * list: 表头固定的列表  detail: 表头固定列表的明细
      */
      rowDrop(data,type) {
       if(!type || type == 'list_api'){ this.apiColumns_Table = data }
       if(type && type == 'detail_api'){ this.apiColumns_DetailsTable = data }
+      if(type && type == 'detailPage_api'){ this.apiColumns_DetailsPage = data }
       if(type && type == 'list'){ this.tableColumns = data }
       if(type && type == 'detail'){ this.detailsTableColumns = data }
     }
diff --git a/Code/Fe/src/mixins/TableMixins.js b/Code/Fe/src/mixins/TableMixins.js
index 8e92b9e..0804550 100644
--- a/Code/Fe/src/mixins/TableMixins.js
+++ b/Code/Fe/src/mixins/TableMixins.js
@@ -42,6 +42,7 @@ export const tableMixins = {
       apiColumns_Table:null,
       apiColumns_DesTions:null,
       apiColumns_DetailsTable:null,
+      apiColumns_DetailsPage:null,
       //主表-列表
       URLOption_base:allUrlOption[this.$route.name].baseURL,
       //主表-明细
@@ -54,12 +55,12 @@ export const tableMixins = {
   },
   methods: {
     // 获取通过api的表头数据，不可以在初始化处理，因为接口返回问题
-    initApiColumns(tableColumns_api,tabsDesTions_api,detailsTableColumns_api){
+    initApiColumns(table,des,detailsTable,detailsPage){
       // 赋值表头数据
-      this.apiColumns_Table = this.initTableColumns(tableColumns_api[this.$route.name])
-      this.apiColumns_DesTions = tabsDesTions_api[this.$route.name]
-      this.apiColumns_DetailsTable = this.initTableColumns(detailsTableColumns_api[this.$route.name],'detail_api')
-    
+      this.apiColumns_Table = this.initTableColumns(table[this.$route.name])
+      this.apiColumns_DesTions = des[this.$route.name]
+      this.apiColumns_DetailsTable = this.initTableColumns(detailsTable[this.$route.name],'detail_api')
+      this.apiColumns_DetailsPage = this.initTableColumns(detailsPage[this.$route.name],'detailPage_api')
     },
     //渲染数据
     paging(callback) {
diff --git a/Code/Fe/src/utils/detailsPageColumns_api/index.js b/Code/Fe/src/utils/detailsPageColumns_api/index.js
new file mode 100644
index 0000000..dcbd804
--- /dev/null
+++ b/Code/Fe/src/utils/detailsPageColumns_api/index.js
@@ -0,0 +1,9 @@
+// 此文件为【明细 - 列表】表头从接口缓存的表头
+
+import { initFromApiColumnsLable } from '@/utils/index'
+
+// 测试数据
+export const TestSchool = [
+  { label: initFromApiColumnsLable('TestStudentDetailStudentName'), prop: "studentName" },
+  { label: initFromApiColumnsLable('TestStudentDetailOrderType'), prop: "orderType" },
+]
\ No newline at end of file
diff --git a/Code/Fe/src/views/interfaceBoard/TestSchool.vue b/Code/Fe/src/views/interfaceBoard/TestSchool.vue
index 1165fbc..e2cd450 100644
--- a/Code/Fe/src/views/interfaceBoard/TestSchool.vue
+++ b/Code/Fe/src/views/interfaceBoard/TestSchool.vue
@@ -66,8 +66,9 @@
     ></newAndEdiDialog>
     <!-- 明细查询页面 -->
     <filterForDetailPage
-      v-if="filterForDetailShow"
-      :listColumns="apiColumns_DetailsTable"
+    @rowDropForDetail="rowDrop"
+      v-if="filterForDetailShow && apiColumns_DetailsPage"
+      :listColumns="apiColumns_DetailsPage"
       :parentColumns="apiColumns_Table"
       @closeDialog="changeFilterForDetailShow"
     ></filterForDetailPage>
@@ -92,8 +93,8 @@ import { filterSelectMixins } from '@/mixins/filter-Select'
 import { getToken } from '@/utils/auth'
 import  * as tableColumns_api from "@/utils/tableColumns_api/index" //全局从接口缓存的表头
 import  * as tabsDesTions_api from "@/utils/tabsDesTions_api/index" //全局从接口缓存的详情
-import  * as detailsTableColumns_api from "@/utils/detailsTableColumns_api/index" //全局从接口缓存的详情
-
+import  * as detailsTableColumns_api from "@/utils/detailsTableColumns_api/index" //全局从接口缓存的列表-明细
+import  * as detailsPageColumns_api from "@/utils/detailsPageColumns_api/index" //全局从接口缓存的明细列表
 
 export default {
   name: "TestSchool",
@@ -127,8 +128,6 @@ export default {
         this.defaultFilterBtn(),//筛选
         this.defaultFilterForDetailBtn()//明细查询按钮
       ],
-      // 明细查询弹窗显示
-      filterForDetailShow:false,
       //新增数据
       CreateFormData: {
         schoolName:null,
@@ -176,7 +175,7 @@ export default {
     };
   },
   mounted() {
-    this.initApiColumns(tableColumns_api,tabsDesTions_api,detailsTableColumns_api)
+    this.initApiColumns(tableColumns_api,tabsDesTions_api,detailsTableColumns_api,detailsPageColumns_api)
     this.paging();
   },
 }