页面调整

src/views/system/RoleUserList.vue

@@ -34,10 +34,10 @@
         <div class="table-operator" style="margin: 5px 0 10px 2px">
           <a-button @click="handleAdd" type="primary" icon="plus">角色录入</a-button>
           <!--<a-button @click="handleEdit(model1)" type="primary" icon="plus">角色编辑</a-button>-->
-          <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+          <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel" v-show="showOP">
             <a-button type="primary" icon="import">导入</a-button>
           </a-upload>
-          <a-button type="primary" icon="download" @click="handleExportXls">导出</a-button>
+          <a-button type="primary" icon="download" @click="handleExportXls" v-show="showOP">导出</a-button>
         </div>
 
         <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
@@ -116,7 +116,7 @@
         </div>
         <!-- 操作按钮区域 -->
         <div class="table-operator" :md="24" :sm="24" >
-          <a-button @click="handleAdd2" type="primary" icon="plus" style="margin-top: 16px">用户录入</a-button>
+          <a-button @click="handleAdd2" type="primary" icon="plus" style="margin-top: 16px" v-show="showOP">用户录入</a-button>
           <!--<a-button @click="handleEdit2" type="primary" icon="edit" style="margin-top: 16px">用户编辑</a-button>-->
           <a-button @click="handleAddUserRole" type="primary" icon="plus" style="margin-top: 16px">添加已有用户</a-button>
 
@@ -124,7 +124,7 @@
             <a-menu slot="overlay">
               <a-menu-item key="1" @click="batchDel2">
                 <a-icon type="delete"/>
-                删除
+                移出
               </a-menu-item>
             </a-menu>
             <a-button style="margin-left: 8px"> 批量操作
@@ -152,20 +152,24 @@
             :rowSelection="{selectedRowKeys: selectedRowKeys2, onChange: onSelectChange2}"
             @change="handleTableChange2">
            <span slot="action" slot-scope="text, record">
-           <a @click="handleEdit2(record)">编辑</a>
-          <a-divider type="vertical"/>
+           <a @click="handleEdit2(record)" v-show="showOP">编辑</a>
+           <a-divider type="vertical" v-show="showOP"/>
+            <a-popconfirm title="确定移出吗?" @confirm="() => handleDelete2(record.id)">
+              <a>移出</a>
+            </a-popconfirm>
+          <!-- <a-divider type="vertical"/>
           <a-dropdown>
             <a class="ant-dropdown-link">
               更多 <a-icon type="down"/>
             </a>
             <a-menu slot="overlay">
               <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete2(record.id)">
-                  <a>删除</a>
+                <a-popconfirm title="确定移出吗?" @confirm="() => handleDelete2(record.id)">
+                  <a>移出</a>
                 </a-popconfirm>
               </a-menu-item>
             </a-menu>
-          </a-dropdown>
+          </a-dropdown> -->
         </span>
           </a-table>
         </div>
@@ -182,7 +186,7 @@
   import { deleteAction, postAction, getAction } from '@/api/manage'
   import SelectUserModal from './modules/SelectUserModal'
   import RoleModal from './modules/RoleModal'
-  import UserModal from './modules/UserModal'
+  import UserModal from './modules/NewUserModal'
   import { filterObj } from '@/utils/util'
   import UserRoleModal from './modules/UserRoleModal'
   import moment from 'moment'
@@ -199,6 +203,7 @@
     },
     data() {
       return {
+        showOP: true,
         model1: {},
         model2: {},
         currentRoleId: '',
@@ -301,6 +306,7 @@
             width: 120
           }],
 
+
         url: {
           list: '/sys/role/list',
           delete: '/sys/role/delete',
@@ -313,6 +319,12 @@
         }
       }
     },
+    created(){
+        var url = window.location.href
+        if(url.indexOf("roleViewList")>0){
+          this.showOP = false
+        }
+    },
     computed: {
       importExcelUrl: function() {
         return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`

src/views/system/UserList.vue

@@ -5,28 +5,7 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
-          <a-col :md="6" :sm="8">
-              <a-form-item label="所属公司">
-                <j-dict-select-tag  v-model="queryParam.belongingCompany" placeholder="请输入用户性别"
-                  dictCode="affiliated-company"/>
-              </a-form-item>
-            </a-col>
-
-            <a-col :md="6" :sm="8">
-              <a-form-item label="部门">
-                <j-search-select-tag v-model="queryParam.deptName" placeholder="请选择部门" 
-                     dict="sys_depart,depart_name,depart_name,org_type='3' or org_code='TBD' or org_code='TWH' order by org_code"/>
-              </a-form-item>
-            </a-col>
-
 
-
-          <template v-if="toggleSearchStatus">
-          <a-col :md="6" :sm="12">
-            <a-form-item label="员工姓名">
-               <j-input placeholder="请输入" v-model="queryParam.realname"></j-input>
-            </a-form-item>
-          </a-col>
           <a-col :md="6" :sm="12">
             <a-form-item label="账号">
               <!--<a-input placeholder="请输入账号查询" v-model="queryParam.username"></a-input>-->
@@ -34,7 +13,31 @@
             </a-form-item>
           </a-col>
 
-            <!-- <a-col :md="6" :sm="8">
+          <a-col :md="6" :sm="8">
+            <a-form-item label="性别">
+              <a-select v-model="queryParam.sex" placeholder="请选择性别">
+                <a-select-option value="">请选择</a-select-option>
+                <a-select-option value="1">男性</a-select-option>
+                <a-select-option value="2">女性</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+
+
+          <template v-if="toggleSearchStatus">
+            <a-col :md="6" :sm="8">
+              <a-form-item label="真实名字">
+                <j-input placeholder="请输入真实名字" v-model="queryParam.realname"></j-input>
+              </a-form-item>
+            </a-col>
+
+            <a-col :md="6" :sm="8">
+              <a-form-item label="手机号码">
+                <j-input placeholder="请输入手机号码查询" v-model="queryParam.phone"></j-input>
+              </a-form-item>
+            </a-col>
+
+            <a-col :md="6" :sm="8">
               <a-form-item label="用户状态">
                 <a-select v-model="queryParam.status" placeholder="请选择">
                   <a-select-option value="">请选择</a-select-option>
@@ -42,7 +45,7 @@
                   <a-select-option value="2">冻结</a-select-option>
                 </a-select>
               </a-form-item>
-            </a-col> -->
+            </a-col>
           </template>
 
           <a-col :md="6" :sm="8">
@@ -62,7 +65,7 @@
 
     <!-- 操作按钮区域 -->
     <div class="table-operator" style="border-top: 5px">
-      <a-button @click="handleAdd" type="primary" icon="plus">添加用户</a-button>
+      <a-button @click="showUserSelection" type="primary" icon="plus">添加用户</a-button>
       <a-button @click="handleSyncUser"  v-has="'user:syncbpm'" type="primary" icon="plus">同步流程</a-button>
       <a-button type="primary" icon="download" @click="handleExportXls('用户信息')">导出</a-button>
       <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
@@ -141,9 +144,9 @@
                 <a href="javascript:;" @click="handleDetail(record)">详情</a>
               </a-menu-item>
 
-              <a-menu-item>
+              <!-- <a-menu-item>
                 <a href="javascript:;" @click="handleChangePassword(record.username)">密码</a>
-              </a-menu-item>
+              </a-menu-item> -->
 
               <a-menu-item>
                 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
@@ -163,9 +166,9 @@
                 </a-popconfirm>
               </a-menu-item>
 
-              <a-menu-item>
+              <!-- <a-menu-item>
                 <a href="javascript:;" @click="handleAgentSettings(record.username)">代理人</a>
-              </a-menu-item>
+              </a-menu-item> -->
 
             </a-menu>
           </a-dropdown>
@@ -185,19 +188,49 @@
     <!-- 用户回收站 -->
     <user-recycle-bin-modal :visible.sync="recycleBinVisible" @ok="modalFormOk"/>
 
+    <a-modal title="新增用户选择" :width="450" :visible="newUserVisible" :closable="false" :maskClosable="false">
+      <template slot="footer">
+        <a-button type="primary" @click="handleAddUser">确认</a-button>
+        <a-button type="primary" @click="newUserVisible = false">取消</a-button>
+      </template>
+
+      <a-form>
+        <a-form-item
+          :labelCol="{ span: 4 }"
+          :wrapperCol="{ span: 20 }"
+          style="margin-bottom:10px"
+        >
+          <!-- <a-tooltip placement="topLeft">
+            <template slot="title">
+              <span>请选择最新添加的用户</span>
+            </template>
+            <a-avatar style="backgroundColor:#87d068" icon="gold" />
+          </a-tooltip> -->
+          <a-select
+            @change="selectUser"
+            placeholder="请选择需要添加的用户"
+            style="margin-left:10px;width: 80%"
+          >
+            <a-icon slot="suffixIcon" type="gold" />
+            <a-select-option v-for="d in newUserList" :key="d.user_id" :value="d.user_id">
+              {{ d.user_cn_name }}  -- {{ d.dept_cn_name }}
+            </a-select-option>
+          </a-select>
+        </a-form-item>
+      </a-form>
+    </a-modal>
   </a-card>
 </template>
 
 <script>
-  import UserModal from './modules/UserModal'
+  import UserModal from './modules/NewUserModal'
   import PasswordModal from './modules/PasswordModal'
-  import {putAction,getFileAccessHttpUrl} from '@/api/manage';
+  import {putAction,getFileAccessHttpUrl,getAction} from '@/api/manage';
   import {frozenBatch} from '@/api/api'
   import {JeecgListMixin} from '@/mixins/JeecgListMixin'
   import SysUserAgentModal from "./modules/SysUserAgentModal";
   import JInput from '@/components/jeecg/JInput'
   import UserRecycleBinModal from './modules/UserRecycleBinModal'
-  import JSearchSelectTag from '@/components/dict/JSearchSelectTag'
 
   export default {
     name: "UserList",
@@ -207,8 +240,7 @@
       UserModal,
       PasswordModal,
       JInput,
-      UserRecycleBinModal,
-      JSearchSelectTag
+      UserRecycleBinModal
     },
     data() {
       return {
@@ -216,15 +248,14 @@
         queryParam: {},
         recycleBinVisible: false,
         userVisible: false,
+        newUserVisible: false,
+        newUserList: [],
+        userSelected:{},
         sheBao: '',
         gongJiJin: '',
         ipagination:{
           pageSizeOptions: ["10", "20", "30", "300"]
         },
-        isorter:{
-          column: "",
-          order: ''
-        },
         columns: [
           /*{
             title: '#',
@@ -237,84 +268,62 @@
             }
           },*/
           {
-            title: '部门',
+            title: '用户账号',
             align: "center",
-            width: 180,
-            dataIndex: 'orgCode'
+            dataIndex: 'username',
+            width: 120
           },
           {
-            title: '员工姓名',
+            title: '用户姓名',
             align: "center",
             width: 100,
             dataIndex: 'realname',
           },
           {
-            title: '工号',
+            title: '头像',
             align: "center",
             width: 120,
-            dataIndex: 'workNo',
+            dataIndex: 'avatar',
+            scopedSlots: {customRender: "avatarslot"}
           },
+
           {
-            title: '身份证号',
+            title: '性别',
             align: "center",
-            width: 120,
-            dataIndex: 'nidNo',
+            width: 80,
+            dataIndex: 'sex_dictText',
+            sorter: true
           },
           {
-            title: '手机号码',
+            title: '生日',
             align: "center",
             width: 100,
-            dataIndex: 'phone'
-          },
-          {
-            title: '所属公司',
-            align: "center",
-            width: 180,
-            dataIndex: 'belongingCompany'
+            dataIndex: 'birthday'
           },
           {
-            title: '生日',
+            title: '手机号码',
             align: "center",
             width: 100,
-            dataIndex: 'birthday'
-          },     
+            dataIndex: 'phone'
+          },
           // {
-          //   title: '状态',
+          //   title: '公司',
           //   align: "center",
-          //   width: 80,
-          //   dataIndex: 'status_dictText'
+          //   width: 180,
+          //   dataIndex: 'pkOrgName'
           // },
           {
-            title: '雇佣状态',
+            title: '部门',
             align: "center",
-            width: 80,
-            dataIndex: 'syHireType'
+            width: 180,
+            dataIndex: 'orgCode'
           },
           {
-            title: '用户账号',
+            title: '状态',
             align: "center",
-            dataIndex: 'username',
-            width: 120
+            width: 80,
+            dataIndex: 'status_dictText'
           },
-          
-          
-          
-          // {
-          //   title: '头像',
-          //   align: "center",
-          //   width: 120,
-          //   dataIndex: 'avatar',
-          //   scopedSlots: {customRender: "avatarslot"}
-          // },
-
-          // {
-          //   title: '性别',
-          //   align: "center",
-          //   width: 80,
-          //   dataIndex: 'sex_dictText',
-          //   sorter: true
-          // },
-          
           {
             title: '操作',
             dataIndex: 'action',
@@ -459,7 +468,50 @@
       },
       passwordModalOk() {
         //TODO 密码修改完成 不需要刷新页面，可以把datasource中的数据更新一下
-      }
+      },
+      showUserSelection(){
+        getAction(`/sys/user/recently/added`)
+          .then(res => {
+            if (res.success) {
+              this.newUserList = res.result
+              // this.newUserList = [
+              //   {
+              //   "user_id": "zhangds5",
+              //   "user_cn_name": "张大山",
+              //   "active_state": "1",
+              //   "update_time": "2022-12-22 10:35:55",
+              //   "dept_code": "c01",
+              //   "dept_cn_name": "办公室",
+              //   "contact": "",
+              //   "email": "",
+              //   "registry_date": "2022-12-19 10:35:55"
+              //   }
+              // ]
+              this.newUserVisible = true;
+            } else {
+              this.$message.error(res.message)
+              this.newUserVisible = false;
+            }
+          })
+          .catch(() => {
+            this.newUserVisible = false;
+          })
+        },
+        selectUser (value) {
+          this.newUserList.forEach(u=>{
+            if(u.user_id == value)
+            this.userSelected = u;
+          })
+        },
+        handleAddUser(){
+          console.log(this.userSelected);
+          let u = this.userSelected;
+          let user = {
+            username : u.user_id,
+            realname: u.user_cn_name,
+          }
+          this.handleEdit(user);
+        }
     }
 
   }

src/views/system/modules/AddressListRight.vue

@@ -11,7 +11,7 @@
           </a-col>
 
 
-          <a-col :md="6" :sm="12">
+          <!-- <a-col :md="6" :sm="12">
             <a-form-item label="工号" style="margin-left:8px">
               <a-input placeholder="请输入工号查询" v-model="queryParam.workNo"></a-input>
             </a-form-item>
@@ -22,7 +22,7 @@
                <j-search-select-tag v-model="queryParam.deptName" placeholder="请选择部门" 
                    dict="sys_depart,depart_name,depart_name,org_type='3' or org_code='TBD' order by org_code"/>
             </a-form-item>
-          </a-col>
+          </a-col> -->
 
           <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
             <a-col :md="6" :sm="24">
@@ -85,15 +85,21 @@
           // },
           {
             title: '姓名',
-            width: '7%',
+            width: '10%',
             align: 'center',
             dataIndex: 'realname'
           },
+          // {
+          //   title: '工号',
+          //   width: '7%',
+          //   align: 'center',
+          //   dataIndex: 'workNo'
+          // },
           {
-            title: '工号',
+            title: '性别',
             width: '7%',
-            align: 'center',
-            dataIndex: 'workNo'
+            align: "center",
+            dataIndex: 'sex_dictText',
           },
           {
             title: '部门',
@@ -102,45 +108,51 @@
             dataIndex: 'departIds'
           },
           {
-            title: '职务',
-            width: '10%',
+            title: '岗位',
+            width: '15%',
             align: 'center',
             dataIndex: 'post',
             customRender: (text) => (text || '').split(',').map(t => this.positionInfo[t] ? this.positionInfo[t] : t).join(',')
           },
           {
             title: '手机',
-            width: '10%',
+            width: '15%',
             align: 'center',
             dataIndex: 'phone'
           },
           {
-            title: '虚拟网号',
-            width: '10%',
-            align: 'center',
-            dataIndex: 'nvirtualNo'
-          },
-          {
-            title: '公司电话',
-            width: '10%',
+            title: '座机',
+            width: '15%',
             align: 'center',
             dataIndex: 'ncompanyPhone'
           },
-          {
-            title: '公司内线',
-            width: '10%',
-            align: 'center',
-            dataIndex: 'ncompanyLine'
-          },
-          {
-            title: '家电',
-            width: '10%',
-            align: 'center',
-            dataIndex: 'telephone'
-          },
+          // {
+          //   title: '虚拟网号',
+          //   width: '10%',
+          //   align: 'center',
+          //   dataIndex: 'nvirtualNo'
+          // },
+          // {
+          //   title: '公司电话',
+          //   width: '10%',
+          //   align: 'center',
+          //   dataIndex: 'ncompanyPhone'
+          // },
+          // {
+          //   title: '公司内线',
+          //   width: '10%',
+          //   align: 'center',
+          //   dataIndex: 'ncompanyLine'
+          // },
+          // {
+          //   title: '家电',
+          //   width: '10%',
+          //   align: 'center',
+          //   dataIndex: 'telephone'
+          // },
           {
             title: '公司邮箱',
-            width: '11%',
+            width: '15%',
             align: 'center',
             dataIndex: 'email'
           }

src/views/system/modules/DepartWindow.vue

@@ -44,7 +44,7 @@
 import pick from 'lodash.pick'
 import { getAction } from '@/api/manage'
 import { queryIdTree } from '@/api/api'
-import userModal from './UserModal'
+import userModal from './NewUserModal'
 export default {
   name: 'DepartWindow',
   components: {

src/views/system/modules/DeptUserInfo.vue

@@ -107,7 +107,7 @@
   import {JeecgListMixin} from '@/mixins/JeecgListMixin'
   import {getAction, postAction, deleteAction} from '@/api/manage'
   import SelectUserModal from './SelectUserModal'
-  import UserModal from './UserModal'
+  import UserModal from './NewUserModal'
   import DeptRoleUserModal from './DeptRoleUserModal'
 
   export default {

src/views/system/modules/NewUserModal.vue

@@ -22,6 +22,14 @@
          <a-form-item label="用户姓名" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-input placeholder="请输入用户姓名" v-decorator="['realname', validatorRules.realname]" />
         </a-form-item>
+        <a-form-item label="用户账号" :labelCol="labelCol" :wrapperCol="wrapperCol"  :validateOnRuleChange="true">
+          <a-input
+            placeholder="请输入用户账号"
+            v-decorator="['username', validatorRules.username]"
+            :readOnly="true"
+            autocomplete="off"
+          />
+        </a-form-item>
 
          <a-form-item label="性别" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-select v-decorator="['sex', validatorRules.sex]" placeholder="请选择性别">
@@ -41,6 +49,14 @@
           <a-input placeholder="请输入证件号码" v-decorator="['nidNo', validatorRules.nidNo]" />
         </a-form-item>
 
+        <a-form-item label="生日" :labelCol="labelCol" :wrapperCol="wrapperCol">
+        <a-date-picker
+            style="width: 100%"
+            placeholder="请选择生日"
+            v-decorator="['birthday',{ initialValue: !model.birthday ? null : moment(model.birthday, dateFormat),rules: [{ required: true, message: '请选择生日日期' }] }]"
+        />
+        </a-form-item>
+
         <a-form-item label="入司日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-date-picker
             style="width: 100%"
@@ -72,6 +88,17 @@
             <a-select-option value="劳务工">劳务工</a-select-option>
           </a-select>
         </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">
           <a-input placeholder="请输入公司座机" v-decorator="['ncompanyPhone', {}]" />
@@ -90,7 +117,7 @@
         </a-form-item>
 
         <a-form-item label="员工状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-select placeholder="请选择员工状态" v-decorator="[ 'status', validatorRules.status]" >
+          <a-select placeholder="请选择员工状态" v-decorator="[ 'syHireType', validatorRules.syHireType]" >
             <a-select-option value="在职">在职</a-select-option>
             <a-select-option value="离职">离职</a-select-option>
             <a-select-option value="退休">退休</a-select-option>
@@ -116,13 +143,43 @@
             <a-input v-decorator="[ 'ssAccount', validatorRules.ssAccount]" placeholder="请输入社保号"></a-input>
         </a-form-item>
 
+        <a-form-item label="身份" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <a-radio-group v-model="identity" @change="identityChange">
+            <a-radio value="1">普通用户</a-radio>
+            <a-radio value="2">上级</a-radio>
+          </a-radio-group>
+        </a-form-item>
+        <a-form-item label="负责部门" :labelCol="labelCol" :wrapperCol="wrapperCol" v-if="departIdShow == true">
+          <a-select
+            mode="multiple"
+            style="width: 100%"
+            placeholder="请选择负责部门"
+            v-model="departIds"
+            optionFilterProp="children"
+            :getPopupContainer="target => target.parentNode"
+            :dropdownStyle="{ maxHeight: '200px', overflow: 'auto' }"
+          >
+            <a-select-option v-for="item in resultDepartOptions" :key="item.key" :value="item.key">{{
+              item.title
+            }}</a-select-option>
+          </a-select>
+        </a-form-item>
+        <!-- <a-form-item label="工作流引擎" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <j-dict-select-tag
+            v-decorator="['activitiSync', {}]"
+            placeholder="请选择是否同步工作流引擎"
+            :type="'radio'"
+            :triggerChange="true"
+            dictCode="activiti_sync"
+          />
+        </a-form-item> -->
 
         <a-form-item label="岗位职能要求" :labelCol="labelCol" :wrapperCol="wrapperCol" class="nresume">
           <a-textarea  v-decorator="['requirement', validatorRules.requirement]" placeholder="请输入岗位职能要求"  :rows="4"></a-textarea >
         </a-form-item>
 
 
-        <a-divider>IT维护</a-divider>
+        <!-- <a-divider>IT维护</a-divider>
         <a-form-item label="用户账号" :labelCol="labelCol" :wrapperCol="wrapperCol"  :validateOnRuleChange="true">
           <a-input
             placeholder="请输入用户账号"
@@ -146,7 +203,6 @@
             />
           </a-form-item>
         </template>
-        <!--部门分配-->
         <a-form-item label="公司部门分配" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!departDisabled">
           <a-input-search
             placeholder="点击右侧按钮选择公司和部门"
@@ -169,7 +225,7 @@
               {{ role.roleName }}
             </a-select-option>
           </a-select>
-        </a-form-item>
+        </a-form-item> -->
 
 <!--         <a-form-item label="工作简历" :labelCol="labelCol" :wrapperCol="wrapperCol" class="nresume">-->
 <!--          <a-input type="textarea" placeholder="请输入" v-decorator="['nresume', {}]" />-->
@@ -224,42 +280,42 @@ export default {
             userDepartModel: { userId: '', departIdList: [] }, // 保存SysUserDepart的用户部门中间表数据需要的对象
             dateFormat: 'YYYY-MM-DD',
             validatorRules: {
-                username: {
-                    rules: [
-                        {
-                            required: false,
-                            message: '请输入用户账号!'
-                        },
-                        {
-                            validator: this.validateUsername
-                        }
-                    ]
-                },
-                password: {
-                    rules: [
-                        {
-                            required: false,
-                             message: '请输入密码!'
-                            // pattern: /^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/,
-                            // message: '密码由8位数字、大小写字母和特殊符号组成!'
-                        },
-                        {
-                            validator: this.validateToNextPassword
-                        }
-                    ],
-                    initialValue:'123456'
-                },
-                confirmpassword: {
-                    rules: [
-                        {
-                            required: false,
-                            message: '请重新输入登陆密码!'
-                        },
-                        {
-                            validator: this.compareToFirstPassword
-                        }
-                    ]
-                },
+                // username: {
+                //     rules: [
+                //         {
+                //             required: false,
+                //             message: '请输入用户账号!'
+                //         },
+                //         {
+                //             validator: this.validateUsername
+                //         }
+                //     ]
+                // },
+                // password: {
+                //     rules: [
+                //         {
+                //             required: false,
+                //              message: '请输入密码!'
+                //             // pattern: /^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/,
+                //             // message: '密码由8位数字、大小写字母和特殊符号组成!'
+                //         },
+                //         {
+                //             validator: this.validateToNextPassword
+                //         }
+                //     ],
+                //     initialValue:'123456'
+                // },
+                // confirmpassword: {
+                //     rules: [
+                //         {
+                //             required: false,
+                //             message: '请重新输入登陆密码!'
+                //         },
+                //         {
+                //             validator: this.compareToFirstPassword
+                //         }
+                //     ]
+                // },
                 realname: { rules: [{ required: true, message: '请输入用户名称!' }] },
                 phone: { rules: [{ validator: this.validatePhone },{ required: true, message: '请输入手机号码!' }] },
                 email: {
@@ -451,7 +507,15 @@ export default {
                         'nrelationshipFor',
                         'npersonnelType',
                         'nregisteredAddr',
-                        'ifOa'
+                        'ifOa',
+                        'idType',
+                        'type',
+                        'syHireType',
+                        'bank',
+                        'cpf',
+                        'ssPlace',
+                        'ssAccount',
+                        'requirement'
                     )
                 )
             })