java_project
/
logpm_page
4
1
Fork 0
Code Issues Pull Requests Activity
Browse Source

尝试适配表格高度不留白

fix_bug_pro20231227
zhangsiyu 2 years ago
parent
6b4a975d33
commit
c39c92d265
3 changed files with 397 additions and 116 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      src/components/tablecmt/tablecmt.vue
  2. 362
      src/views/distribution/inventory/distributionStockListDetails.vue
  3. 131
      src/views/system/param.vue

20
src/components/tablecmt/tablecmt.vue
Unescape View File

@ -1,13 +1,14 @@
<template>
<el-table
<div class="maboxhi">
<el-table
:data="tableData"
style="width: 100%"
style="width: 100%;"
:show-summary="shownm"
:summary-method="getSummaries"
v-loading="loading"
@selection-change="handleSelectionChange"
border
height="500"
height="100%"
:row-class-name="tableRowClassName"
>
<el-table-column
@ -64,7 +65,7 @@
v-if="column.type == 4"
type="date"
clearable
style="width: 150px;"
style="width: auto;"
:placeholder="`请选择${column.label}`"
@change="timechange($event,column)"
@clear="timeclear($event,column)"
@ -124,6 +125,7 @@
</template>
</el-table-column>
</el-table>
</div>
</template>
<script lang="ts" setup>
@ -340,7 +342,12 @@ watchEffect(()=>{
// .el-table .success-row {
// --el-table-tr-bg-color: var(--el-color-success-light-9);
// }
.maboxhi{
width: 100%;
height: calc(100vh - 250px);
// flex:1;
// min-height: 100%;
}
.on{
overflow: hidden;
white-space: nowrap;
@ -444,4 +451,7 @@ watchEffect(()=>{
.el-table__body tr.hover-row.current-row>td,.el-table__body tr.hover-row.el-table__row--striped.current-row>td,.el-table__body tr.hover-row.el-table__row--striped>td,.el-table__body tr.hover-row>td{
background-color:#d3d8e1 !important;
}
.el-date-editor.el-input, .el-date-editor.el-input__wrapper{
height: 23px !important;
}
</style>

362
src/views/distribution/inventory/distributionStockListDetails.vue
Unescape View File

@ -74,26 +74,20 @@
@tab-click="handleClick"
>
<el-tab-pane label="库位库存品" name="library">
<el-table ref="table" v-loading="loading"
@selection-change="selectionChange"
:data="data"
:height="height"
style="width: 100%"
:border="option.border">
<!-- <el-table-column type="selection" v-if="option.selection" width="55" align="center"></el-table-column>-->
<el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>
<el-table-column v-if="option.index" label="序号" type="index" width="70" align="center">
</el-table-column>
<template v-for="(item,index) in option.column">
<!-- table字段 -->
<el-table-column v-if="item.hide!==true"
:prop="item.prop"
:label="item.label"
:width="item.width"
:key="index">
</el-table-column>
</template>
</el-table>
<tablecmt
:columnList="columnListarrs.column"
:tableData="data"
:loading="loading"
@inputTxt="inputsc"
@timeCheck="timesc"
@btnCheck="btnsc"
@selectCheck="selectsc"
@selection="selectionChange"
>
<template #default="slotProps">
</template>
</tablecmt>
<div class="avue-crud__pagination" style="width:100%">
<!-- 分页模块 -->
<el-pagination align="right"
@ -110,60 +104,47 @@
</el-tab-pane>
<el-tab-pane label="出库明细" name="outbound">
<el-table ref="table" v-loading="loading"
@selection-change="selectionChange"
:data="data1"
:height="height"
style="width: 100%"
:border="option.border">
<el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>
<el-table-column v-if="option.index" label="序号" type="index" width="70" align="center">
</el-table-column>
<template v-for="(item,index) in option.columnDetails">
<!-- table字段 -->
<el-table-column v-if="item.hide!==true"
:prop="item.prop"
:label="item.label"
:width="item.width"
:key="index">
</el-table-column>
</template>
</el-table>
<tablecmt
:columnList="columnListarrs.columnDetails"
:tableData="data"
:loading="loading"
@inputTxt="inputsc"
@timeCheck="timesc"
@btnCheck="btnsc"
@selectCheck="selectsc"
@selection="selectionChange"
>
<template #default="slotProps">
</template>
</tablecmt>
<div class="avue-crud__pagination" style="width:100%">
<!-- 分页模块 -->
<el-pagination align="right"
background
@size-change="sizeChange"
@current-change="currentChange"
:current-page="page1.currentPage"
:page-sizes="[30, 50,80, 120]"
:page-size="page1.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="page1.total">
background
@size-change="sizeChange"
@current-change="currentChange"
:current-page="page1.currentPage"
:page-sizes="[30, 50,80, 120]"
:page-size="page1.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="page1.total">
</el-pagination>
</div>
</el-tab-pane>
<el-tab-pane label="入库明细" name="enter">
<el-table ref="table" v-loading="loading"
@selection-change="selectionChange"
:data="data2"
:height="height"
style="width: 100%"
:border="option.border">
<el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>
<el-table-column v-if="option.index" label="序号" type="index" width="70" align="center">
</el-table-column>
<template v-for="(item,index) in option.columnWarehousing">
<!-- table字段 -->
<el-table-column v-if="item.hide!==true"
:prop="item.prop"
:label="item.label"
:width="item.width"
:key="index">
</el-table-column>
</template>
<!-- 操作栏模块 -->
</el-table>
<tablecmt
:columnList="columnListarrs.columnWarehousing"
:tableData="data"
:loading="loading"
@inputTxt="inputsc"
@timeCheck="timesc"
@btnCheck="btnsc"
@selectCheck="selectsc"
@selection="selectionChange"
>
<template #default="slotProps">
</template>
</tablecmt>
<div class="avue-crud__pagination" style="width:100%">
<!-- 分页模块 -->
<el-pagination align="right"
@ -245,6 +226,253 @@ import { getStockListInfoList } from '@/api/distribution/distributionStockListIn
export default {
data () {
return {
columnListarrs:{
//入库明细
columnWarehousing:[
// {
// prop: '',
// label: '序号',
// type: 0,
// values: '',
// width: 55,
// checkarr: [],
// fixed: true,
// },
{
prop: 'warehousingTime',
label: '入库时间',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: true,
sortable: true,
head: false,
},
{
prop: 'orderCode',
label: '订单自编号',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'cargoNumber',
label: '运单编号',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'despatch',
label: '物流车次',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'licensePlate',
label: '车牌',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'quantityStock',
label: '入库数量',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
],
//库存品
column:[
// {
// prop: '',
// label: '序号',
// type: 0,
// values: '',
// width: 55,
// checkarr: [],
// fixed: true,
// },
{
prop: 'storageLocation',
label: '货位',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: true,
sortable: true,
head: false,
},
{
prop: 'descriptionGoods',
label: '货物名称',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'groundingTime',
label: '上架时间',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'quantityStock',
label: '在库数',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'licensePlate',
label: '车牌',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'cargoUnit',
label: '单位',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'unpackingQuantity',
label: '拆包数',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
],
columnDetails:[
// {
// prop: '',
// label: '序号',
// type: 0,
// values: '',
// width: 55,
// checkarr: [],
// fixed: true,
// },
{
prop: 'outboundTypeName',
label: '出库类型',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: true,
sortable: true,
head: false,
},
{
prop: 'orderCode',
label: '订单自编号',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'deliveryListCode',
label: '配送单号',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'createTime',
label: '创建时间',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'unit',
label: '单位',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'goodsAllocation',
label: '库位信息',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
],
},
height: 0,
activeName: 'library',
// 弹框标题

131
src/views/system/param.vue
Unescape View File

@ -46,65 +46,43 @@
</el-row>
<el-row>
<!-- 列表模块 -->
<el-table
ref="table"
v-loading="loading"
@selection-change="selectionChange"
:data="data"
:height="height"
style="width: 100%"
:border="option.border"
<tablecmt
:columnList="columnList"
:tableData="data"
:loading="loading"
@inputTxt="inputsc"
@timeCheck="timesc"
@btnCheck="btnsc"
@selectCheck="selectsc"
@selection="selectionChange"
>
<el-table-column
type="selection"
v-if="option.selection"
width="55"
align="center"
></el-table-column>
<el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>
<el-table-column v-if="option.index" label="#" type="index" width="50" align="center">
</el-table-column>
<template v-for="(item, index) in option.column">
<!-- table字段 -->
<el-table-column
v-if="item.hide !== true"
:prop="item.prop"
:label="item.label"
:width="item.width"
:key="index"
>
</el-table-column>
</template>
<!-- 操作栏模块 -->
<el-table-column prop="menu" label="操作" :width="220" align="center">
<template #="{ row }">
<el-button
<template #default="slotProps">
<el-text
v-if="this.permissionList.viewBtn"
type="primary"
text
icon="el-icon-view"
@click="handleView(row)"
@click="handleView(slotProps.scope.row)"
>查看
</el-button>
<el-button
</el-text>
<el-text
v-if="this.permissionList.editBtn"
type="primary"
text
icon="el-icon-edit"
@click="handleEdit(row)"
@click="handleEdit(slotProps.scope.row)"
>编辑
</el-button>
<el-button
</el-text>
<el-text
v-if="this.permissionList.delBtn"
type="primary"
text
icon="el-icon-delete"
@click="rowDel(row)"
@click="rowDel(slotProps.scope.row)"
>删除
</el-button>
</template>
</el-table-column>
</el-table>
</el-text>
</template>
</tablecmt>
</el-row>
<el-row>
<div class="avue-crud__pagination" style="width: 100%">
@ -167,6 +145,71 @@ import { mapGetters } from 'vuex';
export default {
data() {
return {
columnList: [
{
prop: '',
label: '序号',
type: 0,
values: '',
width: 55,
checkarr: [],
fixed: true,
},
{
prop: 'paramName',
label: '参数名',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'paramKey',
label: '参数键',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'paramValue',
label: '参数值',
type: 2,
values: '',
width: '300',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'remark',
label: '备注',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: '',
label: '操作',
type: 6,
values: '',
width: '150',
checkarr: [],
fixed: 'right',
hide: true,
},
// 更多列的配置...
],
height: 0,
// 弹框标题
title: '',
@ -346,7 +389,7 @@ export default {
},
selectionClear() {
this.selectionList = [];
this.$refs.table.clearSelection();
// this.$refs.table.clearSelection();
},
currentChange(currentPage) {
this.page.currentPage = currentPage;

Write Preview
Loading…
Cancel
Save