|
@@ -98,6 +98,7 @@
|
|
|
row-key="id"
|
|
row-key="id"
|
|
|
@columns-change="handleColumnChange"
|
|
@columns-change="handleColumnChange"
|
|
|
:cache-key="cacheKeyUrl"
|
|
:cache-key="cacheKeyUrl"
|
|
|
|
|
+ :maxHeight="350"
|
|
|
>
|
|
>
|
|
|
</ele-pro-table>
|
|
</ele-pro-table>
|
|
|
</el-tab-pane>
|
|
</el-tab-pane>
|
|
@@ -108,6 +109,7 @@
|
|
|
:columns="trayListColumns"
|
|
:columns="trayListColumns"
|
|
|
:datasource="trayListData"
|
|
:datasource="trayListData"
|
|
|
row-key="id"
|
|
row-key="id"
|
|
|
|
|
+ :maxHeight="350"
|
|
|
>
|
|
>
|
|
|
</ele-pro-table>
|
|
</ele-pro-table>
|
|
|
</el-tab-pane>
|
|
</el-tab-pane>
|
|
@@ -145,14 +147,12 @@
|
|
|
import getDynamicsColumns from '@/mixins/getDynamicsColumns';
|
|
import getDynamicsColumns from '@/mixins/getDynamicsColumns';
|
|
|
// import fileMain from '@/components/addDoc/index.vue';
|
|
// import fileMain from '@/components/addDoc/index.vue';
|
|
|
import PalletTable from '@/views/saleManage/saleOrder/invoice/components/palletTable.vue';
|
|
import PalletTable from '@/views/saleManage/saleOrder/invoice/components/palletTable.vue';
|
|
|
- import {
|
|
|
|
|
- getSendSaleOrderConfirmDetail,
|
|
|
|
|
- } from '@/api/saleManage/invoiceConfirm';
|
|
|
|
|
|
|
+ import { getSendSaleOrderConfirmDetail } from '@/api/saleManage/invoiceConfirm';
|
|
|
import tabMixins from '@/mixins/tableColumnsMixin';
|
|
import tabMixins from '@/mixins/tableColumnsMixin';
|
|
|
import { levelList } from '@/enum/dict.js';
|
|
import { levelList } from '@/enum/dict.js';
|
|
|
|
|
|
|
|
export default {
|
|
export default {
|
|
|
- mixins: [dictMixins, getDynamicsColumns,tabMixins],
|
|
|
|
|
|
|
+ mixins: [dictMixins, getDynamicsColumns, tabMixins],
|
|
|
components: {
|
|
components: {
|
|
|
PalletTable,
|
|
PalletTable,
|
|
|
// fileMain,
|
|
// fileMain,
|
|
@@ -163,7 +163,7 @@
|
|
|
},
|
|
},
|
|
|
data() {
|
|
data() {
|
|
|
return {
|
|
return {
|
|
|
- cacheKeyUrl:'eos-saleManage-invoiceConfirm-inventoryTableDetails',
|
|
|
|
|
|
|
+ cacheKeyUrl: 'eos-saleManage-invoiceConfirm-inventoryTableDetails',
|
|
|
activeComp: 'main',
|
|
activeComp: 'main',
|
|
|
tabOptions: [
|
|
tabOptions: [
|
|
|
{ key: 'main', name: '发货确认单详情' },
|
|
{ key: 'main', name: '发货确认单详情' },
|
|
@@ -381,7 +381,7 @@
|
|
|
minWidth: 100,
|
|
minWidth: 100,
|
|
|
prop: 'totalCount',
|
|
prop: 'totalCount',
|
|
|
label: '确认数量',
|
|
label: '确认数量',
|
|
|
- slot:'totalCount',
|
|
|
|
|
|
|
+ slot: 'totalCount',
|
|
|
showOverflowTooltip: true,
|
|
showOverflowTooltip: true,
|
|
|
align: 'center'
|
|
align: 'center'
|
|
|
},
|
|
},
|
|
@@ -434,7 +434,7 @@
|
|
|
prop: 'taxRate',
|
|
prop: 'taxRate',
|
|
|
label: '税率',
|
|
label: '税率',
|
|
|
formatter: (row, column) => {
|
|
formatter: (row, column) => {
|
|
|
- return row.taxRate?row.taxRate+'%':''
|
|
|
|
|
|
|
+ return row.taxRate ? row.taxRate + '%' : '';
|
|
|
},
|
|
},
|
|
|
align: 'center'
|
|
align: 'center'
|
|
|
},
|
|
},
|
|
@@ -480,7 +480,8 @@
|
|
|
prop: 'goodsLevel',
|
|
prop: 'goodsLevel',
|
|
|
label: '物品级别',
|
|
label: '物品级别',
|
|
|
formatter: (_row, _column, cellValue) => {
|
|
formatter: (_row, _column, cellValue) => {
|
|
|
- return levelList.find(item=>item.value==_row.goodsLevel)?.label
|
|
|
|
|
|
|
+ return levelList.find((item) => item.value == _row.goodsLevel)
|
|
|
|
|
+ ?.label;
|
|
|
},
|
|
},
|
|
|
align: 'center'
|
|
align: 'center'
|
|
|
},
|
|
},
|