From c06718c7245542d235ffeca8dcb436b46957cc08 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, 14 Sep 2023 17:31:15 +0800
Subject: [PATCH] =?UTF-8?q?=E9=AB=98=E7=BA=A7=E7=AD=9B=E9=80=89=E7=AD=89?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=90=8C=E6=AD=A5=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Code/Fe/src/components/ErrorLog/index.vue     |   26 +-
 .../components/addEditFromApiPop/index.vue    |   20 +-
 .../components/currenButton/innerButton.vue   |    3 +-
 .../components/currenDescriptions/index.vue   |    8 +-
 .../components/filterForDetailPage/index.vue  |  645 ++++-----
 .../Fe/src/components/searchOverall/index.vue | 1210 ++++++++---------
 .../components/searchOverall/style/index.scss |    4 +-
 Code/Fe/src/components/tableTree/index.vue    |    6 +-
 Code/Fe/src/components/umyTable/index.vue     |    2 +-
 9 files changed, 962 insertions(+), 962 deletions(-)

diff --git a/Code/Fe/src/components/ErrorLog/index.vue b/Code/Fe/src/components/ErrorLog/index.vue
index 6119c03..15425fd 100644
--- a/Code/Fe/src/components/ErrorLog/index.vue
+++ b/Code/Fe/src/components/ErrorLog/index.vue
@@ -1,15 +1,31 @@
 <template>
   <div v-if="errorLogs.length>0">
-    <el-badge :is-dot="true" style="line-height: 25px;margin-top: -5px;" @click.native="dialogTableVisible=true">
-      <el-button style="padding: 8px 10px;" size="small" type="danger">
-        <svg-icon icon-class="bug" />
+    <el-badge 
+      :is-dot="true" 
+      style="line-height: 10px;" 
+      @click.native="dialogTableVisible=true"
+    >
+      <el-button style="padding: 4px" size="small" type="danger">
+        <svg-icon icon-class="svg_bug" style="font-size: 16px;"/>
       </el-button>
     </el-badge>
 
-    <el-dialog :visible.sync="dialogTableVisible" width="80%" append-to-body>
+    <el-dialog 
+      :visible.sync="dialogTableVisible" 
+      width="80%" 
+      append-to-body
+      :close-on-click-modal="true"
+      :show-close="true"
+    >
       <div slot="title">
         <span style="padding-right: 10px;">Error Log</span>
-        <el-button size="mini" type="primary" icon="el-icon-delete" @click="clearAll">Clear All</el-button>
+        <el-button 
+          size="mini" 
+          type="primary" 
+          icon="el-icon-delete" 
+          @click="clearAll"
+          style="float: right;margin-right: 30px;"
+        >清除全部</el-button>
       </div>
       <el-table :data="errorLogs" border>
         <el-table-column label="Message">
diff --git a/Code/Fe/src/components/addEditFromApiPop/index.vue b/Code/Fe/src/components/addEditFromApiPop/index.vue
index bac7a2f..29fb3b6 100644
--- a/Code/Fe/src/components/addEditFromApiPop/index.vue
+++ b/Code/Fe/src/components/addEditFromApiPop/index.vue
@@ -69,7 +69,7 @@
                     :disabled="Boolean(item.disabled)"
                   >
                     <el-option
-                      v-for="item in getItemEnums(item)"
+                      v-for="item in item.enums_list"
                       :key="item.value"
                       :label="item.label"
                       :value="item.value"
@@ -247,24 +247,6 @@ export default {
         }
       })
     },
-    // 获取枚举、布尔
-    getItemEnums(item){
-      let _option = []
-      // 布尔
-      if(item.apiBaseType == 'boolean'){
-        _option = [{
-          value: true,
-          label: '是'
-        },{
-          value: false,
-          label: '否'
-        },]
-      }
-      if(item.isEnums){
-        _option = item.enums_list
-      }
-      return _option
-    },
     // 关闭弹窗
     close() {
       this.show = false
diff --git a/Code/Fe/src/components/currenButton/innerButton.vue b/Code/Fe/src/components/currenButton/innerButton.vue
index 6d7d293..0bff8ec 100644
--- a/Code/Fe/src/components/currenButton/innerButton.vue
+++ b/Code/Fe/src/components/currenButton/innerButton.vue
@@ -16,9 +16,8 @@
           }"
           :class="item.class"
           @click="tableButtonClick(item.name,item)"
-          v-permission="item.permission"
+          v-permission="item.permission || []"
       >{{ item.label }}</el-button>
-      <!-- v-permission="item.permission" -->
     </div>
   </template>
   <script>
diff --git a/Code/Fe/src/components/currenDescriptions/index.vue b/Code/Fe/src/components/currenDescriptions/index.vue
index f7c4c9b..f96b07d 100644
--- a/Code/Fe/src/components/currenDescriptions/index.vue
+++ b/Code/Fe/src/components/currenDescriptions/index.vue
@@ -146,9 +146,11 @@ export default {
     // 转义枚举值
     initApiEnumList(item,data){
       let _item_enumList = {}
-      item.enums_list.forEach((item,key)=>{
-        _item_enumList[item.value] = item.label
-      })
+      if(item.enums_list){
+        item.enums_list.forEach((item,key)=>{
+          _item_enumList[item.value] = item.label
+        })
+      }
       return _item_enumList[data] || '未定义'
     },
   }
diff --git a/Code/Fe/src/components/filterForDetailPage/index.vue b/Code/Fe/src/components/filterForDetailPage/index.vue
index 05d12a0..7017b93 100644
--- a/Code/Fe/src/components/filterForDetailPage/index.vue
+++ b/Code/Fe/src/components/filterForDetailPage/index.vue
@@ -1,337 +1,338 @@
 <template>
-<div class="filterForDetailPage" v-if="dialogShow">
-    <el-dialog 
-        title="明细查询"
-        :visible.sync="dialogShow"
-        top="5vh"
-        width="96%"
-        :modal-append-to-body="false"
-        :append-to-body="false"
-        :show-close="true"
-        @close="closeDialog(false)"
-        class="mainTable-dialog"
-    >
-        <div 
-            class="filterForDetailPage-list" 
-            v-loading="Loading.tableLoading"
+    <div class="filterForDetailPage" v-if="dialogShow">
+        <el-dialog 
+            title="明细查询"
+            :visible.sync="dialogShow"
+            top="5vh"
+            width="96%"
+            :modal-append-to-body="false"
+            :append-to-body="false"
+            :show-close="true"
+            @close="closeDialog(false)"
+            class="mainTable-dialog"
         >
-            <!-- 列表 -->
-            <tablePagination
-                v-if="dialogShow && listColumns && listColumns.length > 0"
-                :currenButtonData="currenButtonData"
-                :tableData="tableData"
-                :tableLoading="Loading.tableLoading"
-                @rowDrop="rowDropForDetail"
-                :rowSource="'detailPage_api'"
-                :searchOverallCoverHeight="'calc(100vh - 380px)'"
-                :rowMaxHeight="rowMaxHeight"
-                :tableColumns="listColumns"
-                :totalCount="totalCount"
-                :multipleSelection="multipleSelection"
-                :MaxResultCount="PageListParams.MaxResultCount"
-                :setUTableHeight="setUTableHeight"
-                @topbutton="topbutton"
-                @inlineDialog="inlineDialog"
-                @sortChange="sortChange"
-                @alertoldSkipCount="alertoldSkipCount"
-                @alterResultCount="alterResultCount"
-                @handleSelectionChange="handleSelectionChange"
-                :currentPageProps="oldSkipCount"
-                :quicklySearchOption="quicklySearchOption"
-                @quicklySearchClick="quicklySearchClick"
-                @quicklySearchClear="quicklySearchClear"
-                :primarySearchOption="primarySearchOption"
-                @overallSearchFormClick="overallSearchFormClick"
-                :httpOverallSearchData="httpOverallSearchData"
+            <div 
+                class="filterForDetailPage-list" 
+                v-loading="Loading.tableLoading"
             >
-                <template>
-                    <!-- todo:width处理 -->
-                    <el-table-column
-                        v-if="operaButtons && operaButtons.length > 0"
-                        label="操作"
-                        :align="'center'"
-                        width="150"
-                        fixed="left"
-                    >
-                        <template slot-scope="scope">
-                            <span v-for="item in operaButtons" style="margin: 0 10px;">
-                                <!-- 查看主表信息 -->
-                                <el-button 
-                                    v-if="item == 'showParent'"
-                                    type="text" 
-                                    @click="showParentHandleForDetail(scope.row)"
-                                >查看主表信息</el-button>
-                                <!-- 编辑 -->
-                                <el-button 
-                                    v-if="item == 'edit'"
-                                    type="text" 
-                                    style="color: #ff9000;"
-                                    @click="editHandleForDetail(scope.row)"
-                                >编辑</el-button>
-                                <!-- 删除 -->
-                                <el-popover
-                                    v-if="item == 'delete'"
-                                    placement="left"
-                                    width="260"
-                                    v-model="scope.row.deleteTipVisible"
-                                >
-                                    <p>此操作将永久删除该消息, 是否继续?</p>
-                                    <div style="text-align: right; margin: 0">
-                                        <el-button size="mini" type="text" style="margin-right: 20px;" @click="scope.row.deleteTipVisible = false">取消</el-button>
-                                        <el-button type="primary" size="mini" @click="deleteHandleForDetail(scope.row)">确定</el-button>
-                                    </div>
-                                    <el-button type="text" slot="reference" style="color: red;">删除</el-button>
-                                </el-popover>
-                            </span>
-                        </template>
-                    </el-table-column>
-                </template>		
-            </tablePagination>
-        </div>
-    </el-dialog>
-    <!-- 主表信息 -->
-    <el-dialog 
-        :modal-append-to-body="false"
-        :append-to-body="false"
-        :title="showParentTitle" 
-        :visible.sync="showParentDialog"
-        :close-on-click-modal="true"
-        :close-on-press-escape="true"
-        :show-close="true"
-        width="70%"
-    >
-        <div v-loading="showParentLoading">
-            <curren-descriptions
-                v-if="showParentTableData"
-                border
-                :column="column"
-                :direction="direction"
-                :colon="false"
-                :tabsDesTions="parentColumns"
-                :propsData="showParentTableData"
-                style="padding-bottom: 20px;"
-            ></curren-descriptions>
-        </div>
-        <!-- <el-table :data="showParentTableData">
-            <el-table-column property="date" label="日期" width="150"></el-table-column>
-            <el-table-column property="name" label="姓名" width="200"></el-table-column>
-            <el-table-column property="address" label="地址"></el-table-column>
-        </el-table> -->
-    </el-dialog>
-</div>
-</template>
-<script>
-import currenDescriptions from "@/components/currenDescriptions"
-import { tableMixins } from "@/mixins/TableMixins";
-import { TableHeaderMixins } from "@/mixins/TableHeaderMixins";
-import { LoadingMixins } from "@/mixins/LoadingMixins";
-import { mixins } from "@/mixins/mixins";
-import { filterSelectMixins } from '@/mixins/filter-Select'
-import {getListDesById,getPageListForDetail} from "@/api/wms-api"
-export default {
-    name: 'filterForDetailPage',
-    mixins: [
-        tableMixins,
-        TableHeaderMixins,
-        mixins,
-        filterSelectMixins,
-        LoadingMixins
-    ],
-    components:{
-        currenDescriptions
-    },
-    props: {
-        // 已app-main高度为100%  需要减掉的高度
-        setUTableHeight: {
-            type: Number,
-            default: 340
-        },
-        // 是否显示序号
-        isShowIndex:{
-            type: Boolean,
-            default: false
-        },
-        // 复选框
-        tableSelection: {
-            type: Boolean,
-            default: false
-        },
-        cellStyle: {
-            type: Function,
-            default: () => {
-                return Function;
-            }
-        },
-        // 超出内容是否提示
-        showOverflowTooltip:{
-            type: Boolean,
-            default: false,
+                <!-- 列表 -->
+                <tablePagination
+                    v-if="dialogShow && listColumns && listColumns.length > 0"
+                    :currenButtonData="currenButtonData"
+                    :tableData="tableData"
+                    :tableLoading="Loading.tableLoading"
+                    @rowDrop="rowDropForDetail"
+                    :rowSource="'detailPage_api'"
+                    :searchOverallCoverHeight="'calc(100vh - 380px)'"
+                    :rowMaxHeight="rowMaxHeight"
+                    :tableColumns="listColumns"
+                    :totalCount="totalCount"
+                    :multipleSelection="multipleSelection"
+                    :MaxResultCount="PageListParams.MaxResultCount"
+                    :setUTableHeight="setUTableHeight"
+                    :selectMaxHeight="'116px'"
+                    @topbutton="topbutton"
+                    @inlineDialog="inlineDialog"
+                    @sortChange="sortChange"
+                    @alertoldSkipCount="alertoldSkipCount"
+                    @alterResultCount="alterResultCount"
+                    @handleSelectionChange="handleSelectionChange"
+                    :currentPageProps="oldSkipCount"
+                    :quicklySearchOption="quicklySearchOption"
+                    @quicklySearchClick="quicklySearchClick"
+                    @quicklySearchClear="quicklySearchClear"
+                    :primarySearchOption="primarySearchOption"
+                    @overallSearchFormClick="overallSearchFormClick"
+                    :httpOverallSearchData="httpOverallSearchData"
+                >
+                    <template>
+                        <!-- todo:width处理 -->
+                        <el-table-column
+                            v-if="operaButtons && operaButtons.length > 0"
+                            label="操作"
+                            :align="'center'"
+                            width="150"
+                            fixed="left"
+                        >
+                            <template slot-scope="scope">
+                                <span v-for="item in operaButtons" style="margin: 0 10px;">
+                                    <!-- 查看主表信息 -->
+                                    <el-button 
+                                        v-if="item == 'showParent'"
+                                        type="text" 
+                                        @click="showParentHandleForDetail(scope.row)"
+                                    >查看主表信息</el-button>
+                                    <!-- 编辑 -->
+                                    <el-button 
+                                        v-if="item == 'edit'"
+                                        type="text" 
+                                        style="color: #ff9000;"
+                                        @click="editHandleForDetail(scope.row)"
+                                    >编辑</el-button>
+                                    <!-- 删除 -->
+                                    <el-popover
+                                        v-if="item == 'delete'"
+                                        placement="left"
+                                        width="260"
+                                        v-model="scope.row.deleteTipVisible"
+                                    >
+                                        <p>此操作将永久删除该消息, 是否继续?</p>
+                                        <div style="text-align: right; margin: 0">
+                                            <el-button size="mini" type="text" style="margin-right: 20px;" @click="scope.row.deleteTipVisible = false">取消</el-button>
+                                            <el-button type="primary" size="mini" @click="deleteHandleForDetail(scope.row)">确定</el-button>
+                                        </div>
+                                        <el-button type="text" slot="reference" style="color: red;">删除</el-button>
+                                    </el-popover>
+                                </span>
+                            </template>
+                        </el-table-column>
+                    </template>		
+                </tablePagination>
+            </div>
+        </el-dialog>
+        <!-- 主表信息 -->
+        <el-dialog 
+            :modal-append-to-body="false"
+            :append-to-body="false"
+            :title="showParentTitle" 
+            :visible.sync="showParentDialog"
+            :close-on-click-modal="true"
+            :close-on-press-escape="true"
+            :show-close="true"
+            width="70%"
+        >
+            <div v-loading="showParentLoading">
+                <curren-descriptions
+                    v-if="showParentTableData"
+                    border
+                    :column="column"
+                    :direction="direction"
+                    :colon="false"
+                    :tabsDesTions="parentColumns"
+                    :propsData="showParentTableData"
+                    style="padding-bottom: 20px;"
+                ></curren-descriptions>
+            </div>
+            <!-- <el-table :data="showParentTableData">
+                <el-table-column property="date" label="日期" width="150"></el-table-column>
+                <el-table-column property="name" label="姓名" width="200"></el-table-column>
+                <el-table-column property="address" label="地址"></el-table-column>
+            </el-table> -->
+        </el-dialog>
+    </div>
+    </template>
+    <script>
+    import currenDescriptions from "@/components/currenDescriptions"
+    import { tableMixins } from "@/mixins/TableMixins";
+    import { TableHeaderMixins } from "@/mixins/TableHeaderMixins";
+    import { LoadingMixins } from "@/mixins/LoadingMixins";
+    import { mixins } from "@/mixins/mixins";
+    import { filterSelectMixins } from '@/mixins/filter-Select'
+    import {getListDesById,getPageListForDetail} from "@/api/wms-api"
+    export default {
+        name: 'filterForDetailPage',
+        mixins: [
+            tableMixins,
+            TableHeaderMixins,
+            mixins,
+            filterSelectMixins,
+            LoadingMixins
+        ],
+        components:{
+            currenDescriptions
         },
-        // 删除api
-        DeleteApi: {
+        props: {
+            // 已app-main高度为100%  需要减掉的高度
+            setUTableHeight: {
+                type: Number,
+                default: 340
+            },
+            // 是否显示序号
+            isShowIndex:{
+                type: Boolean,
+                default: false
+            },
+            // 复选框
+            tableSelection: {
+                type: Boolean,
+                default: false
+            },
+            cellStyle: {
+                type: Function,
+                default: () => {
+                    return Function;
+                }
+            },
+            // 超出内容是否提示
+            showOverflowTooltip:{
+                type: Boolean,
+                default: false,
+            },
+            // 删除api
+            DeleteApi: {
+                type: String,
+                default: null
+            },
+            // 主表数据-表头
+            parentColumns:{
+                type: Array,
+                default: null
+            },
+            showHandleButtons:{
+                type:Array,
+                default:() => {
+                    //'add','edit'暂未处理操作 'delete'暂时隐藏
+                    // showParent查看主表信息，fresh刷新，filter筛选，field字段设置
+                    return ['showParent','fresh','filter','field'];
+                }
+            },
+            // 父级展现列数，默认为2列展现
+            column: {
+            type: Number,
+            default: 2
+            },
+            // 父级展示方式，默认水平分布
+            direction: {
             type: String,
-            default: null
-        },
-        // 主表数据-表头
-        parentColumns:{
-            type: Array,
-            default: null
+            default: 'horizontal'
+            },
+            rowMaxHeight:{
+            type:String,
+            default:'calc(90vh - 450px)'
+            },
         },
-        showHandleButtons:{
-            type:Array,
-            default:() => {
-                //'add','edit'暂未处理操作 'delete'暂时隐藏
-                // showParent查看主表信息，fresh刷新，filter筛选，field字段设置
-                return ['showParent','fresh','filter','field'];
+        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:[],//操作列按钮
+                showParentDialog:false,//显示父级数据弹窗
+                showParentTitle:null,//显示父级数据弹窗-title
+                showParentTableData:null,//显示父级数据弹窗-数据
+                showParentLoading:false,//显示父级数据弹窗-加载
+                listColumns:[],//表头数据
             }
         },
-        // 父级展现列数，默认为2列展现
-        column: {
-        type: Number,
-        default: 2
-        },
-        // 父级展示方式，默认水平分布
-        direction: {
-        type: String,
-        default: 'horizontal'
-        },
-        rowMaxHeight:{
-        type:String,
-        default:'calc(90vh - 450px)'
-        },
-    },
-    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:[],//操作列按钮
-            showParentDialog:false,//显示父级数据弹窗
-            showParentTitle:null,//显示父级数据弹窗-title
-            showParentTableData:null,//显示父级数据弹窗-数据
-            showParentLoading:false,//显示父级数据弹窗-加载
-            listColumns:[],//表头数据
-        }
-    },
-    activated(){
-        // 解决切换页面的时候，遮罩层消失的问题
-        this.dialogShow = false
-        this.$nextTick(() => {
-            this.dialogShow = true
-        });
-    },
-    mounted(){
-        this.paging()
-        this.initHandleButtons()
-    },
-    methods: {
-        rowDropForDetail(data,type){
-            this.listColumns = data
-            this.$emit("rowDropForDetail", data,type)
-        },
-        // 初始化显示按钮
-        initHandleButtons(){
-            // 头部按钮
-            let _arr_header = []
-            if(this.showHandleButtons.indexOf('add') >= 0){_arr_header.push(this.defaultAddBtn())}
-            if(this.showHandleButtons.indexOf('field') >= 0){_arr_header.push(this.defaultFieldSettingBtn())}
-            if(this.showHandleButtons.indexOf('fresh') >= 0){_arr_header.push(this.defaultFreshBtn())}
-            if(this.showHandleButtons.indexOf('filter') >= 0){_arr_header.push(this.defaultFilterBtn())}
-            this.currenButtonData = _arr_header
-
-            // 操作列按钮
-            let _arr_op = []
-            if(this.showHandleButtons.indexOf('edit') >= 0){_arr_op.push('edit')}
-            if(this.showHandleButtons.indexOf('delete') >= 0){_arr_op.push('delete')}
-            if(this.showHandleButtons.indexOf('showParent') >= 0){_arr_op.push('showParent')}
-            this.operaButtons = _arr_op
-        },
-        // 关闭明细查询弹窗
-        closeDialog(data){
+        activated(){
+            // 解决切换页面的时候，遮罩层消失的问题
             this.dialogShow = false
-            this.$emit("closeDialog", data)
-        },
-        // 获取列表
-        paging(callback){
-            this.Loading.tableLoading = true;
-            this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount
-            getPageListForDetail(this.PageListParams,this.URLOption_detailList)
-                .then(res=>{
-                    // 表头处理
-                    let _parentName = this.URLOption_detailList.substr(0,this.URLOption_detailList.indexOf('/'))
-                    let _Columns = this.initApiColumnsForDto(res.items[0],_parentName)
-                    this.listColumns = this.initTableColumns(_Columns,'detailPage_api')
-                    // 页面数据处理
-                    if(res){
-                        this.Loading.tableLoading = false
-                        this.tableData = []
-                        res.items.forEach(item=>{
-                            item.deleteTipVisible = false
-                            this.tableData.push(item)
-                        })
-                        this.totalCount = res.totalCount
-                    }
-                    this.pagingCallback(callback)
-                })
-                .catch(err=>{
-                    this.Loading.tableLoading = false
-                    this.$message.error("数据获取失败")
-                })
+            this.$nextTick(() => {
+                this.dialogShow = true
+            });
         },
-        // 查看主表信息
-        showParentHandleForDetail(data){
-            this.showParentTitle = `${data[this.URLOption_masterName] || ''} 主表信息`
-            this.showParentDialog = true
-            this.showParentLoading = true
-            getListDesById(this.URLOption_parent,data[this.URLOption_masterId])
-                .then(res => {
-                    this.showParentTableData = res
-                    this.showParentLoading = false
-                })
-                .catch(err => {
-                    this.showParentLoading = false
-                    this.$message.error("主表信息获取失败!")
-                })
+        mounted(){
+            this.paging()
+            this.initHandleButtons()
         },
-        // 编辑
-        editHandleForDetail(data){
-            console.log(data)
-        },
-        // 删除
-        deleteHandleForDetail(data){
-            this.Loading.appMainLoading = true
-            data.deleteTipVisible = false
-            // interfaceApi[this.DeleteApi](data.id).then(res => {
-            //     this.$successMsg('删除成功!')
-            //     this.oldSkipCount = 1
-            //     this.Loading.appMainLoading = false
-            //     this.paging()
-            // }).catch(err => {
-            //     this.Loading.appMainLoading = false
-            //     this.$message.error("删除失败!")
-            // })
-        },
-    }
-}
-</script>
-<style lang="scss">
-.filterForDetailPage {
+        methods: {
+            rowDropForDetail(data,type){
+                this.listColumns = data
+                this.$emit("rowDropForDetail", data,type)
+            },
+            // 初始化显示按钮
+            initHandleButtons(){
+                // 头部按钮
+                let _arr_header = []
+                if(this.showHandleButtons.indexOf('add') >= 0){_arr_header.push(this.defaultAddBtn())}
+                if(this.showHandleButtons.indexOf('field') >= 0){_arr_header.push(this.defaultFieldSettingBtn())}
+                if(this.showHandleButtons.indexOf('fresh') >= 0){_arr_header.push(this.defaultFreshBtn())}
+                if(this.showHandleButtons.indexOf('filter') >= 0){_arr_header.push(this.defaultFilterBtn())}
+                this.currenButtonData = _arr_header
     
-    .mainTable-dialog{
-        .el-dialog{
-            height: calc(100% - 100px);
+                // 操作列按钮
+                let _arr_op = []
+                if(this.showHandleButtons.indexOf('edit') >= 0){_arr_op.push('edit')}
+                if(this.showHandleButtons.indexOf('delete') >= 0){_arr_op.push('delete')}
+                if(this.showHandleButtons.indexOf('showParent') >= 0){_arr_op.push('showParent')}
+                this.operaButtons = _arr_op
+            },
+            // 关闭明细查询弹窗
+            closeDialog(data){
+                this.dialogShow = false
+                this.$emit("closeDialog", data)
+            },
+            // 获取列表
+            paging(callback){
+                this.Loading.tableLoading = true;
+                this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount
+                getPageListForDetail(this.PageListParams,this.URLOption_detailList)
+                    .then(res=>{
+                        // 表头处理
+                        let _parentName = this.URLOption_detailList.substr(0,this.URLOption_detailList.indexOf('/'))
+                        let _Columns = this.initApiColumnsForDto(res.items[0],_parentName)
+                        this.listColumns = this.initTableColumns(_Columns,'detailPage_api')
+                        // 页面数据处理
+                        if(res){
+                            this.Loading.tableLoading = false
+                            this.tableData = []
+                            res.items.forEach(item=>{
+                                item.deleteTipVisible = false
+                                this.tableData.push(item)
+                            })
+                            this.totalCount = res.totalCount
+                        }
+                        this.pagingCallback(callback)
+                    })
+                    .catch(err=>{
+                        this.Loading.tableLoading = false
+                        this.$message.error("数据获取失败")
+                    })
+            },
+            // 查看主表信息
+            showParentHandleForDetail(data){
+                this.showParentTitle = `${data[this.URLOption_masterName] || ''} 主表信息`
+                this.showParentDialog = true
+                this.showParentLoading = true
+                getListDesById(this.URLOption_parent,data[this.URLOption_masterId])
+                    .then(res => {
+                        this.showParentTableData = res
+                        this.showParentLoading = false
+                    })
+                    .catch(err => {
+                        this.showParentLoading = false
+                        this.$message.error("主表信息获取失败!")
+                    })
+            },
+            // 编辑
+            editHandleForDetail(data){
+                console.log(data)
+            },
+            // 删除
+            deleteHandleForDetail(data){
+                this.Loading.appMainLoading = true
+                data.deleteTipVisible = false
+                // interfaceApi[this.DeleteApi](data.id).then(res => {
+                //     this.$successMsg('删除成功!')
+                //     this.oldSkipCount = 1
+                //     this.Loading.appMainLoading = false
+                //     this.paging()
+                // }).catch(err => {
+                //     this.Loading.appMainLoading = false
+                //     this.$message.error("删除失败!")
+                // })
+            },
         }
     }
-    .el-dialog__body{
-        min-height: 200px;
-        padding-bottom: 20px !important;
-    }
+    </script>
+    <style lang="scss">
+    .filterForDetailPage {
+        
+        .mainTable-dialog{
+            .el-dialog{
+                height: calc(100% - 100px);
+            }
+        }
+        .el-dialog__body{
+            min-height: 200px;
+            padding-bottom: 20px !important;
+        }
+        }
+        .filterForDetailPage-list{
+        height: calc(100%);
+        overflow: auto;
     }
-    .filterForDetailPage-list{
-    height: calc(100%);
-    overflow: auto;
-}
-</style>
\ No newline at end of file
+    </style>
\ 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 e4dbc57..ec101c9 100644
--- a/Code/Fe/src/components/searchOverall/index.vue
+++ b/Code/Fe/src/components/searchOverall/index.vue
@@ -1,643 +1,643 @@
 <template>
-<!-- 全面的筛选组件：初级普通筛选 + 高级筛选（按照配置来判断显示情况）-->
-<!-- todo:使用v-if每次重新赋值，与接口查询保持一致 -->
-<div 
-  class="searchOverallComponent" 
-  :style="{height:componentsHeight+'px',overflow:isShowMoreList ? 'unset' : 'hidden'}" 
-  v-show="isShow"
->
+  <!-- 全面的筛选组件：初级普通筛选 + 高级筛选（按照配置来判断显示情况）-->
+  <!-- todo:使用v-if每次重新赋值，与接口查询保持一致 -->
   <div 
-    class="border-outer" 
-    ref="searchOverallComponent_inner"
+    class="searchOverallComponent" 
+    :style="{height:componentsHeight+'px',overflow:isShowMoreList ? 'unset' : 'hidden'}" 
+    v-show="isShow"
   >
-    <!-- 整体背景遮罩 -->
-    <!-- <div 
-      v-if="isShow && isShowMoreList" 
-      class="fullPageCover"
-      :style="{height:searchOverallCoverHeight}"
-    ></div> -->
-    <!-- <div class="title" v-if="isShowMoreList">高级筛选</div> -->
-    <!-- 普通筛选界面 -->
-    <searchPrimary
-      v-if="primarySearchOption && primarySearchOption.length > 0"
-      ref="searchPrimaryRef"
-      :showBaseButton="!isShowMoreList"
-      :primarySearchOption="primarySearchOption"
-      :primarySearchButton="isShowMoreList ? primarySearchButton : primarySearchAllButton"
-      @primarySearchButtonClick="primarySearchButtonClick"
-      @primarySearchBaseHandle="primarySearchBaseHandle"
-      >
-      <slot></slot>
-    </searchPrimary>
-    <!-- 高级筛选界面 -->
-    <div v-if="isShow && isShowMoreList" class="moreListOuter">
-      <curren-Form
-        class="navFilter"
-        size="medium"
-        labelWidth="0"
-        :searchData="moreListData"
-      >
-          <el-row :gutter="20">
-            <el-form-item
-              v-for="(item, index) in moreListData.filters"
-              :key="index"
-            >
-              <el-col :span="5">
-                <el-form-item
-                  :prop="'filters.' + index + '.column'"
-                  :rules="rules && rules.column ? rules.column : []"
-                >
-                  <el-select
-                    v-model="item.column"
-                    placeholder="请选择筛选对象"
-                    :disabled="item.hide"
-                    :filterable="true"
-                    @change="resetSelect(item)"
+    <div 
+      class="border-outer" 
+      ref="searchOverallComponent_inner"
+    >
+      <!-- 整体背景遮罩 -->
+      <!-- <div 
+        v-if="isShow && isShowMoreList" 
+        class="fullPageCover"
+        :style="{height:searchOverallCoverHeight}"
+      ></div> -->
+      <!-- <div class="title" v-if="isShowMoreList">高级筛选</div> -->
+      <!-- 普通筛选界面 -->
+      <searchPrimary
+        v-if="primarySearchOption && primarySearchOption.length > 0"
+        ref="searchPrimaryRef"
+        :showBaseButton="!isShowMoreList"
+        :primarySearchOption="primarySearchOption"
+        :primarySearchButton="isShowMoreList ? primarySearchButton : primarySearchAllButton"
+        @primarySearchButtonClick="primarySearchButtonClick"
+        @primarySearchBaseHandle="primarySearchBaseHandle"
+        >
+        <slot></slot>
+      </searchPrimary>
+      <!-- 高级筛选界面 -->
+      <div v-if="isShow && isShowMoreList" class="moreListOuter">
+        <curren-Form
+          :style="`--navFilterMaxHeight: ${selectMaxHeight};`"
+          class="navFilter"
+          size="medium"
+          labelWidth="0"
+          :searchData="moreListData"
+        >
+            <el-row :gutter="20">
+              <el-form-item
+                v-for="(item, index) in moreListData.filters"
+                :key="index"
+              >
+                <el-col :span="5">
+                  <el-form-item
+                    :prop="'filters.' + index + '.column'"
+                    :rules="rules && rules.column ? rules.column : []"
                   >
-                    <el-option
-                      v-for="(item, index) in tableColumnsOptions(tableColumns)"
-                      :key="index"
-                      :label="item.label"
-                      :value="
-                        item.showProp
-                          ? item.prop + '.' + item.showProp
-                          : item.prop
-                      "
+                    <el-select
+                      v-model="item.column"
+                      placeholder="请选择筛选对象"
+                      :disabled="item.hide"
+                      :filterable="true"
+                      @change="resetSelect(item)"
                     >
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="5">
-                <el-form-item
-                  :prop="'filters.' + index + '.action'"
-                >
-                  <el-select
-                    v-model="item.action"
-                    placeholder="请选择条件"
-                    :disabled="disabledAction || item.column == '' || item.hide ? true : false"
+                      <el-option
+                        v-for="(item, index) in tableColumnsOptions(tableColumns)"
+                        :key="index"
+                        :label="item.label"
+                        :value="
+                          item.showProp
+                            ? item.prop + '.' + item.showProp
+                            : item.prop
+                        "
+                      >
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="5">
+                  <el-form-item
+                    :prop="'filters.' + index + '.action'"
                   >
-                  <!-- moreListOptions.action -->
-                    <el-option
-                      v-for="item in formatMoreListOptions(item.column) "
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
+                    <el-select
+                      v-model="item.action"
+                      placeholder="请选择条件"
+                      :disabled="disabledAction || item.column == '' || item.hide ? true : false"
                     >
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="7">
-                <el-form-item
-                  :prop="'filters.' + index + '.value'"
-                  :rules="rules && rules.value ? rules.value : []"
-                >
-                  <el-select
-                    v-if="Object.keys(inputOrSelect(item.column)).length > 0"
-                    v-model="item.value"
-                    placeholder="请选择内容"
-                    :disabled="item.column == '' || item.hide ? true : false"
-                    :filterable="true"
-                    @change="inputOrSelect(item.column)"
-                    clearable
+                    <!-- moreListOptions.action -->
+                      <el-option
+                        v-for="item in formatMoreListOptions(item.column) "
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
+                      >
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="7">
+                  <el-form-item
+                    :prop="'filters.' + index + '.value'"
+                    :rules="rules && rules.value ? rules.value : []"
                   >
-                    <el-option
-                      v-for="item in $staticOptions[
-                        inputOrSelect(item.column).filters
-                      ]()"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="
-                        typeof item.value == 'string'
-                          ? item.value
-                          : String(item.value)
-                      "
+                    <el-select
+                      v-if="inputOrSelect(item.column)"
+                      v-model="item.value"
+                      placeholder="请选择内容"
+                      :disabled="item.column == '' || item.hide ? true : false"
+                      :filterable="true"
+                      @change="inputOrSelect(item.column)"
+                      clearable
                     >
-                    </el-option>
-                  </el-select>
-                  <!-- 日期时间 -->
-                  <el-date-picker
-                  v-else-if="getColumnType(item.column) == 'dateTime'"
-                    type="datetime"
-                    v-model="item.value"
-                    :placeholder="'选择日期时间'"
-                    style="width: 100%"
-                    format="yyyy-MM-dd HH:mm:ss"
-                    value-format="yyyy-MM-ddTHH:mm:ss"
-                  ></el-date-picker>
-                  <el-input
-                    v-else
-                    v-model="item.value"
-                    placeholder="请输入内容"
-                    :disabled="item.column == '' || item.hide ? true : false"
-                    clearable
-                  ></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="5">
-                <el-form-item
-                  :prop="'filters.' + index + '.logic'"
-                >
-                  <el-select
-                    v-model="item.logic"
-                    placeholder="请选择关系"
-                    :disabled="disabledLogic || item.column == '' || item.hide ? true : false"
+                      <el-option
+                        v-for="item in inputOrSelect(item.column)"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="
+                          typeof item.value == 'string'
+                            ? item.value
+                            : String(item.value)
+                        "
+                      >
+                      </el-option>
+                    </el-select>
+                    <!-- 日期时间 -->
+                    <el-date-picker
+                    v-else-if="getColumnType(item.column) == 'datetime'"
+                      type="datetime"
+                      v-model="item.value"
+                      :placeholder="'选择日期时间'"
+                      style="width: 100%"
+                      format="yyyy-MM-dd HH:mm:ss"
+                      value-format="yyyy-MM-ddTHH:mm:ss"
+                    ></el-date-picker>
+                    <el-input
+                      v-else
+                      v-model="item.value"
+                      placeholder="请输入内容"
+                      :disabled="item.column == '' || item.hide ? true : false"
+                      clearable
+                    ></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="5">
+                  <el-form-item
+                    :prop="'filters.' + index + '.logic'"
                   >
-                    <el-option
-                      v-for="item in moreListOptions.logic"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
+                    <el-select
+                      v-model="item.logic"
+                      placeholder="请选择关系"
+                      :disabled="disabledLogic || item.column == '' || item.hide ? true : false"
                     >
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="1" v-if="!item.hide">
-                <!-- 删除条件按钮 -->
-                <el-button
-                  type="danger"
-                  icon="el-icon-minus"
-                  circle
-                  size="mini"
-                  @click="moreListDelete(index,item)"
-                ></el-button>
-              </el-col>
-            </el-form-item>
-          </el-row>
-      </curren-Form>
-      <div class="buttonsContent">
-        <div class="leftButtons">
-          <!-- 添加筛选条件 -->
-          <el-button size="small" @click="moreListPush(true)">+ 添加筛选条件</el-button>
-          <!-- 收起 -->
-          <el-button
-            type="text"
-            size="small"
-            @click="moreListButtonHandle({ label:'收起筛选', name:'moreList-up', type: 'text', icon:'el-icon-arrow-up',  iconRight:true})"
-          >
-            收起筛选
-            <i 
-              style="margin-left:0" 
-              :class="['el-icon--right','el-icon-arrow-up']"
-            ></i>
-          </el-button>
-        </div>
-        <!-- 按钮 -->
-        <div class="rightButtons" v-if="moreListbuttons && moreListbuttons.length > 0" >
-          <el-button
-            v-for="(item,index) in moreListbuttons"
-            :key="index"
-            :type="item.type"
-            :size="item.size || 'small'"
-            @click="moreListButtonHandle(item)"
-            :icon="item.iconRight ? '' : item.icon"
-          >
-            {{ item.label }}
-            <!-- 自定义右侧图标 -->
-            <i 
-              style="margin-left:0" 
-              v-if="item.iconRight" 
-              :class="['el-icon--right',item.icon]"
-            ></i>
-          </el-button>
+                      <el-option
+                        v-for="item in moreListOptions.logic"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
+                      >
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="1" v-if="!item.hide">
+                  <!-- 删除条件按钮 -->
+                  <el-button
+                    type="danger"
+                    icon="el-icon-minus"
+                    circle
+                    size="mini"
+                    @click="moreListDelete(index,item)"
+                  ></el-button>
+                </el-col>
+              </el-form-item>
+            </el-row>
+        </curren-Form>
+        <div class="buttonsContent">
+          <div class="leftButtons">
+            <!-- 添加筛选条件 -->
+            <el-button size="small" @click="moreListPush(true)">+ 添加筛选条件</el-button>
+            <!-- 收起 -->
+            <el-button
+              type="text"
+              size="small"
+              @click="moreListButtonHandle({ label:'收起筛选', name:'moreList-up', type: 'text', icon:'el-icon-arrow-up',  iconRight:true})"
+            >
+              收起筛选
+              <i 
+                style="margin-left:0" 
+                :class="['el-icon--right','el-icon-arrow-up']"
+              ></i>
+            </el-button>
+          </div>
+          <!-- 按钮 -->
+          <div class="rightButtons" v-if="moreListbuttons && moreListbuttons.length > 0" >
+            <el-button
+              v-for="(item,index) in moreListbuttons"
+              :key="index"
+              :type="item.type"
+              :size="item.size || 'small'"
+              @click="moreListButtonHandle(item)"
+              :icon="item.iconRight ? '' : item.icon"
+            >
+              {{ item.label }}
+              <!-- 自定义右侧图标 -->
+              <i 
+                style="margin-left:0" 
+                v-if="item.iconRight" 
+                :class="['el-icon--right',item.icon]"
+              ></i>
+            </el-button>
+          </div>
         </div>
       </div>
     </div>
   </div>
-</div>
-</template>
-<script>
-import searchPrimary from "@/components/searchPrimary"
-export default {
-  name:'searchOverallComponent',
-  components: {
-    searchPrimary,
-  },
-  watch:{
-    // 监听显示切换
-    showSearchOverall(n){
-      // 控制是否显示 + 动画效果处理
-      // 没有普通查询配置
-      if(this.primarySearchOption.length <= 0){
-        this.changeSearchOverallShow(n)
-        this.changeMoreListShow(n)
-        this.$nextTick(()=>{
-          this.componentsHeight = this.getAllSearchInnerHeight() + 20
-          // 收起
-          if(!n && this.$parent.changeTableHeight){
-            this.$parent.changeTableHeight()
-          }
-        })
-        return
-      }
-      // 有普通查询配置
-      if(n){ 
-        this.changeSearchOverallShow(n)
-        this.changeMoreListShow(false)
-      }
-      this.$nextTick(()=>{
-        if(n){
-            this.componentsHeight = this.getSearchPrimaryHeight() + 20
-        }else{
-          this.componentsHeight = 0
+  </template>
+  <script>
+  import searchPrimary from "@/components/searchPrimary"
+  export default {
+    name:'searchOverallComponent',
+    components: {
+      searchPrimary,
+    },
+    watch:{
+      // 监听显示切换
+      showSearchOverall(n){
+        // 控制是否显示 + 动画效果处理
+        // 没有普通查询配置
+        if(this.primarySearchOption.length <= 0){
+          this.changeSearchOverallShow(n)
+          this.changeMoreListShow(n)
+          this.$nextTick(()=>{
+            this.componentsHeight = this.getAllSearchInnerHeight() + 20
+            // 收起
+            if(!n && this.$parent.changeTableHeight){
+              this.$parent.changeTableHeight()
+            }
+          })
+          return
+        }
+        // 有普通查询配置
+        if(n){ 
+          this.changeSearchOverallShow(n)
           this.changeMoreListShow(false)
-          // setTimeout(()=>{
-          //   this.changeSearchOverallShow(n)
-          // },500)
         }
-      })
-      this.setOverallSearchData(this.httpOverallSearchData)
-    },
-    // 监听接口搜索的筛选数据
-    httpOverallSearchData(n,o){
-      this.setOverallSearchData(n)
-    },
-    isShowMoreList(){
-      this.setOverallSearchData(this.httpOverallSearchData)
-    }
-  },
-  props: {
-    // 筛选遮罩高度
-    searchOverallCoverHeight:{
-      type: String,
-      default: 'calc(100vh - 200px)'
-    },
-    // 禁用选择条件
-    disabledAction:{
-      type: Boolean,
-      default: false
-    },
-    // 禁用选择关系
-    disabledLogic:{
-      type: Boolean,
-      default: false
-    },
-    // 是否显示全面筛选组件
-    showSearchOverall:{
-      type: Boolean,
-      default: false
-    },
-    // 是否显示高级筛选
-    showMoreSearch:{
-      type: Boolean,
-      default: true
-    },
-    //普通筛选绑定表单数据
-    primarySearchOption: {
-      type: Array,
-      default: () => {
-        return []
-      }
-    },
-    //普通筛选自定义按钮
-    primarySearchButton:{
-      type: Array,
-      default: () => {
-        return []
-      }
-    },
-    // 显示数据配置
-    tableColumns: {
-      type: Array,
-      default: () => {
-        return []
-      }
-    },
-    // 当前接口中的筛选数据（用于同步全面筛选的数据）
-    httpOverallSearchData:{
-      type: Object,
-      default: null
-    },
-    // 自定义配置条件
-    filterActionOptions:{
-      type: Array,
-      default: null
-    },
-  },
-  data() {
-    return {
-      // 普通筛选自定义所有按钮(包括高级筛选)
-      primarySearchAllButton:[],
-      // 高级筛选列表是否显示
-      isShowMoreList:false,
-      // 组件高度（用于动画效果）
-      componentsHeight:0,
-      // 是否显示总组件，与showSearchOverall相通（重新定义一遍目的是为了动画效果）
-      isShow:false,
-      // 高级筛选列表内部按钮
-      moreListbuttons: [
-        { label: "搜索", type: "primary", name: "moreList-search" },
-        { label: '重置', name: 'moreList-reset' },
-        // { label:'收起筛选', name:'moreList-up', type: 'text', icon:'el-icon-arrow-up',  iconRight:true}
-      ],
-      // 高级筛选数据列表/值
-      moreListData: {filters:[]},
-      // 高级筛选条件列表配置
-      moreListOptions: {
-        action: [{
-          value: '==',
-          label: '等于'
-        }, {
-          value: '!=',
-          label: '不等于'
-        }, {
-          value: '>',
-          label: '大于'
-        }, {
-          value: '<',
-          label: '小于'
-        }, {
-          value: '>=',
-          label: '大于等于'
-        }, {
-          value: '<=',
-          label: '小于等于'
-        }, {
-          value: 'Like',
-          label: '包含'
-        }, {
-          value: 'NotLike',
-          label: '不包含'
-        },
-          //  {
-          //   value: 'In',
-          //   label: '包含'
-          // }, {
-          //   value: 'NotIn',
-          //   label: '不包含'
-          // }
-        ],
-        logic: [
-          {
-            value: 'And',
-            label: '并且'
-          },
-          {
-            value: 'Or',
-            label: '或者'
+        this.$nextTick(()=>{
+          if(n){
+              this.componentsHeight = this.getSearchPrimaryHeight() + 20
+          }else{
+            this.componentsHeight = 0
+            this.changeMoreListShow(false)
+            // setTimeout(()=>{
+            //   this.changeSearchOverallShow(n)
+            // },500)
           }
-        ],
+        })
+        this.setOverallSearchData(this.httpOverallSearchData)
       },
-      // 高级筛选rules暂未使用验证，但是不能删除rules定义
-      // todo:优化后放开，优化内容：如果选择了筛选对象【column】，则验证【value】，否则都不验证
-      rules:{
-      //   column: [
-      //     { required: true, message: '请选择筛选对象', trigger: 'change' }
-      //   ],
-      //   value: [
-      //     { required: true, message: '请输入内容', trigger: 'blur' }
-      //   ],
+      // 监听接口搜索的筛选数据
+      httpOverallSearchData(n,o){
+        this.setOverallSearchData(n)
       },
-    }
-  },
-  created() {
-    this.moreListPush()
-  },
-  mounted() {
-    // 配置普通筛选默认按钮(是否包含高级筛选按钮)
-    this.setPrimarySearchAllButton()
-  },
-  methods: {
-    // 获取普通筛选的高度,外部也有使用，用于动画样式
-    getSearchPrimaryHeight(){
-      return document.getElementsByClassName('searchPrimaryComponent')[0].clientHeight
-    },
-    // 获取普高级筛选的高度,外部也有使用，用于动画样式
-    getAllSearchInnerHeight(){
-      return this.$refs.searchOverallComponent_inner ? this.$refs.searchOverallComponent_inner.clientHeight : 0
-    },
-    // 配置普通筛选自定义按钮
-    setPrimarySearchAllButton(){
-      let _more_btn = [{
-        label:'高级筛选',
-        name:'more',
-        type: 'text',
-        icon:'el-icon-arrow-down',
-        iconRight:true
-      }]
-      if(this.showMoreSearch){
-        this.primarySearchAllButton = _more_btn.concat(this.primarySearchButton)
-      }else{
-        this.primarySearchAllButton= this.primarySearchButton
+      isShowMoreList(){
+        this.setOverallSearchData(this.httpOverallSearchData)
       }
     },
-    // 普通查询基础按钮点击事件
-    primarySearchBaseHandle(item,data, option, that){
-      this.overallSearchFormClick(item,data, option, that)
-    },
-    // 普通筛选自定义按钮点击事件
-    primarySearchButtonClick( item,data, option,that){
-      // 点击[高级筛选]按钮
-      if(item.name == 'more'){
-        this.changeMoreListShow(true)
-      }
-      this.overallSearchFormClick(item,data, option, that)
-    },
-    // 高级筛选基础按钮点击事件
-    moreListButtonHandle(item){
-      this.overallSearchFormClick(item)
-    },
-    // 设置moreList的列表值（默认按tableColumns设置）
-    tableColumnsOptions(val) {
-      const data = JSON.parse(JSON.stringify(val));
-      let num = 0
-      val.forEach((item, index) => {
-        if (item.showProp) {
-          data.splice(index - num, 1)
-          num++
+    props: {
+      // 筛选条件最大高度
+      selectMaxHeight:{
+        type: String,
+        default: '174px'
+      },
+      // 筛选遮罩高度
+      searchOverallCoverHeight:{
+        type: String,
+        default: 'calc(100vh - 200px)'
+      },
+      // 禁用选择条件
+      disabledAction:{
+        type: Boolean,
+        default: false
+      },
+      // 禁用选择关系
+      disabledLogic:{
+        type: Boolean,
+        default: false
+      },
+      // 是否显示全面筛选组件
+      showSearchOverall:{
+        type: Boolean,
+        default: false
+      },
+      // 是否显示高级筛选
+      showMoreSearch:{
+        type: Boolean,
+        default: true
+      },
+      //普通筛选绑定表单数据
+      primarySearchOption: {
+        type: Array,
+        default: () => {
+          return []
         }
-      })
-      return data
-    },
-    // 判断筛选类型是否是时间格式
-    getColumnType(val) {
-      var columnsType = this.tableColumns.filter(item => item.prop == val)
-      if (columnsType.length > 0) {
-        if (columnsType[0].type) {
-          return columnsType[0].type
-        } 
-      }  else {
-        return ''
-      }
-    },
-    // 筛选条件改变重置其他项
-    resetSelect(val) {
-      val.action = "=="
-      val.value = ""
-    },
-    // 根据数据内容约束条件选项
-    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) {
-            if (this.tableColumns[i].filters) {
-              return this.moreListOptions.action.filter(item => item.value == '==' || item.value == '!=')
-            } else if (this.tableColumns[i].type == 'dateTime') {
-              return this.moreListOptions.action.filter(item => 
-                item.value == '==' || 
-                item.value == '!=' ||
-                item.value == '>' ||
-                item.value == '<' ||
-                item.value == '>=' ||
-                item.value == '<=' )
-            } else {
-              return this.moreListOptions.action
-            }
-          }
+      },
+      //普通筛选自定义按钮
+      primarySearchButton:{
+        type: Array,
+        default: () => {
+          return []
         }
-      }
-      return this.moreListOptions.action
+      },
+      // 显示数据配置
+      tableColumns: {
+        type: Array,
+        default: () => {
+          return []
+        }
+      },
+      // 当前接口中的筛选数据（用于同步全面筛选的数据）
+      httpOverallSearchData:{
+        type: Object,
+        default: null
+      },
+      // 自定义配置条件
+      filterActionOptions:{
+        type: Array,
+        default: null
+      },
     },
-    // 设置moreList列表的内容项是input还是select
-    inputOrSelect(val) {
-      let data
-      if (val) {
-        this.tableColumns.forEach((key) => {
-          if (val == key.prop) {
-            if (key.filters) {
-              data = key
-            } else {
-              data = {}
+    data() {
+      return {
+        // 普通筛选自定义所有按钮(包括高级筛选)
+        primarySearchAllButton:[],
+        // 高级筛选列表是否显示
+        isShowMoreList:false,
+        // 组件高度（用于动画效果）
+        componentsHeight:0,
+        // 是否显示总组件，与showSearchOverall相通（重新定义一遍目的是为了动画效果）
+        isShow:false,
+        // 高级筛选列表内部按钮
+        moreListbuttons: [
+          { label: "搜索", type: "primary", name: "moreList-search" },
+          { label: '重置', name: 'moreList-reset' },
+          // { label:'收起筛选', name:'moreList-up', type: 'text', icon:'el-icon-arrow-up',  iconRight:true}
+        ],
+        // 高级筛选数据列表/值
+        moreListData: {filters:[]},
+        // 高级筛选条件列表配置
+        moreListOptions: {
+          action: [{
+            value: '==',
+            label: '等于'
+          }, {
+            value: '!=',
+            label: '不等于'
+          }, {
+            value: '>',
+            label: '大于'
+          }, {
+            value: '<',
+            label: '小于'
+          }, {
+            value: '>=',
+            label: '大于等于'
+          }, {
+            value: '<=',
+            label: '小于等于'
+          }, {
+            value: 'Like',
+            label: '包含'
+          }, {
+            value: 'NotLike',
+            label: '不包含'
+          },
+            //  {
+            //   value: 'In',
+            //   label: '包含'
+            // }, {
+            //   value: 'NotIn',
+            //   label: '不包含'
+            // }
+          ],
+          logic: [
+            {
+              value: 'And',
+              label: '并且'
+            },
+            {
+              value: 'Or',
+              label: '或者'
             }
-          }
-        })
-      } else {
-        data = {}
-      }
-      return data
-    },
-    // 高级筛选列表-删除筛选条件行
-    moreListDelete(val,item) {
-      if (this.moreListData.filters.length == 1) {
-        this.$warningMsg('必须保留一条筛选条件！')
-      } else {
-        this.$confirm('您确定删除吗, 是否继续?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          this.moreListData.filters.splice(val, 1)
-        }).catch(() => {
-          //   this.modalAppendToBody = false
-        });
-      }
-      this.overallSearchFormClick({name:'moreList-deleteRow'})
-    },
-    // 高级筛选列表-添加筛选条件行
-    moreListPush(handle) {
-      let data = {
-        logic: "And",
-        column: "",
-        action: "==",
-        value: ""
-      }
-      this.moreListData.filters.push(data)
-      this.overallSearchFormClick({name:'moreList-addRow'})
-      if(handle){
-        this.$nextTick(()=>{
-          this.componentsHeight = this.getAllSearchInnerHeight() + 20
-          this.$parent.changeTableHeight(this.getAllSearchInnerHeight())
-        })
+          ],
+        },
+        // 高级筛选rules暂未使用验证，但是不能删除rules定义
+        // todo:优化后放开，优化内容：如果选择了筛选对象【column】，则验证【value】，否则都不验证
+        rules:{
+        //   column: [
+        //     { required: true, message: '请选择筛选对象', trigger: 'change' }
+        //   ],
+        //   value: [
+        //     { required: true, message: '请输入内容', trigger: 'blur' }
+        //   ],
+        },
       }
     },
-    // 重置数据，高级（单纯节点显示数据，不重新查询接口）
-    resetMoreListData(){
-      this.moreListData = {filters:[]}
+    created() {
       this.moreListPush()
     },
-    // 设置数据值，高级（单纯节点显示数据，不重新查询接口）
-    setMoreListData(val){
-      this.moreListData = JSON.parse(JSON.stringify(val))
+    mounted() {
+      // 配置普通筛选默认按钮(是否包含高级筛选按钮)
+      this.setPrimarySearchAllButton()
     },
-    // 重置数据，普通+高级（单纯节点显示数据，不重新查询接口）
-    resetOverallSearchData(){
-      if(this.$refs.searchPrimaryRef)this.$refs.searchPrimaryRef.resetPrimarySearchData();
-      this.resetMoreListData()
-    },
-    // 设置数据，普通+高级（单纯节点显示数据，不重新查询接口）
-    setOverallSearchData(data){
-      // 普通筛选数据同步
-      if(data && data.params){
-        if(this.$refs.searchPrimaryRef)this.$refs.searchPrimaryRef.setPrimarySearchData(data.params)
-      }else{
-        if(this.$refs.searchPrimaryRef)this.$refs.searchPrimaryRef.resetPrimarySearchData()
-      }
-      // 高级筛选数据同步
-      if(data && data.moreList){
-        let _list = {filters:[]}
-        data.moreList.filters.forEach(item=>{
-          if(String(item.column).length > 0 && String(item.value).length > 0){
-            _list.filters.push(item)
+    methods: {
+      // 获取普通筛选的高度,外部也有使用，用于动画样式
+      getSearchPrimaryHeight(){
+        return document.getElementsByClassName('searchPrimaryComponent')[0].clientHeight
+      },
+      // 获取普高级筛选的高度,外部也有使用，用于动画样式
+      getAllSearchInnerHeight(){
+        return this.$refs.searchOverallComponent_inner ? this.$refs.searchOverallComponent_inner.clientHeight : 0
+      },
+      // 配置普通筛选自定义按钮
+      setPrimarySearchAllButton(){
+        let _more_btn = [{
+          label:'高级筛选',
+          name:'more',
+          type: 'text',
+          icon:'el-icon-arrow-down',
+          iconRight:true
+        }]
+        if(this.showMoreSearch){
+          this.primarySearchAllButton = _more_btn.concat(this.primarySearchButton)
+        }else{
+          this.primarySearchAllButton= this.primarySearchButton
+        }
+      },
+      // 普通查询基础按钮点击事件
+      primarySearchBaseHandle(item,data, option, that){
+        this.overallSearchFormClick(item,data, option, that)
+      },
+      // 普通筛选自定义按钮点击事件
+      primarySearchButtonClick( item,data, option,that){
+        // 点击[高级筛选]按钮
+        if(item.name == 'more'){
+          this.changeMoreListShow(true)
+        }
+        this.overallSearchFormClick(item,data, option, that)
+      },
+      // 高级筛选基础按钮点击事件
+      moreListButtonHandle(item){
+        this.overallSearchFormClick(item)
+      },
+      // 设置moreList的列表值（默认按tableColumns设置）
+      tableColumnsOptions(val) {
+        const data = JSON.parse(JSON.stringify(val));
+        let num = 0
+        val.forEach((item, index) => {
+          if (item.showProp) {
+            data.splice(index - num, 1)
+            num++
           }
         })
-        if(_list.filters.length <= 0){
-          _list.filters.push({
-            logic: "And",
-            column: "",
-            action: "==",
-            value: ""
+        return data
+      },
+      // 判断筛选类型是否是时间格式
+      getColumnType(val) {
+        var columnsType = this.tableColumns.filter(item => item.prop == val)
+        if (columnsType.length > 0) {
+          if (columnsType[0].apiBaseType) {
+            return columnsType[0].apiBaseType
+          } 
+        }  else {
+          return ''
+        }
+      },
+      // 筛选条件改变重置其他项
+      resetSelect(val) {
+        val.action = "=="
+        val.value = ""
+      },
+      // 根据数据内容约束条件选项
+      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) {
+              if (this.tableColumns[i].filters) {
+                return this.moreListOptions.action.filter(item => item.value == '==' || item.value == '!=')
+              } else if (this.tableColumns[i].type == 'dateTime') {
+                return this.moreListOptions.action.filter(item => 
+                  item.value == '==' || 
+                  item.value == '!=' ||
+                  item.value == '>' ||
+                  item.value == '<' ||
+                  item.value == '>=' ||
+                  item.value == '<=' )
+              } else {
+                return this.moreListOptions.action
+              }
+            }
+          }
+        }
+        return this.moreListOptions.action
+      },
+      // 设置moreList列表的内容项是input还是select
+      inputOrSelect(val) {
+        let data = null
+        if (val) {
+          this.tableColumns.forEach((key) => {
+            if (val == key.prop) {
+              if (key.enums_list && key.enums_list.length > 0) {
+                data = key.enums_list
+              } 
+            }
+          })
+        } 
+        return data
+      },
+      // 高级筛选列表-删除筛选条件行
+      moreListDelete(val,item) {
+        if (this.moreListData.filters.length == 1) {
+          this.$warningMsg('必须保留一条筛选条件！')
+        } else {
+          this.$confirm('您确定删除吗, 是否继续?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            this.moreListData.filters.splice(val, 1)
+          }).catch(() => {
+            //   this.modalAppendToBody = false
+          });
+        }
+        this.overallSearchFormClick({name:'moreList-deleteRow'})
+      },
+      // 高级筛选列表-添加筛选条件行
+      moreListPush(handle) {
+        let data = {
+          logic: "And",
+          column: "",
+          action: "==",
+          value: ""
+        }
+        this.moreListData.filters.push(data)
+        this.overallSearchFormClick({name:'moreList-addRow'})
+        if(handle){
+          this.$nextTick(()=>{
+            this.componentsHeight = this.getAllSearchInnerHeight() + 20
+            this.$parent.changeTableHeight(this.getAllSearchInnerHeight())
           })
         }
-        this.setMoreListData(_list)
-      }else{
+      },
+      // 重置数据，高级（单纯节点显示数据，不重新查询接口）
+      resetMoreListData(){
+        this.moreListData = {filters:[]}
+        this.moreListPush()
+      },
+      // 设置数据值，高级（单纯节点显示数据，不重新查询接口）
+      setMoreListData(val){
+        this.moreListData = JSON.parse(JSON.stringify(val))
+      },
+      // 重置数据，普通+高级（单纯节点显示数据，不重新查询接口）
+      resetOverallSearchData(){
+        if(this.$refs.searchPrimaryRef)this.$refs.searchPrimaryRef.resetPrimarySearchData();
         this.resetMoreListData()
-      }
-    },
-    // 展开-收缩高级筛选
-    changeMoreListShow(val){
-      this.isShowMoreList = val || false
-      // 如果没有初级筛选 
-      if(!this.primarySearchOption || this.primarySearchOption.length <= 0){
-        // 关闭时候直接整个全面筛选组件
-        if(!this.isShowMoreList){
-          this.isShow = false
-          this.$emit("getShowSearchOverall",this.isShow)
+      },
+      // 设置数据，普通+高级（单纯节点显示数据，不重新查询接口）
+      setOverallSearchData(data){
+        // 普通筛选数据同步
+        if(data && data.params){
+          if(this.$refs.searchPrimaryRef)this.$refs.searchPrimaryRef.setPrimarySearchData(data.params)
+        }else{
+          if(this.$refs.searchPrimaryRef)this.$refs.searchPrimaryRef.resetPrimarySearchData()
         }
-      }
-    },
-    // 关闭整个全面组件
-    changeSearchOverallShow(val){
-      if(!val){
-        this.changeMoreListShow(false)
-      }
-      this.isShow = val || false
-      this.$emit("getShowSearchOverall",this.isShow)
-    },
-    // 全面筛选组件所有按钮事件
-    overallSearchFormClick(item,data, option) {
-      // 页面功能
-      // 收缩筛选
-      if(item.name == 'moreList-up'){
-        this.changeMoreListShow(false)
-      }
-      // 高级筛选内-重置 || 普通格式-重置
-      else if(item.name == "moreList-reset" || item.name == "reset"){
-        this.resetOverallSearchData()
-      }
-      // 抛出函数传参
-      let _searchPrimaryRef = this.$refs.searchPrimaryRef
-      let _options = {
-        item:item,
-        data_primary:_searchPrimaryRef ? _searchPrimaryRef.getPrimarySearchData() : null,
-        data_moreList:this.moreListData,
-        option_primary:this.primarySearchOption,
-        option_moreList:this.tableColumns,
-        vm_primary:_searchPrimaryRef,
-        vm_moreList:this
-      }
-      this.$emit("overallSearchFormClick",_options)
-    },
+        // 高级筛选数据同步
+        if(data && data.moreList){
+          let _list = {filters:[]}
+          data.moreList.filters.forEach(item=>{
+            if(String(item.column).length > 0 && String(item.value).length > 0){
+              _list.filters.push(item)
+            }
+          })
+          if(_list.filters.length <= 0){
+            _list.filters.push({
+              logic: "And",
+              column: "",
+              action: "==",
+              value: ""
+            })
+          }
+          this.setMoreListData(_list)
+        }else{
+          this.resetMoreListData()
+        }
+      },
+      // 展开-收缩高级筛选
+      changeMoreListShow(val){
+        this.isShowMoreList = val || false
+        // 如果没有初级筛选 
+        if(!this.primarySearchOption || this.primarySearchOption.length <= 0){
+          // 关闭时候直接整个全面筛选组件
+          if(!this.isShowMoreList){
+            this.isShow = false
+            this.$emit("getShowSearchOverall",this.isShow)
+          }
+        }
+      },
+      // 关闭整个全面组件
+      changeSearchOverallShow(val){
+        if(!val){
+          this.changeMoreListShow(false)
+        }
+        this.isShow = val || false
+        this.$emit("getShowSearchOverall",this.isShow)
+      },
+      // 全面筛选组件所有按钮事件
+      overallSearchFormClick(item,data, option) {
+        // 页面功能
+        // 收缩筛选
+        if(item.name == 'moreList-up'){
+          this.changeMoreListShow(false)
+        }
+        // 高级筛选内-重置 || 普通格式-重置
+        else if(item.name == "moreList-reset" || item.name == "reset"){
+          this.resetOverallSearchData()
+        }
+        // 抛出函数传参
+        let _searchPrimaryRef = this.$refs.searchPrimaryRef
+        let _options = {
+          item:item,
+          data_primary:_searchPrimaryRef ? _searchPrimaryRef.getPrimarySearchData() : null,
+          data_moreList:this.moreListData,
+          option_primary:this.primarySearchOption,
+          option_moreList:this.tableColumns,
+          vm_primary:_searchPrimaryRef,
+          vm_moreList:this
+        }
+        this.$emit("overallSearchFormClick",_options)
+      },
+    }
+  
   }
-
-}
-</script>
-<style lang="scss" scoped>
-@import "./style/index.scss";
-</style>
\ No newline at end of file
+  </script>
+  <style lang="scss" scoped>
+  @import "./style/index.scss";
+  </style>
\ No newline at end of file
diff --git a/Code/Fe/src/components/searchOverall/style/index.scss b/Code/Fe/src/components/searchOverall/style/index.scss
index 8794ede..6bd0f43 100644
--- a/Code/Fe/src/components/searchOverall/style/index.scss
+++ b/Code/Fe/src/components/searchOverall/style/index.scss
@@ -1,4 +1,4 @@
- .searchOverallComponent{
+.searchOverallComponent{
   height: 0;
   transition:all 0.5s;
   z-index: 1;
@@ -31,7 +31,7 @@
     //  flex-direction: column;
     //  width: 100%;
     //  height: 100%;
-     max-height: 170px;
+     max-height: var(--navFilterMaxHeight);
      overflow: auto;
   
      .el-form {
diff --git a/Code/Fe/src/components/tableTree/index.vue b/Code/Fe/src/components/tableTree/index.vue
index bbcfc4f..4b723da 100644
--- a/Code/Fe/src/components/tableTree/index.vue
+++ b/Code/Fe/src/components/tableTree/index.vue
@@ -11,7 +11,7 @@
           :icon="item.icon"
           :size="item.size"
           @click="headerButtonsHandle(item)"
-          v-permission="item.permission"
+          v-permission="item.permission || []"
         >{{item.label}}</el-button>
       </div>
       <div class="query-box">
@@ -31,7 +31,7 @@
           :icon="item.icon"
           :size="item.size"
           @click="headerButtonsHandle(item)"
-          v-permission="item.permission"
+          v-permission="item.permission || []"
         >{{item.label}}</el-button>
       </div>
     </div>
@@ -75,7 +75,7 @@
             :style="item.style"
             v-show="typeof item.hide == 'function' ? !item.hide(scope.row) : !item.hide"
             :icon="item.icon"
-            v-permission="item.permission"
+            v-permission="item.permission || []"
           >{{item.label}}</el-button>
         </template>
       </el-table-column>
diff --git a/Code/Fe/src/components/umyTable/index.vue b/Code/Fe/src/components/umyTable/index.vue
index ab57c35..397654c 100644
--- a/Code/Fe/src/components/umyTable/index.vue
+++ b/Code/Fe/src/components/umyTable/index.vue
@@ -167,7 +167,7 @@
           :key="indexButton"
           type="text"
           size="mini"
-          v-permission="itemButton.permission"
+          v-permission="itemButton.permission || []"
           :style="{color:itemButton.color || '#409EFF'}"
           @click="buttonOperationClick_right(scope.row, itemButton, indexButton)"
         >{{itemButton.label}}</el-button>