b2894lxlx/tms-erp-web
1
0
Fork 0
Code Issues Pull Requests 3 Actions Packages Projects Releases Wiki Activity

✨ 运力管理司机、车辆、船舶的所属组织只允许选择平台公司

Browse Source
This commit is contained in:
weicw
2026-11-05 20:20:09 +08:00
parent 07af103ecb
commit 523a042fa9
4 changed files with 195 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/transportCapacity/driver.vue
+27 -21
View File
@@ -589,7 +589,7 @@
<el-form-item label="所属组织" prop="organizationName">
<el-cascader
v-model="organizationCascaderValue"
:options="organizationTreeOptions"
:options="formOrganizationTreeOptions"
:props="organizationCascaderProps"
filterable
clearable
@@ -765,10 +765,6 @@ const emptyForm = () => ({
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;
src/views/transportCapacity/ship.vue
+26 -8
View File
@@ -147,7 +147,7 @@
<el-form-item label="船舶所属组织" prop="organizationName">
<el-cascader
v-model="organizationCascaderValue"
:options="organizationTreeOptions"
:options="formOrganizationTreeOptions"
:props="organizationCascaderProps"
filterable
clearable
@@ -664,6 +664,8 @@ export default {
shipForm: emptyForm(),
uploadHeaders: getUploadHeaders(),
organizationOptions: [],
// 表单「船舶所属组织」只允许选平台公司；搜索栏不受影响
restrictFormOrgToPlatformCompany: true,
formRules: {
organizationName: [{ required: true, message: '请选择船舶所属组织', trigger: 'change' }],
shipName: [
@@ -710,13 +712,19 @@ export default {
},
computed: {
...mapGetters(['permission', 'userInfo']),
// 表单所属组织级联的选项：限定平台公司时多一个原组织兜底节点
formOrganizationTreeOptions() {
return this.buildFormOrganizationTree();
},
// 船舶所属组织级联：表单存组织名称，级联控件用 id 路径，两者在此双向转换
organizationCascaderValue: {
get() {
return this.resolveOrgPath(this.shipForm.organizationName);
return this.resolveFormOrgPath(this.shipForm.organizationName);
},
set(path) {
this.shipForm.organizationName = this.resolveOrgName(path);
const name = this.resolveOrgName(path);
this.shipForm.organizationName = name;
this.syncFormOrganizationLegacy(name);
},
},
isAdmin() {
@@ -744,8 +752,8 @@ export default {
},
},
created() {
// initDeptTree 末尾会拉组织树（含平台公司 id），这里不再重复请求
this.initDeptTree();
this.loadOrganizationOptions();
},
methods: {
hasPermission(code) {
@@ -756,9 +764,7 @@ export default {
this.organizationOptions = this.flattenDeptOptions(res.data.data || []);
const column = this.findColumn(this.option.column, 'organizationName');
column.dicData = this.organizationOptions;
if (this.shipBox && !this.shipForm.id && !this.shipForm.organizationName) {
this.shipForm.organizationName = this.getCurrentOrganizationName();
}
return this.loadOrganizationOptions();
});
},
flattenDeptOptions(tree = [], level = 0) {
@@ -784,6 +790,10 @@ export default {
);
return currentDept?.rawLabel || this.userInfo.deptName || this.userInfo.dept_name || '';
},
// 新增时的默认组织：当前登录人组织是平台公司才预填，否则留空
getDefaultOrganizationName() {
return this.defaultFormOrganizationName(this.getCurrentOrganizationName());
},
validateField(prop) {
this.$refs.shipForm?.validateField(prop);
},
@@ -875,12 +885,19 @@ export default {
this.readonly = readonly;
if (!row?.id) {
this.shipForm = emptyForm();
this.shipForm.organizationName = this.getCurrentOrganizationName();
// 默认组织要先有组织树和平台公司列表才能判定，先留空、数据到位再补
this.shipForm.organizationName = '';
this.formOrganizationLegacyName = '';
this.shipBox = true;
this.whenOrganizationOptionsReady(() => {
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();
src/views/transportCapacity/vehicle.vue
+39 -20
View File
@@ -347,7 +347,7 @@
<el-cascader
v-model="organizationCascaderValue"
:options="organizationFormTreeOptions"
:props="formOrgCascaderProps"
:props="organizationFormCascaderProps"
filterable
clearable
placeholder="请选择"
@@ -702,6 +702,8 @@ export default {
// 表单两个级联各自维护路径，避免名称回写互相覆盖；不要与搜索栏共用同一棵树节点
organizationCascaderPath: [],
useDepartmentCascaderPath: [],
// 表单「所属组织」只允许选平台公司，「使用部门」仍是全量组织
restrictFormOrgToPlatformCompany: true,
formOrgCascaderProps: {
value: 'id',
label: 'label',
@@ -757,11 +759,17 @@ export default {
},
// 两个级联必须使用克隆后的独立树，否则 checkStrictly 会在节点上互相抢选中态
organizationFormTreeOptions() {
return this.cloneOrgTree(this.organizationTreeOptions);
return this.cloneOrgTree(this.buildFormOrganizationTree());
},
useDepartmentFormTreeOptions() {
return this.cloneOrgTree(this.organizationTreeOptions);
},
// 所属组织级联的可选范围：只放开平台公司；使用部门仍用 formOrgCascaderProps 全量可选
organizationFormCascaderProps() {
return this.restrictFormOrgToPlatformCompany
? { ...this.formOrgCascaderProps, disabled: data => 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%;
}