Merge branch 'master' of http://114.55.67.98:8070/Natural_p1/zjugis_OA

zjugis-business/src/main/resources/templates/AttendanceNote/js/index.js

@@ -21,12 +21,31 @@
                 ele: ".startTimeRange" + listsLength,
                 name: "AttendanceNoteTimeDO[" + listsLength + "]$startTimeRange",
                 callback: function (val) {
+                    let startDate = z.ui.laydate("[name='AttendanceNoteTimeDO[" + listsLength + "]$startTime']").getValue();
+                    if (!startDate) {
+                        $("[name='AttendanceNoteTimeDO[" + listsLength + "]$startTimeRange']").find("input").val("");
+                        z.ui.alertWarning("请先选择起始日期!")
+                        return;
+                    }
                 }
             })
             timeSelector({
                 ele: ".endTimeRange" + listsLength,
                 name: "AttendanceNoteTimeDO[" + listsLength + "]$endTimeRange",
                 callback: function (val) {
+                    let endDate = z.ui.laydate("[name='AttendanceNoteTimeDO[" + listsLength + "]$endTime']").getValue();
+                    if (!endDate) {
+                        $("[name='AttendanceNoteTimeDO[" + listsLength + "]$endTimeRange']").find("input").val("");
+                        z.ui.alertWarning("请先选择截止日期!")
+                        return;
+                    }
+                    let endTime = Date.parse(endDate + " " + val);
+                    if (endTime <= timeObj.startTime) {
+                        z.ui.alertWarning("截止时间必须大于起始时间!")
+                        $("[name='AttendanceNoteTimeDO[" + listsLength + "]$endTimeRange']").find("input").val("");
+                        z.ui.laydate("[name='AttendanceNoteTimeDO[" + listsLength + "]$endTime']").setValue('');
+                        return;
+                    }
                 }
             })
             $("#editBtn_" + listsLength).click(function () {

zjugis-business/src/main/resources/templates/Travel/js/index.js

@@ -21,12 +21,31 @@
                 ele: ".startTimeRange" + listsLength,
                 name: "TravelTimeDO[" + listsLength + "]$startTimeRange",
                 callback: function (val) {
+                    let startDate = z.ui.laydate("[name='TravelTimeDO[" + listsLength + "]$startTime']").getValue();
+                    if (!startDate) {
+                        $("[name='TravelTimeDO[" + listsLength + "]$startTimeRange']").find("input").val("");
+                        z.ui.alertWarning("请先选择起始日期!")
+                        return;
+                    }
                 }
             })
             timeSelector({
                 ele: ".endTimeRange" + listsLength,
                 name: "TravelTimeDO[" + listsLength + "]$endTimeRange",
                 callback: function (val) {
+                    let endDate = z.ui.laydate("[name='TravelTimeDO[" + listsLength + "]$endTime']").getValue();
+                    if (!endDate) {
+                        $("[name='TravelTimeDO[" + listsLength + "]$endTimeRange']").find("input").val("");
+                        z.ui.alertWarning("请先选择截止日期!")
+                        return;
+                    }
+                    let endTime = Date.parse(endDate + " " + val);
+                    if (endTime <= timeObj.startTime) {
+                        z.ui.alertWarning("截止时间必须大于起始时间!")
+                        $("[name='TravelTimeDO[" + listsLength + "]$endTimeRange']").find("input").val("");
+                        z.ui.laydate("[name='TravelTimeDO[" + listsLength + "]$endTime']").setValue('');
+                        return;
+                    }
                 }
             })
             $("#editBtn_" + listsLength).click(function () {