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

Merge remote-tracking branch 'websoft/master'

Browse Source 
# Conflicts:
#	src/views/settlement/receivable-payable-detail.vue
This commit is contained in:
b2894lxlx
2026-08-31 19:30:16 +08:00
parent 449e4e1884 9b9e652afd
commit a9b4ab069b
25 changed files with 493 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/vehicle/customer-archive.vue
+87 -39
View File
@@ -335,17 +335,13 @@
</el-col>
<el-col :span="6">
<el-form-item label="所属组织" prop="deptName">
<el-tree-select
v-model="archiveForm.deptId"
:data="deptTree"
:props="{ label: 'label', value: 'value', children: 'children' }"
multiple
node-key="value"
check-strictly
filterable
<el-cascader
v-model="deptCascaderValue"
:options="deptTree"
:props="deptCascaderProps"
clearable
:render-after-expand="false"
@change="onDeptChange"
filterable
placeholder="请选择 所属组织"
/>
</el-form-item>
</el-col>
@@ -1367,7 +1363,7 @@
<script>
import { h } from 'vue';
import { ElTreeSelect } from 'element-plus';
import { ElCascader } from 'element-plus';
import {
getList,
getDetail,
@@ -1875,6 +1871,34 @@ export default {
emitPath: true,
};
},
deptCascaderProps() {
return {
value: 'value',
label: 'label',
children: 'children',
emitPath: true,
checkStrictly: true,
expandTrigger: 'click',
};
},
// 所属组织级联值：archiveForm.deptId 只存选中的部门 ID（单选），
// 级联控件需要根到选中节点的完整路径，两者在此做双向转换——
// 部门树是异步加载的，依赖 deptTree 可保证树加载完成后回显自动刷新。
deptCascaderValue: {
get() {
const ids = Array.isArray(this.archiveForm.deptId)
? this.archiveForm.deptId
: this.archiveForm.deptId
? [this.archiveForm.deptId]
: [];
const currentId = ids.length ? String(ids[ids.length - 1]) : '';
if (!currentId) return [];
return this.findDeptPath(currentId) || [currentId];
},
set(path) {
this.onDeptChange(path);
},
},
ids() {
let ids = [];
this.selectionList.forEach(ele => {
@@ -2645,38 +2669,57 @@ export default {
this.onDeptChange([firstTopLevelDept.value]);
},
onDeptChange(value) {
const deptIds = Array.isArray(value) ? value : value ? [value] : [];
const deptNames = deptIds
.map(id => this.deptOptions.find(item => String(item.value) === String(id))?.rawLabel)
.filter(Boolean);
this.archiveForm.deptId = deptIds;
this.archiveForm.deptIds = deptIds.join(',');
this.archiveForm.deptName = deptNames.join(',');
// 级联单选：value 为根到选中节点的 ID 路径，取末级作为客商所属组织
const path = Array.isArray(value)
? value.filter(item => item !== undefined && item !== null && item !== '')
: [];
const deptId = path.length ? String(path[path.length - 1]) : '';
this.archiveForm.deptId = deptId ? [deptId] : [];
this.archiveForm.deptIds = deptId;
this.archiveForm.deptName = deptId ? this.findDeptLabel(deptId) : '';
this.$refs.archiveForm?.validateField('deptName');
},
findDeptPath(id, tree = this.deptTree, parents = []) {
for (const node of tree || []) {
const path = [...parents, String(node.value)];
if (String(node.value) === String(id)) return path;
const children = node.children || [];
if (children.length) {
const matched = this.findDeptPath(id, children, path);
if (matched) return matched;
}
}
return null;
},
findDeptLabel(id, tree = this.deptTree) {
for (const node of tree || []) {
if (String(node.value) === String(id)) return node.label;
const matched = this.findDeptLabel(id, node.children || []);
if (matched) return matched;
}
return '';
},
renderDeptSearch(scope) {
// 搜索区所属组织：多选树形下拉（与新增/编辑表单一致）
// 多选返回 ID 数组，转换为部门名称按逗号拼接写入 searchForm.deptName
return h(ElTreeSelect, {
// 搜索区所属组织：单选级联（与新增/编辑表单一致）
// 级联返回的是根到选中节点的 ID 路径数组，提交时取末级 ID 转部门名称
return h(ElCascader, {
modelValue: Array.isArray(scope.row?.deptName) ? scope.row.deptName : [],
'onUpdate:modelValue': value => {
// 多选模式：modelValue 必须是 ID 数组，否则 el-tree-select 内部状态会错乱导致无法再次选中
const ids = Array.isArray(value) ? value : value ? [value] : [];
if (scope.row) scope.row.deptName = ids;
// 级联单选：modelValue 必须是 ID 路径数组，否则控件内部状态会错乱导致无法再次选中
if (scope.row) scope.row.deptName = Array.isArray(value) ? value : [];
},
options: this.deptTree,
props: {
label: 'label',
value: 'value',
children: 'children',
checkStrictly: true,
expandTrigger: 'click',
},
data: this.deptTree,
'node-key': 'value',
'check-strictly': true,
multiple: true,
filterable: true,
clearable: true,
'render-after-expand': false,
collapseTags: true,
'collapse-tags-tooltip': true,
'default-expand-all': false,
style: 'width: 100%',
placeholder: '请选择 所属组织',
props: { label: 'label', value: 'value', children: 'children' },
});
},
handleNoFixedTermChange(checked) {
@@ -2717,13 +2760,15 @@ export default {
: [];
},
normalizeDeptIds(detail) {
// 所属组织为单选级联，只保留第一个部门 ID（历史多选数据自动收敛）
const value = detail.deptIds || detail.deptId;
return value
const ids = value
? String(value)
.split(',')
.map(item => item.trim())
.filter(item => item !== '')
: [];
return ids.length ? [ids[0]] : [];
},
formatArchiveAddress(archive = {}) {
return [archive.registeredRegionName, archive.registeredDetailAddress]
@@ -4539,12 +4584,15 @@ export default {
this.onLoad(this.page);
},
searchChange(params, done) {
// 搜索区所属组织多选返回的是部门 ID 数组，需转成部门名称逗号串传给后端（与列表接口 deptName 字段一致）
// 搜索区所属组织级联返回的是 ID 路径数组，取末级 ID 转成部门名称传给后端（与列表接口 deptName 字段一致）
if (Array.isArray(params.deptName)) {
params.deptName = params.deptName
.map(id => this.deptOptions.find(item => String(item.value) === String(id))?.rawLabel)
.filter(Boolean)
.join(',');
const path = params.deptName.filter(
item => item !== undefined && item !== null && item !== ''
);
const deptId = path.length ? path[path.length - 1] : '';
params.deptName = deptId
? this.deptOptions.find(item => String(item.value) === String(deptId))?.rawLabel || ''
: '';
}
this.query = this.buildQuery(params);
this.page.currentPage = 1;