feat: 员工账号

src/api/path/system.api.js

@@ -10,21 +10,21 @@ export function systemUserInfoMenu(param) {
  * 新增用户
  */
 export function userAdd(param) {
-  return service.post('/admin/user/register', param)
+  return service.post('/admin/system/user/register', param)
 }
 /**
  * 用户列表
  */
 export function userList(param) {
-  return service.post('/admin/user/list', param)
+  return service.post('/admin/system/user/list', param)
 }
 // 删除
 export function deleteUserItem(param) {
-  return service.post('/admin/user/deleteUser', param)
+  return service.post('/admin/system/user/deleteUser', param)
 } 
 // 更新
 export function updateUserItem(param) {
-  return service.post('/admin/user/updateUser', param)
+  return service.post('/admin/system/user/updateUser', param)
 } 
 // 状态更新
 export function updateUserState(param){

src/views/system/user/config.js

@@ -2,7 +2,6 @@ export const columns = [
  
   { title: '用户ID', dataIndex: 'id', align: 'center', width:100   },
   { title: '员工账号', dataIndex: 'username', align: 'center', width:100   },
-  { title: '用户工号', dataIndex: 'jobId', align: 'center' , width:100   },
   { title: '用户姓名', dataIndex: 'name', align: 'center',  width:100   },
   {
     title: '登录角色',
@@ -18,8 +17,8 @@ export const columns = [
     slotName: 'state',
     width:200 
   },
-  { title: '更新时间', dataIndex: 'updatedAt', align: 'center', width:200 },
-  { title: '创建时间', dataIndex: 'createdAt', align: 'center', width:200 },
+  { title: '更新时间', dataIndex: 'updated_at', align: 'center', width:200 },
+  { title: '创建时间', dataIndex: 'created_at', align: 'center', width:200 },
   {
     title: '操作',
     dataIndex: 'id',

src/views/system/user/form.vue

@@ -36,15 +36,7 @@
           >修改密码</a
         >
       </a-form-item>
-
-      <a-form-item
-      field="jobId"
-        label="用户工号"
-        :rules="[{ required: true, message: '请输入用户工号' }]"
-        :validate-trigger="['change', 'input', 'blur']"
-      >
-        <a-input v-model="form.jobId"   placeholder="请输入用户工号" />
-      </a-form-item>
+ 
 
       <a-form-item
       field="name"
@@ -107,7 +99,7 @@ const handleSubmit = async (values) => {
       username: values.username,
       state: values.state,
       roleIds: values.roleIds,
-      jobId: values.jobId,
+     
       name: values.name
     }
     if (values.password !== '') param.password =  encryptByDES(values.password)
@@ -118,7 +110,7 @@ const handleSubmit = async (values) => {
       username: values.username,
       state: values.state,
       roleIds: values.roleIds,
-      jobId: values.jobId,
+   
       name: values.name
     }
     await userAdd(param)
@@ -145,6 +137,10 @@ const changeKeyName = async (value, cb) => {
   }
 } 
 const changeKeyPassword =  async (value, cb) => {
+  if(form.value.passwordState) {
+    cb()
+    return
+  }
   const rgx = /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,20}$/
   const rgxText = '密码至少包含 数字和英文,长度6-20！'
   if (rgx.test(value)) {

src/views/system/user/index.vue

@@ -29,13 +29,13 @@
         </template>
         <template #state="{ record }">
           <a-popconfirm
-            :content="`确认要${record.state === 0 ? '禁用' : '开启'}${record.username}用户吗?`"
+            :content="`确认要${record.state === '1'? '禁用' : '开启'}${record.username}用户吗?`"
             ok-text="确定"
             cancel-text="取消"
             @ok="evSwitchStatus(record)"
           >
             <div>
-              <a-switch v-model="record.state" style="pointer-events: none" :checked-value="1" :unchecked-value="0" />
+              <a-switch v-model="record.state" style="pointer-events: none" checked-value="1" unchecked-value="0" />
             </div>
           </a-popconfirm>
         </template>