diff --git a/src/components/Table/src/BasicTable.vue b/src/components/Table/src/BasicTable.vue index bca27546..6837c5c7 100644 --- a/src/components/Table/src/BasicTable.vue +++ b/src/components/Table/src/BasicTable.vue @@ -49,6 +49,7 @@ border="outer" :loading="getBindValues.loading" @cell-dblclick="dbclickVxeRow" + @cell-click="clickVxeRow" @sort-change="sortChangeEvent" @resizable-change="resizableChangeEvent" > @@ -173,6 +174,7 @@ export default defineComponent({ 'register', 'row-click', 'row-dbClick', + 'row-Click', 'row-contextmenu', 'row-mouseenter', 'row-mouseleave', @@ -482,6 +484,10 @@ export default defineComponent({ emit('row-dbClick', row) // props.rowDbClick(row) } + const clickVxeRow = ({ row, column }) => { + emit('row-Click', row) + // props.rowDbClick(row) + } // vxe服务端排序 const sortChangeEvent = ({ field, order }) => { if (order) { @@ -538,6 +544,7 @@ export default defineComponent({ wrapRef, tableAction, dbclickVxeRow, + clickVxeRow, redoHeight, fetch, getFormProps: getFormProps as any, diff --git a/src/views/bookingcabin/CabinManagement/columns.tsx b/src/views/bookingcabin/CabinManagement/columns.tsx index 8a8ad0fb..7bd107d8 100644 --- a/src/views/bookingcabin/CabinManagement/columns.tsx +++ b/src/views/bookingcabin/CabinManagement/columns.tsx @@ -53,24 +53,28 @@ export const searchFormSchema: FormSchema[] = [ optionLabelProp: 'label', options: [ { - label: '全部', - value: '0', + label: '现舱', + value: 'INSTOCK', }, { - label: '未取消', - value: '1', + label: '已使用', + value: 'USED', }, { - label: '已取消', - value: '2', + label: '已退舱', + value: 'CUSTOMERBACK', }, { - label: '已使用', - value: '3', + label: 'ALLSLOT', + value: '全部舱位', + }, + { + label: '全部订舱', + value: 'ALLBOOKING', }, { - label: '未使用', - value: '4', + label: '船公司退舱', + value: 'CARRIERCANCEL', }, ], }, @@ -388,6 +392,15 @@ export const columns: BasicColumn[] = [ sortable: true, customCell: sharedOnCell, }, + { + title: '舱位状态', + align: 'left', + width: 100, + dataIndex: 'statusName', + showHeaderOverflow: true, + sortable: true, + customCell: sharedOnCell, + }, { title: '船公司', align: 'left', @@ -538,6 +551,20 @@ export const columns: BasicColumn[] = [ dataIndex: 'loadGuaranteeFlagName', customCell: sharedOnCell1, }, + { + title: '来源邮箱', + align: 'left', + width: 100, + dataIndex: 'senderEmail', + customCell: sharedOnCell1, + }, + { + title: '接受邮箱', + align: 'left', + width: 100, + dataIndex: 'recvEmail', + customCell: sharedOnCell1, + }, { title: '收货地', align: 'left', diff --git a/src/views/operation/invoicExamine/columns.tsx b/src/views/operation/invoicExamine/columns.tsx index 610d2f54..ed511024 100644 --- a/src/views/operation/invoicExamine/columns.tsx +++ b/src/views/operation/invoicExamine/columns.tsx @@ -147,7 +147,7 @@ export const detailColumns: BasicColumn[] = [ { title: '单位', dataIndex: 'unit', - width: 100, + width: 60, align: 'left', }, { diff --git a/src/views/operation/invoicExamine/index.vue b/src/views/operation/invoicExamine/index.vue index 52f8e5c1..1650b1b1 100644 --- a/src/views/operation/invoicExamine/index.vue +++ b/src/views/operation/invoicExamine/index.vue @@ -100,7 +100,7 @@