Merge branch 'main' of http://123.60.103.97:3000/xuziqiang/SaaS-lib

hx-ai-intelligent/src/view/organizationManage/departmentManage/index.vue

@@ -259,25 +259,15 @@
               {
                 label: '部门名称',
                 field: 'department',
-                component: 'NsSelect',
+                component: 'NsInput',
                 componentProps: {
                   disabled: disabled,
-                  placeholder: '请选择部门',
-                  options: [
-                    {
-                      label: '产品部',
-                      value: 1,
-                    },
-                    {
-                      label: '项目部',
-                      value: 2,
-                    },
-                  ],
+                  placeholder: '请输入部门名称',
                 },
                 rules: [
                   {
                     required: false,
-                    message: '请选择部门',
+                    message: '请输入部门名称',
                   },
                 ],
               },
@@ -290,11 +280,11 @@
                   placeholder: '请选择上级部门',
                   options: [
                     {
-                      label: '正常',
+                      label: '部门1',
                       value: 1,
                     },
                     {
-                      label: '冻结',
+                      label: '部门2',
                       value: 2,
                     },
                   ],
@@ -303,25 +293,15 @@
               {
                 label: '部门编码',
                 field: 'department',
-                component: 'NsSelect',
+                component: 'NsInput',
                 componentProps: {
                   disabled: disabled,
-                  placeholder: '请选择部门编码',
-                  options: [
-                    {
-                      label: '正常',
-                      value: 1,
-                    },
-                    {
-                      label: '冻结',
-                      value: 2,
-                    },
-                  ],
+                  placeholder: '请输入部门编码',
                 },
                 rules: [
                   {
                     required: false,
-                    message: '请选择部门编码',
+                    message: '请输入部门编码',
                   },
                 ],
               },
@@ -361,26 +341,16 @@
             schemas: [
               {
                 label: '角色名称',
-                field: 'department',
-                component: 'NsSelect',
+                field: 'departname',
+                component: 'NsInput',
                 componentProps: {
                   disabled: disabled2,
-                  placeholder: '请选择角色名称',
-                  options: [
-                    {
-                      label: '正常',
-                      value: 1,
-                    },
-                    {
-                      label: '冻结',
-                      value: 2,
-                    },
-                  ],
+                  placeholder: '请输入角色名称',
                 },
                 rules: [
                   {
                     required: false,
-                    message: '请选择角色名称',
+                    message: '请输入角色名称',
                   },
                 ],
               },
@@ -393,11 +363,11 @@
                   placeholder: '请选择上级领导',
                   options: [
                     {
-                      label: '正常',
+                      label: '领导1',
                       value: 1,
                     },
                     {
-                      label: '冻结',
+                      label: '领导2',
                       value: 2,
                     },
                   ],
@@ -406,25 +376,15 @@
               {
                 label: '节点编码',
                 field: 'department',
-                component: 'NsSelect',
+                component: 'NsInput',
                 componentProps: {
                   disabled: disabled2,
-                  placeholder: '请选择节点编码',
-                  options: [
-                    {
-                      label: '正常',
-                      value: 1,
-                    },
-                    {
-                      label: '冻结',
-                      value: 2,
-                    },
-                  ],
+                  placeholder: '请输入节点编码',
                 },
                 rules: [
                   {
                     required: false,
-                    message: '请选择节点编码',
+                    message: '请输入节点编码',
                   },
                 ],
               },

hx-ai-intelligent/src/view/organizationManage/usermanage/index.vue

@@ -659,7 +659,7 @@
     height: 46vh;
     border-bottom: 5px solid rgb(229, 235, 240);
   }
-  /* .ns-table-title {
+  .ns-table-title {
     text-align: left;
     height: 46px;
     line-height: 46px;
@@ -668,7 +668,7 @@
     user-select: text;
     padding-left: 16px;
     width: 100%;
-  } */
+  }
   .table {
     /* width: 2000px; */
     /* width: auto; */