Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/components/school/manager/employee_log.vue

@@ -10,7 +10,6 @@
               <q-avatar rounded size="sm" v-if="subItem.UserIcon">
                 <img :src="subItem.UserIcon" />
               </q-avatar>
-
               {{subItem.CreateName}}
             </template>
             <div>
@@ -57,7 +56,6 @@
       //获取员工修改日志
       getEmpLog() {
         queryEmpChangeLog(this.qMsg).then(res => {
-          console.log("res", res);
           if (res.Code == 1) {
             this.LogList = res.Data;
           }

src/components/school/manager/manager-form.vue

@@ -58,7 +58,7 @@
           <q-select filled stack-label option-value="Id" option-label="Name" v-model="objOption.LeaveStatus"
             ref="Education" :options="LeaveStatusList" label="在职状态" :dense="false" class="col-6 q-pr-lg q-pb-lg"
             emit-value map-options />
-          <q-input v-if="objOption.AccountId>0 && objOption.LeaveStatus==4" filled v-model="objOption.LeaveTime"
+          <q-input v-show="objOption.AccountId>0 && objOption.LeaveStatus==4" filled v-model="objOption.LeaveTime"
             class="col-6 q-pr-lg q-pb-lg" mask="date" label="离职时间">
             <template v-slot:append>
               <q-icon name="event" class="cursor-pointer">