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

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,

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 = {

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));

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: {

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[] = [