diff --git a/src/components/Table/src/BasicTable.vue b/src/components/Table/src/BasicTable.vue index 2a04c48a..60b1c6fd 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" @radio-change="rowChange" @@ -175,6 +176,7 @@ export default defineComponent({ 'register', 'row-click', 'row-dbClick', + 'row-Click', 'row-contextmenu', 'row-mouseenter', 'row-mouseleave', @@ -485,6 +487,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) { @@ -545,6 +551,7 @@ export default defineComponent({ wrapRef, tableAction, dbclickVxeRow, + clickVxeRow, redoHeight, fetch, getFormProps: getFormProps as any, diff --git a/src/logics/theme/dark.ts b/src/logics/theme/dark.ts index 76d8d66d..16bbb568 100644 --- a/src/logics/theme/dark.ts +++ b/src/logics/theme/dark.ts @@ -24,6 +24,5 @@ export async function updateDarkTheme(mode: string | null = 'light') { removeClass(htmlRoot, 'dark') } } - console.log(111111111111) htmlRoot.setAttribute('data-theme', mode) } diff --git a/src/views/baseinfo/formcopy/components/Modal copy.vue b/src/views/baseinfo/formcopy/components/Modal copy.vue index 906dd17f..729f2b91 100644 --- a/src/views/baseinfo/formcopy/components/Modal copy.vue +++ b/src/views/baseinfo/formcopy/components/Modal copy.vue @@ -152,7 +152,6 @@ setModalProps({ confirmLoading: false, loading: true }) isUpdate.value = !!data?.isUpdate await init() - console.log(unref(isUpdate), 11111111111111111) if (unref(isUpdate)) { rowId.value = data.record.id diff --git a/src/views/baseinfo/formcopy/components/Modal.vue b/src/views/baseinfo/formcopy/components/Modal.vue index 61560c21..df6389ac 100644 --- a/src/views/baseinfo/formcopy/components/Modal.vue +++ b/src/views/baseinfo/formcopy/components/Modal.vue @@ -195,7 +195,6 @@ formLoading.value = true isUpdate.value = !!data?.isUpdate await init() - console.log(unref(isUpdate), 11111111111111111) if (unref(isUpdate)) { rowId.value = data.record.id 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 @@
- +
@@ -208,7 +208,7 @@ import { useDesign } from '/@/hooks/web/useDesign' const { prefixCls } = useDesign('ds-table-button') const { createMessage } = useMessage() const [registerTable, { reload, getPaginationRef, getVxeSelectRows, getRawDataSource }] = useTable({ - maxHeight: 225, + maxHeight: 215, api: async (p) => { const res: API.DataResult = await GetList(p) return new Promise((resolve) => { @@ -238,7 +238,7 @@ const [registerTable, { reload, getPaginationRef, getVxeSelectRows, getRawDataSo }, canResize: true, immediate: true, - resizeHeightOffset: 50, + resizeHeightOffset: 60, tableComponent: 'vxe', id: '0', autoHeight: window.innerHeight - 330.5 @@ -250,6 +250,7 @@ const [registerTable2, { getSelectRows: getSelectRows2, clearSelectedRowKeys: cl pagination: false, showIndexColumn: false, bordered: true, + maxHeight: 225, canResize: false, showSummary: true, summaryFunc(param) { @@ -286,6 +287,7 @@ const [registerTable3, { setTableData: setTableDataFee }] = useTable({ striped: true, rowKey: 'id', bordered: true, + maxHeight: 225, canResize: true, immediate: false, }) @@ -296,6 +298,7 @@ const [registerTable4, { setTableData: setTableDataFeeSum }] = useTable({ pagination: false, showTableSetting: false, striped: true, + maxHeight: 225, rowKey: 'id', bordered: true, canResize: true, @@ -345,7 +348,6 @@ function handleClick(row) { if (res.succeeded) { feeData.value = res.data setTableData(res.data.invoiceDetails) - // } loading.value = false }) @@ -482,6 +484,7 @@ function sureRefuse() { color: black; display: inline-block; width: 200px; + flex: 1; } } @@ -532,8 +535,10 @@ function sureRefuse() { background-color: white; border-radius: 6px; border: 1px solid rgba(204, 214, 223, 1); - padding: 14px 20px; + padding: 8px 20px; margin-top: 15px; + height: 360px; + padding-bottom: 10px; } diff --git a/src/views/system/serviceFlow/index.vue b/src/views/system/serviceFlow/index.vue index c5849c99..ca488273 100644 --- a/src/views/system/serviceFlow/index.vue +++ b/src/views/system/serviceFlow/index.vue @@ -31,14 +31,15 @@ +
+ + diff --git a/src/views/system/serviceItemList/index.vue b/src/views/system/serviceItemList/index.vue index 4153f550..f46f01ac 100644 --- a/src/views/system/serviceItemList/index.vue +++ b/src/views/system/serviceItemList/index.vue @@ -40,6 +40,7 @@ +