员工

src/projects/business/views/Master/Attendance/LeaveForm.vue

@@ -237,8 +237,15 @@
                     var month = selectItems.m.value;
                     var day = selectItems.d.value;
                     var curDate = year + "-" + month + "-" + day;
+
+                    if(curDate==_this.tjForm.endTime&&_this.tjForm.endTimeQuantum=='0'&&selectItems.h.value=='1'){
+                        //debugger
+                        _mui.alert('开始日期必须大于结束日期');
+                        return false;
+                    }
+
 					_this.tjForm.startTime = curDate;
-					debugger
+
                     _this.tjForm.startTimeQuantum =  selectItems.h.value;
 
                 });

src/projects/business/views/Master/Attendance/LeaveInfo.vue

@@ -20,8 +20,8 @@
 
             <div class="mui-input-row">
                 <label>请假时间</label>
-                <span>自{{detail.startTime}}{{(detail.startTimeQuantum!=''?(detail.startTimeQuantum?'下午上班':'上午上班'):'')}}
-                    <br />至{{detail.endTime}}{{(detail.endTimeQuantum!=''?(detail.endTimeQuantum?'下午下班':'上午下班'):'')}}</span>
+                <span>自{{detail.startTime}}{{(detail.startTimeQuantum!=''?(detail.startTimeQuantum=='1'?'下午上班':'上午上班'):'')}}
+                    <br />至{{detail.endTime}}{{(detail.endTimeQuantum!=''?(detail.endTimeQuantum=='1'?'下午下班':'上午下班'):'')}}</span>
             </div>
             <div class="mui-input-row">
                 <label>请假事由</label>