Merge branch 'main' of http://git.local.topsunit.com/heyuanjiang/yishuju-ui

src/api/user.js

 import request from '@/utils/http/index';
 
 export const saveUser = (data) => {
-  return request.post('/login/save', data);
+  return request.post('/user/save', data);
 };
 
 export const getUserPage = (params) => {
-  return request.get('/login/page', params);
+  return request.get('/user/page', params);
 };
 
 export const deleteUsers = (ids) => {
-  return request.get('/login/batchDeleteByIds', { ids });
+  return request.get('/user/batchDeleteByIds', { ids });
 };
 export const saveLeaderGroup = (data) => {
   return request.post(`/leaderGroup/add?username=${data.username}&password=${data.password}&phone=${data.phone}&status=${data.status}&role=${data.role}`);

src/views/system/accountManage/index.vue

@@ -45,13 +45,13 @@
         slots: {
           default: ({ row }) => {
             return (
-              <>{Array.from(new Set(row.tenantNames)).join(',')}</>
+              <>{row.tenant.name}</>
             );
           },
         },
         field: 'tenantNames',
         enum: Tenantlist,
-        search: { el: 'select', props: { filterable: true }, key: 'tenantId', labelWidth: 85 },
+        search: { el: 'select', props: { filterable: true }, key: 'tenant', labelWidth: 85 },
         fieldNames: { label: 'name', value: 'id' },
         title: '调解中心'
       },

src/views/system/roleManage/index.vue

@@ -33,7 +33,7 @@
       { field: 'roleCode', title: '角色编码', search: { el: 'input' } },
       { field: 'roleDesc', title: '角色描述', search: { el: 'input' } },
       {
-        width: 320,
+        width: 200,
         title: '操作',
         fixed: 'right',
         slots: {
@@ -52,7 +52,7 @@
               >
                 设置权限
               </ElButton>
-              <ElButton
+              {/* <ElButton
                 type="primary"
                 link
                 icon={Setting}
@@ -61,7 +61,7 @@
                 }
               >
                 设置成员
-              </ElButton>
+              </ElButton> */}
             </>
           ),
         },

src/views/system/tenantManage/index.vue

@@ -8,7 +8,7 @@
     </ProTable>
 
     <TenantFormModal ref="tenatModalRef" @success="query" />
-    <AllocationUserModal ref="allocationUserModalRef" @success="query" />
+    <!-- <AllocationUserModal ref="allocationUserModalRef" @success="query" /> -->
   </div>
 </template>
 
@@ -46,7 +46,7 @@
         width: 80,
         slots: {
           default: ({ row }) => {
-            return <div>{row.users.length}</div>;
+            return <div>{row.usersSize}</div>;
           },
         },
       },
@@ -65,7 +65,7 @@
         },
       },
       {
-        width: 200,
+        width: 100,
         title: '操作',
         fixed: 'right',
         slots: {
@@ -74,16 +74,7 @@
               <ElButton type="primary" link icon={Edit} onClick={() => handleEdit(row)}>
                 编辑
               </ElButton>
-              <ElButton
-                type="primary"
-                link
-                icon={Setting}
-                onClick={() =>
-                  allocationUserModalRef.value.openModal(JSON.parse(JSON.stringify(row)))
-                }
-              >
-                设置成员
-              </ElButton>
+
             </>
           ),
         },