From 5a81e8225b501c29af405ebd51438028edbbec87 Mon Sep 17 00:00:00 2001
From: TanYibin <5491541@qq.com>
Date: Thu, 12 Oct 2023 09:12:05 +0800
Subject: [PATCH] 盘点页明细新增细节优化
---
ant-design-vue-jeecg/src/views/system/stocktaking/modules/CycleCountDetailModal.vue | 76 +++++++++++++++++++++++++++++++++++++++-------------------------------------
1 file changed, 39 insertions(+), 37 deletions(-)
diff --git a/ant-design-vue-jeecg/src/views/system/stocktaking/modules/CycleCountDetailModal.vue b/ant-design-vue-jeecg/src/views/system/stocktaking/modules/CycleCountDetailModal.vue
index 2d82f68..6e5be42 100644
--- a/ant-design-vue-jeecg/src/views/system/stocktaking/modules/CycleCountDetailModal.vue
+++ b/ant-design-vue-jeecg/src/views/system/stocktaking/modules/CycleCountDetailModal.vue
@@ -42,6 +42,7 @@
</div>
<div style="height: 340px">
<a-table
+ ref="table"
size="middle"
bordered
:rowKey="rowKey"
@@ -49,7 +50,7 @@
:dataSource="dataSource"
:pagination="ipagination"
:loading="loading"
- :scroll="{ y: 240 }"
+ :scroll="{ y: 235 }"
:customRow="customRowFn"
:rowSelection="{selectedRowKeys, onChange: onSelectChange, type: 'checkbox'}"
class="j-table-force-nowrap"
@@ -65,7 +66,7 @@
</div>
</a-col>
<a-col :span="8">
- <a-card :title="'已选' + title" :bordered="false" :head-style="{padding:0}" :body-style="{padding:0}">
+ <a-card :title="'已选' + title" :bordered="false" :body-style="{padding:0}">
<a-table size="middle" bordered :rowKey="rowKey" v-bind="selectedTable" class="j-table-force-nowrap">
<span slot="action" slot-scope="text, record, index">
<a @click="handleDeleteSelected(record, index)">删除</a>
@@ -75,30 +76,31 @@
</a-col>
</a-row>
<!-- 底部表格 start -->
- <div style="height: 320px">
+ <div>
<a-table
ref="table"
size="middle"
bordered
rowKey="id"
- :scroll="{x:true}"
:columns="detailColumns"
:dataSource="detailDataSource"
:pagination="detailIpagination"
:loading="loading"
class="j-table-force-nowrap"
@change="handleDetailTableChange">
- <span slot="companyCode" slot-scope="companyCode">
- <a-tag :key="companyCode" color=blue>
- {{ solutionCompany(companyCode) }}
- </a-tag>
- </span>
- <span slot="inventoryStatus_dictText" slot-scope="inventoryStatus_dictText">
- <a-tag :key="inventoryStatus_dictText" :color="getStatusColor(inventoryStatus_dictText)">
- {{ inventoryStatus_dictText }}
- </a-tag>
- </span>
+ <span slot="companyCode" slot-scope="companyCode">
+ <a-tag :key="companyCode" color=blue>
+ {{ solutionCompany(companyCode) }}
+ </a-tag>
+ </span>
+
+ <span slot="inventoryStatus_dictText" slot-scope="inventoryStatus_dictText">
+ <a-tag :key="inventoryStatus_dictText" :color="getStatusColor(inventoryStatus_dictText)">
+ {{ inventoryStatus_dictText }}
+ </a-tag>
+ </span>
+
</a-table>
</div>
<!-- 底部表格 end -->
@@ -133,20 +135,13 @@ export default {
selectedRows: [],
selectedRowIds: [],
columns: [
- {title: 'ID', align: 'center', width: '20%', widthRight: '70%', dataIndex: 'id'},
- {
- title: '库区',
- align: 'center',
- width: '20%',
- widthRight: '70%',
- dataIndex: 'zoneCode',
- scopedSlots: {customRender: 'zoneCode'}
- },
- {title: '容器编码', align: 'center', width: '25%', dataIndex: 'containerCode'},
- {title: '容器状态', align: 'center', width: '20%', dataIndex: 'containerStatus_dictText'},
- {title: '库位编码', align: 'center', width: '20%', dataIndex: 'locationCode'},
- {title: '总数量', align: 'center', width: '20%', dataIndex: 'totalQty'},
- {title: '状态', align: 'center', width: '20%', dataIndex: 'enable_dictText'},
+ {title: 'ID', align: 'center', width: '10%', widthRight: '70%', dataIndex: 'id'},
+ {title: '库区', align: 'center', width: '15%', widthRight: '70%', dataIndex: 'zoneCode', scopedSlots: {customRender: 'zoneCode'}},
+ {title: '库位编码', align: 'center', dataIndex: 'locationCode'},
+ {title: '容器编码', align: 'center', dataIndex: 'containerCode'},
+ {title: '容器状态', align: 'center', width: '10%', dataIndex: 'containerStatus_dictText'},
+ {title: '总数量', align: 'center', width: '15%', dataIndex: 'totalQty'},
+ {title: '状态', align: 'center', width: '10%', dataIndex: 'enable_dictText'},
],
detailColumns: [
{title: '货主', align: "center", dataIndex: 'companyCode', scopedSlots: {customRender: 'companyCode'}},
@@ -168,7 +163,7 @@ export default {
],
selectedTable: {
pagination: false,
- scroll: {y: 240},
+ scroll: {y: 235},
columns: [
{title: '库位编码', align: 'center', width: '70%', dataIndex: 'locationCode'},
{title: '操作', dataIndex: 'action', align: 'center', width: 60, scopedSlots: {customRender: 'action'},}
@@ -186,7 +181,7 @@ export default {
ipagination: {
current: 1,
pageSize: 5,
- pageSizeOptions: ['5'],
+ pageSizeOptions: ['5', '10', '100'],
showTotal: (total, range) => {
return range[0] + "-" + range[1] + " 共" + total + "条"
},
@@ -197,7 +192,7 @@ export default {
detailIpagination: {
current: 1,
pageSize: 5,
- pageSizeOptions: ['5'],
+ pageSizeOptions: ['5', '10', '100'],
showTotal: (total, range) => {
return range[0] + "-" + range[1] + " 共" + total + "条"
},
@@ -208,6 +203,17 @@ export default {
}
},
methods: {
+ searchReset() {
+ Object.keys(this.queryParam).forEach(key => {
+ this.queryParam[key] = ''
+ })
+ this.selectedRowKeys = []
+ this.selectedRows = []
+ this.selectedRowIds = []
+ this.selectedTable.dataSource = []
+ this.detailDataSource = []
+ this.loadData(1)
+ },
handleOk() {
let params = {
inventoryHeaderIds: this.selectedRowIds,
@@ -302,12 +308,8 @@ export default {
})
},
close() {
- this.visible = false;
- this.selectedRowIds = [];
- this.selectionRows = [];
- this.selectedRowKeys = [];
- this.detailDataSource = [];
- this.selectedTable.dataSource = [];
+ this.searchReset()
+ this.visible = false
},
handleCancel() {
this.close()
--
libgit2 0.22.2