sunlupeng 1 рік тому
батько
коміт
dc59d9fbc0

+ 1 - 1
src/views/personnel/attendance/employee/index.vue

@@ -48,7 +48,7 @@
 
         <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="55" align="center" />
-          <el-table-column label="员工Id" align="center" rop="employeeId"/>
+          <!-- <el-table-column label="员工Id" align="center" rop="employeeId"/> -->
           <el-table-column label="员工姓名" align="center" prop="name"/>
           <el-table-column label="班次信息" align="center" prop="shiftName"/>
           <el-table-column label="部门" align="center" key="deptName" prop="deptName"/>

+ 6 - 9
src/views/personnel/attendance/scheduling/index.vue

@@ -55,19 +55,16 @@
           <el-input v-model="form.shiftName" placeholder="请输入排班名称" />
         </el-form-item>
         <el-form-item label="上班时间" prop="startTime">
-          <el-time-select value-format="HH:mm" placeholder="上班时间" v-model="form.startTime" :picker-options="{
-            start: '08:30',
-            step: '00:05',
-            end: '18:30'
+          <el-time-select value-format="HH:mm" format="HH:mm" placeholder="上班时间" v-model="form.startTime" 
+          :picker-options="{
+            selectableRange: '00:30 - 23:59'
           }" style="width: 100%;">
           </el-time-select>
         </el-form-item>
         <el-form-item label="下班时间" prop="endTime">
-          <el-time-select value-format="HH:mm" placeholder="下班时间" v-model="form.endTime" :picker-options="{
-            start: '08:30',
-            step: '00:05',
-            end: '18:30',
-            minTime: form.startTime
+          <el-time-select value-format="HH:mm" format="HH:mm" placeholder="下班时间" v-model="form.endTime"
+            :picker-options="{
+            selectableRange: '00:30 - 23:59'
           }" style="width: 100%;">
           </el-time-select>
         </el-form-item>