新增用户loginName改name

src/views/security/user/UserForm.vue

@@ -1,12 +1,5 @@
 <template>
-  <a-modal
+  <a-modal :title="modalTitle" :width="900" :visible="visible" :confirmLoading="confirmLoading" @ok="handleSubmit" @cancel="handleCancel">
-    :title="modalTitle"
-    :width="900"
-    :visible="visible"
-    :confirmLoading="confirmLoading"
-    @ok="handleSubmit"
-    @cancel="handleCancel"
-  >
     <a-spin :spinning="confirmLoading">
       <a-divider orientation="left">基本信息</a-divider>
       <a-row :gutter="24">
@@ -16,24 +9,14 @@
               <a-input v-decorator="['id']" />
             </a-form-item>
 
-            <a-form-item
+            <a-form-item label="账号" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-              label="账号"
+              <a-input placeholder="请输入账号" v-decorator="['name', {rules: [{required: true, min: 5, message: '请输入至少五个字符的账号！'}]}]" />
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-              has-feedback
-            >
-              <a-input placeholder="请输入账号" v-decorator="['loginName', {rules: [{required: true, min: 5, message: '请输入至少五个字符的账号！'}]}]" />
             </a-form-item>
           </a-form>
         </a-col>
         <a-col :md="12" :sm="24">
           <a-form :form="form">
-            <a-form-item
+            <a-form-item label="姓名" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-              label="姓名"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-              has-feedback
-            >
               <a-input placeholder="请输入姓名" v-decorator="['userName', {rules: [{required: true, message: '请输入姓名！'}]}]" />
             </a-form-item>
           </a-form>
@@ -42,16 +25,8 @@
       <a-row :gutter="24" v-if="isAdd">
         <a-col :md="12" :sm="24">
           <a-form :form="form">
-            <a-form-item
+            <a-form-item label="密码" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-              label="密码"
+              <a-input placeholder="请输入密码" type="password" v-decorator="['password', {rules: [{required: true, message: '请输入密码！'},{
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-              has-feedback
-            >
-              <a-input
-                placeholder="请输入密码"
-                type="password"
-                v-decorator="['password', {rules: [{required: true, message: '请输入密码！'},{
                   validator: validateToNextPassword,
                 },]}]" />
             </a-form-item>
@@ -59,16 +34,8 @@
         </a-col>
         <a-col :md="12" :sm="24">
           <a-form :form="form">
-            <a-form-item
+            <a-form-item label="重复密码" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-              label="重复密码"
+              <a-input placeholder="请再次输入密码" type="password" v-decorator="['confirm', {rules: [{required: true, message: '请再次输入密码！'},
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-              has-feedback
-            >
-              <a-input
-                placeholder="请再次输入密码"
-                type="password"
-                v-decorator="['confirm', {rules: [{required: true, message: '请再次输入密码！'},
                                                   {
                                                     validator: compareToFirstPassword,
                                                   }]}]" />
@@ -79,24 +46,14 @@
       <a-row :gutter="24">
         <a-col :md="12" :sm="24">
           <a-form :form="form">
-            <a-form-item
+            <a-form-item label="昵称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-              label="昵称"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-              has-feedback
-            >
               <a-input placeholder="请输入昵称" v-decorator="['nickName']" />
             </a-form-item>
           </a-form>
         </a-col>
         <a-col :md="12" :sm="24">
           <a-form :form="form">
-            <a-form-item
+            <a-form-item label="生日" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-              label="生日"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-              has-feedback
-            >
               <a-date-picker placeholder="请选择生日" @change="onChange" style="width: 100%" v-decorator="['birthday']" />
             </a-form-item>
           </a-form>
@@ -105,11 +62,7 @@
       <a-row :gutter="24">
         <a-col :md="12" :sm="24">
           <a-form :form="form">
-            <a-form-item
+            <a-form-item label="性别" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              label="性别"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
               <a-radio-group v-decorator="['sex',{rules: [{ required: true, message: '请选择性别！' }]}]">
                 <a-radio :value="1">男</a-radio>
                 <a-radio :value="2">女</a-radio>
@@ -119,12 +72,7 @@
         </a-col>
         <a-col :md="12" :sm="24">
           <a-form :form="form">
-            <a-form-item
+            <a-form-item label="邮箱" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-              label="邮箱"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-              has-feedback
-            >
               <a-input placeholder="请输入邮箱" v-decorator="['email']" />
             </a-form-item>
           </a-form>
@@ -133,12 +81,7 @@
       <a-row :gutter="24">
         <a-col :md="12" :sm="24">
           <a-form :form="form">
-            <a-form-item
+            <a-form-item label="手机号" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-              label="手机号"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-              has-feedback
-            >
               <a-input placeholder="请输入手机号" v-decorator="['phoneNumber',{rules: [{ required: true, message: '请输入手机号！' }]}]" />
             </a-form-item>
           </a-form>
@@ -188,7 +131,7 @@
         this.form.setFieldsValue(
           {
             id: record.id,
-              loginName: record.loginName,
+            name: record.name,
             userName: record.userName,
             nickName: record.nickName,
             sex: record.sex,