From 4531e7a9d31099627e1b08fc524f59939fd21f9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Thu, 13 Jul 2023 14:25:09 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=8D=E5=88=B6json?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Code/Fe/src/components/umyTable/index.vue | 52 ++++++++++++++++++++++-
 1 file changed, 50 insertions(+), 2 deletions(-)

diff --git a/Code/Fe/src/components/umyTable/index.vue b/Code/Fe/src/components/umyTable/index.vue
index 8e0fff9..bd19b88 100644
--- a/Code/Fe/src/components/umyTable/index.vue
+++ b/Code/Fe/src/components/umyTable/index.vue
@@ -345,6 +345,26 @@
       {{ showDetailData ? showDetailData + "" : showDetailData }}
     </el-dialog>
 
+    <!-- json弹窗（复制的json内容） -->
+    <el-dialog
+      :visible.sync="showJsonCopy"
+      :modal-append-to-body="false"
+      :append-to-body="true"
+      :show-close="true"
+      :close-on-click-modal="true"
+      :close-on-press-escape="true"
+      :title="'JSON详情'"
+    >
+      <el-input
+        ref="copyJsonTextarea_ref"
+        type="textarea"
+        readonly
+        autosize
+        placeholder="请输入内容"
+        v-model="showJsonData_str">
+      </el-input>
+    </el-dialog>
+
     <!-- 点开查看Json转换后table弹窗 -->
     <el-dialog 
       :visible.sync="showJsonDialog"
@@ -355,6 +375,11 @@
       :close-on-press-escape="true"
       :title="'内容详情'"
     >
+      <el-button 
+        @click="copyJsonHandle()" 
+        type="primary" 
+        style="margin-bottom: 10px;float: right;"
+      >复制JSON</el-button>
       <el-table
         :data="showJsonData"
         :border="true"
@@ -369,7 +394,7 @@
         >
           <template slot-scope="scope">
             <!-- DETAILS todo:DETAILS判断条件需要优化，使用传参的方式 -->
-            <span v-if="(scope.row.name).toUpperCase != 'DETAILS'">{{scope.row.value}}</span>
+            <span v-if="(scope.row.name).toUpperCase() != 'DETAILS'">{{scope.row.value}}</span>
             <el-table
               v-else
               height="300"
@@ -502,6 +527,8 @@ export default {
       showDetailData:null,//点开查看全部内容
       showJsonDialog:false,//点开查看Json转换后table弹窗
       showJsonData:null,//点开查看Json的数据
+      showJsonData_str:null,//复制的Json字符串
+      showJsonCopy:false,//复制json的Dialog显隐控制
     };
   },
   computed: {
@@ -795,7 +822,7 @@ export default {
           // 如果是数组
           if(Array.isArray(_json[item])){
             //  如果是 DETAILS todo:DETAILS判断条件需要优化，使用传参的方式
-            let _value = (item).toUpperCase == 'DETAILS' ? __initJson(_json[item][0]) : (_json[item]).join(",")
+            let _value = (item).toUpperCase() == 'DETAILS' ? __initJson(_json[item][0]) : (_json[item]).join(",")
             _arr.push({name:item,value:_value})
           }
           // 如果是对象
@@ -812,8 +839,29 @@ export default {
         }
       }
       this.showJsonData = _arr
+      this.showJsonData_str = JSON.stringify(JSON.parse(JSON.stringify(this.showJsonData)), null, '\t')
       this.$emit("showJsonTable", row);
     },
+    // 复制Json按钮
+    copyJsonHandle(){
+      this.showJsonCopy = true
+      // this.$refs.copyJsonTextarea_ref.focus()
+      navigator.clipboard.writeText(this.showJsonData_str)
+			.then(() => {
+				this.$message.success('复制成功');
+			})
+			.catch(err => {
+				this.$message.error('复制失败');
+			});
+      this.$nextTick(()=>{
+        if(this.$refs.copyJsonTextarea_ref){
+          this.$refs.copyJsonTextarea_ref.focus()
+          // this.$nextTick(()=>{
+          //   this.$refs.copyJsonTextarea_ref.scrollTop = 0
+          // })
+        }
+      })
+    },
     //点击按钮打开自定义弹窗
     buttonClick(row, index, label) {
       this.$emit("buttonClick", row, index, label);

From 5c61ae9fca75111c512157b30b55eb6e050ba11a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Thu, 13 Jul 2023 15:18:20 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Code/Fe/src/components/umyTable/index.vue |  8 ++++----
 Code/Fe/src/permission.js                 | 24 +++++++++++------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Code/Fe/src/components/umyTable/index.vue b/Code/Fe/src/components/umyTable/index.vue
index bd19b88..d708364 100644
--- a/Code/Fe/src/components/umyTable/index.vue
+++ b/Code/Fe/src/components/umyTable/index.vue
@@ -347,6 +347,7 @@
 
     <!-- json弹窗（复制的json内容） -->
     <el-dialog
+      id="copyJsonTextarea_dialog_ref"
       :visible.sync="showJsonCopy"
       :modal-append-to-body="false"
       :append-to-body="true"
@@ -845,7 +846,6 @@ export default {
     // 复制Json按钮
     copyJsonHandle(){
       this.showJsonCopy = true
-      // this.$refs.copyJsonTextarea_ref.focus()
       navigator.clipboard.writeText(this.showJsonData_str)
 			.then(() => {
 				this.$message.success('复制成功');
@@ -856,9 +856,9 @@ export default {
       this.$nextTick(()=>{
         if(this.$refs.copyJsonTextarea_ref){
           this.$refs.copyJsonTextarea_ref.focus()
-          // this.$nextTick(()=>{
-          //   this.$refs.copyJsonTextarea_ref.scrollTop = 0
-          // })
+          this.$nextTick(()=>{
+            document.getElementById('copyJsonTextarea_dialog_ref').scrollTop = 0
+          })
         }
       })
     },
diff --git a/Code/Fe/src/permission.js b/Code/Fe/src/permission.js
index f41ba68..10cb5ce 100644
--- a/Code/Fe/src/permission.js
+++ b/Code/Fe/src/permission.js
@@ -81,18 +81,18 @@ router.beforeEach(async (to, from, next) => {
     }
   }else{
     // 重新获取api接口表头
-    const _interfaceBoardColumnsNames = localStorage.getItem("interfaceBoardColumnsNames")
-    if( !_interfaceBoardColumnsNames || _interfaceBoardColumnsNames == 'undefined' || _interfaceBoardColumnsNames == 'null'){
-      getInterfaceBoard().then(result => {
-        let _zh = localStorage.getItem('columnsApiNamesZh')
-        localStorage.setItem("interfaceBoardColumnsNames", JSON.stringify(result.localization.values[_zh]));
-        setTimeout(()=>{
-          next()
-        },0)
-      })
-    }else{
-      next()
-    }
+    // const _interfaceBoardColumnsNames = localStorage.getItem("interfaceBoardColumnsNames")
+    // if( !_interfaceBoardColumnsNames || _interfaceBoardColumnsNames == 'undefined' || _interfaceBoardColumnsNames == 'null'){
+    getInterfaceBoard().then(result => {
+      let _zh = localStorage.getItem('columnsApiNamesZh')
+      localStorage.setItem("interfaceBoardColumnsNames", JSON.stringify(result.localization.values[_zh]));
+      setTimeout(()=>{
+        next()
+      },0)
+    })
+    // }else{
+    //   next()
+    // }
   }
   
 

From 2d7941c2f9754b291de41a8e6c0a96f8b9382797 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=B8=A4=E6=97=AD=5BIrelia=5D?= <366601522@qq.com>
Date: Thu, 13 Jul 2023 23:07:08 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppBase/ZbxBase.cs                        | 89 ++++++++++++++++---
 1 file changed, 76 insertions(+), 13 deletions(-)

diff --git a/Code/Be/Faster.Zheng.Winin/src/Faster.Zheng.Winin.Application/AppBase/ZbxBase.cs b/Code/Be/Faster.Zheng.Winin/src/Faster.Zheng.Winin.Application/AppBase/ZbxBase.cs
index 55fb94d..e011fc4 100644
--- a/Code/Be/Faster.Zheng.Winin/src/Faster.Zheng.Winin.Application/AppBase/ZbxBase.cs
+++ b/Code/Be/Faster.Zheng.Winin/src/Faster.Zheng.Winin.Application/AppBase/ZbxBase.cs
@@ -33,8 +33,6 @@ public class ZbxBase<TEntity, TEntityDto, TKey, TPagedAndSortedResultRequestDto,
     where TEntityDto : IEntityDto<TKey>
 {
     private readonly IRepository<TEntity, TKey> _repository;
-    private readonly IMapper _mapper;
-    private Func<TCreateInput, Entity> _mapFunc;
 
     protected IStringLocalizer<WininResource> _localizer =>
         LazyServiceProvider.LazyGetRequiredService<IStringLocalizer<WininResource>>();
@@ -42,7 +40,6 @@ public class ZbxBase<TEntity, TEntityDto, TKey, TPagedAndSortedResultRequestDto,
     protected ExportCustomUserSettingAppService _exportCustomUserSettingAppService =>
         LazyServiceProvider.LazyGetRequiredService<ExportCustomUserSettingAppService>();
 
-
     public ZbxBase(IRepository<TEntity, TKey> repository) : base(repository)
     {
         _repository = repository;
@@ -61,6 +58,8 @@ public class ZbxBase<TEntity, TEntityDto, TKey, TPagedAndSortedResultRequestDto,
     public async Task<PagedResultDto<TEntityDto>> GetPageListByFilterAsync(SfsRequestInputBase sfsRequestInputBase,
         bool includeDetails = false, CancellationToken cancellationToken = default)
     {
+        await CheckGetListPolicyAsync();
+
         var expression = sfsRequestInputBase.Condition.Filters?.Count > 0
             ? sfsRequestInputBase.Condition.Filters.ToLambda<TEntity>()
             : p => true;
@@ -286,7 +285,10 @@ public class ZbxBase<TEntity, TEntityDto, TKey, TPagedAndSortedResultRequestDto,
         IWorkbook workbook = new XSSFWorkbook();
         var sheet = workbook.CreateSheet(typeof(TEntityDto).Name);
         var splitDetailsColumnNumber = 1; //分割主表和从表的列数量
-        var excelDetailsColor = SetExcelDetailsColor(workbook); //字表样式
+        var excelDetailsCellStyle = SetExcelDetailsCellStyle(workbook); //子表单元格样式
+        var excelSplitCellStyle = SetSplitCellStyle(workbook); //分割单元格样式
+        var excelOnlyMainCellStyle = SetExcelOnlyMainCellStyle(workbook);
+        var excelHeadCellStyle = SetExcelHeadCellStyle(workbook);
 
         // 获取主表的属性 创建主表 表头
         var mainAllProperties = typeof(TEntityDto).GetProperties();
@@ -306,13 +308,15 @@ public class ZbxBase<TEntity, TEntityDto, TKey, TPagedAndSortedResultRequestDto,
 
         #endregion
 
-        var headerRow = sheet.CreateRow(0);
+        var headerRow = sheet.CreateRow(0);//标头列
         for (var i = 0; i < mainProperties.Length; i++)
         {
             var englishName = mainProperties[i].Name;
             //本地化
             var localizerName = _localizer[typeof(TEntity).Name + englishName];
-            headerRow.CreateCell(i).SetCellValue(localizerName);
+            var headCell = headerRow.CreateCell(i);
+            headCell.SetCellValue(localizerName);
+            headCell.CellStyle = excelHeadCellStyle;
         }
 
         // 获取从表的属性 创建从表 表头
@@ -333,7 +337,7 @@ public class ZbxBase<TEntity, TEntityDto, TKey, TPagedAndSortedResultRequestDto,
 
             if (isHasDetail)
             {
-                headerRow.CreateCell(mainProperties.Length).SetCellValue("---分割---");
+                headerRow.CreateCell(mainProperties.Length).SetCellValue("---【分割】---");
 
                 #region 用户个性导出 从表
 
@@ -356,7 +360,7 @@ public class ZbxBase<TEntity, TEntityDto, TKey, TPagedAndSortedResultRequestDto,
                     headerRow.CreateCell(mainProperties.Length + splitDetailsColumnNumber + i)
                         .SetCellValue(detailProperties[i].Name);
                     var headCell = headerRow.GetCell(mainProperties.Length + splitDetailsColumnNumber + i);
-                    headCell.CellStyle = excelDetailsColor;
+                    headCell.CellStyle = excelHeadCellStyle;
                 }
             }
         }
@@ -369,7 +373,7 @@ public class ZbxBase<TEntity, TEntityDto, TKey, TPagedAndSortedResultRequestDto,
             {
                 // 获取从表数据
                 var detailsIndex = mainAllProperties.FindIndex(p => p.Name == "Details");
-                //从表
+                // 子表
                 var detailList = (IEnumerable<object>)mainAllProperties[detailsIndex].GetValue(mainDto);
                 var startMainRowIndex = rowIndex;
                 for (var datailCount = 0; datailCount < detailList.Count(); datailCount++)
@@ -408,13 +412,17 @@ public class ZbxBase<TEntity, TEntityDto, TKey, TPagedAndSortedResultRequestDto,
                     {
                         //填充子表数据
                         var detailRow = sheet.GetRow(startMainRowIndex);
+
+                        var splitCell = detailRow.CreateCell(mainProperties.Length);
+                        splitCell.CellStyle = excelSplitCellStyle;
+
                         for (var i = 0; i < detailProperties.Length; i++)
                         {
                             var value = detailProperties[i].GetValue(detail);
                             detailRow.CreateCell(mainProperties.Length + splitDetailsColumnNumber + i)
                                 .SetCellValue(value?.ToString());
                             var detailCell = detailRow.GetCell(mainProperties.Length + splitDetailsColumnNumber + i);
-                            detailCell.CellStyle = excelDetailsColor;
+                            detailCell.CellStyle = excelDetailsCellStyle;
                         }
                     }
 
@@ -430,6 +438,10 @@ public class ZbxBase<TEntity, TEntityDto, TKey, TPagedAndSortedResultRequestDto,
                     var value = mainProperties[i].GetValue(mainDto);
                     dataRow.CreateCell(i).SetCellValue(value?.ToString());
                 }
+                if (rowIndex % 2 == 0)
+                {
+                    dataRow.RowStyle = excelOnlyMainCellStyle;
+                }
             }
 
             //添加1个空行将2条数据分割开
@@ -441,9 +453,11 @@ public class ZbxBase<TEntity, TEntityDto, TKey, TPagedAndSortedResultRequestDto,
         if (isHasDetail)
         {
             // 自动调整列宽
-            for (var i = 0; i < mainProperties.Length + detailProperties.Length; i++)
+            for (var i = 0; i < mainProperties.Length + splitDetailsColumnNumber + detailProperties.Length; i++)
             {
-                sheet.AutoSizeColumn(i + splitDetailsColumnNumber);
+                sheet.AutoSizeColumn(i);
+                sheet.SetColumnWidth(i, Math.Max(sheet.GetColumnWidth(i) + 150, 265 * 15));
+                sheet.SetColumnWidth(mainProperties.Length, 3600);
             }
         }
         else
@@ -452,6 +466,7 @@ public class ZbxBase<TEntity, TEntityDto, TKey, TPagedAndSortedResultRequestDto,
             for (var i = 0; i < mainProperties.Length; i++)
             {
                 sheet.AutoSizeColumn(i);
+                sheet.SetColumnWidth(i, Math.Max(sheet.GetColumnWidth(i) + 150, 265 * 15));
             }
         }
 
@@ -491,6 +506,7 @@ public class ZbxBase<TEntity, TEntityDto, TKey, TPagedAndSortedResultRequestDto,
         bool includeDetails = false, CancellationToken cancellationToken = default)
     {
         var query = await Repository.WithDetailsAsync();
+        //var query = await Repository.GetQueryableAsync();
 
         var entities = query.Where(expression);
         entities = GetSortingQueryable(entities, sorting);
@@ -549,7 +565,53 @@ public class ZbxBase<TEntity, TEntityDto, TKey, TPagedAndSortedResultRequestDto,
     /// </summary>
     /// <param name="workbook"></param>
     /// <returns></returns>
-    private static ICellStyle SetExcelDetailsColor(IWorkbook workbook)
+    private static ICellStyle SetExcelDetailsCellStyle(IWorkbook workbook)
+    {
+        var cellStyle = workbook.CreateCellStyle();
+        cellStyle.FillBackgroundColor = IndexedColors.Grey25Percent.Index;
+        cellStyle.FillForegroundColor = IndexedColors.Grey25Percent.Index;
+        cellStyle.FillPattern = FillPattern.SolidForeground;
+        return cellStyle;
+    }
+
+    /// <summary>
+    ///     导出设置只有主表时的交替行 单元格样式
+    /// </summary>
+    /// <param name="workbook"></param>
+    /// <returns></returns>
+    private static ICellStyle SetExcelOnlyMainCellStyle(IWorkbook workbook)
+    {
+        var cellStyle = workbook.CreateCellStyle();
+        cellStyle.FillBackgroundColor = IndexedColors.Grey25Percent.Index;
+        cellStyle.FillForegroundColor = IndexedColors.Grey25Percent.Index;
+        cellStyle.FillPattern = FillPattern.SolidForeground;
+        return cellStyle;
+    }
+
+    /// <summary>
+    ///     设置分割单元格的演示
+    /// </summary>
+    /// <param name="workbook"></param>
+    /// <returns></returns>
+    private static ICellStyle SetSplitCellStyle(IWorkbook workbook)
+    {
+        var cellStyle = workbook.CreateCellStyle();
+        cellStyle.BorderLeft = BorderStyle.MediumDashed;
+        cellStyle.BorderRight = BorderStyle.MediumDashed;
+        cellStyle.LeftBorderColor = IndexedColors.BrightGreen.Index;
+        cellStyle.RightBorderColor = IndexedColors.Grey25Percent.Index;
+        cellStyle.FillBackgroundColor = IndexedColors.White.Index;
+        cellStyle.FillForegroundColor = IndexedColors.White.Index;
+        cellStyle.FillPattern = FillPattern.ThickVerticalBands;
+        return cellStyle;
+    }
+
+    /// <summary>
+    ///     导出设置表头单元格样式
+    /// </summary>
+    /// <param name="workbook"></param>
+    /// <returns></returns>
+    private static ICellStyle SetExcelHeadCellStyle(IWorkbook workbook)
     {
         var cellStyle = workbook.CreateCellStyle();
         cellStyle.FillBackgroundColor = IndexedColors.LightOrange.Index;
@@ -559,4 +621,5 @@ public class ZbxBase<TEntity, TEntityDto, TKey, TPagedAndSortedResultRequestDto,
     }
 
     #endregion
+}
 }
\ No newline at end of file

From db09cfbcd000097be76cfc2cc955d69472995b3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=B8=A4=E6=97=AD=5BIrelia=5D?= <366601522@qq.com>
Date: Thu, 13 Jul 2023 23:07:25 +0800
Subject: [PATCH 4/9] 1

---
 .../src/Faster.Zheng.Winin.Application/AppBase/ZbxBase.cs        | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Code/Be/Faster.Zheng.Winin/src/Faster.Zheng.Winin.Application/AppBase/ZbxBase.cs b/Code/Be/Faster.Zheng.Winin/src/Faster.Zheng.Winin.Application/AppBase/ZbxBase.cs
index e011fc4..ebe5e9d 100644
--- a/Code/Be/Faster.Zheng.Winin/src/Faster.Zheng.Winin.Application/AppBase/ZbxBase.cs
+++ b/Code/Be/Faster.Zheng.Winin/src/Faster.Zheng.Winin.Application/AppBase/ZbxBase.cs
@@ -621,5 +621,4 @@ public class ZbxBase<TEntity, TEntityDto, TKey, TPagedAndSortedResultRequestDto,
     }
 
     #endregion
-}
 }
\ No newline at end of file

From 0b8fbab1dbaa848c8b1767c0e9044def12008b44 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 17:02:37 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E4=B8=BB=E8=A1=A8=E5=B8=A6=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E7=89=88=E6=9C=AC=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Code/Fe/public/config.js                      |   3 +-
 Code/Fe/src/api/wms-interface.js              |   4 +-
 .../commonTabel-drawer copy/index.vue         | 559 ++++++++++++++++++
 .../commonTabel-drawer copy/style/index.scss  | 122 ++++
 .../components/commonTabel-drawer/index.vue   |  30 +-
 .../components/filterForDetailPage/index.vue  |   7 +-
 Code/Fe/src/components/rowDrop/index.vue      |  31 +-
 .../src/components/tablePagination/index.vue  |  10 +
 Code/Fe/src/components/umyTable/index.vue     |  45 +-
 Code/Fe/src/mixins/TableMixins.js             |  45 +-
 Code/Fe/src/mixins/mixins.js                  |   6 +-
 Code/Fe/src/permission.js                     |  36 +-
 Code/Fe/src/utils/baseData/urlOption.js       |   2 +
 Code/Fe/src/utils/defaultButtons.js           |   2 +-
 Code/Fe/src/utils/tableColumns_api/index.js   |   2 +-
 Code/Fe/src/views/dashboard/index.vue         |   2 +-
 .../src/views/interfaceBoard/TestSchool.vue   |  13 +-
 17 files changed, 848 insertions(+), 71 deletions(-)
 create mode 100644 Code/Fe/src/components/commonTabel-drawer copy/index.vue
 create mode 100644 Code/Fe/src/components/commonTabel-drawer copy/style/index.scss

diff --git a/Code/Fe/public/config.js b/Code/Fe/public/config.js
index f150e76..8a6e680 100644
--- a/Code/Fe/public/config.js
+++ b/Code/Fe/public/config.js
@@ -1,6 +1,7 @@
 // dev_win
 window.SITE_CONFIG['base'] = 'http://dev.ccwin-in.com:60069'
-window.SITE_CONFIG['columnsApiNames'] = '/api/abp/application-configuration'
+window.SITE_CONFIG['columnsApiNames'] = '/api/abp/application-localization'
+// window.SITE_CONFIG['columnsApiNames'] = '/api/abp/application-configuration'
 window.SITE_CONFIG['columnsApiNamesZh'] = 'Winin'
 window.SITE_CONFIG['isAutoLogin'] = false
 window.SITE_CONFIG['isSinglePage'] = false
diff --git a/Code/Fe/src/api/wms-interface.js b/Code/Fe/src/api/wms-interface.js
index a11d6a2..8c28acf 100644
--- a/Code/Fe/src/api/wms-interface.js
+++ b/Code/Fe/src/api/wms-interface.js
@@ -7,7 +7,9 @@ let colum_url = localStorage.getItem('columnsApiNames')
 export function getInterfaceBoard() {
     return request({
         method:'get',
-        url: base_api + colum_url
+        url: base_api + colum_url,
+        params:{CultureName:'zh-Hans'}
+        // params:{IncludeLocalizationResources:true}
     })
 }
 
diff --git a/Code/Fe/src/components/commonTabel-drawer copy/index.vue b/Code/Fe/src/components/commonTabel-drawer copy/index.vue
new file mode 100644
index 0000000..6d9e66d
--- /dev/null
+++ b/Code/Fe/src/components/commonTabel-drawer copy/index.vue	
@@ -0,0 +1,559 @@
+<template>
+  <el-drawer
+    v-loading="DrawerLoading"
+    v-if="drawer"
+    :visible="true"
+    :close-on-press-escape="false"
+    :wrapperClosable="false"
+    :with-header="false"
+    :modal="false"
+    size="100%"
+  >
+    <div class="drawer-heder">
+      <div class="heder-left">
+        <!-- <div class="heder-img">
+          <img
+            src="@/assets/img/drawerHeader.png"
+            alt=""
+            style="width: 100%; height: 100%"
+          />
+        </div> -->
+        <div class="header-text">
+          <span>{{ propsData[title[0].prop] }}</span>
+          <span>{{ title[0].label }}</span>
+        </div>
+      </div>
+      <div class="heder-right">
+        <curren-Button
+          :Butttondata="Butttondata"
+          @tableButtonClick="tableButtonClick"
+        >
+          <template>
+            <el-dropdown
+              trigger="click"
+              @command="handleCommand"
+              v-if="JSON.stringify(dropdownData) != '{}'"
+            >
+              <el-button size="mini" icon="el-icon-more"></el-button>
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item
+                  v-for="(item, index) in dropdownData"
+                  :key="index"
+                  :command="item.command"
+                  >{{ item.label }}</el-dropdown-item
+                >
+              </el-dropdown-menu>
+            </el-dropdown>
+          </template>
+        </curren-Button>
+      </div>
+    </div>
+    <div class="drawer-main">
+      <curren-tabs
+        :tabsData="dropdownTabs"
+        :activeName="firstTabs"
+        type="border-card"
+        @handleClick="handleClick"
+      >
+        <template slot-scope="scope">
+          <curren-descriptions
+            border
+            v-if="scope.value == 'xq'"
+            :column="column"
+            :direction="direction"
+            :colon="false"
+            :tabsDesTions="tabsDesTions"
+            :propsData="propsData"
+          >
+          </curren-descriptions>
+          <!-- currenTableDetails 组件 明细中带分页功能 -->
+          <umyTable
+            v-if="scope.value == 'mx'"
+            :tableBorder="true"
+            :tableData="propsData.details"
+            :propsData="propsData"
+            :tableColumns="tableColumns"
+            :selectionTable="selectionTable"
+            :requiredRules="false"
+            :setUTableHeight="260"
+            @sortChange="sortChange"
+            @handleSelectionChange="handleSelectionChange"
+            @inlineDialog="inlineDialog"
+            @buttonClick="buttonClick"
+          >
+            <template>
+              <slot></slot>
+            </template>		
+          </umyTable>
+          <!-- 明细页码 -->
+          <pagination
+            v-if="scope.value == 'mx'"
+            :totalCount="totalCount"
+            :pagesizeProps="MaxResultCount"
+            @SizeChange="alterResultCountDetails"
+            @CurrentChange="alertoldSkipCountDetails"
+            :currentPageProps="currentPage"
+          ></pagination>
+          <!-- 新增汇总 表头 区分明细表头使用 summaryTableColumns -->
+          <umyTable
+            v-if="scope.value == 'hz'"
+            :tableBorder="true"
+            :tableData="propsData.summaryDetails"
+            :tableColumns="summaryTableColumns.length == 0 ? tableColumns : summaryTableColumns"
+            :selectionTable="selectionTable"
+            :requiredRules="false"
+            @sortChange="sortChange"
+            @handleSelectionChange="handleSelectionChange"
+            @inlineDialog="inlineDialog"
+            @buttonClick="buttonClick"
+            :setUTableHeight="210"
+          >
+            <template>
+              <slot></slot>
+            </template>		
+          </umyTable>
+          <!-- 自定义扩展 -->
+          <umyTable
+            v-if="
+              scope.value == zdyValue && 
+              scope.value != 'xq' &&
+              scope.value != 'mx' && 
+              scope.value != 'hz' &&
+              scope.value != 'zwlcj'
+            "
+            :tableBorder="true"
+            :tableLoading="tableLoading"
+            :tableData="otherData"
+            :tableColumns="zdyTableColumns"
+            :selectionTable="selectionTable"
+            :requiredRules="false"
+            @sortChange="sortChange"
+            @handleSelectionChange="handleSelectionChange"
+            @inlineDialog="inlineDialog"
+            @buttonClick="buttonClick"
+            :setUTableHeight="210"
+          >
+            <template>
+              <slot></slot>
+            </template>		
+          </umyTable>
+          <!-- 自定义扩展（tree）的形式 目前使用位置：物品清单信息-子物品层级  todo:待优化-->
+          <currenTable
+            v-if="
+              scope.value == zdyValue &&
+              scope.value == 'zwlcj'
+            "
+            :tableLoading="tableLoading"
+            :tableData="otherData"
+            :tableColumns="zdyTableColumns"
+            :selectionTable="selectionTable"
+            :requiredRules="false"
+            @sortChange="sortChange"
+            @handleSelectionChange="handleSelectionChange"
+            @inlineDialog="inlineDialog"
+            :treeProps="{children: 'children', hasChildren: 'hasChildren'}"
+            @buttonClick="buttonClick"
+          >
+            <template>
+              <slot></slot>
+            </template>			
+          </currenTable>
+        </template>
+      </curren-tabs>
+    </div>
+    <div class="drawer-Shut" @click="drawerShut">
+      <el-button type="danger" size="mini">关闭</el-button>
+    </div>
+  </el-drawer>
+</template>
+<script>
+import { getListByItemcode,byItem,byProduct,byComponent,bySupplierCode,byLocation,byLocationCode,
+  relationByLocationCode,byComponentCJ,purRecNoteCustomInfo,EnumPurchaseReceiptInspect 
+} from "@/api/wms-api"
+import currenButton from "@/components/currenButton"
+import currenDescriptions from "@/components/currenDescriptions"
+import currenTabs from "@/components/currenTabs"
+import currenTable from "@/components/currenTable"
+import pagination from "@/components/Pagination"
+export default {
+  name: 'currenTabel-drawer',
+  components: {
+    pagination,
+    currenButton,
+    currenDescriptions,
+    currenTabs,
+    currenTable,
+  },
+  props: {
+    title: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    },
+    DrawerLoading: {
+      type: Boolean,
+      default: true
+    },
+    drawer: {
+      type: Boolean,
+      default: false
+    },
+    dropdownData: {
+      type: Object,
+      default: () => {
+        return {}
+      }
+    },
+    propsData: {
+      type: Object,
+      default: () => {
+        return {}
+      }
+    },
+    tabsDesTions: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    },
+    dropdownTabsData: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    },
+    tableLoading: {
+      type: Boolean,
+      default: false
+    },
+    tableColumns: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    },
+    summaryTableColumns: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    },
+    Butttondata: {
+      type: Array,
+      default: () => {
+        return [{
+          type: 'warning',
+          icon: 'el-icon-edit',
+          label: '编辑',
+          name: 'edit',
+          size: 'mini'
+        }]
+      }
+    },
+    selectionTable: {
+      type: Boolean,
+      default: false
+    },
+    MaxResultCount: {
+      type: Number,
+      default: 0
+    },
+    totalCount: {
+      type: Number,
+      default: 0
+    },
+    currentPage: {
+      type: Number,
+      default: 0
+    },
+    // 详情展现列数，默认为2列展现
+    column: {
+      type: Number,
+      default: 2
+    },
+    // 详情展示方式，默认水平分布
+    direction: {
+      type: String,
+      default: 'horizontal'
+    },
+    // 详情tabs排序默认
+    firstTabs: {
+      type: String,
+      default: 'xq'
+    }
+
+  },
+  computed: {
+    dropdownTabs () {
+      // 带有特殊扩展tabs页的
+      if (this.dropdownTabsData.length !== 0) {
+        return this.dropdownTabsData
+      } else {
+        // 正常普通 详情，明细，汇总
+        if (Object.keys(this.propsData).length != 0) {
+          this.initDropdownTabsData = [{
+              label: "详情",
+              name: 'xq'
+            },
+            {
+              label: "明细",
+              name: 'mx'
+            },
+            {
+              label: "汇总",
+              name: 'hz'
+            }]
+          if (this.propsData.details == undefined || !this.propsData.details.length) {
+            this.initDropdownTabsData = [{
+              label: "详情",
+              name: 'xq'
+            }]
+            return this.initDropdownTabsData
+          }
+          if (this.propsData.summaryDetails == undefined || !this.propsData.summaryDetails.length ) {
+            this.initDropdownTabsData = [{
+              label: "详情",
+              name: 'xq'
+            },
+            {
+              label: "明细",
+              name: 'mx'
+            }]
+            return this.initDropdownTabsData
+          }
+        }
+        return this.initDropdownTabsData
+      }
+    },
+  },
+  mounted () {
+  },
+  data () {
+    return {
+      otherData:[], // 切换tabs页赋值
+      zdyTableColumns:[], // 自定义表头
+      zdyValue:'', // 自定义展现值
+      // firstTabs:'xq',
+      initDropdownTabsData:[
+        {
+          label: "详情",
+          name: 'xq'
+        },
+        {
+          label: "明细",
+          name: 'mx'
+        },
+        {
+          label: "汇总",
+          name: 'hz'
+        }
+      ]
+    }
+  },
+  methods: {
+    
+    handleCommand (command) {
+      this.$emit('handleCommand', command)
+    },
+    drawerShut () {
+      this.$emit('drawerShut', false)
+    },
+    tableButtonClick (val) {
+      this.$emit('drawerbutton', val)
+    },
+    //排序
+    sortChange (data) {
+      this.$emit('sortChange', data)
+    },
+    //点击selection框
+    handleSelectionChange (val) {
+      this.$emit("handleSelectionChange", val)
+    },
+    //点击name提交emit打开编辑页面
+    inlineDialog (row) {
+      this.$emit("inlineDialog", row)
+    },
+     //接收分页组件emit改变每页最大页数
+    alterResultCountDetails (val) {
+      this.$emit('alterResultCountDetails', val)
+    },
+    //接收分页组件emit改变当前页
+    alertoldSkipCountDetails (val) {
+      this.$emit('alertoldSkipCountDetails', val)
+    },
+    buttonClick(row) {
+      this.$emit("buttonClick", row);
+    },
+    // tabs 切换页
+    handleClick (val) {
+      this.$emit("currenTabsChange", val);//父级获取当前的tab内容
+      this.zdyValue = val.name
+      this.dropdownTabsData.forEach( item => {
+        if (item.name == val.name) {
+          let parent = this.$parent
+          parent.tableLoading = true
+          // 详情 明细 汇总
+          parent.firstTabs = val.name
+          if (val.name == 'xq' || val.name == 'mx' || val.name == 'hz') {
+            this.zdyTableColumns = []
+            this.otherData = []
+            parent.tableLoading = false
+          } else {
+            this.zdyTableColumns = []
+            this.otherData = []
+            // this.firstTabs = val.name
+          // 其他自定义tab页
+            if (item.functionName == 'getListByItemcode') {
+              let params = {
+                itemCode: this.propsData.code
+              }
+              getListByItemcode(params, item.url).then(res => {
+                let zdyTableColumnsJSON = JSON.parse(JSON.stringify(this.$isTableColumns[item.tableColumns]));
+                delete zdyTableColumnsJSON[0].type
+                this.zdyTableColumns = zdyTableColumnsJSON
+                this.otherData = res
+                parent.tableLoading = false
+              }).catch(err => {
+                console.log(err)
+                parent.tableLoading = false
+              })
+            } else if (item.functionName == 'byItem') {
+              byItem(this.propsData.code, item.url).then(res => {
+                let zdyTableColumnsJSON = JSON.parse(JSON.stringify(this.$isTableColumns[item.tableColumns]));
+                delete zdyTableColumnsJSON[0].type
+                this.zdyTableColumns = zdyTableColumnsJSON
+                this.otherData = res
+                parent.tableLoading = false
+              }).catch(err => {
+                console.log(err)
+                parent.tableLoading = false
+              })
+            } else if (item.functionName == 'byProduct') {
+              byProduct({product:this.propsData.product}, item.url).then(res => {
+                let zdyTableColumnsJSON = JSON.parse(JSON.stringify(this.$isTableColumns[item.tableColumns]));
+                delete zdyTableColumnsJSON[0].type
+                this.zdyTableColumns = zdyTableColumnsJSON
+                this.otherData = res
+                parent.tableLoading = false
+              }).catch(err => {
+                console.log(err)
+                parent.tableLoading = false
+              })
+            } else if (item.functionName == 'byComponent') {
+              byComponent({component:this.propsData.component}, item.url).then(res => {
+                let zdyTableColumnsJSON = JSON.parse(JSON.stringify(this.$isTableColumns[item.tableColumns]));
+                delete zdyTableColumnsJSON[0].type
+                this.zdyTableColumns = zdyTableColumnsJSON
+                this.otherData = res
+                parent.tableLoading = false
+              }).catch(err => {
+                console.log(err)
+                parent.tableLoading = false
+              })
+            } 
+            // 基础数据管理-物品清单维护-物品清单信息-详情-子物品层级
+            else if (item.functionName == 'byComponentCJ') {
+              this.otherData = []
+              byComponentCJ({component:this.propsData.component}, item.url).then(res => {
+                let zdyTableColumnsJSON = JSON.parse(JSON.stringify(this.$isTableColumns[item.tableColumns]));
+                delete zdyTableColumnsJSON[0].type
+                this.zdyTableColumns = zdyTableColumnsJSON
+                this.otherData = res
+                this.recursion(this.otherData)
+                parent.tableLoading = false
+              }).catch(err => {
+                console.log(err)
+                parent.tableLoading = false
+              })
+            } else if (item.functionName == 'bySupplierCode') {
+              bySupplierCode({supplierCode:this.propsData.code}, item.url).then(res => {
+                let zdyTableColumnsJSON = JSON.parse(JSON.stringify(this.$isTableColumns[item.tableColumns]));
+                delete zdyTableColumnsJSON[0].type
+                this.zdyTableColumns = zdyTableColumnsJSON
+                this.otherData = res
+                parent.tableLoading = false
+              }).catch(err => {
+                console.log(err)
+                parent.tableLoading = false
+              })
+            } else if (item.functionName == 'byLocation') {
+              byLocation(this.propsData.code==null?this.propsData.locationCode:this.propsData.code, item.url).then(res => {
+                let zdyTableColumnsJSON = JSON.parse(JSON.stringify(this.$isTableColumns[item.tableColumns]));
+                delete zdyTableColumnsJSON[0].type
+                this.zdyTableColumns = zdyTableColumnsJSON
+                this.otherData = res
+                this.o
+                parent.tableLoading = false
+              }).catch(err => {
+                console.log(err)
+                parent.tableLoading = false
+              })
+            } else if (item.functionName == 'byLocationCode') {
+              byLocationCode({locationCode: this.propsData.code}, item.url).then(res => {
+                let itemData = []
+                itemData.push(res)
+                let zdyTableColumnsJSON = JSON.parse(JSON.stringify(this.$isTableColumns[item.tableColumns]));
+                delete zdyTableColumnsJSON[0].type
+                this.zdyTableColumns = zdyTableColumnsJSON
+                this.otherData = itemData
+                parent.tableLoading = false
+              }).catch(err => {
+                console.log(err)
+                parent.tableLoading = false
+              })
+            } 
+            // 基础数据管理-库位信息-详情-库位零件关系
+            else if (item.functionName == 'relationByLocationCode') {
+              relationByLocationCode({locationCode: this.propsData.code}, item.url).then(res => {
+                let zdyTableColumnsJSON = JSON.parse(JSON.stringify(this.$isTableColumns[item.tableColumns]));
+                delete zdyTableColumnsJSON[0].type
+                this.zdyTableColumns = zdyTableColumnsJSON
+                this.otherData = res
+                parent.tableLoading = false 
+              }).catch(err => {
+                console.log(err)
+                parent.tableLoading = false
+              })
+            }
+            // 采购收货记录-合格品收货明细, 不合格品收货明细, 收货缺料明细
+            else if(item.functionName == "purRecNoteCustomInfo"){
+              parent.Loading.DrawerLoading = true
+              purRecNoteCustomInfo( item.url,this.propsData.id).then(res => {
+                let zdyTableColumnsJSON = JSON.parse(JSON.stringify(this.$isTableColumns[item.tableColumns]));
+                delete zdyTableColumnsJSON[0].type
+                this.zdyTableColumns = zdyTableColumnsJSON
+                this.otherData = res
+                parent.Loading.DrawerLoading = false
+              }).catch(err => {
+                console.log(err)
+                parent.Loading.DrawerLoading = false
+              })
+            }
+            // 客户退拆记录-详情页TAB-回冲记录
+            else if(item.functionName == "customerDismantleBackFlushNote"){
+              let zdyTableColumnsJSON = JSON.parse(JSON.stringify(this.$isTableColumns[item.tableColumns]));
+              delete zdyTableColumnsJSON[0].type
+              this.zdyTableColumns = zdyTableColumnsJSON
+              this.otherData = this.propsData.noteAndBackFlushDetails
+            }
+          }
+        }
+      })
+    },
+    // 递归 物品子级层级
+    recursion(val){
+      val.forEach(item => {
+        if(item.componentDTOs) {
+          item.children = item.componentDTOs
+          this.recursion(item.componentDTOs)
+        }
+      })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+// el-drawer
+@import "./style/index.scss";
+</style>
\ No newline at end of file
diff --git a/Code/Fe/src/components/commonTabel-drawer copy/style/index.scss b/Code/Fe/src/components/commonTabel-drawer copy/style/index.scss
new file mode 100644
index 0000000..877fd49
--- /dev/null
+++ b/Code/Fe/src/components/commonTabel-drawer copy/style/index.scss	
@@ -0,0 +1,122 @@
+.el-drawer__wrapper {
+  z-index: 10 !important;
+  position: absolute;
+  left: 32%;
+  overflow: visible;
+  // height:calc(100% - 28px);
+  // top: 14px;
+  // right:14px
+
+  ::v-deep .el-drawer {
+    height: 100%;
+    overflow: visible;
+    box-shadow: 0 8px 10px -5px rgb(0 0 0 / 15%), 0 16px 24px 2px rgb(0 0 0 / 9%), 0 6px 30px 5px rgb(0 0 0 / 7%);
+
+    .el-drawer__body {
+      width: 100%;
+      height: 100%;
+      display: flex;
+      flex-direction: column;
+
+      .drawer-heder {
+        display: flex;
+        padding: 15px 10px;
+        justify-content: space-between;
+        align-items: center;
+
+        .heder-left {
+          display: flex;
+          justify-content: space-between;
+
+          .heder-img {
+            width: 40px;
+            height: 40px;
+            margin-right: 10px;
+          }
+
+          .header-text {
+            padding:0 20px;
+            display: flex;
+            flex-direction: column;
+            justify-content: space-between;
+
+            span:nth-child(1) {
+              color: #333;
+              font-size: 22px;
+            }
+
+            span:nth-child(2) {
+              color: #999;
+              font-size: 16px;
+            }
+          }
+        }
+      }
+
+      .Descriptions {
+        padding: 0 10px;
+      }
+
+      .drawer-main {
+        // padding-top: 20px;
+        flex: 1;
+        overflow: hidden;
+        // background-color: #efefef;
+        padding: 10px 20px 20px 30px;
+        border-top: solid 5px  #f6f6f6;
+
+        .el-tabs {
+          height: 100%;
+          display: flex;
+          flex-direction: column;
+          .el-tabs__header{
+            // padding-bottom: 5px ;
+            .el-tabs__nav{
+                z-index: auto !important;
+            }
+          }
+
+          .el-tabs__content {
+            flex: 1;
+
+            .el-tab-pane {
+              width: 100%;
+              height: 100%;
+              overflow-y: auto;
+            }
+
+            .el-descriptions-item__label {
+              padding-right: 40px;
+            }
+          }
+        }
+      }
+
+      .drawer-Shut {
+        width: 35px;
+        height: 100px;
+        position: absolute;
+        top: 200px;
+        left: -35px;
+
+        .el-button {
+          width: 100%;
+          height: 100%;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+
+          ::v-deep span {
+            font-size: 12px;
+            letter-spacing: 10px;
+            writing-mode: tb-rl;
+          }
+        }
+      }
+    }
+  }
+}
+
+::v-deep .el-tabs__nav-wrap::after{
+  content: unset !important;
+}
diff --git a/Code/Fe/src/components/commonTabel-drawer/index.vue b/Code/Fe/src/components/commonTabel-drawer/index.vue
index 6d9e66d..cd64cba 100644
--- a/Code/Fe/src/components/commonTabel-drawer/index.vue
+++ b/Code/Fe/src/components/commonTabel-drawer/index.vue
@@ -66,7 +66,20 @@
             :propsData="propsData"
           >
           </curren-descriptions>
+          <rowDrop 
+            @radio="rowDrop" 
+            :tableColumns="tableColumns" 
+            :visible="rowDropVisible"
+            @closeRowDrop="closeRowDrop"
+          ></rowDrop>
           <!-- currenTableDetails 组件 明细中带分页功能 -->
+          <!-- 字段设置弹窗 -->
+          <!-- <div 
+            class="mx-header" 
+            v-if="scope.value == 'mx'"
+          >
+            <el-button @click="columnsSettingHandle()">字段设置</el-button>
+          </div> -->
           <umyTable
             v-if="scope.value == 'mx'"
             :tableBorder="true"
@@ -175,6 +188,7 @@ import currenDescriptions from "@/components/currenDescriptions"
 import currenTabs from "@/components/currenTabs"
 import currenTable from "@/components/currenTable"
 import pagination from "@/components/Pagination"
+import rowDrop from "@/components/rowDrop/index.vue"
 export default {
   name: 'currenTabel-drawer',
   components: {
@@ -183,6 +197,7 @@ export default {
     currenDescriptions,
     currenTabs,
     currenTable,
+    rowDrop
   },
   props: {
     title: {
@@ -331,6 +346,8 @@ export default {
   },
   data () {
     return {
+      // 明细-字段设置是否显示
+      rowDropVisible: false,
       otherData:[], // 切换tabs页赋值
       zdyTableColumns:[], // 自定义表头
       zdyValue:'', // 自定义展现值
@@ -352,7 +369,18 @@ export default {
     }
   },
   methods: {
-    
+    rowDrop(data) {
+      this.$emit('rowDrop',data)
+      // this.isUpdate = !this.isUpdate
+    },
+    // 字段设置
+    columnsSettingHandle(){
+      this.rowDropVisible = !this.rowDropVisible
+    },
+    // 关闭字段设置
+    closeRowDrop() {
+      this.rowDropVisible = false
+    },
     handleCommand (command) {
       this.$emit('handleCommand', command)
     },
diff --git a/Code/Fe/src/components/filterForDetailPage/index.vue b/Code/Fe/src/components/filterForDetailPage/index.vue
index acd7b76..ced8e1a 100644
--- a/Code/Fe/src/components/filterForDetailPage/index.vue
+++ b/Code/Fe/src/components/filterForDetailPage/index.vue
@@ -46,6 +46,7 @@
                         label="操作"
                         :align="'center'"
                         width="150"
+                        fixed="right"
                     >
                         <template slot-scope="scope">
                             <span v-for="item in operaButtons" style="margin: 0 10px;">
@@ -198,6 +199,8 @@ data () {
     return {
         dialogShow:true,
         URLOption_detailList:allUrlOption[this.$route.name].detailListURL,//明细-列表
+        URLOption_masterId:allUrlOption[this.$route.name].masterId || 'masterId',//明细-查看主表的连接id
+        URLOption_masterName:allUrlOption[this.$route.name].masterName,//明细-列表//明细-查看主表的连接title名称
         URLOption_parent:allUrlOption[this.$route.name].parentURL ? allUrlOption[this.$route.name].parentURL : allUrlOption[this.$route.name].detailURL,//明细-查看主表
         currenButtonData: [],//头部按钮
         operaButtons:[],//操作列按钮
@@ -256,10 +259,10 @@ methods: {
     },
     // 查看主表信息
     showParentHandleForDetail(data){
-        this.showParentTitle = `[${data.studentName}] 主表信息`
+        this.showParentTitle = `${data[this.URLOption_masterName]} 主表信息`
         this.showParentDialog = true
         this.showParentLoading = true
-        getListDesById(this.URLOption_parent,data.masterId)
+        getListDesById(this.URLOption_parent,data[this.URLOption_masterId])
             .then(res => {
                 this.showParentTableData = res
                 this.showParentLoading = false
diff --git a/Code/Fe/src/components/rowDrop/index.vue b/Code/Fe/src/components/rowDrop/index.vue
index 5df37ed..1e7b8a3 100644
--- a/Code/Fe/src/components/rowDrop/index.vue
+++ b/Code/Fe/src/components/rowDrop/index.vue
@@ -54,12 +54,14 @@ export default {
   },
   data() {
     return {
+      historyTableColumns:null,
       name: null,
       oldData: null,
       newData: null,
       dataList: [],
       // 全选 allSelect hasSelect NoSelect
       allSeletType:'NoSelect',
+      userName:JSON.parse(localStorage.getItem('currentUserInfo')).userName
     }
   },
   props: {
@@ -77,8 +79,9 @@ export default {
       },
   },
   mounted() {
-      this.formatData(this.tableColumns)
-      this.initSelectSta()
+    this.historyTableColumns = JSON.parse(JSON.stringify(this.tableColumns))
+    this.formatData(this.tableColumns)
+    this.initSelectSta()
   },
   methods: {
     reset() {
@@ -88,10 +91,11 @@ export default {
         type: 'warning',
         cancelButtonClass:'rowDropNotHideItem'
       }).then(() => {
-        // 先set是为了字段设置按钮可以监听到缓存变化，之后在移除缓存
-        localStorage.setItem('tableColumns_' + this.$store.getters.name.userName + '_' + this.$route.name, JSON.stringify([]))
-        localStorage.removeItem('tableColumns_' + this.$store.getters.name.userName + '_' + this.$route.name)
-        let _resetCol = this.$isTableColumns[this.$route.name]
+        // 先set是为了字段设置按钮可以监听到缓存变化，之后在移除缓存  this.$store.getters.name.userName
+        localStorage.setItem('tableColumns_' + this.userName + '_' + this.$route.name, JSON.stringify([]))
+        localStorage.removeItem('tableColumns_' + this.userName + '_' + this.$route.name)
+        // let _resetCol = this.$isTableColumns[this.$route.name]
+        let _resetCol = this.historyTableColumns
         _resetCol.forEach(item => {
           item.istrue = true
         })
@@ -110,16 +114,16 @@ export default {
     formatData (val) {
       this.dataList = JSON.parse(JSON.stringify(val))
       this.dataList.forEach(item => {
-          if (item.istrue == undefined) {
-              item.istrue = true
-          }
+        if (item.istrue == undefined) {
+            item.istrue = true
+        }
       })
     },
     save () {
       this.$forceUpdate()
       this.$emit('radio',this.dataList)
       // 本地缓存 当前用户名 + 路由名称
-      localStorage.setItem('tableColumns_' + this.$store.getters.name.userName + '_' + this.$route.name, JSON.stringify(this.dataList))
+      localStorage.setItem('tableColumns_' + this.userName + '_' + this.$route.name, JSON.stringify(this.dataList))
     },
     dragstart(value) {
         this.oldData = value
@@ -149,9 +153,12 @@ export default {
     },
     // item元素点击眼睛事件
     rediochange(index){
-      this.dataList[index].istrue = !this.dataList[index].istrue
+      // this.dataList[index].istrue = !this.dataList[index].istrue
+      this.$set(this.dataList[index],'istrue', !this.dataList[index].istrue)
       this.initSelectSta()
-      this.save()
+      this.$nextTick(()=>{
+        this.save()
+      })
     },
     // 初始化当前全选状态
     initSelectSta(){
diff --git a/Code/Fe/src/components/tablePagination/index.vue b/Code/Fe/src/components/tablePagination/index.vue
index df69402..8c826c6 100644
--- a/Code/Fe/src/components/tablePagination/index.vue
+++ b/Code/Fe/src/components/tablePagination/index.vue
@@ -49,6 +49,7 @@
         @sortChange="sortChange"
         @handleSelectionChange="handleSelectionChange"
         @inlineDialog="inlineDialog"
+        :buttonOperationList="buttonOperationList"
         @buttonOperationClick="buttonOperationClick"
         :tableBorder="true"
         :firstFixed="true"
@@ -107,6 +108,11 @@ export default {
         return []
       }
     },
+    // 操作列按钮
+    buttonOperationList:{
+      type: Array,
+      default: null,
+    },
     // 列表数据
     tableData: {
       type: Array,
@@ -325,6 +331,10 @@ export default {
     buttonOperationClick(row, index, label) {
       this.$emit("buttonOperationClick", row, index, label);
     },
+    //点击table操作列按钮
+    buttonOperationClick(row, item, index) {
+      this.$emit("buttonOperationClick", row, item, index);
+    },
     // 全面筛选组件配置
     // 全面筛选组件内部显示/隐藏更改触发，同步当前的showSearchOverall值
     getShowSearchOverall(val){
diff --git a/Code/Fe/src/components/umyTable/index.vue b/Code/Fe/src/components/umyTable/index.vue
index d708364..9b0ccab 100644
--- a/Code/Fe/src/components/umyTable/index.vue
+++ b/Code/Fe/src/components/umyTable/index.vue
@@ -19,6 +19,27 @@
     header-row-class-name="uTableHeader"
   >
     <!-- :tree-props="treeProps" 与 “height”  不能共存， 此组件暂不支持tree的格式-->
+    <!-- 操作列 -->
+    <u-table-column
+      v-if="buttonOperationList"
+      :fixed="'left'"
+      :width="120"
+      :align="'center'"
+      :header-align="'center'"
+    >
+      <template #header>
+        <span>操作</span>
+      </template>
+      <template slot-scope="scope">
+        <el-button
+          v-for="(itemButton, indexButton) in buttonOperationList"
+          :key="indexButton"
+          type="text"
+          size="mini"
+          @click="buttonOperationClick(scope.row, itemButton, indexButton)"
+        >{{itemButton.label}}</el-button>
+      </template>
+    </u-table-column>
     <u-table-column v-if="selectionTable" fixed="left" type="selection" :reserve-selection="true" />
     <u-table-column v-if="isShowIndex" type="index" fixed="left" label="序号" width="50" />
     <template v-for="(item, index) in TableSize">
@@ -257,18 +278,6 @@
             >{{item.label}}</el-button>
           </div>
         <!-- </el-form-item> -->
-
-        <!-- table表添加操作列 -->
-        <div v-if="item.type == 'buttonOperation'">
-          <el-button
-            class="buttonOperation-btn"
-            v-for="(itemButton, indexButton) in item.buttonText.split('|')"
-            :key="indexButton"
-            type="text"
-            size="mini"
-            @click="buttonOperationClick(scope.row, item.buttonName.split('|')[indexButton])"
-          >{{itemButton}}</el-button>
-        </div>
         <span v-if="item.type == 'object'">
           {{ scope.row[item.prop] ? scope.row[item.prop][item.showProp] : "" }}
         </span>
@@ -432,6 +441,11 @@ export default {
     },
   },
   props: {
+    // 操作列按钮
+    buttonOperationList:{
+      type: Array,
+      default: null,
+    },
     // 超出内容是否提示
     showOverflowTooltip:{
       type: Boolean,
@@ -867,8 +881,8 @@ export default {
       this.$emit("buttonClick", row, index, label);
     },
     //点击table操作列按钮
-    buttonOperationClick(row, label) {
-      this.$emit("buttonOperationClick", row, label);
+    buttonOperationClick(row, item, index) {
+      this.$emit("buttonOperationClick", row, item, index);
     },
   },
 };
@@ -911,9 +925,6 @@ export default {
 .el-table__fixed-right::before {
   z-index: auto !important;
 }
-.buttonOperation-btn{
-  padding: 0;
-}
 .spamHover {
   color: #409eff;
   cursor: pointer;
diff --git a/Code/Fe/src/mixins/TableMixins.js b/Code/Fe/src/mixins/TableMixins.js
index 9147252..c3d2d08 100644
--- a/Code/Fe/src/mixins/TableMixins.js
+++ b/Code/Fe/src/mixins/TableMixins.js
@@ -38,6 +38,10 @@ export const tableMixins = {
       tableDataDetails:[],
       //默认tag
       firstTabs:'xq',
+      // api的表头原始数据
+      apiColumns_Table_copy:null,
+      apiColumns_DesTions_copy:null,
+      apiColumns_DetailsTable_copy:null,
       // api的表头数据
       apiColumns_Table:null,
       apiColumns_DesTions:null,
@@ -46,9 +50,34 @@ export const tableMixins = {
       URLOption_base:allUrlOption[this.$route.name].baseURL,
       //主表-明细
       URLOption_detail:allUrlOption[this.$route.name].detailURL,
+      // 主表-操作列
+      operationButtonsTable:[{label:'查看详情',name:'info'}]
     }
   },
+  mounted() {
+    // 用于api表头的字段设置监听同步
+    window.addEventListener('setItemEvent', (item) => {
+        if (item.key.indexOf('tableColumns') > -1) {
+          if(JSON.parse(item.newValue).length <= 0){
+            this.apiColumns_Table = this.apiColumns_Table_copy[this.$route.name]
+          }else{
+            this.apiColumns_Table = JSON.parse(item.newValue)
+          }
+        }
+    })
+  },
   methods: {
+    // 获取通过api的表头数据，不可以在初始化处理，因为接口返回问题
+    initApiColumns(tableColumns_api,tabsDesTions_api,detailsTableColumns_api){
+      // 复制一份原始数据（目的：字段设置恢复）
+      this.apiColumns_Table_copy = JSON.parse(JSON.stringify(tableColumns_api))
+      this.apiColumns_DesTions_copy = JSON.parse(JSON.stringify(tabsDesTions_api))
+      this.apiColumns_DetailsTable_copy = JSON.parse(JSON.stringify(detailsTableColumns_api))
+      // 赋值表头数据
+      this.apiColumns_Table = this.initTableColumns(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;
@@ -212,13 +241,18 @@ export const tableMixins = {
     /**
      * 
      * @param {*} row 当前行数据
-     * @param {*} label 按钮name
+     * @param {*} item 按钮信息
+     * @param {*} index 按钮索引
      */
-    buttonOperationClick(row, label) {
+    buttonOperationClick(row, item, index) {
       // 获取当前行数据，赋值给 propsData
       this.propsData = row
-      
-      if (label == "edit") {
+      // 查看详情
+      if (item.name == "info") {
+        this.inlineDialog(row)
+      }
+      // 编辑
+      if (item.name == "edit") {
         this.formTitle = this.$route.meta.title + "编辑";
         this.formReveal = false
         this.theEvent = "edit"
@@ -234,7 +268,8 @@ export const tableMixins = {
         }
         this.displayDialog.editDialog = true
       }
-      if (label == 'delete') {
+      // 删除
+      if (item.name == 'delete') {
         this.$confirm('此操作将永久删除该消息, 是否继续?', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
diff --git a/Code/Fe/src/mixins/mixins.js b/Code/Fe/src/mixins/mixins.js
index e39638a..441c825 100644
--- a/Code/Fe/src/mixins/mixins.js
+++ b/Code/Fe/src/mixins/mixins.js
@@ -55,10 +55,10 @@ export const mixins = {
   methods: {
     // 结合默认及缓存中的列表tableColumns数据做初始化
     initTableColumns(){
-      let _list_defalut = this.$isTableColumns[this.$route.name]
+      let _list_defalut = columnsData ? columnsData : this.$isTableColumns[this.$route.name]
       if(!_list_defalut)return
-      let _local = localStorage.getItem('tableColumns_' + this.$store.getters.name.userName + '_' + this.$route.name)
-      let _list_local = JSON.parse(localStorage.getItem('tableColumns_' + this.$store.getters.name.userName + '_' + this.$route.name))
+      let _local = localStorage.getItem('tableColumns_' + JSON.parse(localStorage.getItem('currentUserInfo')).userName + '_' + this.$route.name)
+      let _list_local = JSON.parse(localStorage.getItem('tableColumns_' + JSON.parse(localStorage.getItem('currentUserInfo')).userName + '_' + this.$route.name))
       let _new_list = [] //格式化后的数据
       // 如果没有缓存则直接为默认值
       if(!_local){
diff --git a/Code/Fe/src/permission.js b/Code/Fe/src/permission.js
index 10cb5ce..fc684ad 100644
--- a/Code/Fe/src/permission.js
+++ b/Code/Fe/src/permission.js
@@ -39,21 +39,23 @@ router.beforeEach(async (to, from, next) => {
     isAutoLogin = JSON.parse(_url_isAutoLogin)
   }
   let userInfo = localStorage.getItem('currentUserInfo')
+  let _zh = localStorage.getItem('columnsApiNamesZh')
   // 是否有用户信息：
   // 1、如果没有判断是否为自动登录（是自动登录则自动执行登录，账号密码为配置信息中的值，不是自动登录则跳到登录页）
   // 2、如果有用户信息：则检查是否有api接口的表头数据，没有的话重新获取
   if(!userInfo){
-    if(isAutoLogin){
-      let loginForm= {
-        userNameOrEmailAddress:localStorage.getItem("userNameOrEmailAddress"),
-        password:localStorage.getItem("client_secret"),
-        // rememberMe:true,
-        // grant_type: 'password',
-        // client_id: 'Auth_App',
-      }
+    if(isAutoLogin || to.query.loginName){
+      // let loginForm= {
+      //   userNameOrEmailAddress:localStorage.getItem("userNameOrEmailAddress"),
+      //   password:localStorage.getItem("client_secret"),
+      //   // rememberMe:true,
+      //   // grant_type: 'password',
+      //   // client_id: 'Auth_App',
+      // }
       // store.dispatch('user/login', loginForm).then(() => {
-      login(loginForm).then(()=>{
+      // login(loginForm).then(()=>{
         getUsersByUserName(localStorage.getItem("userNameOrEmailAddress")).then(res=>{
+          // todo:currentUserInfo全程需要优化
           localStorage.setItem("currentUserInfo", JSON.stringify(res));
         })
         .catch(err => {
@@ -61,16 +63,16 @@ router.beforeEach(async (to, from, next) => {
         })
         // 提前获取接口监控看板表头数据并存储
         getInterfaceBoard().then(result => {
-          localStorage.setItem("interfaceBoardColumnsNames", JSON.stringify(result.localization.values.Winin));
-          next()
+          localStorage.setItem("interfaceBoardColumnsNames", JSON.stringify(result.resources[_zh].texts));
+          next('/')
         })
         .catch(err => {
           console.log('获取表头失败，请重试')
         })
-      })
-      .catch((error) => {
-        console.log('登录失败')
-      })
+      // })
+      // .catch((error) => {
+      //   console.log('登录失败')
+      // })
     }else{
       if (to.path != '/login') {
         next('/login')
@@ -84,8 +86,8 @@ router.beforeEach(async (to, from, next) => {
     // const _interfaceBoardColumnsNames = localStorage.getItem("interfaceBoardColumnsNames")
     // if( !_interfaceBoardColumnsNames || _interfaceBoardColumnsNames == 'undefined' || _interfaceBoardColumnsNames == 'null'){
     getInterfaceBoard().then(result => {
-      let _zh = localStorage.getItem('columnsApiNamesZh')
-      localStorage.setItem("interfaceBoardColumnsNames", JSON.stringify(result.localization.values[_zh]));
+      // todo-new:columnsApiNamesZh配置的地址补全（evel）
+      localStorage.setItem("interfaceBoardColumnsNames", JSON.stringify(result.resources[_zh].texts));
       setTimeout(()=>{
         next()
       },0)
diff --git a/Code/Fe/src/utils/baseData/urlOption.js b/Code/Fe/src/utils/baseData/urlOption.js
index db30f20..fee01c4 100644
--- a/Code/Fe/src/utils/baseData/urlOption.js
+++ b/Code/Fe/src/utils/baseData/urlOption.js
@@ -3,6 +3,8 @@ export const TestSchool = {
     baseURL:'TestSchool/base',//主表-列表
     detailURL:'app/test-school',//主表-明细 + 明细-查看主表
     detailListURL:'TestStudentDetail/base',//明细-列表,
+    masterId:'masterId',//明细获取主表信息的masterId(默认)
+    masterName:'studentName'//明细获取主表信息的title名称
     // parentURL:null,//明细-查看主表:特殊接口，如果没有则走detailURL
     // deleteURL:null,//删除特殊URL
     // updataURL:null,//新增+编辑特殊URL（新增+编辑使用一个）
diff --git a/Code/Fe/src/utils/defaultButtons.js b/Code/Fe/src/utils/defaultButtons.js
index d5fba58..d952763 100644
--- a/Code/Fe/src/utils/defaultButtons.js
+++ b/Code/Fe/src/utils/defaultButtons.js
@@ -42,7 +42,7 @@ export function defaultExportBtn(option) {
 // 字段设置
 export function defaultFieldSettingBtn(option) {
     // todo:监听已经配置过的字段按钮更改状态特殊显示
-    let _local = localStorage.getItem('tableColumns_' + this.$store.getters.name.userName + '_' + this.$route.name)
+    let _local = localStorage.getItem('tableColumns_' + JSON.parse(localStorage.getItem('currentUserInfo')).userName + '_' + this.$route.name)
     let _type = ''
     let _num = 0
     if(_local){
diff --git a/Code/Fe/src/utils/tableColumns_api/index.js b/Code/Fe/src/utils/tableColumns_api/index.js
index 48248df..b4b0a73 100644
--- a/Code/Fe/src/utils/tableColumns_api/index.js
+++ b/Code/Fe/src/utils/tableColumns_api/index.js
@@ -4,6 +4,6 @@ import { initFromApiColumnsLable } from '@/utils/index'
 
 // 测试数据
 export const TestSchool = [
-  { label: initFromApiColumnsLable('TestSchoolSchoolName'), prop: "schoolName", fixed: "left", type: "name" },
+  { label: initFromApiColumnsLable('TestSchoolSchoolName'), prop: "schoolName", fixed: "left" },
   { label: initFromApiColumnsLable('TestStudentDetailOrderType'), prop: "orderType" },
 ]
\ No newline at end of file
diff --git a/Code/Fe/src/views/dashboard/index.vue b/Code/Fe/src/views/dashboard/index.vue
index ca5d4ba..2f72066 100644
--- a/Code/Fe/src/views/dashboard/index.vue
+++ b/Code/Fe/src/views/dashboard/index.vue
@@ -178,7 +178,7 @@
                     display: flex;
                     padding-top: 10px;
                     .title{
-                        width: 180px;
+                        width: 240px;
                         text-align: right;
                         font-weight: bold;
                         flex-shrink: 0;
diff --git a/Code/Fe/src/views/interfaceBoard/TestSchool.vue b/Code/Fe/src/views/interfaceBoard/TestSchool.vue
index d861436..8a98178 100644
--- a/Code/Fe/src/views/interfaceBoard/TestSchool.vue
+++ b/Code/Fe/src/views/interfaceBoard/TestSchool.vue
@@ -23,6 +23,8 @@
       :primarySearchOption="primarySearchOption"
       @overallSearchFormClick="overallSearchFormClick"
       :httpOverallSearchData="httpOverallSearchData"
+      @buttonOperationClick="buttonOperationClick"
+      :buttonOperationList="operationButtonsTable"
     ></tablePagination>
     <curren-Drawer
       :title="apiColumns_DesTions"
@@ -110,6 +112,7 @@ export default {
           isRedundance:true,
           isDetailExport:true
         }),//导出
+        this.defaultFieldSettingBtn(),//字段设置
         this.defaultFreshBtn(),//刷新
         this.defaultFilterBtn(),//筛选
         this.defaultFilterForDetailBtn()//明细查询按钮
@@ -163,17 +166,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>

From 3875b40814548c8fc322966f427dd52f5e95a09c 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 17:30:59 +0800
Subject: [PATCH 6/9] =?UTF-8?q?=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Code/Fe/src/permission.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Code/Fe/src/permission.js b/Code/Fe/src/permission.js
index fc684ad..fc99b88 100644
--- a/Code/Fe/src/permission.js
+++ b/Code/Fe/src/permission.js
@@ -83,8 +83,8 @@ router.beforeEach(async (to, from, next) => {
     }
   }else{
     // 重新获取api接口表头
-    // const _interfaceBoardColumnsNames = localStorage.getItem("interfaceBoardColumnsNames")
-    // if( !_interfaceBoardColumnsNames || _interfaceBoardColumnsNames == 'undefined' || _interfaceBoardColumnsNames == 'null'){
+    const _interfaceBoardColumnsNames = localStorage.getItem("interfaceBoardColumnsNames")
+    if( !_interfaceBoardColumnsNames || _interfaceBoardColumnsNames == 'undefined' || _interfaceBoardColumnsNames == 'null'){
     getInterfaceBoard().then(result => {
       // todo-new:columnsApiNamesZh配置的地址补全（evel）
       localStorage.setItem("interfaceBoardColumnsNames", JSON.stringify(result.resources[_zh].texts));
@@ -92,9 +92,9 @@ router.beforeEach(async (to, from, next) => {
         next()
       },0)
     })
-    // }else{
-    //   next()
-    // }
+    }else{
+      next()
+    }
   }
   
 

From 10049ebb95cfe0b918b4065ff585d936349c81f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Mon, 17 Jul 2023 10:51:25 +0800
Subject: [PATCH 7/9] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=9A=82=E5=AD=98=E5=B0=81=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Code/Fe/src/components/exportDrop/index.vue   | 89 +++++++++++++++++++
 Code/Fe/src/mixins/LoadingMixins.js           |  3 +-
 Code/Fe/src/mixins/TableHeaderMixins.js       | 73 ++++++---------
 Code/Fe/src/utils/utils.js                    |  4 +-
 .../src/views/interfaceBoard/TestSchool.vue   |  6 ++
 5 files changed, 127 insertions(+), 48 deletions(-)
 create mode 100644 Code/Fe/src/components/exportDrop/index.vue

diff --git a/Code/Fe/src/components/exportDrop/index.vue b/Code/Fe/src/components/exportDrop/index.vue
new file mode 100644
index 0000000..f773a3f
--- /dev/null
+++ b/Code/Fe/src/components/exportDrop/index.vue
@@ -0,0 +1,89 @@
+<template>
+    <div>
+    <el-dialog
+      title="导出"
+      :visible.sync="show"
+      :append-to-body="true"
+      :modal-append-to-body="false"
+      width="800px"
+      :show-close="true"
+      @close="close"
+    >
+      <div class="formItem">
+        <span class="title">是否显示明细：</span>
+        <el-radio-group v-model="form.isDetail" >
+          <el-radio :label="true">是</el-radio>
+          <el-radio :label="false">否</el-radio>
+        </el-radio-group>
+      </div>
+      <div class="formItem">
+        <span class="title">是否冗余主表数据：</span>
+        <el-radio-group v-model="form.isRedundance" >
+          <el-radio :label="true">是</el-radio>
+          <el-radio :label="false">否</el-radio>
+        </el-radio-group>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="submit('page')">本页导出</el-button>
+        <el-button 
+          :spinner="'el-icon-loading'"
+          type="primary" 
+          @click="submit('all')"
+        >全部导出</el-button>
+      </span>
+    </el-dialog>
+  </div>
+  </template>
+  
+  <script>
+  export default {
+    name: 'exportDrop',
+    props: {
+      // 导出是【否冗余主表数据】配置
+      isDetail:{
+        type: Boolean,
+        default: true,
+      },
+      // 导出是【显示明细】配置
+      isRedundance:{
+        type: Boolean,
+        default: true,
+      },
+    },
+    data () {
+      return {
+        show:true,
+        form:{
+          isDetail:null,
+          isRedundance:null,
+        }
+      }
+    },
+    mounted () {
+      this.form={
+        isDetail:this.isDetail,
+        isRedundance:this.isRedundance,
+      }
+    },
+    methods: {
+      close() {
+        this.show = false
+        this.$emit("closeDialog")
+      },
+      submit(type){
+        this.$emit("exportDropSubmit",type,this.form)
+      }
+    }
+  }
+  </script>
+  <style lang="scss" scoped>
+  .formItem{
+    padding-bottom: 15px;
+    display: flex;
+    .title{
+      width: 180px;
+      text-align: right;
+      padding-right: 10px;
+    }
+  }
+  </style>
\ No newline at end of file
diff --git a/Code/Fe/src/mixins/LoadingMixins.js b/Code/Fe/src/mixins/LoadingMixins.js
index ef83937..efc9f06 100644
--- a/Code/Fe/src/mixins/LoadingMixins.js
+++ b/Code/Fe/src/mixins/LoadingMixins.js
@@ -18,7 +18,8 @@ export const LoadingMixins = {
         screenDialog: false, //筛选
         AddNewDialog: false, //选择数据弹出框
         scanningDialog: false, //扫描
-        importDialog: false, //导出
+        importDialog: false, //导入
+        exportDialog: false, //导出
         handleFromDialog: false, //执行生成
       },
     }
diff --git a/Code/Fe/src/mixins/TableHeaderMixins.js b/Code/Fe/src/mixins/TableHeaderMixins.js
index 370ca0a..6a1e19e 100644
--- a/Code/Fe/src/mixins/TableHeaderMixins.js
+++ b/Code/Fe/src/mixins/TableHeaderMixins.js
@@ -30,6 +30,32 @@ export const TableHeaderMixins = {
     }
   },
   methods: {
+    // 关闭导出弹窗
+    closeExportDrop(){
+      this.displayDialog.exportDialog = false
+    },
+    // 导出功能
+    exportDropSubmit(type,form){
+      const name = this.$route.meta.title 
+      let _params = {
+        isRedundance:Boolean(form.isRedundance),
+        isDetailExport:Boolean(form.isDetail),
+        userId:JSON.parse(localStorage.getItem("currentUserInfo")).id
+      }
+      let _exportUrl = this.URLOption_export ? this.URLOption_export : this.URLOption_base;
+      let _special = this.URLOption_export ? true : false
+      let _data = JSON.parse(JSON.stringify(this.PageListParams))
+      // 全部导出处理
+      if(type && type == 'all'){ _data.MaxResultCount = this.totalCount}
+      this.closeExportDrop()
+      this.Loading.appMainLoading = true
+      postExport(_params,_data, _exportUrl, _special).then(res => {
+        this.blob(res, name)//使用前端导出名称
+        this.Loading.appMainLoading = false
+      }).catch(err => {
+        this.Loading.appMainLoading = false
+      })
+    },
     // 点击常用按钮
     topbutton(val,item) {
       // 更新
@@ -63,52 +89,7 @@ export const TableHeaderMixins = {
       // } 
       // 导出
       else if (val == 'export') {
-        const name = this.$route.meta.title 
-        let _params = {
-          isRedundance:Boolean(item.isRedundance),
-          isDetailExport:Boolean(item.isDetailExport),
-          userId:JSON.parse(localStorage.getItem("currentUserInfo")).id
-        }
-        let _exportUrl = this.URLOption_export ? this.URLOption_export : this.URLOption_base;
-        let _special = this.URLOption_export ? true : false
-        this.$confirm('您将进行导出操作, 是否继续?', '提示', {
-          confirmButtonText: '本页导出',
-          cancelButtonText: '全部导出',
-          distinguishCancelAndClose: true,
-          closeOnClickModal: false,
-          closeOnPressEscape: false,
-          type: 'warning'
-        }).then(() => {
-          // 本页导出
-          this.Loading.appMainLoading = true
-          // this.PageListParams.company = window.SITE_CONFIG['company']
-          // this.PageListParams.function = name
-          //自定义导出url
-          // this.PageListParams.route =  item.url ? item.url : this.URLOption_base + '/export';
-          postExport(_params,this.PageListParams, _exportUrl, _special).then(res => {
-            this.blob(res, name)//使用前端导出名称
-            this.Loading.appMainLoading = false
-          }).catch(err => {
-            this.Loading.appMainLoading = false
-          })
-        }).catch((action) => {
-          if (action === 'cancel') {
-            // 全部导出
-            this.Loading.appMainLoading = true
-            let params = JSON.parse(JSON.stringify(this.PageListParams))
-            params.MaxResultCount = this.totalCount
-            this.Loading.appMainLoading = true
-            // params.company = window.SITE_CONFIG['company']
-            // params.route = this.URLOption_base + '/export'
-            // params.function = name
-            postExport(_params,params, _exportUrl, _special).then(res => {
-              this.blob(res, name)//使用前端导出名称
-              this.Loading.appMainLoading = false
-            }).catch(err => {
-              this.Loading.appMainLoading = false
-            })
-          }
-        });
+        this.displayDialog.exportDialog = true
       } 
       // 导入
       else if (val == 'import') {
diff --git a/Code/Fe/src/utils/utils.js b/Code/Fe/src/utils/utils.js
index 4555d89..5493136 100644
--- a/Code/Fe/src/utils/utils.js
+++ b/Code/Fe/src/utils/utils.js
@@ -54,7 +54,8 @@ import currenDrawer from "@/components/commonTabel-drawer"; //抽屉
 import currenButton from "@/components/currenButton" //按钮
 import currenTable from "@/components/currenTable" //table
 import tablePagination from "@/components/tablePagination"; //第一视图集成
-import importFile from "@/components/importFile" //导出
+import importFile from "@/components/importFile" //导入
+import exportDrop from "@/components/exportDrop" //导出
 import pagination from "@/components/Pagination" //分页器
 import conditionFilters from "@/components/conditionFilters" //高级筛选
 import searchPage from '@/components/searchPage' //autocomplete拉取数据探弹窗
@@ -108,6 +109,7 @@ Vue.component('currenButton', currenButton)
 Vue.component('currenTable', currenTable)
 Vue.component('tablePagination', tablePagination)
 Vue.component('importFile', importFile)
+Vue.component('exportDrop', exportDrop)
 Vue.component('pagination', pagination)
 Vue.component('conditionFilters', conditionFilters)
 Vue.component('searchPage', searchPage)
diff --git a/Code/Fe/src/views/interfaceBoard/TestSchool.vue b/Code/Fe/src/views/interfaceBoard/TestSchool.vue
index 8a98178..b31e52f 100644
--- a/Code/Fe/src/views/interfaceBoard/TestSchool.vue
+++ b/Code/Fe/src/views/interfaceBoard/TestSchool.vue
@@ -69,6 +69,12 @@
     ></filterForDetailPage>
     <!-- DeleteApi="TestSchoolDetailList_delete" -->
     <!-- todo: 明细查询中的parentColumns 是否需要独立表头，现与列表页面一致-->
+    <!-- 导出弹窗 -->
+    <exportDrop 
+      v-if="displayDialog.exportDialog"
+      @closeDialog="closeExportDrop"
+      @exportDropSubmit="exportDropSubmit"
+    ></exportDrop>
   </div>
 </template>
 <script>

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

---
 .../components/commonTabel-drawer/index.vue   | 65 +++++++++++++++----
 .../commonTabel-drawer/style/index.scss       |  5 ++
 Code/Fe/src/components/rowDrop/index.vue      | 47 ++++++++------
 Code/Fe/src/mixins/TableHeaderMixins.js       | 15 ++++-
 Code/Fe/src/mixins/TableMixins.js             | 23 +------
 Code/Fe/src/mixins/mixins.js                  | 25 +++----
 Code/Fe/src/utils/defaultButtons.js           |  5 +-
 .../src/views/interfaceBoard/TestSchool.vue   |  1 +
 8 files changed, 118 insertions(+), 68 deletions(-)

diff --git a/Code/Fe/src/components/commonTabel-drawer/index.vue b/Code/Fe/src/components/commonTabel-drawer/index.vue
index cd64cba..f0bd575 100644
--- a/Code/Fe/src/components/commonTabel-drawer/index.vue
+++ b/Code/Fe/src/components/commonTabel-drawer/index.vue
@@ -66,29 +66,42 @@
             :propsData="propsData"
           >
           </curren-descriptions>
+          <!-- todo-new 代码整理-->
+          <div 
+            class="currenTabel-drawer-mx-header" 
+            v-if="scope.value == 'mx' && (showDetailColumnsSet || showDetailFilters)"
+          >
+            <el-button 
+              v-if="showDetailColumnsSet"
+              class="rowDropNotHideItem"
+              @click="columnsSettingHandle()"
+            >字段设置</el-button>
+            <!-- <el-button 
+              type="primary"
+              v-if="showDetailFilters"
+              @click="detailFiltersHandle()"
+            >筛选</el-button> -->
+          </div>
+          <!-- 字段设置弹窗 -->
           <rowDrop 
             @radio="rowDrop" 
             :tableColumns="tableColumns" 
             :visible="rowDropVisible"
             @closeRowDrop="closeRowDrop"
+            :source="'detail_api'"
+            :innerMaxHeight="'calc(90vh - 400px)'"
           ></rowDrop>
           <!-- currenTableDetails 组件 明细中带分页功能 -->
-          <!-- 字段设置弹窗 -->
-          <!-- <div 
-            class="mx-header" 
-            v-if="scope.value == 'mx'"
-          >
-            <el-button @click="columnsSettingHandle()">字段设置</el-button>
-          </div> -->
           <umyTable
             v-if="scope.value == 'mx'"
+            :isUpdate="isUpdate"
             :tableBorder="true"
             :tableData="propsData.details"
             :propsData="propsData"
             :tableColumns="tableColumns"
             :selectionTable="selectionTable"
             :requiredRules="false"
-            :setUTableHeight="260"
+            :setUTableHeight="showDetailColumnsSet ? 305 : 260"
             @sortChange="sortChange"
             @handleSelectionChange="handleSelectionChange"
             @inlineDialog="inlineDialog"
@@ -189,6 +202,7 @@ import currenTabs from "@/components/currenTabs"
 import currenTable from "@/components/currenTable"
 import pagination from "@/components/Pagination"
 import rowDrop from "@/components/rowDrop/index.vue"
+import { getParentNode } from '@/utils'
 export default {
   name: 'currenTabel-drawer',
   components: {
@@ -200,6 +214,16 @@ export default {
     rowDrop
   },
   props: {
+    // 是否显示明细-字段设置
+    showDetailColumnsSet:{
+      type: Boolean,
+      default: true
+    },
+    // 是否显示明细-筛选
+    showDetailFilters:{
+      type: Boolean,
+      default: true
+    },
     title: {
       type: Array,
       default: () => {
@@ -343,9 +367,22 @@ export default {
     },
   },
   mounted () {
+    // 点击外部，字段设置弹窗隐藏
+    document.addEventListener('click',(e)=>{
+      if(!this.rowDropVisible)return
+      let _class = "rowDropNotHideItem"
+      let _hasParent = getParentNode(e.target,_class)
+      let _current_class = e.target._prevClass || e.target.className
+      let _hasCurrent = _current_class ? String(_current_class).includes(_class) : false
+      if(!_hasParent && !_hasCurrent){
+        this.closeRowDrop()
+      }
+    })
   },
   data () {
     return {
+      // table 重新渲染所需key
+      isUpdate: false,
       // 明细-字段设置是否显示
       rowDropVisible: false,
       otherData:[], // 切换tabs页赋值
@@ -369,13 +406,17 @@ export default {
     }
   },
   methods: {
-    rowDrop(data) {
-      this.$emit('rowDrop',data)
-      // this.isUpdate = !this.isUpdate
+    rowDrop(data,type) {
+      this.$emit('rowDrop',data,type)
+      this.isUpdate = !this.isUpdate
     },
-    // 字段设置
+    // 明细-字段设置
     columnsSettingHandle(){
       this.rowDropVisible = !this.rowDropVisible
+    },
+    // 明细-筛选
+    detailFiltersHandle(){
+
     },
     // 关闭字段设置
     closeRowDrop() {
diff --git a/Code/Fe/src/components/commonTabel-drawer/style/index.scss b/Code/Fe/src/components/commonTabel-drawer/style/index.scss
index 877fd49..2856abf 100644
--- a/Code/Fe/src/components/commonTabel-drawer/style/index.scss
+++ b/Code/Fe/src/components/commonTabel-drawer/style/index.scss
@@ -120,3 +120,8 @@
 ::v-deep .el-tabs__nav-wrap::after{
   content: unset !important;
 }
+
+.currenTabel-drawer-mx-header{
+  text-align: right;
+  padding: 0 10px 10px 0;
+}
\ No newline at end of file
diff --git a/Code/Fe/src/components/rowDrop/index.vue b/Code/Fe/src/components/rowDrop/index.vue
index 1e7b8a3..449d5a9 100644
--- a/Code/Fe/src/components/rowDrop/index.vue
+++ b/Code/Fe/src/components/rowDrop/index.vue
@@ -15,7 +15,7 @@
         <i class="el-icon-success icon" v-if="allSeletType == 'NoSelect'" style="color:#999" ></i>
         全选
       </div>
-      <transition-group class="transition-wrapper" name="sort">
+      <transition-group class="transition-wrapper" :style="{maxHeight:innerMaxHeight}" name="sort">
         <div 
           v-for="(item,index) in dataList" 
           :key='index+item.label' 
@@ -65,18 +65,27 @@ export default {
     }
   },
   props: {
-      visible: {
-          type: Boolean,
-          default: () => {
-              return false
-          }
-      },
-      tableColumns: {
-          type: Array,
-          default: () => {
-              return [];
-          },
-      },
+    innerMaxHeight:{
+      type:String,
+      default:'calc(90vh - 280px)'
+    },
+    visible: {
+        type: Boolean,
+        default: () => {
+            return false
+        }
+    },
+    tableColumns: {
+        type: Array,
+        default: () => {
+            return [];
+        },
+    },
+    // list_api  detail_api  detailPage_api  list  detail  detailPage
+    source:{
+      type:String,
+      default:'list_api'
+    }
   },
   mounted() {
     this.historyTableColumns = JSON.parse(JSON.stringify(this.tableColumns))
@@ -92,8 +101,8 @@ export default {
         cancelButtonClass:'rowDropNotHideItem'
       }).then(() => {
         // 先set是为了字段设置按钮可以监听到缓存变化，之后在移除缓存  this.$store.getters.name.userName
-        localStorage.setItem('tableColumns_' + this.userName + '_' + this.$route.name, JSON.stringify([]))
-        localStorage.removeItem('tableColumns_' + this.userName + '_' + this.$route.name)
+        localStorage.setItem('file_Columns_' + this.source + '_' + this.userName + '_' + this.$route.name, JSON.stringify([]))
+        localStorage.removeItem('file_Columns_' + this.source + '_' +this.userName + '_' + this.$route.name)
         // let _resetCol = this.$isTableColumns[this.$route.name]
         let _resetCol = this.historyTableColumns
         _resetCol.forEach(item => {
@@ -101,7 +110,7 @@ export default {
         })
         this.dataList = _resetCol
         this.initSelectSta()
-        this.$emit('radio',_resetCol)
+        this.$emit('radio',_resetCol,this.source)
         this.close()
       }).catch(() => {
 
@@ -121,9 +130,9 @@ export default {
     },
     save () {
       this.$forceUpdate()
-      this.$emit('radio',this.dataList)
+      this.$emit('radio',this.dataList,this.source)
       // 本地缓存 当前用户名 + 路由名称
-      localStorage.setItem('tableColumns_' + this.userName + '_' + this.$route.name, JSON.stringify(this.dataList))
+      localStorage.setItem('file_Columns_' + this.source + '_' + this.userName + '_' + this.$route.name, JSON.stringify(this.dataList))
     },
     dragstart(value) {
         this.oldData = value
@@ -194,7 +203,7 @@ $paddingSize:20px;
   }
   .transition-wrapper {
     display: block;
-    max-height: calc(90vh - 280px);
+    // max-height: calc(90vh - 280px);
     overflow: auto;
     padding: 0 0 $paddingSize $paddingSize;
 
diff --git a/Code/Fe/src/mixins/TableHeaderMixins.js b/Code/Fe/src/mixins/TableHeaderMixins.js
index 6a1e19e..62808fb 100644
--- a/Code/Fe/src/mixins/TableHeaderMixins.js
+++ b/Code/Fe/src/mixins/TableHeaderMixins.js
@@ -297,9 +297,18 @@ export const TableHeaderMixins = {
         });
       }
     },
-    // 表头字段设置
-    rowDrop(data) {
-      this.tableColumns = data
+    /**
+     * 表头字段设置
+     * @param {*} data 数据
+     * @param {*} type 设置来源 
+     * list_api: 表头来自api的列表  detail_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 == '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 c3d2d08..5f9b542 100644
--- a/Code/Fe/src/mixins/TableMixins.js
+++ b/Code/Fe/src/mixins/TableMixins.js
@@ -38,10 +38,6 @@ export const tableMixins = {
       tableDataDetails:[],
       //默认tag
       firstTabs:'xq',
-      // api的表头原始数据
-      apiColumns_Table_copy:null,
-      apiColumns_DesTions_copy:null,
-      apiColumns_DetailsTable_copy:null,
       // api的表头数据
       apiColumns_Table:null,
       apiColumns_DesTions:null,
@@ -54,29 +50,14 @@ export const tableMixins = {
       operationButtonsTable:[{label:'查看详情',name:'info'}]
     }
   },
-  mounted() {
-    // 用于api表头的字段设置监听同步
-    window.addEventListener('setItemEvent', (item) => {
-        if (item.key.indexOf('tableColumns') > -1) {
-          if(JSON.parse(item.newValue).length <= 0){
-            this.apiColumns_Table = this.apiColumns_Table_copy[this.$route.name]
-          }else{
-            this.apiColumns_Table = JSON.parse(item.newValue)
-          }
-        }
-    })
-  },
   methods: {
     // 获取通过api的表头数据，不可以在初始化处理，因为接口返回问题
     initApiColumns(tableColumns_api,tabsDesTions_api,detailsTableColumns_api){
-      // 复制一份原始数据（目的：字段设置恢复）
-      this.apiColumns_Table_copy = JSON.parse(JSON.stringify(tableColumns_api))
-      this.apiColumns_DesTions_copy = JSON.parse(JSON.stringify(tabsDesTions_api))
-      this.apiColumns_DetailsTable_copy = JSON.parse(JSON.stringify(detailsTableColumns_api))
       // 赋值表头数据
       this.apiColumns_Table = this.initTableColumns(tableColumns_api[this.$route.name])
       this.apiColumns_DesTions = tabsDesTions_api[this.$route.name]
-      this.apiColumns_DetailsTable = detailsTableColumns_api[this.$route.name]
+      this.apiColumns_DetailsTable = this.initTableColumns(detailsTableColumns_api[this.$route.name],'detail_api')
+    
     },
     //渲染数据
     paging(callback) {
diff --git a/Code/Fe/src/mixins/mixins.js b/Code/Fe/src/mixins/mixins.js
index 441c825..d18b46c 100644
--- a/Code/Fe/src/mixins/mixins.js
+++ b/Code/Fe/src/mixins/mixins.js
@@ -54,11 +54,12 @@ export const mixins = {
   },
   methods: {
     // 结合默认及缓存中的列表tableColumns数据做初始化
-    initTableColumns(){
+    initTableColumns(columnsData,type){
       let _list_defalut = columnsData ? columnsData : this.$isTableColumns[this.$route.name]
+      let _type = type ? type : 'list_api'
       if(!_list_defalut)return
-      let _local = localStorage.getItem('tableColumns_' + JSON.parse(localStorage.getItem('currentUserInfo')).userName + '_' + this.$route.name)
-      let _list_local = JSON.parse(localStorage.getItem('tableColumns_' + JSON.parse(localStorage.getItem('currentUserInfo')).userName + '_' + this.$route.name))
+      let _local = localStorage.getItem('file_Columns_' + _type + '_' + JSON.parse(localStorage.getItem('currentUserInfo')).userName + '_' + this.$route.name)
+      let _list_local = JSON.parse(localStorage.getItem('file_Columns_' + _type + '_' + JSON.parse(localStorage.getItem('currentUserInfo')).userName + '_' + this.$route.name))
       let _new_list = [] //格式化后的数据
       // 如果没有缓存则直接为默认值
       if(!_local){
@@ -71,14 +72,16 @@ export const mixins = {
       else{
         // 先处理缓存数据，设置索引
         let _locals = {}
-        _list_local.forEach((localItem,index) => {
-          localItem.itemIndex = index
-          if(localItem.showProp && typeof localItem.showProp == 'string'){
-            _locals[localItem.showProp] = localItem
-          }else{
-            _locals[localItem.prop] = localItem
-          }
-        })
+        if(_list_local){
+          _list_local.forEach((localItem,index) => {
+            localItem.itemIndex = index
+            if(localItem.showProp && typeof localItem.showProp == 'string'){
+              _locals[localItem.showProp] = localItem
+            }else{
+              _locals[localItem.prop] = localItem
+            }
+          })
+        }
         // 将缓存与默认设置合并，索引同步
         let _number = 0
         _list_defalut.forEach((defalutItem) => {
diff --git a/Code/Fe/src/utils/defaultButtons.js b/Code/Fe/src/utils/defaultButtons.js
index d952763..2036d06 100644
--- a/Code/Fe/src/utils/defaultButtons.js
+++ b/Code/Fe/src/utils/defaultButtons.js
@@ -40,9 +40,10 @@ export function defaultExportBtn(option) {
 }
 
 // 字段设置
-export function defaultFieldSettingBtn(option) {
+export function defaultFieldSettingBtn(option,source) {
+    let _source = source ? source : 'list_api'
     // todo:监听已经配置过的字段按钮更改状态特殊显示
-    let _local = localStorage.getItem('tableColumns_' + JSON.parse(localStorage.getItem('currentUserInfo')).userName + '_' + this.$route.name)
+    let _local = localStorage.getItem('file_Columns_' + _source + '_' + JSON.parse(localStorage.getItem('currentUserInfo')).userName + '_' + this.$route.name)
     let _type = ''
     let _num = 0
     if(_local){
diff --git a/Code/Fe/src/views/interfaceBoard/TestSchool.vue b/Code/Fe/src/views/interfaceBoard/TestSchool.vue
index b31e52f..6615efd 100644
--- a/Code/Fe/src/views/interfaceBoard/TestSchool.vue
+++ b/Code/Fe/src/views/interfaceBoard/TestSchool.vue
@@ -28,6 +28,7 @@
     ></tablePagination>
     <curren-Drawer
       :title="apiColumns_DesTions"
+      @rowDrop="rowDrop"
       :tableColumns="apiColumns_DetailsTable"
       :tabsDesTions="apiColumns_DesTions"
       :DrawerLoading="Loading.DrawerLoading"

From 36cedb4ddce20fd1ac2dfc34297bff3dd3fb0c7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Mon, 17 Jul 2023 17:17:14 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=E6=98=8E=E7=BB=86=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AF=E6=A8=A1=E6=8B=9F=E7=AD=9B=E9=80=89=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/commonTabel-drawer/index.vue   | 92 ++++++++++++-------
 .../commonTabel-drawer/style/index.scss       | 10 ++
 .../Fe/src/components/searchOverall/index.vue | 26 +++++-
 Code/Fe/src/mixins/TableMixins.js             | 58 ++++++++++--
 .../src/views/interfaceBoard/TestSchool.vue   |  3 +
 5 files changed, 147 insertions(+), 42 deletions(-)

diff --git a/Code/Fe/src/components/commonTabel-drawer/index.vue b/Code/Fe/src/components/commonTabel-drawer/index.vue
index f0bd575..b993a82 100644
--- a/Code/Fe/src/components/commonTabel-drawer/index.vue
+++ b/Code/Fe/src/components/commonTabel-drawer/index.vue
@@ -75,12 +75,14 @@
               v-if="showDetailColumnsSet"
               class="rowDropNotHideItem"
               @click="columnsSettingHandle()"
+              size="mini"
             >字段设置</el-button>
-            <!-- <el-button 
+            <el-button 
               type="primary"
               v-if="showDetailFilters"
               @click="detailFiltersHandle()"
-            >筛选</el-button> -->
+              size="mini"
+            >筛选</el-button>
           </div>
           <!-- 字段设置弹窗 -->
           <rowDrop 
@@ -91,6 +93,23 @@
             :source="'detail_api'"
             :innerMaxHeight="'calc(90vh - 400px)'"
           ></rowDrop>
+          <!-- 全面搜索（普通+高级整合） -->
+          <searchOverall
+            ref="searchOverallRef"
+            class="detailFiltersPopPage"
+            :showSearchOverall="detailFiltersVisible"
+            @getShowSearchOverall="getShowSearchOverall"
+            :showMoreSearch="true"
+            :tableColumns="tableColumns"
+            @overallSearchFormClick="detailFiltersSearch"
+            :filterActionOptions="filterActionOptions"
+            :httpOverallSearchData="detailSearchDataFE"
+            :disabledAction="true"
+            :disabledLogic="true"
+          >
+            <!-- 插槽预留 -->
+            <slot name="searchPrimarySlot"></slot>
+          </searchOverall>
           <!-- currenTableDetails 组件 明细中带分页功能 -->
           <umyTable
             v-if="scope.value == 'mx'"
@@ -101,7 +120,7 @@
             :tableColumns="tableColumns"
             :selectionTable="selectionTable"
             :requiredRules="false"
-            :setUTableHeight="showDetailColumnsSet ? 305 : 260"
+            :setUTableHeight="showDetailColumnsSet ? 300 : 260"
             @sortChange="sortChange"
             @handleSelectionChange="handleSelectionChange"
             @inlineDialog="inlineDialog"
@@ -193,6 +212,7 @@
   </el-drawer>
 </template>
 <script>
+import searchOverall from "@/components/searchOverall"
 import { getListByItemcode,byItem,byProduct,byComponent,bySupplierCode,byLocation,byLocationCode,
   relationByLocationCode,byComponentCJ,purRecNoteCustomInfo,EnumPurchaseReceiptInspect 
 } from "@/api/wms-api"
@@ -211,6 +231,7 @@ export default {
     currenDescriptions,
     currenTabs,
     currenTable,
+    searchOverall,
     rowDrop
   },
   props: {
@@ -224,6 +245,11 @@ export default {
       type: Boolean,
       default: true
     },
+    // 明细-筛选-当前接口中的筛选数据（用于同步全面筛选的数据）
+    detailSearchDataFE:{
+      type: Object,
+      default: null
+    },
     title: {
       type: Array,
       default: () => {
@@ -330,36 +356,24 @@ export default {
         return this.dropdownTabsData
       } else {
         // 正常普通 详情，明细，汇总
-        if (Object.keys(this.propsData).length != 0) {
+        // if (Object.keys(this.propsData).length != 0) {
+          if (Object.keys(this.propsData)) {
           this.initDropdownTabsData = [{
-              label: "详情",
-              name: 'xq'
-            },
-            {
+            label: "详情",
+            name: 'xq'
+          }]
+          // 明细可以为空数组，前端分页使用
+          if(this.propsData.details){
+            this.initDropdownTabsData.push({
               label: "明细",
               name: 'mx'
-            },
-            {
+            })
+          }
+          if(this.propsData.summaryDetails && this.propsData.summaryDetails.length > 0){
+            this.initDropdownTabsData.push({
               label: "汇总",
               name: 'hz'
-            }]
-          if (this.propsData.details == undefined || !this.propsData.details.length) {
-            this.initDropdownTabsData = [{
-              label: "详情",
-              name: 'xq'
-            }]
-            return this.initDropdownTabsData
-          }
-          if (this.propsData.summaryDetails == undefined || !this.propsData.summaryDetails.length ) {
-            this.initDropdownTabsData = [{
-              label: "详情",
-              name: 'xq'
-            },
-            {
-              label: "明细",
-              name: 'mx'
-            }]
-            return this.initDropdownTabsData
+            })
           }
         }
         return this.initDropdownTabsData
@@ -402,7 +416,15 @@ export default {
           label: "汇总",
           name: 'hz'
         }
-      ]
+      ],
+      detailFiltersVisible:false,//筛选显示
+      filterActionOptions:[{
+        value: '==',
+        label: '等于'
+      }, {
+        value: '!=',
+        label: '不等于'
+      }],
     }
   },
   methods: {
@@ -416,9 +438,17 @@ export default {
     },
     // 明细-筛选
     detailFiltersHandle(){
-
+      this.detailFiltersVisible = !this.detailFiltersVisible
+    },
+    // 明细-全面筛选组件内部显示/隐藏更改触发，同步当前的showSearchOverall值
+    getShowSearchOverall(val){
+      this.detailFiltersVisible = val || false
+    },
+    // 明细-全面筛选所有按钮操作集
+    detailFiltersSearch(options){
+      this.$emit('detailFiltersSearch', options)
     },
-    // 关闭字段设置
+    // 明细-关闭字段设置
     closeRowDrop() {
       this.rowDropVisible = false
     },
diff --git a/Code/Fe/src/components/commonTabel-drawer/style/index.scss b/Code/Fe/src/components/commonTabel-drawer/style/index.scss
index 2856abf..4451c6f 100644
--- a/Code/Fe/src/components/commonTabel-drawer/style/index.scss
+++ b/Code/Fe/src/components/commonTabel-drawer/style/index.scss
@@ -124,4 +124,14 @@
 .currenTabel-drawer-mx-header{
   text-align: right;
   padding: 0 10px 10px 0;
+}
+
+.detailFiltersPopPage{
+  position: absolute;
+  right: 0;
+  left: 0;
+  height: 240px;
+  .fullPageCover{
+    height: calc(100vh - 300px) !important;
+  }
 }
\ No newline at end of file
diff --git a/Code/Fe/src/components/searchOverall/index.vue b/Code/Fe/src/components/searchOverall/index.vue
index 4a7255d..2a2d7e9 100644
--- a/Code/Fe/src/components/searchOverall/index.vue
+++ b/Code/Fe/src/components/searchOverall/index.vue
@@ -70,7 +70,7 @@
                   <el-select
                     v-model="item.action"
                     placeholder="请选择条件"
-                    :disabled="item.column == '' || item.hide ? true : false"
+                    :disabled="disabledAction || item.column == '' || item.hide ? true : false"
                   >
                   <!-- moreListOptions.action -->
                     <el-option
@@ -137,7 +137,7 @@
                   <el-select
                     v-model="item.logic"
                     placeholder="请选择关系"
-                    :disabled="item.column == '' || item.hide ? true : false"
+                    :disabled="disabledLogic || item.column == '' || item.hide ? true : false"
                   >
                     <el-option
                       v-for="item in moreListOptions.logic"
@@ -233,6 +233,16 @@ export default {
     }
   },
   props: {
+    // 禁用选择条件
+    disabledAction:{
+      type: Boolean,
+      default: false
+    },
+    // 禁用选择关系
+    disabledLogic:{
+      type: Boolean,
+      default: false
+    },
     // 是否显示全面筛选组件
     showSearchOverall:{
       type: Boolean,
@@ -268,7 +278,12 @@ export default {
     httpOverallSearchData:{
       type: Object,
       default: null
-    }
+    },
+    // 自定义配置条件
+    filterActionOptions:{
+      type: Array,
+      default: null
+    },
   },
   data() {
     return {
@@ -419,6 +434,11 @@ export default {
     },
     // 根据数据内容约束条件选项
     formatMoreListOptions(val) {
+      // 自定义配置条件filterActionOptions
+      if(this.filterActionOptions){
+        this.moreListOptions.action = this.filterActionOptions
+        return this.moreListOptions.action
+      }
       if (val) {
         for(var i =0; i< this.tableColumns.length; i++) {
           if (val == this.tableColumns[i].prop) {
diff --git a/Code/Fe/src/mixins/TableMixins.js b/Code/Fe/src/mixins/TableMixins.js
index 5f9b542..8e92b9e 100644
--- a/Code/Fe/src/mixins/TableMixins.js
+++ b/Code/Fe/src/mixins/TableMixins.js
@@ -35,7 +35,7 @@ export const tableMixins = {
       //每页最大显示数
       MaxResultCountDetails: 20,
       // 明细数据临时存储
-      tableDataDetails:[],
+      tableDataDetails:null,
       //默认tag
       firstTabs:'xq',
       // api的表头数据
@@ -46,6 +46,8 @@ export const tableMixins = {
       URLOption_base:allUrlOption[this.$route.name].baseURL,
       //主表-明细
       URLOption_detail:allUrlOption[this.$route.name].detailURL,
+      // 主表-明细-筛选数据同步回显
+      detailSearchDataFE:null,
       // 主表-操作列
       operationButtonsTable:[{label:'查看详情',name:'info'}]
     }
@@ -110,14 +112,9 @@ export const tableMixins = {
       let _url = this.URLOption_detail ? this.URLOption_detail : this.URLOption_base
       getDetailed(val.id, _url).then(res => {
           if (res.details) {
-            // 前端分页处理
             this.tableDataDetails = JSON.parse(JSON.stringify(res))
-            let linshiTableDataDetails = JSON.parse(JSON.stringify(this.tableDataDetails))
-            this.totalCountDetails = res.details.length
-            // 删除除当前页面最大数以外数据
-            linshiTableDataDetails.details.splice(this.MaxResultCountDetails,this.totalCountDetails); 
-            // this.oldSkipCountDetails = 1
-            this.propsData = linshiTableDataDetails
+            // 前端分页处理
+            this.propsData = this.detailListPageFromFE(res)
           } else {
             this.propsData = res
           }
@@ -126,6 +123,14 @@ export const tableMixins = {
         this.Loading.DrawerLoading = false
       })
     },
+    // 前端分页处理
+    detailListPageFromFE(data){
+      let linshiTableDataDetails = JSON.parse(JSON.stringify(data))
+      this.totalCountDetails = data.details.length
+      // 删除除当前页面最大数以外数据
+      linshiTableDataDetails.details.splice(this.MaxResultCountDetails,this.totalCountDetails); 
+      return linshiTableDataDetails
+    },
     // 明细 分页 接收分页组件emit改变每页最大页数
     alterResultCountDetails(val) {
       this.Loading.DrawerLoading = true
@@ -276,6 +281,43 @@ export const tableMixins = {
       if(callback)callback()
       // this.getSupplierByCodesHandle_table()
     },
+    // 筛选前端查询
+    detailFiltersSearch(options){
+      let _item = options.item;
+      // 重置
+      if(_item.name == 'reset' || _item.name == 'moreList-reset'){
+        this.propsData = this.detailListPageFromFE(this.tableDataDetails)
+        //关闭高级筛选
+        if(options.vm_moreList){options.vm_moreList.changeMoreListShow(false)}
+        // 同步当前列表数据请求接口的筛选条件
+        this.detailSearchDataFE = {}
+        this.detailSearchDataFE.moreList = {filters:JSON.parse(JSON.stringify([]))}
+      }
+      // 查询
+      if( _item.name == 'search' || _item.name == 'moreList-search'){
+        let _searchObj = {}
+        let searchData = options.data_moreList.filters;
+        console.log(299,searchData)
+        searchData.forEach(item=>{
+          _searchObj[item.column] = item.value
+        })
+        const productFilter = (data, params) => data.filter(function(item){
+          return Object.keys(params).every(function(key){ 
+              return item[key]!=undefined && item[key]==params[key] //可以相应修改条件
+          })
+        })
+        let _allData = JSON.parse(JSON.stringify(this.tableDataDetails))
+        let _filterList = productFilter(_allData.details,_searchObj)
+        _allData.details = _filterList
+        this.propsData = this.detailListPageFromFE(_allData)
+        //关闭高级筛选
+        if(options.vm_moreList){options.vm_moreList.changeMoreListShow(false)}
+        // 同步当前列表数据请求接口的筛选条件
+        this.detailSearchDataFE = {}
+        this.detailSearchDataFE.moreList = {filters:JSON.parse(JSON.stringify(searchData))}
+      }
+      // return res
+    },
     // 点击抽屉，获取明细后全局通用操作
     inlineDialogCallback(){
       this.Loading.DrawerLoading = false
diff --git a/Code/Fe/src/views/interfaceBoard/TestSchool.vue b/Code/Fe/src/views/interfaceBoard/TestSchool.vue
index 6615efd..1165fbc 100644
--- a/Code/Fe/src/views/interfaceBoard/TestSchool.vue
+++ b/Code/Fe/src/views/interfaceBoard/TestSchool.vue
@@ -35,6 +35,8 @@
       :drawer="displayDialog.detailsDialog"
       :dropdownData="dropdownData"
       :propsData="propsData"
+      @detailFiltersSearch="detailFiltersSearch"
+      :detailSearchDataFE="detailSearchDataFE"
       @drawerShut="(val) => (displayDialog.detailsDialog = val)"
       @drawerbutton="drawerbutton"
       @handleCommand="drawerHandle"
@@ -62,6 +64,7 @@
       @close="FormClose"
       @goBack="goBack"
     ></newAndEdiDialog>
+    <!-- 明细查询页面 -->
     <filterForDetailPage
       v-if="filterForDetailShow"
       :listColumns="apiColumns_DetailsTable"