Merge remote-tracking branch 'origin/master'

src/views/activiti/form/demoForm2.vue

@@ -959,7 +959,7 @@ export default {
                    //   actual = that.$refs.KFB.form.getFieldValue('practical_leave'),
                     leaveCategory = this.$refs.KFB.form.getFieldValue('leave_category')
                     if(leaveCategory=='年假' && !estimate){
-                      this.$message.error('请填写预计请假时长！')
+                      this.$message.error('请填写预计请假天数！')
                       addForm = 'yes'
                      }
                       if(estimate>this.leave){

src/views/system/modules/AddCertificateManagement.vue

@@ -19,16 +19,16 @@
               </a-form-model-item>
             </a-col>
             <a-col :md="8" :sm="8">
-              <a-form-model-item label="证件所有人"  prop="userId" >
+              <!-- <a-form-model-item label="证件所有人"  prop="userId" >
                 <j-search-select-tag v-model="formState.userId" placeholder="请选择用户名称" 
                    dict="sys_user,realname,username" @search="searchName" />
-              </a-form-model-item>
-              <!-- <a-form-model-item label="证件所有人"  prop="userId" >
+              </a-form-model-item> -->
+              <a-form-model-item label="证件所有人"  prop="userId" >
                 <j-search-select-tag v-model="formState.userId" placeholder="请选择用户名称" 
                    dict="sys_user,realname,username" @search="searchName" style="width:71%" v-if="inputMethod =='select'"/>
                    <a-input   placeholder="请输入"  v-model="formState.name" style="width:71%" v-if="inputMethod =='input'"/>
                 <a-button type="primary" style="margin-left: 8%;" v-model="formState.name" @click="changeInputMethod">切换</a-button>
-              </a-form-model-item> -->
+              </a-form-model-item>
                 
            </a-col>
             <a-col :md="8" :sm="8">