Merge branch 'master' of http://139.196.39.194:9021/chenc/cd-work-flow-web

src/views/activiti/form/demoForm2.vue

@@ -955,7 +955,7 @@ export default {
           if(key == 'proposer' && this.processData.businessTable == 'regular_employee_apply'){//员工转正申请：申请人部门
             this.$refs.KFB.setData({apply_department:this.deptInfo[value]})   
           }
-          if(key == 'proposer' && this.processData.businessTable == 'request_for_overtime'){//员工转正申请：加班申请
+          if(key == 'proposer' && this.processData.businessTable == 'request_for_overtime'){//加班申请：申请人部门
             this.$refs.KFB.setData({department:this.deptInfo[value]})   
           }
           if(key == 'regular_employee' && this.processData.businessTable == 'regular_employee_apply'){//员工转正申请：转正人员岗位

src/views/system/modules/UserModal.vue

@@ -112,6 +112,9 @@
           <!-- <a-input placeholder="请输入户口所在地" v-decorator="['nregisteredAddr', validatorRules.nregisteredAddr]" /> -->
         </a-form-item>
 
+        <a-form-item label="毕业院校" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <a-input placeholder="请输入毕业院校" v-decorator="['graduationSchool', validatorRules.graduationSchool]" />
+        </a-form-item>
         <a-form-item label="所学专业" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-input placeholder="请输入所学专业" v-decorator="['nmajor', validatorRules.nmajor]" />
         </a-form-item>
@@ -513,6 +516,9 @@ export default {
                 nmajor:{
                     rules: [{ required: true, message: '请输入所学专业' }]
                 },
+                graduationSchool:{
+                    rules: [{ required: true, message: '请输入毕业院校' }]
+                },
                 noutlook:{
                    rules: [{ required: true, message: '请选择政治面貌' }]
                 },
@@ -682,6 +688,7 @@ export default {
                         'nmarriage',
                         'nregistered',
                         'noutlook',
+                        'graduationSchool',
                         'nmajor',
                         'neducation',
                         'ngraduationTime',