修改

src/views/personnel/attendance/info/index.vue

@@ -15,8 +15,8 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="手机号" prop="employeePhone">
-        <el-input v-model="queryParams.employeePhone" placeholder="请输入手机号" clearable style="width: 250px"
+      <el-form-item label="手机号" prop="employeeMobile">
+        <el-input v-model="queryParams.employeeMobile" placeholder="请输入手机号" clearable style="width: 250px"
           @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="日期" prop="attendanceDate">
@@ -46,7 +46,7 @@
       <el-table-column label="员工姓名" align="center" prop="employeeName" min-width="80" />
       <el-table-column label="部门" align="center" prop="deptName" min-width="100" />
       <el-table-column label="职位" align="center" prop="position" min-width="100" />
-      <el-table-column label="手机号" align="center" prop="employeePhone" min-width="100" />
+      <el-table-column label="手机号" align="center" prop="employeeMobile" min-width="100" />
       <el-table-column label="日期" align="center" prop="attendanceDate" min-width="100" />
       <el-table-column label="上班打卡" align="center" prop="workStartTime" min-width="100" />
       <el-table-column label="下班打卡" align="center" prop="workEndTime" min-width="100" />
@@ -91,7 +91,7 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="手机号">
-              <el-input v-model="form.employeePhone" placeholder='手机号' disabled></el-input>
+              <el-input v-model="form.employeeMobile" placeholder='手机号' disabled></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -106,6 +106,7 @@
               <el-time-picker
                 v-model="form.workStartTime"
                 value-format="HH:mm"
+                format="HH:mm"
                 :picker-options="{
                   selectableRange: '00:00:00 - 23:59:59'
                 }"
@@ -119,6 +120,7 @@
               <el-time-picker
                 v-model="form.workEndTime"
                 value-format="HH:mm"
+                format="HH:mm"
                 :picker-options="{
                   selectableRange: '00:00:00 - 23:59:59'
                 }"
@@ -167,7 +169,7 @@
             <div class="field-name">手机号</div>
           </div>
           <div class="field-component">
-            <span>{{ form.employeePhone }}</span>
+            <span>{{ form.employeeMobile }}</span>
           </div>
         </div>
         <div class="fx-field x-grid-col-12">
@@ -243,7 +245,7 @@ export default {
         employeeName: undefined,
         deptId: undefined,
         position: undefined,
-        employeePhone: undefined,
+        employeeMobile: undefined,
         attendanceDate: [],
       },
       // 表单参数
@@ -275,7 +277,7 @@ export default {
         let employeeInfo = response.data;
         this.form.deptName = employeeInfo.deptName;
         this.form.position = employeeInfo.position;
-        this.form.employeePhone = employeeInfo.phone;
+        this.form.employeeMobile = employeeInfo.phone;
         // this.form.entryDate = employeeInfo.entryDate;
         // this.form.probationEndDate = employeeInfo.probationEndDate;
       });
@@ -335,7 +337,7 @@ export default {
         employeeId: undefined,
         deptName: undefined,
         position: undefined,
-        employeePhone: undefined,
+        employeeMobile: undefined,
         attendanceDate: undefined,
 
         workStartTime: undefined,

src/views/personnel/attendance/scheduling/index.vue

@@ -55,18 +55,26 @@
           <el-input v-model="form.shiftName" placeholder="请输入排班名称" />
         </el-form-item>
         <el-form-item label="上班时间" prop="startTime">
-          <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-time-picker
+            value-format="HH:mm"
+            format="HH:mm"
+            v-model="form.startTime"
+            :picker-options="{
+              selectableRange: '00:00:00 - 23:59:00'
+            }"
+            placeholder="上班时间" style="width: 100%;">
+          </el-time-picker>
         </el-form-item>
         <el-form-item label="下班时间" prop="endTime">
-          <el-time-select value-format="HH:mm" format="HH:mm" placeholder="下班时间" v-model="form.endTime"
+          <el-time-picker
+            value-format="HH:mm"
+            format="HH:mm"
+            v-model="form.endTime"
             :picker-options="{
-            selectableRange: '00:30 - 23:59'
-          }" style="width: 100%;">
-          </el-time-select>
+              selectableRange: '00:00:00 - 23:59:00'
+            }"
+            placeholder="下班时间" style="width: 100%;">
+          </el-time-picker>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">

src/views/personnel/holiday/index.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="员工" prop="entryName">
-        <el-input v-model="queryParams.entryName" placeholder="请输入员工姓名" clearable style="width: 250px"
+      <el-form-item label="员工" prop="name">
+        <el-input v-model="queryParams.name" placeholder="请输入员工姓名" clearable style="width: 250px"
           @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="部门" prop="deptId">
@@ -51,7 +51,7 @@
           <div class="field-name">员工</div>
         </div>
         <div class="field-component">
-          <span :title="form.loginName">{{ form.entryName }}</span>
+          <span :title="form.name">{{ form.name }}</span>
         </div>
       </div>
       <div class="fx-field x-grid-col-12">
@@ -154,7 +154,7 @@ export default {
       queryParams: {
         pageNo: 1,
         pageSize: 10,
-        entryName: undefined,
+        name: undefined,
         deptId: undefined,
         position: undefined,
       },
@@ -202,7 +202,7 @@ export default {
     // 表单重置
     reset() {
       this.form = {
-        entryName: undefined,
+        name: undefined,
         deptId: undefined,
         position: undefined,
         employeeStatus: undefined,