Merge branch 'dev' of https://gitee.com/continew/continew-admin-ui into dev

src/views/system/user/UserAddModal.vue

@@ -112,18 +112,8 @@ const rules: FormInstance['rules'] = {
 }
 
 const { form, resetForm } = useForm({
-  id: '',
-  username: '',
-  nickname: '',
   gender: 1 as Gender,
-  phone: '',
-  email: '',
-  deptId: '',
-  roleIds: [] as string[],
-  description: '',
-  status: 1 as Status,
-  type: 2 as 1 | 2,
-  disabled: false
+  status: 1 as Status
 })
 
 // 重置

src/views/system/user/UserResetPwdModal.vue

@@ -36,9 +36,7 @@ const columns: Columns = [
   { label: '密码', field: 'newPassword', type: 'input-password', rules: [{ required: true, message: '请输入密码' }] }
 ]
 
-const { form, resetForm } = useForm({
-  newPassword: ''
-})
+const { form, resetForm } = useForm({})
 
 // 重置
 const reset = () => {

src/views/system/user/index.vue

@@ -109,7 +109,7 @@ const {
   pagination,
   search,
   handleDelete
-} = useTable((page) => listUser({ ...queryForm, ...page }), { immediate: true })
+} = useTable((page) => listUser({ ...queryForm, ...page }), { immediate: false })
 
 const columns: TableInstanceColumns[] = [
   {
@@ -135,7 +135,7 @@ const columns: TableInstanceColumns[] = [
   { title: '手机号', dataIndex: 'phone', width: 170, ellipsis: true, tooltip: true },
   { title: '邮箱', dataIndex: 'email', width: 170, ellipsis: true, tooltip: true },
   { title: '系统内置', slotName: 'isSystem', width: 100, align: 'center', show: false },
-  { title: '描述', dataIndex: 'description', ellipsis: true, tooltip: true },
+  { title: '描述', dataIndex: 'description', width: 130, ellipsis: true, tooltip: true },
   { title: '创建人', dataIndex: 'createUserString', ellipsis: true, tooltip: true, width: 140, show: false },
   { title: '创建时间', dataIndex: 'createTime', width: 180 },
   { title: '修改人', dataIndex: 'updateUserString', ellipsis: true, tooltip: true, width: 140, show: false },