diff --git a/src/mixins/organization-search.js b/src/mixins/organization-search.js index 7a69e9d..b9c6760 100644 --- a/src/mixins/organization-search.js +++ b/src/mixins/organization-search.js @@ -1,4 +1,4 @@ -import { getDeptTree } from '@/api/system/dept'; +import { getDeptTree, getPlatformCompanySelect } from '@/api/system/dept'; import { ElCascader } from 'element-plus'; import { h } from 'vue'; @@ -14,6 +14,10 @@ import { h } from 'vue'; * 3. 在 created / 初始化时调用 this.loadOrganizationOptions() * 4. 需要「未分配组织」筛选项的页面在 data 里置 enableUnassignedOrgFilter: true； * 该项只追加进搜索树 organizationSearchTreeOptions，表单级联 organizationTreeOptions 不含哨兵 + * 5. 表单「所属组织」只允许选平台公司的页面（运力管理）在 data 里置 + * restrictFormOrgToPlatformCompany: true，表单级联样式改用 + * buildFormOrganizationTree(...) 的结果，并在打开表单时把回显的组织名写进 + * formOrganizationLegacyName；只影响表单，搜索栏仍是全量组织 * * 说明： * - 自动识别 organizationName / deptName 两种 prop，并挂载 column.renderSearch @@ -34,6 +38,11 @@ const ORG_PROPS = ['organizationName', 'deptName']; // 后端换成空串会让整段组织条件不生效，筛选静默失效。前端与后端这几处必须同步修改。 const UNASSIGNED_ORG_FILTER = '__UNASSIGNED_ORG__'; +// 表单「所属组织」限定只能选平台公司时，存量记录里的旧组织名在组织树里已经找不到 +// （节点被删或改名），用这个 id 补一个只读节点，否则编辑老数据时所属组织显示为空、 +// 保存即把原值丢掉。 +const FORM_LEGACY_ORG_ID = '__LEGACY_ORG__'; + export default { data() { return { @@ -44,6 +53,14 @@ export default { organizationLoading: false, // 组织筛选是否追加「未分配组织」一项；页面在 data 里覆盖为 true 才生效 enableUnassignedOrgFilter: false, + // 表单「所属组织」是否只允许选平台公司；页面在 data 里覆盖为 true 才生效 + restrictFormOrgToPlatformCompany: false, + // 平台公司部门 id（字符串），loadOrganizationOptions 时一并拉取 + platformCompanyOrgIds: [], + // 表单当前回显的组织名，树里没有同名节点时用它补一个只读选项 + formOrganizationLegacyName: '', + // 进行中的组织数据请求，并发调用共用（不是响应式状态，只做去重） + organizationOptionsPromise: null, }; }, computed: { @@ -54,9 +71,12 @@ export default { ? [this.unassignedOrgOption(), ...this.organizationTreeOptions] : this.organizationTreeOptions; }, - // 所属组织级联配置：checkStrictly 允许选中任意层级，不必选到末级 + // 所属组织级联配置：checkStrictly 允许选中任意层级，不必选到末级。 + // 限定只能选平台公司时用 disabled 函数只放开平台公司：非平台公司的非末级节点 + // 在 checkStrictly 下仍可展开（el-cascader 的 expandable 判断），末级节点点击无效， + // 两者都选不中。disabled 在节点渲染时求值，平台公司 id 到手后节点会自行重算。 organizationCascaderProps() { - return { + const props = { value: 'id', label: 'label', children: 'children', @@ -64,15 +84,25 @@ export default { checkStrictly: true, expandTrigger: 'click', }; + if (this.restrictFormOrgToPlatformCompany) { + props.disabled = data => this.platformCompanyOrgDisabled(data); + } + return props; }, }, methods: { loadOrganizationOptions() { - if (this.organizationLoading) return; + // 并发调用共用同一次请求，返回的 Promise 在数据就绪后才 resolve + if (this.organizationOptionsPromise) return this.organizationOptionsPromise; this.organizationLoading = true; const tenantId = this.userInfo?.tenantId; - getDeptTree(tenantId) - .then(res => { + // 平台公司下拉失败不能拖垮组织树，单独兜住，失败时保持上一次的可选范围 + const platformCompanyRequest = this.restrictFormOrgToPlatformCompany + ? getPlatformCompanySelect().catch(() => null) + : Promise.resolve(null); + this.organizationOptionsPromise = Promise.all([getDeptTree(tenantId), platformCompanyRequest]) + .then(([res, platformRes]) => { + this.applyPlatformCompanyOptions(platformRes); const source = res.data?.data || res.data || []; const tree = this.excludeExternalOrganization ? this.excludeExternalOrganization(source) @@ -90,7 +120,21 @@ export default { }) .finally(() => { this.organizationLoading = false; + this.organizationOptionsPromise = null; }); + return this.organizationOptionsPromise; + }, + // 组织树与平台公司列表就绪后执行回调；已加载过则立即执行 + whenOrganizationOptionsReady(callback) { + const pending = this.organizationTreeFlatOptions.length + ? Promise.resolve() + : this.loadOrganizationOptions(); + return Promise.resolve(pending).then(callback, () => callback()); + }, + applyPlatformCompanyOptions(res) { + if (!res) return; + const list = res.data?.data || res.data || []; + this.platformCompanyOrgIds = (Array.isArray(list) ? list : []).map(item => String(item.id)); }, // 默认排除「外部组织」节点；页面可覆盖 excludeExternalOrganization(tree = []) { @@ -154,6 +198,52 @@ export default { findOrgName(id) { return this.findOrgById(id)?.rawLabel || ''; }, + // 级联节点的 disabled 判定：只有平台公司可选。页面自建 props 时也复用它 + platformCompanyOrgDisabled(data) { + return !this.platformCompanyOrgIds.includes(String(data?.id ?? '')); + }, + // 组织名对应的节点是否为平台公司；名称在树里不存在时按「不是」处理 + isPlatformCompanyOrgName(name) { + const value = String(name ?? '').trim(); + if (!value) return false; + const node = this.organizationTreeFlatOptions.find(item => item.rawLabel === value); + return !!node && this.platformCompanyOrgIds.includes(String(node.id)); + }, + // 新增表单的默认组织：只有落在平台公司上才预填，否则留空（不能让用户从默认值 + // 直接带出一个选不中的组织名） + defaultFormOrganizationName(name) { + return this.isPlatformCompanyOrgName(name) ? String(name).trim() : ''; + }, + // 表单级联的选项树：限定平台公司时，把回显的原组织名补成一个只读节点， + // 否则存量记录的组织在树里找不到，编辑时显示为空、保存即丢原值 + buildFormOrganizationTree(tree = this.organizationTreeOptions) { + const source = tree || []; + if (!this.restrictFormOrgToPlatformCompany) return source; + const name = String(this.formOrganizationLegacyName || '').trim(); + if (!name) return source; + if (this.organizationTreeFlatOptions.some(item => item.rawLabel === name)) return source; + return [...source, { id: FORM_LEGACY_ORG_ID, label: name, rawLabel: name }]; + }, + // 表单级联回显用的路径：树里有该组织就用真实路径，否则落到原组织兜底节点 + resolveFormOrgPath(name) { + const path = this.resolveOrgPath(name); + if (path.length) return path; + const value = String(name ?? '').trim(); + if (!value) return []; + return value === String(this.formOrganizationLegacyName || '').trim() + ? [FORM_LEGACY_ORG_ID] + : []; + }, + // 记录表单当前回显的组织名：能匹配真实节点（或已清空）就不需要兜底节点， + // 否则记下来，由 buildFormOrganizationTree 补成只读选项 + syncFormOrganizationLegacy(name) { + const value = String(name ?? '').trim(); + if (!value || this.organizationTreeFlatOptions.some(item => item.rawLabel === value)) { + this.formOrganizationLegacyName = ''; + return; + } + this.formOrganizationLegacyName = value; + }, // 组织名称 → 级联路径（表单回显用；部门树异步加载完成后会自动重算） resolveOrgPath(name) { const value = String(name ?? '').trim(); @@ -166,7 +256,13 @@ export default { const value = Array.isArray(path) ? path.filter(item => item !== undefined && item !== null && item !== '') : []; - return value.length ? this.findOrgById(value)?.rawLabel || '' : ''; + if (!value.length) return ''; + const node = this.findOrgById(value); + if (node) return node.rawLabel || ''; + // 原组织兜底节点不在扁平表里，直接取它代表的历史名称 + return String(value[value.length - 1]) === FORM_LEGACY_ORG_ID + ? String(this.formOrganizationLegacyName || '').trim() + : ''; }, // 搜索提交前把级联路径数组就地转成组织名称（后端按名称过滤） normalizeOrganizationSearch(params, prop = 'organizationName') { diff --git a/src/views/transportCapacity/driver.vue b/src/views/transportCapacity/driver.vue index c6c0ae2..c99b1bd 100644 --- a/src/views/transportCapacity/driver.vue +++ b/src/views/transportCapacity/driver.vue @@ -589,7 +589,7 @@ ({ status: 1, }); -// 新增司机时预填的组织。名称必须与组织树里的节点完全一致：级联框按名称回显， -// 保存时后端也按名称反查 dept_id，写成树里没有的名字会两边都落空。 -const DEFAULT_ORGANIZATION_NAME = '广西桂物物流服务集团有限公司'; - export default { components: { ImageUploadField, @@ -801,6 +797,8 @@ export default { driverBox: false, // 搜索栏组织级联追加「未分配组织」一项（哨兵值见 organization-search mixin） enableUnassignedOrgFilter: true, + // 表单「所属组织」只允许选平台公司；搜索栏不受影响 + restrictFormOrgToPlatformCompany: true, vehicleSelectorVisible: false, vehicleSelectorLoading: false, vehicleSelectorOption, @@ -925,13 +923,19 @@ export default { }, computed: { ...mapGetters(['permission', 'userInfo']), + // 表单所属组织级联的选项：限定平台公司时多一个原组织兜底节点 + formOrganizationTreeOptions() { + return this.buildFormOrganizationTree(); + }, // 所属组织级联：表单存组织名称，级联控件用 id 路径，两者在此双向转换 organizationCascaderValue: { get() { - return this.resolveOrgPath(this.driverForm.organizationName); + return this.resolveFormOrgPath(this.driverForm.organizationName); }, set(path) { - this.driverForm.organizationName = this.resolveOrgName(path); + const name = this.resolveOrgName(path); + this.driverForm.organizationName = name; + this.syncFormOrganizationLegacy(name); }, }, isAdmin() { @@ -969,8 +973,8 @@ export default { }, }, created() { + // initDeptTree 末尾会拉组织树（含平台公司 id），这里不再重复请求 this.initDeptTree(); - this.loadOrganizationOptions(); this.initRegionOptions(); this.initQualificationTypeOptions(); }, @@ -988,9 +992,7 @@ export default { 'organizationName' ); vehicleColumn.dicData = this.organizationOptions; - if (this.driverBox && !this.driverForm.id && !this.driverForm.organizationName) { - this.driverForm.organizationName = this.getDefaultOrganizationName(); - } + return this.loadOrganizationOptions(); }); }, initQualificationTypeOptions() { @@ -1020,16 +1022,10 @@ export default { }); return result; }, - // 组织树受数据权限裁剪、不含预填节点时退回当前登录人组织， - // 否则级联框会预填一个树里没有的名称，显示为空 + // 新增时的默认组织：当前登录人组织是平台公司才预填，否则留空， + // 不能让默认值带出一个在表单里选不中的组织名 getDefaultOrganizationName() { - const matched = this.organizationTreeFlatOptions.find( - item => item.rawLabel === DEFAULT_ORGANIZATION_NAME - ); - if (matched || !this.organizationTreeFlatOptions.length) { - return DEFAULT_ORGANIZATION_NAME; - } - return this.getCurrentOrganizationName(); + return this.defaultFormOrganizationName(this.getCurrentOrganizationName()); }, getCurrentOrganizationName() { const currentDeptId = this.userInfo.deptId || this.userInfo.dept_id; @@ -1218,8 +1214,16 @@ export default { this.submitAttempted = false; if (!row?.id) { this.driverForm = emptyForm(); - this.driverForm.organizationName = this.getDefaultOrganizationName(); + // 组织树与平台公司列表异步加载，默认值要等两者都到位才能判定，这里先留空 + this.driverForm.organizationName = ''; + this.formOrganizationLegacyName = ''; this.driverBox = true; + this.whenOrganizationOptionsReady(() => { + if (!this.driverBox || this.driverForm.id || this.driverForm.organizationName) return; + const name = this.getDefaultOrganizationName(); + this.driverForm.organizationName = name; + this.syncFormOrganizationLegacy(name); + }); return; } getDetail(row.id).then(res => { @@ -1233,11 +1237,13 @@ export default { postList: detail.posts ? detail.posts.split(',').filter(Boolean) : [], }; this.syncAddressRegionPath(); + this.syncFormOrganizationLegacy(this.driverForm.organizationName); this.driverBox = true; }); }, resetDriver() { this.driverForm = emptyForm(); + this.formOrganizationLegacyName = ''; this.drivingLicenseUploads = {}; this.readonly = false; this.submitAttempted = false; diff --git a/src/views/transportCapacity/ship.vue b/src/views/transportCapacity/ship.vue index 42895c8..c8acb8e 100644 --- a/src/views/transportCapacity/ship.vue +++ b/src/views/transportCapacity/ship.vue @@ -147,7 +147,7 @@ { + if (!this.shipBox || this.shipForm.id || this.shipForm.organizationName) return; + this.shipForm.organizationName = this.getDefaultOrganizationName(); + }); return; } getDetail(row.id).then(res => { this.shipForm = { ...emptyForm(), ...(res.data.data || {}) }; + this.syncFormOrganizationLegacy(this.shipForm.organizationName); this.shipBox = true; }); }, @@ -890,6 +907,7 @@ export default { }, resetShip() { this.shipForm = emptyForm(); + this.formOrganizationLegacyName = ''; this.readonly = false; this.submitLoading = false; this.$refs.shipForm?.clearValidate(); diff --git a/src/views/transportCapacity/vehicle.vue b/src/views/transportCapacity/vehicle.vue index c83075d..96da88e 100644 --- a/src/views/transportCapacity/vehicle.vue +++ b/src/views/transportCapacity/vehicle.vue @@ -347,7 +347,7 @@ this.platformCompanyOrgDisabled(data) } + : this.formOrgCascaderProps; + }, // 所属组织级联：本地保存 id 路径，名称同步到表单字段供后端使用 organizationCascaderValue: { get() { @@ -769,7 +777,9 @@ export default { }, set(path) { this.organizationCascaderPath = Array.isArray(path) ? [...path] : []; - this.vehicleForm.organizationName = this.resolveOrgName(this.organizationCascaderPath); + const name = this.resolveOrgName(this.organizationCascaderPath); + this.vehicleForm.organizationName = name; + this.syncFormOrganizationLegacy(name); }, }, // 使用部门级联：独立路径状态，避免与所属组织共用计算回写导致选不中 @@ -810,7 +820,6 @@ export default { }, created() { this.initDeptTree(); - this.loadOrganizationOptions(); }, watch: { organizationTreeOptions() { @@ -852,17 +861,15 @@ export default { })); }, syncOrgCascaderPaths() { - this.organizationCascaderPath = this.resolveOrgPath(this.vehicleForm.organizationName); + this.organizationCascaderPath = this.resolveFormOrgPath(this.vehicleForm.organizationName); this.useDepartmentCascaderPath = this.resolveOrgPath(this.vehicleForm.useDepartment); }, initDeptTree() { + this.loadOrganizationOptions(); getDeptTree(this.userInfo.tenantId).then(res => { this.organizationOptions = this.flattenDeptOptions(res.data.data || []); const column = this.findColumn(this.option.column, 'organizationName'); column.dicData = this.organizationOptions; - if (this.vehicleBox && !this.vehicleForm.id && !this.vehicleForm.organizationName) { - this.vehicleForm.organizationName = this.getCurrentOrganizationName(); - } if (this.vehicleBox && !this.vehicleForm.useDepartment) { this.vehicleForm.useDepartment = this.getCurrentOrganizationName(); } @@ -894,6 +901,10 @@ export default { ); return currentDept?.rawLabel || this.userInfo.deptName || this.userInfo.dept_name || ''; }, + // 新增时的默认组织：当前登录人组织是平台公司才预填，否则留空 + getDefaultOrganizationName() { + return this.defaultFormOrganizationName(this.getCurrentOrganizationName()); + }, digitsOnly(value = '') { return String(value).replace(/\D/g, ''); }, @@ -961,11 +972,18 @@ export default { this.readonly = readonly; if (!row?.id) { this.vehicleForm = emptyForm(); - this.vehicleForm.organizationName = this.getCurrentOrganizationName(); + // 默认组织要先有组织树和平台公司列表才能判定，先留空、数据到位再补 + this.vehicleForm.organizationName = ''; + this.formOrganizationLegacyName = ''; this.vehicleForm.useDepartment = this.getCurrentOrganizationName(); this.syncOrgCascaderPaths(); this.syncPlateNo(false); this.vehicleBox = true; + this.whenOrganizationOptionsReady(() => { + if (!this.vehicleBox || this.vehicleForm.id || this.vehicleForm.organizationName) return; + this.vehicleForm.organizationName = this.getDefaultOrganizationName(); + this.syncOrgCascaderPaths(); + }); return; } getDetail(row.id).then(res => { @@ -977,6 +995,7 @@ export default { if (!this.vehicleForm.useDepartment) { this.vehicleForm.useDepartment = this.getCurrentOrganizationName(); } + this.syncFormOrganizationLegacy(this.vehicleForm.organizationName); this.syncOrgCascaderPaths(); this.splitPlateNo(); this.syncPlateNo(false); @@ -989,6 +1008,7 @@ export default { }, resetVehicle() { this.vehicleForm = emptyForm(); + this.formOrganizationLegacyName = ''; this.organizationCascaderPath = []; this.useDepartmentCascaderPath = []; this.vehicleCertificateUploads = {}; @@ -1610,6 +1630,16 @@ export default { } } +// 列表组织列超长时单行省略 +.org-cell-text { + display: inline-block; + max-width: 100%; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + vertical-align: bottom; +} + // 编辑弹窗：灰底 + section-card 白卡分组 .vehicle-form { :deep(.el-form-item__label) { @@ -1641,18 +1671,7 @@ export default { flex: 0 0 calc(4em + 24px) !important; width: calc(4em + 24px) !important; } -} -.org-cell-text { - display: inline-block; - max-width: 100%; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - vertical-align: bottom; -} - -.vehicle-form { .org-cascader-tooltip { width: 100%; }