用户管理字段排布，与上传

src/views/system/modules/UserModal.vue

@@ -18,28 +18,7 @@
 
     <a-spin :spinning="confirmLoading">
       <a-form :form="form">
-        <a-form-item label="用户账号" :labelCol="labelCol" :wrapperCol="wrapperCol"  :validateOnRuleChange="true">
-          <a-input
-            placeholder="请输入用户账号"
-            v-decorator="['username', validatorRules.username]"
-            :readOnly="!!model.id"
-          />
-        </a-form-item>
-
-        <template v-if="!model.id">
-          <a-form-item label="登陆密码" :labelCol="labelCol" :wrapperCol="wrapperCol">
-            <a-input type="password" placeholder="请输入登陆密码" v-decorator="['password', validatorRules.password]" />
-          </a-form-item>
-
-          <a-form-item label="确认密码" :labelCol="labelCol" :wrapperCol="wrapperCol">
-            <a-input
-              type="password"
-              @blur="handleConfirmBlur"
-              placeholder="请重新输入登陆密码"
-              v-decorator="['confirmpassword', validatorRules.confirmpassword]"
-            />
-          </a-form-item>
-        </template>
+        
         <a-form-item label="工号" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-input placeholder="请输入工号" v-decorator="['workNo', validatorRules.workNo]" />
         </a-form-item>
@@ -102,36 +81,11 @@
           />
         </a-form-item>
 
-         <!--部门分配-->
-        <a-form-item label="公司部门分配" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!departDisabled">
-          <a-input-search
-            placeholder="点击右侧按钮选择公司和部门"
-            v-model="checkedDepartNameString"
-            disabled
-            @search="onSearch"
-          >
-            <a-button slot="enterButton" icon="search">选择</a-button>
-          </a-input-search>
-        </a-form-item>
-
         <a-form-item label="职务" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <j-select-position placeholder="请选择职务" :multiple="false" v-decorator="['post', {}]" />
         </a-form-item>
 
-        <a-form-item label="角色分配" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!roleDisabled">
-          <a-select
-            mode="multiple"
-            style="width: 100%"
-            placeholder="请选择用户角色"
-            optionFilterProp="children"
-            v-model="selectedRole"
-          >
-            <a-select-option v-for="(role, roleindex) in roleList" :key="roleindex.toString()" :value="role.id">
-              {{ role.roleName }}
-            </a-select-option>
-          </a-select>
-        </a-form-item>
-
+        
         <a-form-item label="入司日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-date-picker
             style="width: 100%"
@@ -236,13 +190,13 @@
           <a-input placeholder="请输入" v-decorator="['nrequirement', {}]" />
         </a-form-item>
         
-        <a-form-item label="希望待遇" :labelCol="labelCol" :wrapperCol="wrapperCol">
+        <!-- <a-form-item label="希望待遇" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-input placeholder="请输入希望待遇" v-decorator="['nhopeFor',{}]" />
         </a-form-item>
         
         <a-form-item label="与原单位关系" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-input placeholder="请输入" v-decorator="['nrelationshipFor', {}]" />
-        </a-form-item>
+        </a-form-item> -->
 
          <a-form-item label="人员类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <a-input placeholder="请输入" v-decorator="['npersonnelType', {}]" />
@@ -302,6 +256,54 @@
         <a-form-item label="备注信息" :labelCol="labelCol" :wrapperCol="wrapperCol" class="nresume">
           <a-input type="textarea" placeholder="请输入" v-decorator="['nremarks', {}]" />
         </a-form-item>
+        <a-divider>IT维护</a-divider>
+        <a-form-item label="用户账号" :labelCol="labelCol" :wrapperCol="wrapperCol"  :validateOnRuleChange="true">
+          <a-input
+            placeholder="请输入用户账号"
+            v-decorator="['username', validatorRules.username]"
+            :readOnly="!!model.id"
+          />
+        </a-form-item>
+
+        <template v-if="!model.id">
+          <a-form-item label="登陆密码" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <a-input type="password" placeholder="请输入登陆密码" v-decorator="['password', validatorRules.password]" />
+          </a-form-item>
+
+          <a-form-item label="确认密码" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <a-input
+              type="password"
+              @blur="handleConfirmBlur"
+              placeholder="请重新输入登陆密码"
+              v-decorator="['confirmpassword', validatorRules.confirmpassword]"
+            />
+          </a-form-item>
+        </template>
+                 <!--部门分配-->
+        <a-form-item label="公司部门分配" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!departDisabled">
+          <a-input-search
+            placeholder="点击右侧按钮选择公司和部门"
+            v-model="checkedDepartNameString"
+            disabled
+            @search="onSearch"
+          >
+            <a-button slot="enterButton" icon="search">选择</a-button>
+          </a-input-search>
+        </a-form-item>
+        <a-form-item label="角色分配" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!roleDisabled">
+          <a-select
+            mode="multiple"
+            style="width: 100%"
+            placeholder="请选择用户角色"
+            optionFilterProp="children"
+            v-model="selectedRole"
+          >
+            <a-select-option v-for="(role, roleindex) in roleList" :key="roleindex.toString()" :value="role.id">
+              {{ role.roleName }}
+            </a-select-option>
+          </a-select>
+        </a-form-item>
+
       </a-form>
     </a-spin>
 
@@ -366,7 +368,7 @@ export default {
                 password: {
                     rules: [
                         {
-                            required: true,
+                            required: false,
                              message: '请输入密码!'
                             // pattern: /^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/,
                             // message: '密码由8位数字、大小写字母和特殊符号组成!'
@@ -379,7 +381,7 @@ export default {
                 confirmpassword: {
                     rules: [
                         {
-                            required: true,
+                            required: false,
                             message: '请重新输入登陆密码!'
                         },
                         {
@@ -636,6 +638,7 @@ export default {
         handleSubmit () {
             if(!this.orgObject.pkOrg){
               this.$message.warning("请选择公司");
+              return
             }
             const that = this
             // 触发表单验证
@@ -648,6 +651,7 @@ export default {
                         values.birthday = values.birthday.format(this.dateFormat)
                     }
                     let formData = Object.assign(this.model, values)
+                    debugger
                     // 获取公司信息
                     formData.pkOrg = this.orgObject.pkOrg
                     formData.pkOrgName = this.orgObject.pkOrgName