Merge remote-tracking branch 'origin/master'

ruoyi-ui/src/views/pay/attendance/index.vue

@@ -122,26 +122,10 @@
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="员工姓名" align="center" prop="empName" />
         <el-table-column label="部门名称" align="center" prop="deptName" />
-        <el-table-column label="上午开始时间" align="center" prop="amStartTime" width="180">
+        <el-table-column label="上午开始时间" align="center" prop="amStartTime" width="180"/>
-          <template slot-scope="scope">
+        <el-table-column label="上午结束时间" align="center" prop="amEndTime" width="180"/>
-            <span>{{ parseTime(scope.row.amStartTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        <el-table-column label="下午开始时间" align="center" prop="pmStartTime" width="180"/>
-          </template>
+        <el-table-column label="下午结束时间" align="center" prop="pmEndTime" width="180"/>
-        </el-table-column>
-        <el-table-column label="上午结束时间" align="center" prop="amEndTime" width="180">
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.amEndTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="下午开始时间" align="center" prop="pmStartTime" width="180">
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.pmStartTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="下午结束时间" align="center" prop="pmEndTime" width="180">
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.pmEndTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
-          </template>
-        </el-table-column>
         <el-table-column label="考勤日期" align="center" prop="kaoqinDate" width="180">
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.kaoqinDate, '{y}-{m}-{d}') }}</span>
@@ -215,23 +199,23 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="上午开始时间" prop="amBeginTime">
+            <el-form-item label="上午开始时间" prop="amStartTime1">
-              <el-time-picker v-model="form.amBeginTime" style="width: 100%;" value-format="HH:mm" format="HH:mm" placeholder="上午开始时间"></el-time-picker>
+              <el-time-picker v-model="form.amStartTime1" style="width: 100%;" value-format="HH:mm" format="HH:mm" placeholder="上午开始时间"></el-time-picker>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="上午结束时间" prop="amFnishTime">
+            <el-form-item label="上午结束时间" prop="amEndTime1">
-              <el-time-picker v-model="form.amFnishTime" style="width: 100%;" value-format="HH:mm" format="HH:mm" placeholder="上午结束时间"></el-time-picker>
+              <el-time-picker v-model="form.amEndTime1" style="width: 100%;" value-format="HH:mm" format="HH:mm" placeholder="上午结束时间"></el-time-picker>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="下午开始时间" prop="pmBeginTime">
+            <el-form-item label="下午开始时间" prop="pmStartTime1">
-              <el-time-picker v-model="form.pmBeginTime" style="width: 100%;" value-format="HH:mm" format="HH:mm" placeholder="下午开始时间"></el-time-picker>
+              <el-time-picker v-model="form.pmStartTime1" style="width: 100%;" value-format="HH:mm" format="HH:mm" placeholder="下午开始时间"></el-time-picker>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="下午结束时间" prop="pmFnishTime">
+            <el-form-item label="下午结束时间" prop="pmEndTime1">
-              <el-time-picker v-model="form.pmFnishTime" style="width: 100%;" value-format="HH:mm" format="HH:mm" placeholder="下午结束时间"></el-time-picker>
+              <el-time-picker v-model="form.pmEndTime1" style="width: 100%;" value-format="HH:mm" format="HH:mm" placeholder="下午结束时间"></el-time-picker>
             </el-form-item>
           </el-col>
         </el-row>
@@ -520,9 +504,13 @@ export default {
         deptName: undefined,
         deptId: undefined,
         amStartTime: undefined,
+        amStartTime1: undefined,
+        amEndTime1: undefined,
         amEndTime: undefined,
         pmStartTime: undefined,
+        pmStartTime1: undefined,
         pmEndTime: undefined,
+        pmEndTime1: undefined,
         kaoqinDate: undefined,
         kaoqinYearMonth: undefined,
         kaoqinjiNum: undefined
@@ -559,6 +547,46 @@ export default {
       getAttendance(id).then(response => {
         this.loading = false;
         this.form = response.data;
+
+        if(this.form.amStartTime == null){
+          this.$set(this.form,"amStartTime1",null);
+        }else{
+          var asth = new Date(this.form.amStartTime).getHours();
+          asth = asth < 10 ?  asth : asth;
+          var astm = new Date(this.form.amStartTime).getMinutes();
+          astm = astm < 10 ? '0' + astm : astm;
+          this.$set(this.form,"amStartTime1",asth+":"+astm);
+        }
+
+        if(this.form.amEndTime == null){
+          this.$set(this.form,"amEndTime1",null);
+        }else{
+          var aeth = new Date(this.form.amEndTime).getHours();
+          aeth = aeth < 10 ?  aeth : aeth;
+          var aetm = new Date(this.form.amEndTime).getMinutes();
+          aetm = aetm < 10 ? '0' + aetm : aetm;
+          this.$set(this.form,"amEndTime1",aeth+":"+aetm);
+        }
+
+        if(this.form.pmStartTime == null){
+          this.$set(this.form,"pmStartTime1",null);
+        }else{
+          var psth = new Date(this.form.pmStartTime).getHours();
+          psth = psth < 10 ?  psth : psth;
+          var pstm = new Date(this.form.pmStartTime).getMinutes();
+          pstm = pstm < 10 ? '0' + pstm : pstm;
+          this.$set(this.form,"pmStartTime1",psth+":"+pstm);
+        }
+        if(this.form.pmEndTime == null){
+          this.$set(this.form,"pmEndTime1",null);
+        }else{
+          var peth = new Date(this.form.pmEndTime).getHours();
+          peth = peth < 10 ?  peth : peth;
+          var petm = new Date(this.form.pmEndTime).getMinutes();
+          petm = petm < 10 ? '0' + petm : petm;
+          this.$set(this.form,"pmEndTime1",peth+":"+petm);
+        }
+
         this.open = true;
         this.title = "修改考勤";
       });
@@ -567,7 +595,40 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          this.form.tenantId = this.gsInfo.active_id;
           this.buttonLoading = true;
+          var isTime = true;
+          if(this.form.amStartTime1!==null){
+            this.form.amStartTime = this.form.kaoqinDate + ' ' + this.form.amStartTime1 + ':00';
+          }
+          if(this.form.amEndTime1!==null){
+            this.form.amEndTime = this.form.kaoqinDate + ' ' + this.form.amEndTime1 + ':00';
+          }
+          if(this.form.pmStartTime1!==null){
+            this.form.pmStartTime = this.form.kaoqinDate + ' ' + this.form.pmStartTime1 + ':00';
+          }
+          if(this.form.pmEndTime1!==null){
+            this.form.pmEndTime = this.form.kaoqinDate + ' ' + this.form.pmEndTime1 + ':00';
+          }
+          if (new Date(this.form.amEndTime).getTime() < new Date(this.form.amStartTime).getTime()) {
+            isTime = false
+            this.$alert('上午结束时间应大于上午开始时间', '信息', {
+              confirmButtonText: '确定',
+              customClass: 'message_box_alert'
+            }).catch((err) => {
+              console.log(err)
+            })
+          }
+          if(new Date(this.form.pmEndTime).getTime() < new Date(this.form.pmStartTime).getTime()){
+            isTime = false
+            this.$alert('上午结束时间应大于上午开始时间', '信息', {
+              confirmButtonText: '确定',
+              customClass: 'message_box_alert'
+            }).catch((err) => {
+              console.log(err)
+            })
+          }
+
           if (this.form.id != null) {
             updateAttendance(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");