Merge remote-tracking branch 'origin/master'

attendance-performance-manager-ui/admin/src/views/perform/attend/record/drawershow.vue

@@ -12,7 +12,7 @@
           <el-form-item label="姓名：">
             <p v-if="form.view == '查看'">{{ form.staffName }}</p>
             <el-select
-              v-model="form.staffName"
+              v-model="form.staffId"
               filterable
               @change="staffChange"
               style="width: 100%;"
@@ -92,8 +92,9 @@
             <el-date-picker
               v-else
               v-model="form.errorTime"
-              type="date"
+              type="datetime"
               placeholder="选择日期"
+              value-format="yyyy-MM-dd HH:mm:ss"
               style="width: 100%;"
             >
             </el-date-picker>
@@ -104,18 +105,16 @@
         <el-col :span="22">
           <el-form-item label="实际打卡时间：">
             <p v-if="form.view == '查看'">{{ form.actualAttendTime }}</p>
-            <el-time-select
+
+            <el-date-picker
               v-else
               v-model="form.actualAttendTime"
-              :picker-options="{
-                start: '06:00',
-                step: '00:01',
-                end: '18:30',
-              }"
-              placeholder="选择时间"
+              type="datetime"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              placeholder="选择日期时间"
               style="width: 100%;"
             >
-            </el-time-select>
+            </el-date-picker>
           </el-form-item>
         </el-col>
       </el-row>