czh-20260615-增加选人组件排序;增加用户管理中设置排序和ip

This commit is contained in:
zhihao
2026-06-15 15:54:52 +08:00
parent c1028224c1
commit 1034baa77e
5 changed files with 56 additions and 14 deletions
@@ -134,8 +134,8 @@ const ipagination = reactive({
});
const isorter = reactive({
column: 'createTime',
order: 'desc',
column: 'sortno',
order: 'asc',
});
const url = {
@@ -133,7 +133,7 @@ const businessesDeparts = computed(() => {
const subDeparts = computed(() => {
return recurTree(treeData.value, (node) => {
if (String(node.departType) === '3' && !node.disableCheckbox) return [node];
if (String(node.departType) === '4' && !node.disableCheckbox) return [node];
return [];
});
});
@@ -197,14 +197,14 @@ const showCancelCheckAllBusiness = computed(() => {
const showCheckAllCurrentSubDepart = computed(() => {
return (props.role === 2 || props.role === '2')
&& (departType.value === 2 || departType.value === '2' || departType.value === 3 || departType.value === '3')
&& (departType.value === 2 || departType.value === '2' || departType.value === 4 || departType.value === '4')
&& subDeparts.value.length > 0
&& !subDeparts.value.every((item) => selectedDeparts.value.some((i) => i.id === item.id));
});
const showCancelCheckAllCurrentSubDepart = computed(() => {
return (props.role === 2 || props.role === '2')
&& (departType.value === 2 || departType.value === '2' || departType.value === 3 || departType.value === '3')
&& (departType.value === 2 || departType.value === '2' || departType.value === 4 || departType.value === '4')
&& selectedDeparts.value.length > 0
&& !showCheckAllCurrentSubDepart.value;
});
@@ -398,7 +398,7 @@ async function loadDepart() {
treeData.value = manageTreeRender(arr).res;
} else if (departType.value === 2 || departType.value === '2') {
treeData.value = businessesRender(arr).res;
} else if (departType.value === 3 || departType.value === '3') {
} else if (departType.value === 4 || departType.value === '4') {
treeData.value = subDepartsRender(arr).res;
}
}
@@ -547,7 +547,7 @@ function uncheckAllBusinessesDepart() {
function checkAllCurrentSubDepart() {
const allSubDepart = recurTree(treeData.value, (node) => {
if (!node.disableCheckbox && String(node.departType) === '3') {
if (!node.disableCheckbox && String(node.departType) === '4') {
node.assignType = checkAllCurrentSubDepartAssignType.value;
return [node];
}
@@ -568,7 +568,7 @@ function checkAllCurrentSubDepart() {
function uncheckAllCurrentSubDepart() {
const allCurrentSubDepart = recurTree(treeData.value, (node) => {
if (String(node.departType) === '3') return [node];
if (String(node.departType) === '4') return [node];
return [];
});
const mainDeparts = props.selectedMainDeparts.filter((item) => !allCurrentSubDepart.some((manage) => item.id === manage.id));