2022.6.24 1

fhKeeper/formulahousekeeper/timesheet/src/views/settings/timetype.vue

@@ -22,7 +22,7 @@
                     <el-option v-for="item in times" :key="item" :label="item.toFixed(1)" :value="item"></el-option>
                 </el-select>
                 小时
-                <span class="lockworktime"><el-checkbox v-model="timeType.fillAhead" label="可提前填报" /></span>
+                
                 <span class="lockworktime"><el-checkbox v-model="timeType.lockWorktime" label="锁定工作时长" />
                 
                 <el-tooltip effect="dark" content="锁定每日填报工时的上限" placement="top-start">
@@ -203,7 +203,7 @@
             </el-col>
         </el-row>
 <!-- 设置员工可补填的时间 -->
-        <p style="margin-left:10px;color:#666;">普通员工补填日报时间限制</p>
+        <p style="margin-left:10px;color:#666;">普通员工填报日报时间限制</p>
         <el-row :gutter="20" style="padding-top:10px;width:100%;margin:0 auto;padding-left:10px;padding-right:10px;">
         <el-col :span="24" >
             <div class="panel" style="height:60px;">
@@ -215,6 +215,7 @@
                         </el-option>
                     </el-select>
                     <span style="color:#666;margin-left:10px;">(说明：系统管理员为员工代填日报时不受补填时间的限制)</span>
+                    <span class="lockworktime"><el-checkbox v-model="timeType.fillAhead" label="可提前填报" /></span>
                 </el-form-item>
                 </el-form>
             </div>