diff --git a/src/views/mdp/sys/user/Form.vue b/src/views/mdp/sys/user/Form.vue
index 263584d..de9a0a4 100644
--- a/src/views/mdp/sys/user/Form.vue
+++ b/src/views/mdp/sys/user/Form.vue
@@ -7,26 +7,32 @@
 				<el-form-item label="用户名称" prop="username">
 					<el-input v-model="editForm.username" placeholder="用户名称" :maxlength="128" @change="editSomeFields(editForm,'username',$event)" :disabled="disabledJudge('username')"></el-input>
 				</el-form-item>  
-				<el-form-item label="用户状态" prop="ustatus">
-					<mdp-select item-code="ustatus" v-model="editForm.ustatus" placeholder="用户账户状态" :maxlength="1" @change="editSomeFields(editForm,'ustatus',$event)" :disabled="disabledJudge('ustatus')"/>
-				</el-form-item> 
 				<el-form-item label="昵称" prop="nickname">
 					<el-input v-model="editForm.nickname" placeholder="昵称" :maxlength="128" @change="editSomeFields(editForm,'nickname',$event)" :disabled="disabledJudge('nickname')"></el-input>
 				</el-form-item> 
-				<el-form-item label="登录编号" prop="displayUserid">
-					<el-input v-model="editForm.displayUserid" placeholder="登录用户编号" :maxlength="64" @change="editSomeFields(editForm,'displayUserid',$event)" :disabled="disabledJudge('displayUserid')"></el-input>
-				</el-form-item>  
 				<el-form-item label="用户编号" prop="userid">
 					<el-input v-model="editForm.userid" placeholder="内部用户编号" :maxlength="64" @change="editSomeFields(editForm,'userid',$event)" :disabled="disabledJudge('userid')"></el-input>
+				</el-form-item>  
+				<el-form-item label="登录编号" prop="displayUserid">
+					<el-input v-model="editForm.displayUserid" placeholder="登录编号" :maxlength="64" @change="editSomeFields(editForm,'displayUserid',$event)" :disabled="disabledJudge('displayUserid')"></el-input>
+				</el-form-item>  
+				<el-form-item label="用户状态" prop="ustatus" v-if="currOpType!='add'">
+					<mdp-select item-code="ustatus" v-model="editForm.ustatus" placeholder="用户账户状态" :maxlength="1" @change="editSomeFields(editForm,'ustatus',$event)" :disabled="disabledJudge('ustatus')"/>
 				</el-form-item> 
-				
+				<el-form-item label="锁定" prop="locked" v-if="currOpType!='add'">
+					
+					<el-radio-group v-model="editForm.locked"  @change="editSomeFields(editForm,'locked',$event)" :disabled="disabledJudge('locked')">
+				     <el-radio v-model="editForm.locked" label="0" border>正常</el-radio>
+				      <el-radio v-model="editForm.locked" label="1" border>已锁定</el-radio>
+				    </el-radio-group>
+ 				</el-form-item> 
 				<el-form-item label="归属部门" prop="deptid" v-if="currOpType=='add'">
 					<mdp-select-dept v-model="editForm.deptid" placeholder="内部用户编号" :maxlength="64" />
 				</el-form-item>  
 				<el-form-item label="协作类型" prop="cpaType">
                     <el-row type="flex">
                     <mdp-select item-code="cpaType" width="8em" v-model="editForm.cpaType"  placeholder="协作类型" @change="editSomeFields(editForm,'cpaType',$event)"></mdp-select>   
-                    <mdp-select-table show-style="tag" placeholder="协作组织" :props="{id:'id',name:'branchName'}" v-model="editForm.cpaOrg" :load-fun="$mdp.listBranch" @change="editSomeFields(editForm,'cpaOrg',$event)"></mdp-select-table>
+                    &nbsp;&nbsp;&nbsp;<mdp-select-table show-style="tag" placeholder="协作组织" :props="{id:'id',name:'branchName'}" v-model="editForm.cpaOrg" :load-fun="$mdp.listBranch" @change="editSomeFields(editForm,'cpaOrg',$event)"></mdp-select-table>
                         </el-row>
 				</el-form-item> 
 				<el-form-item label="性别" prop="sex">
@@ -40,13 +46,6 @@
 				<el-form-item label="生日" prop="birthday">
 					<el-date-picker type="date" placeholder="选择日期" v-model="editForm.birthday"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" :disabled="disabledJudge('birthday')"></el-date-picker>
 				</el-form-item> 
-				<el-form-item label="锁定" prop="locked">
-					
-					<el-radio-group v-model="editForm.locked"  @change="editSomeFields(editForm,'locked',$event)" :disabled="disabledJudge('locked')">
-				     <el-radio v-model="editForm.locked" label="0" border>正常</el-radio>
-				      <el-radio v-model="editForm.locked" label="1" border>已锁定</el-radio>
-				    </el-radio-group>
- 				</el-form-item> 
 				<el-form-item label="启用日期" prop="startdate">
 					<el-date-picker type="date" placeholder="选择日期" v-model="editForm.startdate"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" :disabled="disabledJudge('startdate')"></el-date-picker>
 				</el-form-item> 
@@ -85,15 +84,15 @@
 				<el-form-item label="身份证号码" prop="idCardNo">
 					<el-input v-model="editForm.idCardNo" placeholder="身份证号码" :maxlength="500" @change="editSomeFields(editForm,'idCardNo',$event)" :disabled="disabledJudge('idCardNo')"></el-input>
 				</el-form-item>  
-				<el-form-item label="审批状态" prop="bizFlowState">
+				<el-form-item label="审批状态" prop="bizFlowState" v-if="currOpType!='add'">
 					<mdp-select v-model="editForm.bizFlowState" item-code="bizFlowState" :disabled="true"></mdp-select>
  				</el-form-item> 
 				 
-				<el-form-item label="更新日期" prop="ltime">
-					<el-date-picker type="date" placeholder="选择日期" v-model="editForm.ltime"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" :disabled="disabledJudge('ltime')"></el-date-picker>
+				<el-form-item label="更新日期" prop="ltime" v-if="currOpType!='add'">
+					<el-date-picker type="date" placeholder="选择日期" v-model="editForm.ltime"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" :disabled="disabledJudge('ltime')||true"></el-date-picker>
 				</el-form-item>  
-				<el-form-item label="归属机构号" prop="branchId">
-					<el-input v-model="editForm.branchId" placeholder="归属的机构编号" :maxlength="50" @change="editSomeFields(editForm,'branchId',$event)" :disabled="disabledJudge('branchId')"></el-input>
+				<el-form-item label="归属机构号" prop="branchId" v-if="currOpType!='add'">
+					<el-input v-model="editForm.branchId" placeholder="归属的机构编号" :maxlength="50" @change="editSomeFields(editForm,'branchId',$event)" :disabled="disabledJudge('branchId')||true"></el-input>
 				</el-form-item> 
 				  <!--
 				<el-form-item label="职业类型" prop="profeType">
@@ -233,13 +232,22 @@ export default {
             currOpType:'mng',//表单 add、edit，所有按钮可动、detail-只看不能操作
             editFormRules: {
 				displayUserid: [
-					{ required: true, message: '账号必填', trigger: 'blur' }
+					{ required: true, message: '账号必填', trigger: 'blur' },
+					
+                    { min: 1,max: 50, message: '长度在1到50之间', trigger: 'blur'}
+				],
+				userid: [  
+                    { min: 1,max: 50, message: '长度在1到50之间', trigger: 'blur'}
 				],
 				username: [
-					{ required: true, message: '用户名称必填', trigger: 'blur' }
+					{ required: true, message: '用户名称必填', trigger: 'blur' },
+					
+                    { min: 1,max: 50, message: '长度在1到50之间', trigger: 'blur'}
 				],
 				nickname: [
-					{ required: true, message: '昵称必填', trigger: 'blur' }
+					{ required: true, message: '昵称必填', trigger: 'blur' },
+					
+                    { min: 1,max: 50, message: '长度在1到50之间', trigger: 'change'}
 				],
 				phoneno: [ 
 					{ validator:validatePhoneno, trigger: 'blur' }
@@ -268,6 +276,14 @@ export default {
         //由组件扩展添加其它的初始页面的逻辑
          initCurrData(){
             this.disabledRulesInit(this.disabledRules)
+			if(this.currOpType=='add'){
+				this.editForm.sex='0' 
+				this.editForm.ustatus="0"
+				this.editForm.locked="0" 
+                this.editForm.cpaType='0' 
+				this.editForm.branchId=this.userInfo.branchId
+                this.editForm.cpaOrg=this.editForm.branchId
+			}
          },
         /**
          * 检查参数是否满足调用后台接口的条件