Browse Source

高级筛选高度优化处理

noToken
安虹睿 1 year ago
parent
commit
f8411642d8
  1. 7
      PC/InterFace.Dash/src/components/commonTabel-drawer/index.vue
  2. 642
      PC/InterFace.Dash/src/components/filterForDetailPage/index.vue
  3. 1216
      PC/InterFace.Dash/src/components/searchOverall/index.vue
  4. 4
      PC/InterFace.Dash/src/components/searchOverall/style/index.scss
  5. 15
      PC/InterFace.Dash/src/components/tablePagination/index.vue
  6. 1
      PC/UI.WinIn.FasterZ.Job/src/components/commonTabel-drawer/index.vue
  7. 1
      PC/UI.WinIn.FasterZ.Job/src/components/filterForDetailPage/index.vue
  8. 6
      PC/UI.WinIn.FasterZ.Job/src/components/searchOverall/index.vue
  9. 2
      PC/UI.WinIn.FasterZ.Job/src/components/searchOverall/style/index.scss
  10. 15
      PC/UI.WinIn.FasterZ.Job/src/components/tablePagination/index.vue
  11. 3
      PC/UI.WinIn.FasterZ.Store/src/components/commonTabel-drawer/index.vue
  12. 645
      PC/UI.WinIn.FasterZ.Store/src/components/filterForDetailPage/index.vue
  13. 1216
      PC/UI.WinIn.FasterZ.Store/src/components/searchOverall/index.vue
  14. 4
      PC/UI.WinIn.FasterZ.Store/src/components/searchOverall/style/index.scss
  15. 15
      PC/UI.WinIn.FasterZ.Store/src/components/tablePagination/index.vue

7
PC/InterFace.Dash/src/components/commonTabel-drawer/index.vue

@ -69,6 +69,7 @@
@rowDrop="rowDrop" @rowDrop="rowDrop"
:searchOverallCoverHeight="'calc(100vh - 345px)'" :searchOverallCoverHeight="'calc(100vh - 345px)'"
:rowSource="'detail_api'" :rowSource="'detail_api'"
:selectMaxHeight="'116px'"
:rowMaxHeight="rowMaxHeight" :rowMaxHeight="rowMaxHeight"
:totalCount="totalCountForDetail" :totalCount="totalCountForDetail"
:MaxResultCount="MaxResultCount" :MaxResultCount="MaxResultCount"
@ -164,6 +165,7 @@ import searchOverall from "@/components/searchOverall"
import currenButton from "@/components/currenButton" import currenButton from "@/components/currenButton"
import currenDescriptions from "@/components/currenDescriptions" import currenDescriptions from "@/components/currenDescriptions"
import currenTabs from "@/components/currenTabs" import currenTabs from "@/components/currenTabs"
import currenTable from "@/components/currenTable"
import pagination from "@/components/Pagination" import pagination from "@/components/Pagination"
import rowDrop from "@/components/rowDrop/index.vue" import rowDrop from "@/components/rowDrop/index.vue"
import * as allUrlOption from '@/utils/baseData/urlOption' import * as allUrlOption from '@/utils/baseData/urlOption'
@ -175,6 +177,7 @@ export default {
currenButton, currenButton,
currenDescriptions, currenDescriptions,
currenTabs, currenTabs,
currenTable,
searchOverall, searchOverall,
rowDrop rowDrop
}, },
@ -380,8 +383,8 @@ export default {
methods: { methods: {
// - // -
getDetailList(data,successFn,errorFn){ getDetailList(data,successFn,errorFn){
//
if(data)this.PageListParams.condition.filters = [] if(data)this.PageListParams.condition.filters = []
//
let _hasId = false let _hasId = false
this.PageListParams.condition.filters.forEach(item=>{ this.PageListParams.condition.filters.forEach(item=>{
if(item.column == this.URLOption_masterId){ if(item.column == this.URLOption_masterId){
@ -577,7 +580,7 @@ export default {
this.zdyTableColumns = [] this.zdyTableColumns = []
this.otherData = [] this.otherData = []
// this.firstTabs = val.name // this.firstTabs = val.name
// tab // tab
// if (item.functionName == 'getListByItemcode') { // if (item.functionName == 'getListByItemcode') {
// let params = { // let params = {
// itemCode: this.propsData.code // itemCode: this.propsData.code

642
PC/InterFace.Dash/src/components/filterForDetailPage/index.vue

@ -1,332 +1,338 @@
<template> <template>
<div class="filterForDetailPage" v-if="dialogShow"> <div class="filterForDetailPage" v-if="dialogShow">
<el-dialog <el-dialog
title="明细查询" title="明细查询"
:visible.sync="dialogShow" :visible.sync="dialogShow"
top="5vh" top="5vh"
width="96%" width="96%"
:modal-append-to-body="false" :modal-append-to-body="false"
:append-to-body="false" :append-to-body="false"
:show-close="true" :show-close="true"
@close="closeDialog(false)" @close="closeDialog(false)"
class="mainTable-dialog" class="mainTable-dialog"
>
<div
class="filterForDetailPage-list"
v-loading="Loading.tableLoading"
> >
<!-- 列表 --> <div
<tablePagination class="filterForDetailPage-list"
v-if="dialogShow && listColumns && listColumns.length > 0" v-loading="Loading.tableLoading"
: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"
> >
<template> <!-- 列表 -->
<!-- todo:width处理 --> <tablePagination
<el-table-column v-if="dialogShow && listColumns && listColumns.length > 0"
v-if="operaButtons && operaButtons.length > 0" :currenButtonData="currenButtonData"
label="操作" :tableData="tableData"
:align="'center'" :tableLoading="Loading.tableLoading"
width="150" @rowDrop="rowDropForDetail"
fixed="left" :rowSource="'detailPage_api'"
> :searchOverallCoverHeight="'calc(100vh - 380px)'"
<template slot-scope="scope"> :rowMaxHeight="rowMaxHeight"
<span v-for="item in operaButtons" style="margin: 0 10px;"> :tableColumns="listColumns"
<!-- 查看主表信息 --> :totalCount="totalCount"
<el-button :multipleSelection="multipleSelection"
v-if="item == 'showParent'" :MaxResultCount="PageListParams.MaxResultCount"
type="text" :setUTableHeight="setUTableHeight"
@click="showParentHandleForDetail(scope.row)" :selectMaxHeight="'116px'"
>查看主表信息</el-button> @topbutton="topbutton"
<!-- 编辑 --> @inlineDialog="inlineDialog"
<el-button @sortChange="sortChange"
v-if="item == 'edit'" @alertoldSkipCount="alertoldSkipCount"
type="text" @alterResultCount="alterResultCount"
style="color: #ff9000;" @handleSelectionChange="handleSelectionChange"
@click="editHandleForDetail(scope.row)" :currentPageProps="oldSkipCount"
>编辑</el-button> :quicklySearchOption="quicklySearchOption"
<!-- 删除 --> @quicklySearchClick="quicklySearchClick"
<el-popover @quicklySearchClear="quicklySearchClear"
v-if="item == 'delete'" :primarySearchOption="primarySearchOption"
placement="left" @overallSearchFormClick="overallSearchFormClick"
width="260" :httpOverallSearchData="httpOverallSearchData"
v-model="scope.row.deleteTipVisible" >
> <template>
<p>此操作将永久删除该消息, 是否继续?</p> <!-- todo:width处理 -->
<div style="text-align: right; margin: 0"> <el-table-column
<el-button size="mini" type="text" style="margin-right: 20px;" @click="scope.row.deleteTipVisible = false">取消</el-button> v-if="operaButtons && operaButtons.length > 0"
<el-button type="primary" size="mini" @click="deleteHandleForDetail(scope.row)">确定</el-button> label="操作"
</div> :align="'center'"
<el-button type="text" slot="reference" style="color: red;">删除</el-button> width="150"
</el-popover> fixed="left"
</span> >
</template> <template slot-scope="scope">
</el-table-column> <span v-for="item in operaButtons" style="margin: 0 10px;">
</template> <!-- 查看主表信息 -->
</tablePagination> <el-button
</div> v-if="item == 'showParent'"
</el-dialog> type="text"
<!-- 主表信息 --> @click="showParentHandleForDetail(scope.row)"
<el-dialog >查看主表信息</el-button>
:modal-append-to-body="false" <!-- 编辑 -->
:append-to-body="false" <el-button
:title="showParentTitle" v-if="item == 'edit'"
:visible.sync="showParentDialog" type="text"
:close-on-click-modal="true" style="color: #ff9000;"
:close-on-press-escape="true" @click="editHandleForDetail(scope.row)"
:show-close="true" >编辑</el-button>
width="70%" <!-- 删除 -->
> <el-popover
<div v-loading="showParentLoading"> v-if="item == 'delete'"
<curren-descriptions placement="left"
v-if="showParentTableData" width="260"
border v-model="scope.row.deleteTipVisible"
:column="column" >
:direction="direction" <p>此操作将永久删除该消息, 是否继续?</p>
:colon="false" <div style="text-align: right; margin: 0">
:tabsDesTions="parentColumns" <el-button size="mini" type="text" style="margin-right: 20px;" @click="scope.row.deleteTipVisible = false">取消</el-button>
:propsData="showParentTableData" <el-button type="primary" size="mini" @click="deleteHandleForDetail(scope.row)">确定</el-button>
style="padding-bottom: 20px;" </div>
></curren-descriptions> <el-button type="text" slot="reference" style="color: red;">删除</el-button>
</div> </el-popover>
<!-- <el-table :data="showParentTableData"> </span>
<el-table-column property="date" label="日期" width="150"></el-table-column> </template>
<el-table-column property="name" label="姓名" width="200"></el-table-column> </el-table-column>
<el-table-column property="address" label="地址"></el-table-column> </template>
</el-table> --> </tablePagination>
</el-dialog> </div>
</div> </el-dialog>
</template> <!-- 主表信息 -->
<script> <el-dialog
import currenDescriptions from "@/components/currenDescriptions" :modal-append-to-body="false"
import { tableMixins } from "@/mixins/TableMixins"; :append-to-body="false"
import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"; :title="showParentTitle"
import { LoadingMixins } from "@/mixins/LoadingMixins"; :visible.sync="showParentDialog"
import { mixins } from "@/mixins/mixins"; :close-on-click-modal="true"
import { filterSelectMixins } from '@/mixins/filter-Select' :close-on-press-escape="true"
import {getListDesById,getPageListForDetail} from "@/api/wms-api" :show-close="true"
export default { width="70%"
name: 'filterForDetailPage', >
mixins: [ <div v-loading="showParentLoading">
tableMixins, <curren-descriptions
TableHeaderMixins, v-if="showParentTableData"
mixins, border
filterSelectMixins, :column="column"
LoadingMixins :direction="direction"
], :colon="false"
components:{ :tabsDesTions="parentColumns"
currenDescriptions :propsData="showParentTableData"
}, style="padding-bottom: 20px;"
props: { ></curren-descriptions>
// app-main100% </div>
setUTableHeight: { <!-- <el-table :data="showParentTableData">
type: Number, <el-table-column property="date" label="日期" width="150"></el-table-column>
default: 340 <el-table-column property="name" label="姓名" width="200"></el-table-column>
}, <el-table-column property="address" label="地址"></el-table-column>
// </el-table> -->
isShowIndex:{ </el-dialog>
type: Boolean, </div>
default: false </template>
}, <script>
// import currenDescriptions from "@/components/currenDescriptions"
tableSelection: { import { tableMixins } from "@/mixins/TableMixins";
type: Boolean, import { TableHeaderMixins } from "@/mixins/TableHeaderMixins";
default: false import { LoadingMixins } from "@/mixins/LoadingMixins";
}, import { mixins } from "@/mixins/mixins";
cellStyle: { import { filterSelectMixins } from '@/mixins/filter-Select'
type: Function, import {getListDesById,getPageListForDetail} from "@/api/wms-api"
default: () => { export default {
return Function; name: 'filterForDetailPage',
} mixins: [
}, tableMixins,
// TableHeaderMixins,
showOverflowTooltip:{ mixins,
type: Boolean, filterSelectMixins,
default: false, LoadingMixins
],
components:{
currenDescriptions
}, },
// api props: {
DeleteApi: { // app-main100%
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'
// showParentfreshfilterfield
return ['showParent','fresh','filter','field'];
}
},
// 2
column: {
type: Number,
default: 2
},
//
direction: {
type: String, type: String,
default: null default: 'horizontal'
}, },
// - rowMaxHeight:{
parentColumns:{ type:String,
type: Array, default:'calc(90vh - 450px)'
default: null },
}, },
showHandleButtons:{ data () {
type:Array, return {
default:() => { dialogShow:true,
//'add','edit' 'delete' // URLOption_detailList:allUrlOption[this.$route.name].detailListURL,//-
// showParentfreshfilterfield // URLOption_masterId:allUrlOption[this.$route.name].masterId || 'masterId',//-id
return ['showParent','fresh','filter','field']; // 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 activated(){
column: { //
type: Number,
default: 2
},
//
direction: {
type: String,
default: 'horizontal'
},
rowMaxHeight:{
type:String,
default:'calc(90vh - 450px)'
},
},
data () {
return {
dialogShow:true,
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){
this.dialogShow = false this.dialogShow = false
this.$emit("closeDialog", data) this.$nextTick(() => {
}, this.dialogShow = true
// });
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)
}, },
// mounted(){
deleteHandleForDetail(data){ this.paging()
this.Loading.appMainLoading = true this.initHandleButtons()
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("!")
// })
}, },
} methods: {
} rowDropForDetail(data,type){
</script> this.listColumns = data
<style lang="scss"> this.$emit("rowDropForDetail", data,type)
.filterForDetailPage { },
.mainTable-dialog{ //
.el-dialog{ initHandleButtons(){
height: calc(100% - 100px); //
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){
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{ </script>
min-height: 200px; <style lang="scss">
padding-bottom: 20px !important; .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;
} }
} </style>
.filterForDetailPage-list{
height: calc(100%);
overflow: auto;
}
</style>

1216
PC/InterFace.Dash/src/components/searchOverall/index.vue

File diff suppressed because it is too large

4
PC/InterFace.Dash/src/components/searchOverall/style/index.scss

@ -1,4 +1,4 @@
.searchOverallComponent{ .searchOverallComponent{
height: 0; height: 0;
transition:all 0.5s; transition:all 0.5s;
z-index: 1; z-index: 1;
@ -31,7 +31,7 @@
// flex-direction: column; // flex-direction: column;
// width: 100%; // width: 100%;
// height: 100%; // height: 100%;
max-height: 170px; max-height: var(--navFilterMaxHeight);
overflow: auto; overflow: auto;
.el-form { .el-form {

15
PC/InterFace.Dash/src/components/tablePagination/index.vue

@ -25,6 +25,7 @@
:tableColumns="tableColumns" :tableColumns="tableColumns"
@overallSearchFormClick="overallSearchFormClick" @overallSearchFormClick="overallSearchFormClick"
:httpOverallSearchData="httpOverallSearchData" :httpOverallSearchData="httpOverallSearchData"
:selectMaxHeight="selectMaxHeight"
> >
<!-- 插槽预留 --> <!-- 插槽预留 -->
<slot name="searchPrimarySlot"></slot> <slot name="searchPrimarySlot"></slot>
@ -48,7 +49,7 @@
:tableColumns="tableColumns | isTableColumns" :tableColumns="tableColumns | isTableColumns"
:isShowIndex="isShowIndex" :isShowIndex="isShowIndex"
:selectionTable="tableSelection" :selectionTable="tableSelection"
:setUTableHeight="setUTableHeight || uTableTopHeight" :setUTableHeight="uTableTopHeight"
@sortChange="sortChange" @sortChange="sortChange"
@handleSelectionChange="handleSelectionChange" @handleSelectionChange="handleSelectionChange"
@inlineDialog="inlineDialog" @inlineDialog="inlineDialog"
@ -95,6 +96,11 @@ export default {
type:String, type:String,
default:'calc(90vh - 280px)' default:'calc(90vh - 280px)'
}, },
//
selectMaxHeight:{
type: String,
default: '174px'
},
// //
searchOverallCoverHeight:{ searchOverallCoverHeight:{
type: String, type: String,
@ -226,6 +232,7 @@ export default {
rowDropVisible: false, rowDropVisible: false,
// table key // table key
isUpdate: false, isUpdate: false,
appRemoveHeight:165,
// table // table
uTableTopHeight:165, uTableTopHeight:165,
// table // table
@ -265,6 +272,8 @@ export default {
} }
}, },
mounted(){ mounted(){
this.appRemoveHeight = this.setUTableHeight || 165
this.uTableTopHeight = this.appRemoveHeight
this.uTableOuterHeight = this.$refs.tablePaginationTableRef.getTableHeight() this.uTableOuterHeight = this.$refs.tablePaginationTableRef.getTableHeight()
this.uTableOuterHeight_init = Number(JSON.stringify(this.uTableOuterHeight)) this.uTableOuterHeight_init = Number(JSON.stringify(this.uTableOuterHeight))
@ -328,12 +337,12 @@ export default {
let _margin = 20 let _margin = 20
this.uTableOuterHeight = this.uTableOuterHeight_init - minusHeight - _margin this.uTableOuterHeight = this.uTableOuterHeight_init - minusHeight - _margin
setTimeout(()=>{ setTimeout(()=>{
this.uTableTopHeight = minusHeight + 165 + _margin this.uTableTopHeight = minusHeight + this.appRemoveHeight + _margin
},0) },0)
}else{ }else{
this.uTableOuterHeight = this.uTableOuterHeight_init this.uTableOuterHeight = this.uTableOuterHeight_init
setTimeout(()=>{ setTimeout(()=>{
this.uTableTopHeight = 165 this.uTableTopHeight = this.appRemoveHeight
},0) },0)
} }
}, },

1
PC/UI.WinIn.FasterZ.Job/src/components/commonTabel-drawer/index.vue

@ -69,6 +69,7 @@
@rowDrop="rowDrop" @rowDrop="rowDrop"
:searchOverallCoverHeight="'calc(100vh - 345px)'" :searchOverallCoverHeight="'calc(100vh - 345px)'"
:rowSource="'detail_api'" :rowSource="'detail_api'"
:selectMaxHeight="'116px'"
:rowMaxHeight="rowMaxHeight" :rowMaxHeight="rowMaxHeight"
:totalCount="totalCountForDetail" :totalCount="totalCountForDetail"
:MaxResultCount="MaxResultCount" :MaxResultCount="MaxResultCount"

1
PC/UI.WinIn.FasterZ.Job/src/components/filterForDetailPage/index.vue

@ -30,6 +30,7 @@
:multipleSelection="multipleSelection" :multipleSelection="multipleSelection"
:MaxResultCount="PageListParams.MaxResultCount" :MaxResultCount="PageListParams.MaxResultCount"
:setUTableHeight="setUTableHeight" :setUTableHeight="setUTableHeight"
:selectMaxHeight="'116px'"
@topbutton="topbutton" @topbutton="topbutton"
@inlineDialog="inlineDialog" @inlineDialog="inlineDialog"
@sortChange="sortChange" @sortChange="sortChange"

6
PC/UI.WinIn.FasterZ.Job/src/components/searchOverall/index.vue

@ -32,6 +32,7 @@
<!-- 高级筛选界面 --> <!-- 高级筛选界面 -->
<div v-if="isShow && isShowMoreList" class="moreListOuter"> <div v-if="isShow && isShowMoreList" class="moreListOuter">
<curren-Form <curren-Form
:style="`--navFilterMaxHeight: ${selectMaxHeight};`"
class="navFilter" class="navFilter"
size="medium" size="medium"
labelWidth="0" labelWidth="0"
@ -259,6 +260,11 @@ export default {
} }
}, },
props: { props: {
//
selectMaxHeight:{
type: String,
default: '174px'
},
// //
searchOverallCoverHeight:{ searchOverallCoverHeight:{
type: String, type: String,

2
PC/UI.WinIn.FasterZ.Job/src/components/searchOverall/style/index.scss

@ -31,7 +31,7 @@
// flex-direction: column; // flex-direction: column;
// width: 100%; // width: 100%;
// height: 100%; // height: 100%;
max-height: 170px; max-height: var(--navFilterMaxHeight);
overflow: auto; overflow: auto;
.el-form { .el-form {

15
PC/UI.WinIn.FasterZ.Job/src/components/tablePagination/index.vue

@ -25,6 +25,7 @@
:tableColumns="tableColumns" :tableColumns="tableColumns"
@overallSearchFormClick="overallSearchFormClick" @overallSearchFormClick="overallSearchFormClick"
:httpOverallSearchData="httpOverallSearchData" :httpOverallSearchData="httpOverallSearchData"
:selectMaxHeight="selectMaxHeight"
> >
<!-- 插槽预留 --> <!-- 插槽预留 -->
<slot name="searchPrimarySlot"></slot> <slot name="searchPrimarySlot"></slot>
@ -48,7 +49,7 @@
:tableColumns="tableColumns | isTableColumns" :tableColumns="tableColumns | isTableColumns"
:isShowIndex="isShowIndex" :isShowIndex="isShowIndex"
:selectionTable="tableSelection" :selectionTable="tableSelection"
:setUTableHeight="setUTableHeight || uTableTopHeight" :setUTableHeight="uTableTopHeight"
@sortChange="sortChange" @sortChange="sortChange"
@handleSelectionChange="handleSelectionChange" @handleSelectionChange="handleSelectionChange"
@inlineDialog="inlineDialog" @inlineDialog="inlineDialog"
@ -95,6 +96,11 @@ export default {
type:String, type:String,
default:'calc(90vh - 280px)' default:'calc(90vh - 280px)'
}, },
//
selectMaxHeight:{
type: String,
default: '174px'
},
// //
searchOverallCoverHeight:{ searchOverallCoverHeight:{
type: String, type: String,
@ -226,6 +232,7 @@ export default {
rowDropVisible: false, rowDropVisible: false,
// table key // table key
isUpdate: false, isUpdate: false,
appRemoveHeight:165,
// table // table
uTableTopHeight:165, uTableTopHeight:165,
// table // table
@ -265,6 +272,8 @@ export default {
} }
}, },
mounted(){ mounted(){
this.appRemoveHeight = this.setUTableHeight || 165
this.uTableTopHeight = this.appRemoveHeight
this.uTableOuterHeight = this.$refs.tablePaginationTableRef.getTableHeight() this.uTableOuterHeight = this.$refs.tablePaginationTableRef.getTableHeight()
this.uTableOuterHeight_init = Number(JSON.stringify(this.uTableOuterHeight)) this.uTableOuterHeight_init = Number(JSON.stringify(this.uTableOuterHeight))
@ -328,12 +337,12 @@ export default {
let _margin = 20 let _margin = 20
this.uTableOuterHeight = this.uTableOuterHeight_init - minusHeight - _margin this.uTableOuterHeight = this.uTableOuterHeight_init - minusHeight - _margin
setTimeout(()=>{ setTimeout(()=>{
this.uTableTopHeight = minusHeight + 165 + _margin this.uTableTopHeight = minusHeight + this.appRemoveHeight + _margin
},0) },0)
}else{ }else{
this.uTableOuterHeight = this.uTableOuterHeight_init this.uTableOuterHeight = this.uTableOuterHeight_init
setTimeout(()=>{ setTimeout(()=>{
this.uTableTopHeight = 165 this.uTableTopHeight = this.appRemoveHeight
},0) },0)
} }
}, },

3
PC/UI.WinIn.FasterZ.Store/src/components/commonTabel-drawer/index.vue

@ -69,6 +69,7 @@
@rowDrop="rowDrop" @rowDrop="rowDrop"
:searchOverallCoverHeight="'calc(100vh - 345px)'" :searchOverallCoverHeight="'calc(100vh - 345px)'"
:rowSource="'detail_api'" :rowSource="'detail_api'"
:selectMaxHeight="'116px'"
:rowMaxHeight="rowMaxHeight" :rowMaxHeight="rowMaxHeight"
:totalCount="totalCountForDetail" :totalCount="totalCountForDetail"
:MaxResultCount="MaxResultCount" :MaxResultCount="MaxResultCount"
@ -579,7 +580,7 @@ export default {
this.zdyTableColumns = [] this.zdyTableColumns = []
this.otherData = [] this.otherData = []
// this.firstTabs = val.name // this.firstTabs = val.name
// tab // tab
// if (item.functionName == 'getListByItemcode') { // if (item.functionName == 'getListByItemcode') {
// let params = { // let params = {
// itemCode: this.propsData.code // itemCode: this.propsData.code

645
PC/UI.WinIn.FasterZ.Store/src/components/filterForDetailPage/index.vue

@ -1,337 +1,338 @@
<template> <template>
<div class="filterForDetailPage" v-if="dialogShow"> <div class="filterForDetailPage" v-if="dialogShow">
<el-dialog <el-dialog
title="明细查询" title="明细查询"
:visible.sync="dialogShow" :visible.sync="dialogShow"
top="5vh" top="5vh"
width="96%" width="96%"
:modal-append-to-body="false" :modal-append-to-body="false"
:append-to-body="false" :append-to-body="false"
:show-close="true" :show-close="true"
@close="closeDialog(false)" @close="closeDialog(false)"
class="mainTable-dialog" class="mainTable-dialog"
>
<div
class="filterForDetailPage-list"
v-loading="Loading.tableLoading"
> >
<!-- 列表 --> <div
<tablePagination class="filterForDetailPage-list"
v-if="dialogShow && listColumns && listColumns.length > 0" v-loading="Loading.tableLoading"
: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"
> >
<template> <!-- 列表 -->
<!-- todo:width处理 --> <tablePagination
<el-table-column v-if="dialogShow && listColumns && listColumns.length > 0"
v-if="operaButtons && operaButtons.length > 0" :currenButtonData="currenButtonData"
label="操作" :tableData="tableData"
:align="'center'" :tableLoading="Loading.tableLoading"
width="150" @rowDrop="rowDropForDetail"
fixed="left" :rowSource="'detailPage_api'"
> :searchOverallCoverHeight="'calc(100vh - 380px)'"
<template slot-scope="scope"> :rowMaxHeight="rowMaxHeight"
<span v-for="item in operaButtons" style="margin: 0 10px;"> :tableColumns="listColumns"
<!-- 查看主表信息 --> :totalCount="totalCount"
<el-button :multipleSelection="multipleSelection"
v-if="item == 'showParent'" :MaxResultCount="PageListParams.MaxResultCount"
type="text" :setUTableHeight="setUTableHeight"
@click="showParentHandleForDetail(scope.row)" :selectMaxHeight="'116px'"
>查看主表信息</el-button> @topbutton="topbutton"
<!-- 编辑 --> @inlineDialog="inlineDialog"
<el-button @sortChange="sortChange"
v-if="item == 'edit'" @alertoldSkipCount="alertoldSkipCount"
type="text" @alterResultCount="alterResultCount"
style="color: #ff9000;" @handleSelectionChange="handleSelectionChange"
@click="editHandleForDetail(scope.row)" :currentPageProps="oldSkipCount"
>编辑</el-button> :quicklySearchOption="quicklySearchOption"
<!-- 删除 --> @quicklySearchClick="quicklySearchClick"
<el-popover @quicklySearchClear="quicklySearchClear"
v-if="item == 'delete'" :primarySearchOption="primarySearchOption"
placement="left" @overallSearchFormClick="overallSearchFormClick"
width="260" :httpOverallSearchData="httpOverallSearchData"
v-model="scope.row.deleteTipVisible" >
> <template>
<p>此操作将永久删除该消息, 是否继续?</p> <!-- todo:width处理 -->
<div style="text-align: right; margin: 0"> <el-table-column
<el-button size="mini" type="text" style="margin-right: 20px;" @click="scope.row.deleteTipVisible = false">取消</el-button> v-if="operaButtons && operaButtons.length > 0"
<el-button type="primary" size="mini" @click="deleteHandleForDetail(scope.row)">确定</el-button> label="操作"
</div> :align="'center'"
<el-button type="text" slot="reference" style="color: red;">删除</el-button> width="150"
</el-popover> fixed="left"
</span> >
</template> <template slot-scope="scope">
</el-table-column> <span v-for="item in operaButtons" style="margin: 0 10px;">
</template> <!-- 查看主表信息 -->
</tablePagination> <el-button
</div> v-if="item == 'showParent'"
</el-dialog> type="text"
<!-- 主表信息 --> @click="showParentHandleForDetail(scope.row)"
<el-dialog >查看主表信息</el-button>
:modal-append-to-body="false" <!-- 编辑 -->
:append-to-body="false" <el-button
:title="showParentTitle" v-if="item == 'edit'"
:visible.sync="showParentDialog" type="text"
:close-on-click-modal="true" style="color: #ff9000;"
:close-on-press-escape="true" @click="editHandleForDetail(scope.row)"
:show-close="true" >编辑</el-button>
width="70%" <!-- 删除 -->
> <el-popover
<div v-loading="showParentLoading"> v-if="item == 'delete'"
<curren-descriptions placement="left"
v-if="showParentTableData" width="260"
border v-model="scope.row.deleteTipVisible"
:column="column" >
:direction="direction" <p>此操作将永久删除该消息, 是否继续?</p>
:colon="false" <div style="text-align: right; margin: 0">
:tabsDesTions="parentColumns" <el-button size="mini" type="text" style="margin-right: 20px;" @click="scope.row.deleteTipVisible = false">取消</el-button>
:propsData="showParentTableData" <el-button type="primary" size="mini" @click="deleteHandleForDetail(scope.row)">确定</el-button>
style="padding-bottom: 20px;" </div>
></curren-descriptions> <el-button type="text" slot="reference" style="color: red;">删除</el-button>
</div> </el-popover>
<!-- <el-table :data="showParentTableData"> </span>
<el-table-column property="date" label="日期" width="150"></el-table-column> </template>
<el-table-column property="name" label="姓名" width="200"></el-table-column> </el-table-column>
<el-table-column property="address" label="地址"></el-table-column> </template>
</el-table> --> </tablePagination>
</el-dialog> </div>
</div> </el-dialog>
</template> <!-- 主表信息 -->
<script> <el-dialog
import currenDescriptions from "@/components/currenDescriptions" :modal-append-to-body="false"
import { tableMixins } from "@/mixins/TableMixins"; :append-to-body="false"
import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"; :title="showParentTitle"
import { LoadingMixins } from "@/mixins/LoadingMixins"; :visible.sync="showParentDialog"
import { mixins } from "@/mixins/mixins"; :close-on-click-modal="true"
import { filterSelectMixins } from '@/mixins/filter-Select' :close-on-press-escape="true"
import {getListDesById,getPageListForDetail} from "@/api/wms-api" :show-close="true"
export default { width="70%"
name: 'filterForDetailPage', >
mixins: [ <div v-loading="showParentLoading">
tableMixins, <curren-descriptions
TableHeaderMixins, v-if="showParentTableData"
mixins, border
filterSelectMixins, :column="column"
LoadingMixins :direction="direction"
], :colon="false"
components:{ :tabsDesTions="parentColumns"
currenDescriptions :propsData="showParentTableData"
}, style="padding-bottom: 20px;"
props: { ></curren-descriptions>
// app-main100% </div>
setUTableHeight: { <!-- <el-table :data="showParentTableData">
type: Number, <el-table-column property="date" label="日期" width="150"></el-table-column>
default: 340 <el-table-column property="name" label="姓名" width="200"></el-table-column>
}, <el-table-column property="address" label="地址"></el-table-column>
// </el-table> -->
isShowIndex:{ </el-dialog>
type: Boolean, </div>
default: false </template>
}, <script>
// import currenDescriptions from "@/components/currenDescriptions"
tableSelection: { import { tableMixins } from "@/mixins/TableMixins";
type: Boolean, import { TableHeaderMixins } from "@/mixins/TableHeaderMixins";
default: false import { LoadingMixins } from "@/mixins/LoadingMixins";
}, import { mixins } from "@/mixins/mixins";
cellStyle: { import { filterSelectMixins } from '@/mixins/filter-Select'
type: Function, import {getListDesById,getPageListForDetail} from "@/api/wms-api"
default: () => { export default {
return Function; name: 'filterForDetailPage',
} mixins: [
}, tableMixins,
// TableHeaderMixins,
showOverflowTooltip:{ mixins,
type: Boolean, filterSelectMixins,
default: false, LoadingMixins
],
components:{
currenDescriptions
}, },
// api props: {
DeleteApi: { // app-main100%
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'
// showParentfreshfilterfield
return ['showParent','fresh','filter','field'];
}
},
// 2
column: {
type: Number,
default: 2
},
//
direction: {
type: String, type: String,
default: null default: 'horizontal'
}, },
// - rowMaxHeight:{
parentColumns:{ type:String,
type: Array, default:'calc(90vh - 450px)'
default: null },
}, },
showHandleButtons:{ data () {
type:Array, return {
default:() => { dialogShow:true,
//'add','edit' 'delete' // URLOption_detailList:allUrlOption[this.$route.name].detailListURL,//-
// showParentfreshfilterfield // URLOption_masterId:allUrlOption[this.$route.name].masterId || 'masterId',//-id
return ['showParent','fresh','filter','field']; // 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 activated(){
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){
this.dialogShow = false this.dialogShow = false
this.$emit("closeDialog", data) this.$nextTick(() => {
}, this.dialogShow = true
// });
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("数据获取失败")
})
}, },
// mounted(){
showParentHandleForDetail(data){ this.paging()
this.showParentTitle = `${data[this.URLOption_masterName] || ''} 主表信息` this.initHandleButtons()
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("主表信息获取失败!")
})
}, },
// methods: {
editHandleForDetail(data){ rowDropForDetail(data,type){
console.log(data) this.listColumns = data
}, this.$emit("rowDropForDetail", data,type)
// },
deleteHandleForDetail(data){ //
this.Loading.appMainLoading = true initHandleButtons(){
data.deleteTipVisible = false //
// interfaceApi[this.DeleteApi](data.id).then(res => { let _arr_header = []
// this.$successMsg('!') if(this.showHandleButtons.indexOf('add') >= 0){_arr_header.push(this.defaultAddBtn())}
// this.oldSkipCount = 1 if(this.showHandleButtons.indexOf('field') >= 0){_arr_header.push(this.defaultFieldSettingBtn())}
// this.Loading.appMainLoading = false if(this.showHandleButtons.indexOf('fresh') >= 0){_arr_header.push(this.defaultFreshBtn())}
// this.paging() if(this.showHandleButtons.indexOf('filter') >= 0){_arr_header.push(this.defaultFilterBtn())}
// }).catch(err => { this.currenButtonData = _arr_header
// this.Loading.appMainLoading = false
// this.$message.error("!")
// })
},
}
}
</script>
<style lang="scss">
.filterForDetailPage {
.mainTable-dialog{ //
.el-dialog{ let _arr_op = []
height: calc(100% - 100px); 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{ </script>
min-height: 200px; <style lang="scss">
padding-bottom: 20px !important; .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{ </style>
height: calc(100%);
overflow: auto;
}
</style>

1216
PC/UI.WinIn.FasterZ.Store/src/components/searchOverall/index.vue

File diff suppressed because it is too large

4
PC/UI.WinIn.FasterZ.Store/src/components/searchOverall/style/index.scss

@ -1,4 +1,4 @@
.searchOverallComponent{ .searchOverallComponent{
height: 0; height: 0;
transition:all 0.5s; transition:all 0.5s;
z-index: 1; z-index: 1;
@ -31,7 +31,7 @@
// flex-direction: column; // flex-direction: column;
// width: 100%; // width: 100%;
// height: 100%; // height: 100%;
max-height: 170px; max-height: var(--navFilterMaxHeight);
overflow: auto; overflow: auto;
.el-form { .el-form {

15
PC/UI.WinIn.FasterZ.Store/src/components/tablePagination/index.vue

@ -25,6 +25,7 @@
:tableColumns="tableColumns" :tableColumns="tableColumns"
@overallSearchFormClick="overallSearchFormClick" @overallSearchFormClick="overallSearchFormClick"
:httpOverallSearchData="httpOverallSearchData" :httpOverallSearchData="httpOverallSearchData"
:selectMaxHeight="selectMaxHeight"
> >
<!-- 插槽预留 --> <!-- 插槽预留 -->
<slot name="searchPrimarySlot"></slot> <slot name="searchPrimarySlot"></slot>
@ -48,7 +49,7 @@
:tableColumns="tableColumns | isTableColumns" :tableColumns="tableColumns | isTableColumns"
:isShowIndex="isShowIndex" :isShowIndex="isShowIndex"
:selectionTable="tableSelection" :selectionTable="tableSelection"
:setUTableHeight="setUTableHeight || uTableTopHeight" :setUTableHeight="uTableTopHeight"
@sortChange="sortChange" @sortChange="sortChange"
@handleSelectionChange="handleSelectionChange" @handleSelectionChange="handleSelectionChange"
@inlineDialog="inlineDialog" @inlineDialog="inlineDialog"
@ -95,6 +96,11 @@ export default {
type:String, type:String,
default:'calc(90vh - 280px)' default:'calc(90vh - 280px)'
}, },
//
selectMaxHeight:{
type: String,
default: '174px'
},
// //
searchOverallCoverHeight:{ searchOverallCoverHeight:{
type: String, type: String,
@ -226,6 +232,7 @@ export default {
rowDropVisible: false, rowDropVisible: false,
// table key // table key
isUpdate: false, isUpdate: false,
appRemoveHeight:165,
// table // table
uTableTopHeight:165, uTableTopHeight:165,
// table // table
@ -265,6 +272,8 @@ export default {
} }
}, },
mounted(){ mounted(){
this.appRemoveHeight = this.setUTableHeight || 165
this.uTableTopHeight = this.appRemoveHeight
this.uTableOuterHeight = this.$refs.tablePaginationTableRef.getTableHeight() this.uTableOuterHeight = this.$refs.tablePaginationTableRef.getTableHeight()
this.uTableOuterHeight_init = Number(JSON.stringify(this.uTableOuterHeight)) this.uTableOuterHeight_init = Number(JSON.stringify(this.uTableOuterHeight))
@ -328,12 +337,12 @@ export default {
let _margin = 20 let _margin = 20
this.uTableOuterHeight = this.uTableOuterHeight_init - minusHeight - _margin this.uTableOuterHeight = this.uTableOuterHeight_init - minusHeight - _margin
setTimeout(()=>{ setTimeout(()=>{
this.uTableTopHeight = minusHeight + 165 + _margin this.uTableTopHeight = minusHeight + this.appRemoveHeight + _margin
},0) },0)
}else{ }else{
this.uTableOuterHeight = this.uTableOuterHeight_init this.uTableOuterHeight = this.uTableOuterHeight_init
setTimeout(()=>{ setTimeout(()=>{
this.uTableTopHeight = 165 this.uTableTopHeight = this.appRemoveHeight
},0) },0)
} }
}, },

Loading…
Cancel
Save