From 1f6c4c9ae4de7c9c4c311a9d042488f4d4339f59 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, 20 Nov 2023 10:16:02 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=8E=A5=E5=8F=A3=E7=9C=8B=E6=9D=BF+j?=
 =?UTF-8?q?ob+sore+Inventory=E3=80=91=E5=8F=8D=E6=9F=A5=E4=B8=BB=E8=A1=A8?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/filterForDetailPage/index.vue  |   4 +-
 .../components/filterForDetailPage/index.vue  | 646 +++++++++---------
 .../components/filterForDetailPage/index.vue  | 646 +++++++++---------
 .../components/filterForDetailPage/index.vue  |   4 +-
 4 files changed, 650 insertions(+), 650 deletions(-)

diff --git a/PC/InterFace.Dash/src/components/filterForDetailPage/index.vue b/PC/InterFace.Dash/src/components/filterForDetailPage/index.vue
index 7017b93..7be7b63 100644
--- a/PC/InterFace.Dash/src/components/filterForDetailPage/index.vue
+++ b/PC/InterFace.Dash/src/components/filterForDetailPage/index.vue
@@ -56,9 +56,9 @@
                         >
                             <template slot-scope="scope">
                                 <span v-for="item in operaButtons" style="margin: 0 10px;">
-                                    <!-- 查看主表信息 -->
+                                    <!-- 查看主表信息 如果配置中masterId的值为空，则不显示-->
                                     <el-button 
-                                        v-if="item == 'showParent'"
+                                        v-if="item == 'showParent' && (scope.row[URLOption_masterId])"
                                         type="text" 
                                         @click="showParentHandleForDetail(scope.row)"
                                     >查看主表信息</el-button>
diff --git a/PC/UI.WinIn.FasterZ.Inventory/src/components/filterForDetailPage/index.vue b/PC/UI.WinIn.FasterZ.Inventory/src/components/filterForDetailPage/index.vue
index 6322ab8..7be7b63 100644
--- a/PC/UI.WinIn.FasterZ.Inventory/src/components/filterForDetailPage/index.vue
+++ b/PC/UI.WinIn.FasterZ.Inventory/src/components/filterForDetailPage/index.vue
@@ -1,338 +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"
-                :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"
+            <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;">
+                                    <!-- 查看主表信息 如果配置中masterId的值为空，则不显示-->
+                                    <el-button 
+                                        v-if="item == 'showParent' && (scope.row[URLOption_masterId])"
+                                        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/PC/UI.WinIn.FasterZ.Job/src/components/filterForDetailPage/index.vue b/PC/UI.WinIn.FasterZ.Job/src/components/filterForDetailPage/index.vue
index 6322ab8..7be7b63 100644
--- a/PC/UI.WinIn.FasterZ.Job/src/components/filterForDetailPage/index.vue
+++ b/PC/UI.WinIn.FasterZ.Job/src/components/filterForDetailPage/index.vue
@@ -1,338 +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"
-                :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"
+            <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;">
+                                    <!-- 查看主表信息 如果配置中masterId的值为空，则不显示-->
+                                    <el-button 
+                                        v-if="item == 'showParent' && (scope.row[URLOption_masterId])"
+                                        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/PC/UI.WinIn.FasterZ.Store/src/components/filterForDetailPage/index.vue b/PC/UI.WinIn.FasterZ.Store/src/components/filterForDetailPage/index.vue
index 7017b93..7be7b63 100644
--- a/PC/UI.WinIn.FasterZ.Store/src/components/filterForDetailPage/index.vue
+++ b/PC/UI.WinIn.FasterZ.Store/src/components/filterForDetailPage/index.vue
@@ -56,9 +56,9 @@
                         >
                             <template slot-scope="scope">
                                 <span v-for="item in operaButtons" style="margin: 0 10px;">
-                                    <!-- 查看主表信息 -->
+                                    <!-- 查看主表信息 如果配置中masterId的值为空，则不显示-->
                                     <el-button 
-                                        v-if="item == 'showParent'"
+                                        v-if="item == 'showParent' && (scope.row[URLOption_masterId])"
                                         type="text" 
                                         @click="showParentHandleForDetail(scope.row)"
                                     >查看主表信息</el-button>