diff --git a/src/views/operation/seaexport/detail/modules/baseInfo.tsx b/src/views/operation/seaexport/detail/modules/baseInfo.tsx index a1277184..83324cc1 100644 --- a/src/views/operation/seaexport/detail/modules/baseInfo.tsx +++ b/src/views/operation/seaexport/detail/modules/baseInfo.tsx @@ -640,11 +640,12 @@ export const mailingInfoFormSchemaR: FormSchema[] = [ { field: 'etd', label: '开船日期', + labelSlot: 'etd', component: 'DatePicker', rules: [{ required: true, message: '请选择开船日期' }], dynamicDisabled: false, defaultValue: undefined, - colProps: { span: 5 }, + colProps: { className: 'edt-picker ant-col ant-col-5' }, componentProps: { allowClear: true, valueFormat: 'YYYY-MM-DD', @@ -680,10 +681,11 @@ export const mailingInfoFormSchemaR: FormSchema[] = [ field: 'atd', label: '计费日(PRICEDATE)', component: 'DatePicker', + labelSlot: 'atd', required: false, dynamicDisabled: false, // defaultValue: '', - colProps: { span: 5 }, + colProps: { className: 'atd-picker ant-col ant-col-5' }, componentProps: { allowClear: true, valueFormat: 'YYYY-MM-DD', diff --git a/src/views/operation/seaexport/detail/modules/mailingInfo.vue b/src/views/operation/seaexport/detail/modules/mailingInfo.vue index 457b2ae9..7fc47e4b 100644 --- a/src/views/operation/seaexport/detail/modules/mailingInfo.vue +++ b/src/views/operation/seaexport/detail/modules/mailingInfo.vue @@ -72,7 +72,16 @@

运输信息

- + + + + + + @@ -121,6 +130,14 @@ console.log(notifyPartyList.value) }) } + // 根据日期计算今天是周几 + const getWeekday = (dateStr) => { + if (!dateStr) return + const weekDays = ['周日', '周一', '周二', '周三', '周四', '周五', '周六'] + const date = new Date(dateStr) + const weekday = date.getDay() + return weekDays[weekday] + } // 打开通知人弹窗 const openContactModal = () => { twoFlag.value = true @@ -295,6 +312,28 @@ height: 102px; } } + .edt-picker { + .ant-form-item-label { + overflow: visible; + } + .week-day { + position: relative; + top: 23.5px; + left: 12px; + z-index: 10; + } + } + .atd-picker { + .ant-form-item-label { + overflow: visible; + } + .week-day { + position: relative; + top: 23.5px; + left: -28px; + z-index: 10; + } + } .ant-divider-horizontal { margin: 8px 0 8px!important; background: #E8EBED; diff --git a/src/views/system/user/columns.tsx b/src/views/system/user/columns.tsx index 4489caf6..6b5b0728 100644 --- a/src/views/system/user/columns.tsx +++ b/src/views/system/user/columns.tsx @@ -65,6 +65,16 @@ export const columns: BasicColumn[] = [ return text }, }, + { + title: '默认机构', + dataIndex: 'defaultOrgName', + width: 140, + }, + { + title: '默认部门', + dataIndex: 'deptName', + width: 140, + }, { title: '手机号', dataIndex: 'phone', @@ -115,6 +125,38 @@ export const searchFormSchema: FormSchema[] = [ component: 'Input', colProps: { span: 4 }, }, + { + field: 'defaultOrgId', + label: '默认机构', + component: 'Select', + colProps: { span: 4 }, + componentProps: () => { + return { + options: orgIds.value, + resultField: 'data', + showSearch: true, + filterOption: (input: string, option: any) => { + return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0 + } + } + } + }, + { + field: 'deptId', + label: '默认部门', + component: 'ApiSelect', + colProps: { span: 4 }, + componentProps: () => { + return { + api: getDeptList, + params: { orgId: null }, + labelField: 'orgName', + valueField: 'id', + resultField: 'data', + immediate: false + } + }, + }, ] export const formSchema: FormSchema[] = [ { diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index afef3a4f..95151665 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -77,13 +77,14 @@ showTableSetting: true, bordered: true, showIndexColumn: true, - canResize: false, + canResize: true, + resizeHeightOffset: 15, actionColumn: { width: 80, title: '操作', dataIndex: 'action', - fixed: 'right', - }, + fixed: 'right' + } }) function handleCreate() {