格克

src/components/jeecgbiz/JSelectPosition.vue

@@ -19,9 +19,9 @@
           queryParamCode: 'name',
           queryParamText: '职务名称',
           columns: [
-            { title: '职务名称', dataIndex: 'name', align: 'center', width: '30%', widthRight: '70%' },
-            { title: '职务编码', dataIndex: 'code', align: 'center', width: '35%' },
-            { title: '职级', dataIndex: 'rank_dictText', align: 'center', width: '25%' }
+            { title: '职务名称', dataIndex: 'name', align: 'center'},
+            { title: '职务编码', dataIndex: 'code', align: 'center' },
+            
           ]
         }
       }

src/views/system/UserList.vue

@@ -5,44 +5,54 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
-
           <a-col :md="6" :sm="12">
             <a-form-item label="真实名字">
               <a-input placeholder="请输入真实名字" v-model="queryParam.realname"></a-input>
             </a-form-item>
-            
           </a-col>
 
           <a-col :md="6" :sm="8">
             <a-form-item label="工号">
               <a-input placeholder="请输入工号查询" v-model="queryParam.workNo"></a-input>
-            
             </a-form-item>
-            
           </a-col>
 
-
           <template v-if="toggleSearchStatus">
             <a-col :md="6" :sm="8">
               <a-form-item label="部门名称">
-                <a-input placeholder="请输入部门名称查询" v-model="queryParam.orgCodeTxt"></a-input>
+                <j-tree-select
+                        style="width: 200px"
+                        v-model="queryParam.orgCodeTxt"
+                        dict="sys_depart,depart_name,id"
+                        pid-field="parent_id">
+                      </j-tree-select>
               </a-form-item>
             </a-col>
             
             <a-col :md="6" :sm="8">
-              <a-form-item label="性别">
+              <!-- <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-form-item> -->
             </a-col>
 
             <a-col :md="6" :sm="8">
-              <a-form-item label="手机号码">
-                <a-input placeholder="请输入手机号码查询" v-model="queryParam.phone"></a-input>
+              <a-form-item label="人员类别">
+                <a-select v-model="queryParam.category" placeholder="请选择">
+                  <a-select-option value="101">正式工</a-select-option>
+                  <a-select-option value="102">顾问</a-select-option>
+                  <a-select-option value="103">实习生</a-select-option>
+                  <a-select-option value="104">劳务工</a-select-option>
+                  <a-select-option value="105">劳务外包5+2</a-select-option>
+                  <a-select-option value="106">劳务外包6+1</a-select-option>
+                </a-select>
               </a-form-item>
+              <!-- <a-form-item label="手机号码">
+                <a-input placeholder="请输入手机号码查询" v-model="queryParam.phone"></a-input>
+              </a-form-item> -->
             </a-col>
 
             <a-col :md="6" :sm="8">
@@ -51,7 +61,7 @@
                   <a-select-option value="10">在职</a-select-option>
                   <a-select-option value="20">离退</a-select-option>
                   <a-select-option value="30">离职</a-select-option>
-                
+                  <a-select-option value="40">待入职</a-select-option>
                 </a-select>
               </a-form-item>
             </a-col>
@@ -88,7 +98,10 @@
             <a-icon type="delete" @click="batchDel"/>
             删除
           </a-menu-item>
-    
+          <a-menu-item key="4" v-if="selectionRows[0].employmentStatus==40" >
+            <a-icon type="check-circle"  @click="batchrz"/>
+            入职
+          </a-menu-item>
         </a-menu>
         <a-button style="margin-left: 8px">
           批量操作
@@ -123,6 +136,12 @@
           </div>
         </template>
         
+        <template slot="userRealname" slot-scope="text, record, index">
+          <div class="anty-img-wrap">
+           <a @click="handleDetails(record)" >{{text}}</a>
+          </div>
+        </template>
+        
         <span slot="categorys" slot-scope="text, record, index">
           <a-tag color="#87d068" v-if="record.category=='101'||record.category==101 ">正式工</a-tag>
           <a-tag color="#87d068" v-else-if="record.category=='102'||record.category==102 ">顾问</a-tag>
@@ -133,9 +152,10 @@
         </span>
         
         <span slot="employmentStatuss" slot-scope="text, record, index">
-         <a-tag color="#87d068" v-if="record.employmentStatus=='10'||record.category==10 ">在职</a-tag>
-         <a-tag color="#cd201f" v-else-if="record.employmentStatus=='20'||record.category==20 ">离退</a-tag>
-         <a-tag color="#cd201f" v-else-if="record.employmentStatus=='30'||record.category==30 ">离职</a-tag>
+         <a-tag color="#87d068" v-if="record.employmentStatus=='10'||record.employmentStatus==10 ">在职</a-tag>
+         <a-tag color="#cd201f" v-else-if="record.employmentStatus=='20'||record.employmentStatus==20 ">离退</a-tag>
+         <a-tag color="#cd201f" v-else-if="record.employmentStatus=='30'||record.employmentStatus==30 ">离职</a-tag>
+         <a-tag color="#cd201f" v-else-if="record.employmentStatus=='40'||record.employmentStatus==40 ">待入职</a-tag>
         </span>
 
         <span slot="action" slot-scope="text, record">
@@ -148,8 +168,8 @@
               更多 <a-icon type="down"/>
             </a>
             <a-menu slot="overlay">
-              <a-menu-item v-has="'user:details'" >
-                <a href="javascript:;" @click="handleDetails(record)">详情</a>
+              <a-menu-item v-has="'user:details'" v-if="record.employmentStatus==40||record.employmentStatus=='40'">
+                <a href="javascript:;" @click="handleDetails(record)">入职</a>
               </a-menu-item>
 
 
@@ -184,13 +204,14 @@
   import UserModal from './modules/UserModal'
   import UserDetailModal from './modules/UserDetailModal'
   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 JInput from '@/components/jeecg/JInput'
   import UserRecycleBinModal from './modules/UserRecycleBinModal'
   import JSuperQuery from '@/components/jeecg/JSuperQuery'
-
+import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
+ import JTreeSelect from '@/components/jeecg/JTreeSelect'
   export default {
     name: "UserList",
     mixins: [JeecgListMixin],
@@ -200,14 +221,20 @@
       JInput,
       UserRecycleBinModal,
       UserDetailModal,
-      JSuperQuery
+      JSuperQuery,
+      JSelectDepart,
+      JTreeSelect
     },
     data() {
       return {
         description: '这是用户管理页面',
-        queryParam: {},
+        queryParam: {
+          employmentStatus:"10",
+          category:"101"
+        },
         recycleBinVisible: false,
         selectedRowKeys:[],
+        selectionRows:[],
         columns: [
           /*{
             title: '#',
@@ -219,11 +246,18 @@
               return parseInt(index)+1;
             }
           },*/
+          {
+            title: '工号',
+            align: "center",
+            dataIndex: 'workNo',
+            width: 100,
+          },
           {
             title: '员工姓名',
             align: "center",
             width: 100,
             dataIndex: 'realname',
+            scopedSlots: {customRender: "userRealname"}
           },
           // {
           //   title: '头像',
@@ -239,45 +273,52 @@
             dataIndex: 'sex_dictText',
            
           },
+          
+          // {
+          //   title: '生日',
+          //   align: "center",
+          //   width: 100,
+          //   dataIndex: 'birthday'
+          // },
+          // {
+          //   title: '手机号码',
+          //   align: "center",
+          //   width: 120,
+          //   dataIndex: 'phone',
+          //   customRender:function (t,r,index) {
+          //     if(t!=null&&t!=""){
+          //       var a=t.slice(0,3);
+          //       var b=t.slice(8,11);
+          //       return a+"****"+b;
+          //     }else{
+          //       return"";
+          //     }
+              
+          //   }
+          // },
           {
-            title: '工号',
-            align: "center",
-            dataIndex: 'workNo',
-            width: 100,
-          },
-          {
-            title: '生日',
+            title: '邮箱',
             align: "center",
-            width: 100,
-            dataIndex: 'birthday'
+            width: 120,
+            dataIndex: 'email'
           },
           {
-            title: '手机号码',
+            title: '一级部门',
             align: "center",
             width: 120,
-            dataIndex: 'phone',
-            customRender:function (t,r,index) {
-              if(t!=null&&t!=""){
-                var a=t.slice(0,3);
-                var b=t.slice(8,11);
-                return a+"****"+b;
-              }else{
-                return"";
-              }
-              
-            }
+            dataIndex: 'del2'
           },
           {
-            title: '邮箱',
+            title: '二级部门',
             align: "center",
             width: 120,
-            dataIndex: 'email'
+            dataIndex: 'del3'
           },
           {
-            title: '部门',
+            title: '三级部门',
             align: "center",
             width: 120,
-            dataIndex: 'orgCodeTxt'
+            dataIndex: 'del4'
           },
           {
             title: '入职时间',
@@ -328,7 +369,8 @@
           deleteBatch: "/sys/user/deleteBatch",
           exportXlsUrl: "/sys/user/exportXls",
           importExcelUrl: "sys/user/importExcel",
-          pulldata:"/sys/weixin/pullData"
+          pulldata:"/sys/weixin/pullData",
+          editstate:"/sys/user/editState"
         },
       }
     },
@@ -338,6 +380,10 @@
       }
     },
     methods: {
+      // onSelectChanges(selectedRowKeys, selectionRows) {
+      //   this.selectedRowKeys = selectedRowKeys;
+      //   this.selectionRows = selectionRows;
+      // },
       handleExportXltx(){
         this.queryParam.orgCodeTxt="空白模板";
         this.$options.methods.handleExportXls.call(this)
@@ -346,7 +392,26 @@
       getAvatarView: function (avatar) {
         return getFileAccessHttpUrl(avatar)
       },
-
+      batchrz(){
+        if (this.selectedRowKeys.length<=0) {
+          this.$message.warning('请选择一条记录！');
+          return false;
+        } else {
+          var userids=this.selectedRowKeys.join(",");
+          getAction(this.url.editstate, {
+            userids:userids
+          }).then(res => {
+            if (res.success) {
+              this.$message.success(res.message);
+                this.loadData();
+              }else{
+                this.$message.warning(res.message);
+              }
+          })
+          this.selectedRowKeys=[];
+          this.selectionRows=[];
+        }
+      },
       batchFrozen: function (status) {
         if (this.selectedRowKeys.length <= 0) {
           this.$message.warning('请选择一条记录！');
@@ -391,6 +456,8 @@
           this.batchFrozen(2);
         } else if (e.key == 3) {
           this.batchFrozen(1);
+        }else if(e.key==4){
+          this.batchrz();
         }
       },
       handleDetails(e){

src/views/system/modules/DepartWindow.vue

@@ -13,21 +13,20 @@
     <template>
       <a-form :form="form">
       <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="上级部门">
-      <a-tree
+      <a-directory-tree
         multiple
         treeCheckable="tree"
-        checkable
         @expand="onExpand"
         :expandedKeys="expandedKeysss"
         :checkedKeys="checkedKeys"
         allowClear="true"
         :checkStrictly="true"
-        @check="onCheck"
+        @select="onCheck"
         :dropdownStyle="{maxHeight:'200px',overflow:'auto'}"
         :treeData="departTree"
         placeholder="请选择上级部门"
         >
-      </a-tree>
+      </a-directory-tree>
       </a-form-item>
       </a-form>
     </template>
@@ -46,6 +45,7 @@
     },
     data () {
       return {
+        defaultExpandedKeys:[],
         checkedKeys:[], // 存储选中的部门id
         expandedKeysss:[],//展开的节点
         userId:"", // 存储用户id
@@ -134,9 +134,9 @@
       onCheck(checkedKeys, info){
         this.departList = [];
         this.checkedKeys = checkedKeys.checked;
-        let checkedNodes = info.checkedNodes;
-        for (let i = 0; i < checkedNodes.length; i++) {
-          let de = checkedNodes[i].data.props;
+        let selectedNodes = info.selectedNodes;
+        for (let i = 0; i < selectedNodes.length; i++) {
+          let de = selectedNodes[i]._props;
           let depart = {key:"",value:"",title:""};
           depart.key = de.value;
           depart.value = de.value;

src/views/system/modules/StatutoryLeaveModal.vue

@@ -33,7 +33,12 @@
           label="假期开始时间">
           <a-date-picker  format='YYYY-MM-DD' v-decorator="[ 'startDate', validatorRules.startDate]" />
         </a-form-item>
-        
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="假期结束时间">
+          <a-date-picker  format='YYYY-MM-DD' v-decorator="[ 'endDate', validatorRules.endDate]" />
+        </a-form-item>
         <a-form-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"

src/views/system/modules/UserDetailModal.vue

@@ -13,6 +13,11 @@
     <a-spin :spinning="confirmLoading">
       <a-form :form="form" style="overflow-y: auto;height: 650px;">
         <a-row>
+          <a-col :md="6" :sm="8" :lg="8">
+            <a-form-model-item label="头像" :labelCol="labelCol" :wrapperCol="wrapperCol">
+               <j-image-upload disabled  class="avatar-uploader" text="上传" v-model="model.avatar" ></j-image-upload>
+             </a-form-model-item>
+          </a-col>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="姓名" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-input disabled maxLength="10"  v-decorator="[ 'realname']" />
@@ -23,15 +28,24 @@
               <a-input disabled maxLength="10"  v-decorator="[ 'egName']" />
             </a-form-item>
           </a-col>
-          
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="邮箱" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-input disabled maxLength="30"  v-decorator="[ 'email']" />
             </a-form-item>
           </a-col>
-        </a-row>
-
-        <a-row>
+          <a-col :md="6" :sm="8" :lg="8">
+            <a-form-item label="人员类别" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-select disabled v-decorator="[ 'category', {initialValue:101}]" 
+                :getPopupContainer="(target) => target.parentNode" @change="handleChangeStatus">
+                <a-select-option :value="101">正式工</a-select-option>
+                <a-select-option :value="103">实习生</a-select-option>
+                <a-select-option :value="104">劳务工</a-select-option>
+                <a-select-option :value="105">劳务外包5+2</a-select-option>
+                <a-select-option :value="106">劳务外包6+1</a-select-option>
+                <a-select-option :value="102">顾问</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="证件类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-select disabled v-model="sfzType" >
@@ -54,26 +68,41 @@
                 </a-select>
               </a-form-item>
             </a-col>
-        </a-row>
-
-        <a-row>
-          <a-col :md="6" :sm="8" :lg="8">
-          <a-form-item label="生日" :labelCol="labelCol" :wrapperCol="wrapperCol">
-            <a-date-picker disabled style="width: 100%" 
-              v-decorator="['birthday', {initialValue:!model.birthday?null:moment(model.birthday,dateFormat)}]"
-              :getCalendarContainer="node => node.parentNode" />
-          </a-form-item>
-          </a-col>
+            <a-col :md="6" :sm="8" :lg="8">
+            <a-form-item label="生日" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-date-picker disabled style="width: 100%" 
+                v-decorator="['birthday', {initialValue:!model.birthday?null:moment(model.birthday,dateFormat)}]"
+                :getCalendarContainer="node => node.parentNode" />
+            </a-form-item>
+            </a-col>
             <a-col :md="6" :sm="8" :lg="8">
                 <a-form-item label="手机号" :labelCol="labelCol" :wrapperCol="wrapperCol">
                   <a-input disabled maxLength="20"  v-decorator="[ 'phone']" />
                 </a-form-item>
             </a-col>
+            
+        </a-row>
+      
+        <a-row>
+          
             <a-col :md="6" :sm="8" :lg="8">
               <a-form-item label="公积金" :labelCol="labelCol" :wrapperCol="wrapperCol">
                   <a-input disabled maxLength="20"   v-decorator="['syFund']" />
                 </a-form-item>
               </a-col>
+            
+              <a-col :md="6" :sm="8" :lg="8">
+                <a-form-item label="部门" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!departDisabled">
+                  <a-input-search disabled  v-model="checkedDepartNameString" readOnly @search="onSearch">
+                  </a-input-search>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="8" :lg="8">
+                <a-form-item label="职务" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <a-input-search disabled  v-model="zwName" readOnly @search="zw()">
+                  </a-input-search>
+                </a-form-item>
+              </a-col>
         </a-row>
 
         <a-row>
@@ -88,10 +117,10 @@
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="8" :lg="8">
-            <a-form-item label="部门" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!departDisabled">
-              <a-input-search disabled  v-model="checkedDepartNameString" readOnly @search="onSearch">
-                
-              </a-input-search>
+            <a-form-item label="入职日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-date-picker disabled style="width: 100%" 
+                v-decorator="['entryDate', {initialValue:!model.entryDate?moment(new Date(),dateFormat):moment(model.entryDate,dateFormat)}]"
+                :getCalendarContainer="node => node.parentNode" />
             </a-form-item>
           </a-col>
         </a-row>
@@ -109,39 +138,14 @@
           </a-col>
          
           <a-col :md="6" :sm="8" :lg="8">
-            <a-form-item label="职务" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input-search disabled  v-model="zwName" readOnly @search="zw()">
-              </a-input-search>
+            <a-form-item label="缴交基数" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input-number  min="0" max="10" disabled controls="false" style="width: 210px;"  v-decorator="['wagesBase', {}]" />
             </a-form-item>
           </a-col>
         </a-row>
 
         <a-row>
-          <a-col :md="6" :sm="8" :lg="8">
-            <a-form-item label="人员类别" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-select disabled v-decorator="[ 'category', {initialValue:101}]" 
-                :getPopupContainer="(target) => target.parentNode" @change="handleChangeStatus">
-                <a-select-option :value="101">正式工</a-select-option>
-                <a-select-option :value="103">实习生</a-select-option>
-                <a-select-option :value="104">劳务工</a-select-option>
-                <a-select-option :value="105">劳务外包5+2</a-select-option>
-                <a-select-option :value="106">劳务外包6+1</a-select-option>
-                <a-select-option :value="102">顾问</a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="8" :lg="8">
-            <a-form-item label="缴交基数" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input-number  min="0" max="10" disabled controls="false" style="width: 210px;"  v-decorator="['wagesBase', {}]" />
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="8" :lg="8">
-            <a-form-item label="入职日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-date-picker disabled style="width: 100%" 
-                v-decorator="['entryDate', {initialValue:!model.entryDate?moment(new Date(),dateFormat):moment(model.entryDate,dateFormat)}]"
-                :getCalendarContainer="node => node.parentNode" />
-            </a-form-item>
-          </a-col>
+          
           
         </a-row>
         <a-row>
@@ -212,18 +216,12 @@
            
       
         <a-row>
-          <a-col :md="6" :sm="8" :lg="8">
-            <a-form-model-item label="头像" :labelCol="labelCol" :wrapperCol="wrapperCol">
-               <j-image-upload disabled  class="avatar-uploader" text="上传" v-model="model.avatar" ></j-image-upload>
-             </a-form-model-item>
-          </a-col>
-          <a-col :md="6" :sm="8" :lg="16">
-            <a-table rowKey="id" bordered :data-source="dataSources" :columns="columnst"  :pagination="ipaginations" @change="handleTableChanges"
-           
-            >
+         
+          
+            <a-table rowKey="id" bordered :data-source="dataSources" :columns="columnst"  :pagination="ipaginations" @change="handleTableChanges">
               
             </a-table>
-          </a-col>
+         
         </a-row>
 
       </a-form>

src/views/system/modules/UserModal.vue

@@ -13,25 +13,40 @@
     <a-spin :spinning="confirmLoading">
       <a-form :form="form" style="overflow-y: auto;height: 650px;">
         <a-row>
+          <a-col :md="6" :sm="8" :lg="8">
+            <a-form-model-item label="头像" :labelCol="labelCol" :wrapperCol="wrapperCol">
+               <j-image-upload  class="avatar-uploader" text="上传" v-model="model.avatar" ></j-image-upload>
+             </a-form-model-item>
+          </a-col>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="姓名" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input maxLength="10" placeholder="请输入员工姓名" v-decorator="[ 'realname', validatorRules.realname]" />
+              <a-input :maxLength="10" placeholder="请输入员工姓名" v-decorator="[ 'realname', validatorRules.realname]" />
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="英文名" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input maxLength="10" placeholder="请输入英文名" v-decorator="[ 'egName', validatorRules.egName]" />
+              <a-input :maxLength="20" placeholder="请输入英文名" v-decorator="[ 'egName', validatorRules.egName]" />
             </a-form-item>
           </a-col>
           
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="邮箱" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input maxLength="30" placeholder="请输入邮箱" v-decorator="[ 'email', validatorRules.email]" />
+              <a-input :maxLength="30" placeholder="请输入邮箱" v-decorator="[ 'email', validatorRules.email]" />
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="8" :lg="8">
+            <a-form-item label="人员类别" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-select v-decorator="[ 'category', {initialValue:101}]" placeholder="请选择人员类别"
+                :getPopupContainer="(target) => target.parentNode" @change="handleChangeStatus">
+                <a-select-option :value="101">正式工</a-select-option>
+                <a-select-option :value="103">实习生</a-select-option>
+                <a-select-option :value="104">劳务工</a-select-option>
+                <a-select-option :value="105">劳务外包5+2</a-select-option>
+                <a-select-option :value="106">劳务外包6+1</a-select-option>
+                <a-select-option :value="102">顾问</a-select-option>
+              </a-select>
             </a-form-item>
           </a-col>
-        </a-row>
-
-        <a-row>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="证件类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-select v-model="sfzType" placeholder="请选择证件类型">
@@ -42,9 +57,12 @@
           </a-col>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="身份证" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input maxLength="20" placeholder="请输入身份证号码" v-decorator="[ 'sfzCode', validatorRules.sfzCode]" />
+              <a-input :maxLength="20" placeholder="请输入身份证号码" v-decorator="[ 'sfzCode', validatorRules.sfzCode]" />
             </a-form-item>
             </a-col>
+        </a-row>
+
+        <a-row>
             <a-col :md="6" :sm="8" :lg="8">
               <a-form-item label="性别" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <a-select v-decorator="[ 'sex',validatorRules.sex]" placeholder="请选择性别"
@@ -54,37 +72,30 @@
                 </a-select>
               </a-form-item>
             </a-col>
-        </a-row>
-
-        <a-row>
-          <a-col :md="6" :sm="8" :lg="8">
-          <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)}]"
-              :getCalendarContainer="node => node.parentNode" />
-          </a-form-item>
-          </a-col>
+            
             <a-col :md="6" :sm="8" :lg="8">
-                <a-form-item label="手机号" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-input maxLength="20" placeholder="请输入手机号码" v-decorator="[ 'phone', validatorRules.phone]" />
-                </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)}]"
+                 :getCalendarContainer="node => node.parentNode" />
+             </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="8" :lg="8">
-              <a-form-item label="公积金" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-input maxLength="20" placeholder="请输入公积金账号"  v-decorator="['syFund',validatorRules.syFund]" />
-                </a-form-item>
-              </a-col>
+           <a-col :md="6" :sm="8" :lg="8">
+               <a-form-item label="手机号" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                 <a-input :maxLength="20" placeholder="请输入手机号码" v-decorator="[ 'phone', validatorRules.phone]" />
+               </a-form-item>
+           </a-col>
         </a-row>
 
         <a-row>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="银行卡" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input maxLength="20" placeholder="请输入银行卡号"  v-decorator="['bankCard', validatorRules.bankCard]" />
+              <a-input :maxLength="20" placeholder="请输入银行卡号"  v-decorator="['bankCard', validatorRules.bankCard]" />
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="开户行" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input maxLength="30" placeholder="请输入开户行" v-decorator="['bankAddr', {}]" />
+              <a-input :maxLength="30" placeholder="请输入开户行" v-decorator="['bankAddr', {initialValue:'招商银行'}]" />
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="8" :lg="8">
@@ -99,12 +110,12 @@
         <a-row>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="工资一" :labelCol="labelCol" :wrapperCol="wrapperCol" >
-              <a-input-number min="0" max="999999" id="inputNumber" placeholder="请输入基本工资" style="width: 210px;" v-decorator="['wagesOne',validatorRules.wagesOne]" />
+              <a-input :maxLength="6"   placeholder="请输入基本工资" style="width: 210px;" v-decorator="['wagesOne',validatorRules.wagesOne]" />
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="工资二" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input-number min="0" max="999999" placeholder="请输入基本工资" style="width: 210px;" v-decorator="['wagesTwo', {}]" />
+              <a-input :maxLength="6" placeholder="请输入基本工资" style="width: 210px;" v-decorator="['wagesTwo', {}]" />
             </a-form-item>
           </a-col>
           <!-- <a-col :md="6" :sm="8" :lg="8">
@@ -114,30 +125,20 @@
           </a-col> -->
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="职务" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input-search placeholder="点击选择职位" v-model="zwName" readOnly @search="zw()">
-                <a-button slot="enterButton" icon="search">选择</a-button>
-              </a-input-search>
+             <j-select-position placeholder="请选择职务" :multiple="false" v-model="model.post"/>
             </a-form-item>
           </a-col>
         </a-row>
 
         <a-row>
           <a-col :md="6" :sm="8" :lg="8">
-            <a-form-item label="人员类别" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-select v-decorator="[ 'category', {initialValue:101}]" placeholder="请选择人员类别"
-                :getPopupContainer="(target) => target.parentNode" @change="handleChangeStatus">
-                <a-select-option :value="101">正式工</a-select-option>
-                <a-select-option :value="103">实习生</a-select-option>
-                <a-select-option :value="104">劳务工</a-select-option>
-                <a-select-option :value="105">劳务外包5+2</a-select-option>
-                <a-select-option :value="106">劳务外包6+1</a-select-option>
-                <a-select-option :value="102">顾问</a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
+            <a-form-item label="公积金" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <a-input :maxLength="20" placeholder="请输入公积金账号"  v-decorator="['syFund',validatorRules.syFund]" />
+              </a-form-item>
+            </a-col>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="缴交基数" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input-number min="0" max="10" :disabled="personType" controls="false" style="width: 210px;" placeholder="请输入缴交基数" v-decorator="['wagesBase', {}]" />
+              <a-input :maxLength="2" :disabled="personType"  style="width: 210px;" placeholder="请输入缴交基数" v-decorator="['wagesBase', {}]" />
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="8" :lg="8">
@@ -152,12 +153,12 @@
         <a-row>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="联系人" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input maxLength="10" placeholder="请输入紧急联系人" v-decorator="[ 'urgentName',{}]" />
+              <a-input :maxLength="20" placeholder="请输入紧急联系人" v-decorator="[ 'urgentName',{}]" />
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="电话" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input maxLength="20" placeholder="请输入紧急联系人电话" v-decorator="[ 'urgentPhone', {}]" />
+              <a-input :maxLength="20" placeholder="请输入紧急联系人电话" v-decorator="[ 'urgentPhone', {}]" />
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="8" :lg="8">
@@ -172,16 +173,17 @@
         <a-row>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="家庭住址" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input maxLength="50" placeholder="请输入家庭住址" v-decorator="[ 'addr', {}]" />
+              <a-input :maxLength="50" placeholder="请输入家庭住址" v-decorator="[ 'addr', {}]" />
             </a-form-item>
           </a-col>
          <a-col :md="6" :sm="8" :lg="8">
            <a-form-item label="雇佣状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
-             <a-select v-decorator="[ 'employmentStatus', {initialValue:10}]" placeholder="请选择雇佣状态"
+             <a-select v-decorator="[ 'employmentStatus', {initialValue:40}]" placeholder="请选择雇佣状态"
                :getPopupContainer="(target) => target.parentNode" >
                <a-select-option :value="10">在职</a-select-option>
                <a-select-option :value="20">离退</a-select-option>
                <a-select-option :value="30">离职</a-select-option>
+               <a-select-option :value="40">待入职</a-select-option>
              </a-select>
            </a-form-item>
          </a-col>
@@ -200,7 +202,7 @@
         <a-row>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-textarea maxLength="255" placeholder="请输备注" v-decorator="[ 'remarks', {}]" />
+              <a-textarea :maxLength="255" placeholder="请输备注" v-decorator="[ 'remarks', {}]" />
             </a-form-item>
           </a-col>
          <a-col :md="6" :sm="8" :lg="8">
@@ -225,13 +227,7 @@
           </a-col>
           
         </a-row> -->
-        <a-row>
-          <a-col :md="6" :sm="8" :lg="8">
-            <a-form-model-item label="头像" :labelCol="labelCol" :wrapperCol="wrapperCol">
-               <j-image-upload  class="avatar-uploader" text="上传" v-model="model.avatar" ></j-image-upload>
-             </a-form-model-item>
-          </a-col>
-        </a-row>
+      
 
       </a-form>
     </a-spin>
@@ -744,7 +740,7 @@
         this.zwName=record.post_dictText;
         that.$nextTick(() => {
           that.form.setFieldsValue(pick(this.model, 'sex', 'email', 'phone', 'urgentName', 'urgentPhone',
-            'bankAddr', 'bankCard', 'realname', 'egName', 'sfzCode','isAttendance','remarks','addr',
+            'bankAddr', 'bankCard', 'realname', 'egName', 'sfzCode','isAttendance','remarks','addr','post',
             'infoSy', 'syFund', 'category', 'employmentStatus', 'wagesOne', 'wagesTwo', 'security','wagesBase'))
         });
         //身份为上级显示负责部门，否则不显示
@@ -867,7 +863,7 @@
               }
               formData.txt = txt.join(",");
             }
-            formData.post=this.zwCode;
+            //formData.post=this.zwCode;
             //formData.selectedroles = this.selectedRole.length>0?this.selectedRole.join(","):'';
             formData.selecteddeparts = this.userDepartModel.departIdList.length > 0 ? this.userDepartModel
               .departIdList.join(",") : '';
@@ -949,12 +945,12 @@
         if (!value) {
           callback()
         } else {
-          this.egName = value;
+          this.egName =value.substr(0,1).toLowerCase()+value.substr(1,value.length);
           if (this.realname != null && this.realname != "") {
             var emil = "@gksports.com.cn";
             var name = py.chineseToPinYin(this.realname.substr(0, 1))
             this.form.setFieldsValue({
-              email: value + "." + name + emil
+              email: this.egName + "." + name + emil
             })
           }
           callback()