From 1034baa77e72ac1450e49ded5ccdfe3c47b1dd7e Mon Sep 17 00:00:00 2001 From: zhihao <18915542763@163.com> Date: Mon, 15 Jun 2026 15:54:52 +0800 Subject: [PATCH] =?UTF-8?q?czh-20260615-=E5=A2=9E=E5=8A=A0=E9=80=89?= =?UTF-8?q?=E4=BA=BA=E7=BB=84=E4=BB=B6=E6=8E=92=E5=BA=8F=EF=BC=9B=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86=E4=B8=AD=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E6=8E=92=E5=BA=8F=E5=92=8Cip?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/modal/SzDeptSelectModal.vue | 4 +- .../deptUserComponent/SzDeptUserSelect.vue | 4 +- .../distributeComponent/SzSelectDepart.vue | 12 ++--- .../three-admin/three-admin-user/index.vue | 2 +- .../three-admin/three-admin-user/user.data.ts | 48 +++++++++++++++++-- 5 files changed, 56 insertions(+), 14 deletions(-) diff --git a/src/components/Form/src/jeecg/components/modal/SzDeptSelectModal.vue b/src/components/Form/src/jeecg/components/modal/SzDeptSelectModal.vue index 4a3f579..d744719 100644 --- a/src/components/Form/src/jeecg/components/modal/SzDeptSelectModal.vue +++ b/src/components/Form/src/jeecg/components/modal/SzDeptSelectModal.vue @@ -110,11 +110,11 @@ return (params) => queryFn(Object.assign({}, params, { primaryKey: props.rowKey })).then(filterDeptTree); } - /** 过滤部门树：隐藏工作组(departType=3)，公司节点(orgCategory=1)禁止勾选 */ + /** 过滤部门树：隐藏工作组(departType=4)，公司节点(orgCategory=1)禁止勾选 */ function filterDeptTree(nodes: any[]): any[] { if (!Array.isArray(nodes)) return nodes; return nodes - .filter((node) => String(node.departType) !== '3') + .filter((node) => String(node.departType) !== '4') .map((node) => ({ ...node, disableCheckbox: String(node.orgCategory) === '1' ? true : !!node.disableCheckbox, diff --git a/src/components/semri/deptUserComponent/SzDeptUserSelect.vue b/src/components/semri/deptUserComponent/SzDeptUserSelect.vue index f994eb4..88a8eeb 100644 --- a/src/components/semri/deptUserComponent/SzDeptUserSelect.vue +++ b/src/components/semri/deptUserComponent/SzDeptUserSelect.vue @@ -134,8 +134,8 @@ const ipagination = reactive({ }); const isorter = reactive({ - column: 'createTime', - order: 'desc', + column: 'sortno', + order: 'asc', }); const url = { diff --git a/src/components/semri/distributeComponent/SzSelectDepart.vue b/src/components/semri/distributeComponent/SzSelectDepart.vue index e1da721..e510448 100644 --- a/src/components/semri/distributeComponent/SzSelectDepart.vue +++ b/src/components/semri/distributeComponent/SzSelectDepart.vue @@ -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)); diff --git a/src/views/three-admin/three-admin-user/index.vue b/src/views/three-admin/three-admin-user/index.vue index 8970f7e..fc4f78b 100644 --- a/src/views/three-admin/three-admin-user/index.vue +++ b/src/views/three-admin/three-admin-user/index.vue @@ -101,7 +101,7 @@ width: 120, }, beforeFetch: (params) => { - return Object.assign({ column: 'createTime', order: 'desc' }, params); + return Object.assign({ column: 'sortno', order: 'asc' }, params); }, }, exportConfig: { diff --git a/src/views/three-admin/three-admin-user/user.data.ts b/src/views/three-admin/three-admin-user/user.data.ts index e0ade6f..d600129 100644 --- a/src/views/three-admin/three-admin-user/user.data.ts +++ b/src/views/three-admin/three-admin-user/user.data.ts @@ -64,6 +64,17 @@ export const columns: BasicColumn[] = [ width: 150, dataIndex: 'isSpecial_dictText', }, + { + title: '排序号', + dataIndex: 'sortno', + width: 80, + sorter: true, + }, + { + title: '用户IP', + dataIndex: 'ip', + width: 150, + }, ]; export const recycleColumns: BasicColumn[] = [ @@ -137,9 +148,13 @@ export const searchFormSchema: FormSchema[] = [ //colProps: { span: 6 }, { label: '密级', - field: 'phone', - component: 'Input', - //colProps: { span: 6 }, + field: 'userSecurityLevel', + component: 'JDictSelectTag', + componentProps: { + dictCode: 'user_security_level', + placeholder: '请选择密级', + stringToNumber: true, + }, }, { label: '手机号码', @@ -147,6 +162,16 @@ export const searchFormSchema: FormSchema[] = [ component: 'Input', //colProps: { span: 6 }, }, + { + label: '排序号', + field: 'sortno', + component: 'InputNumber', + }, + { + label: '用户IP', + field: 'ip', + component: 'Input', + }, ]; export const formSchema: FormSchema[] = [ @@ -375,6 +400,23 @@ export const formSchema: FormSchema[] = [ stringToNumber: true, }, }, + { + label: '排序号', + field: 'sortno', + component: 'InputNumber', + componentProps: { + placeholder: '请输入排序号', + style: { width: '100%' }, + }, + }, + { + label: '用户IP', + field: 'ip', + component: 'Input', + componentProps: { + placeholder: '请输入用户IP', + }, + }, ]; export const formPasswordSchema: FormSchema[] = [