From 3acf3d5ee9435576276453ad0fbe0d8f202f10e4 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Fri, 27 Nov 2020 19:33:52 +0800
Subject: [PATCH] 修改查询到期的接口

---
 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/rechargeupdate.html |  135 +++++++++++++++++---------------------------
 1 files changed, 52 insertions(+), 83 deletions(-)

diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/rechargeupdate.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/rechargeupdate.html
index 343a3a7..d53d368 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/rechargeupdate.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/rechargeupdate.html
@@ -267,6 +267,8 @@
 
         //充值进行中
         var isRun = false;
+        var contractBeginTimeVVV="";
+        var contractEndTimeVVV="";
         //执行一个laydate实例
         var contractBeginTime= laydate.render({
             elem: '#contractBeginTime', //指定元素
@@ -278,20 +280,11 @@
                     $('#contractBeginTime').val($('#contractEndTime').val());
                 } else {
                     $('#custom_beginTime').val($("#contractBeginTime").val())
-                    custom_beginTimes.config.min = {
-                        year: date.year,
-                        month: date.month - 1,//关键
-                        date: date.date,
-                        hours: date.hours,
-                        minutes: date.minutes,
-                        seconds: date.seconds
-                    }
                 }
             }
         });
         var contractEndTime = laydate.render({
             elem: '#contractEndTime', //指定元素
-            // min: $("#contractEndTime_not").val(),
             done: function (value, date, endDate) {
                 var startDate = new Date($('#contractBeginTime').val()).getTime();
                 var endTime = new Date(value).getTime();
@@ -300,23 +293,7 @@
                     $('#contractEndTime').val($('#contractBeginTime').val());
                 } else {
                     $('#custom_endTime').val($("#contractEndTime").val())
-                    custom_endTimes.config.max = {
-                        year: date.year,
-                        month: date.month - 1,//关键
-                        date: date.date,
-                        hours: date.hours,
-                        minutes: date.minutes,
-                        seconds: date.seconds
-                    }
-                    var begin = new Date($("#contractBeginTime").val())
-                    custom_endTimes.config.min = {
-                        year: layui.util.toDateString(begin, "yyyy"),
-                        month: layui.util.toDateString(begin, "MM") - 1,//关键
-                        date: layui.util.toDateString(begin, "dd"),
-                        hours: layui.util.toDateString(begin, "HH"),
-                        minutes: layui.util.toDateString(begin, "mm"),
-                        seconds: layui.util.toDateString(begin, "ss")
-                    }
+                   
 
                 }
             }
@@ -327,32 +304,7 @@
         laydate.render({
             elem: '#contractEndTime_not' //指定元素
         });
-        var custom_beginTimes = laydate.render({
-            elem: '#custom_beginTime', //指定元素
-            // min: $("#contractEndTime").val(),
-            // man: $("#contractBeginTime").val(),
-            done: function (value, date, endDate) {
-                var startDate = new Date(value).getTime();
-                var endTime = new Date($('#custom_endTime').val()).getTime();
-                if (endTime < startDate) {
-                    layer.msg('结束时间不能小于开始时间');
-                    $('#custom_beginTime').val($('#custom_endTime').val());
-                }
-            }
-        });
-        var custom_endTimes = laydate.render({
-            elem: '#custom_endTime', //指定元素
-            // min: $("#contractEndTime").val(),
-            // man: $("#contractBeginTime").val(),
-            done: function (value, date, endDate) {
-                var startDate = new Date($('#custom_beginTime').val()).getTime();
-                var endTime = new Date(value).getTime();
-                if (endTime < startDate) {
-                    layer.msg('结束时间不能小于开始时间');
-                    $('#custom_endTime').val($('#custom_beginTime').val());
-                }
-            }
-        });
+        
         //现将临时数据清理
         admin.putTempData("t_tempProduct", "");
         //待充值列表
@@ -555,35 +507,46 @@
                    
                 },"get")
         }
+        //限制自定义的时间
+        function xianzhi(){
+            var custom_beginTimesd = laydate.render({
+                    elem: '#custom_beginTime', //指定元素
+                    min: $("#contractBeginTime").val(),
+                    max: $("#contractEndTime").val(),
+                    done: function (value, date, endDate) {
+                        var startDate = new Date(value).getTime();
+                        var endTime = new Date($('#custom_endTime').val()).getTime();
+                        if (endTime < startDate) {
+                            layer.msg('结束时间不能小于开始时间');
+                            $('#custom_beginTime').val($('#custom_endTime').val());
+                        }
+                    }
+                });
+            var custom_endTimes = laydate.render({
+                elem: '#custom_endTime', //指定元素
+                min: $("#contractBeginTime").val(),
+                max: $("#contractEndTime").val(),
+                done: function (value, date, endDate) {
+                    var startDate = new Date($('#custom_beginTime').val()).getTime();
+                    var endTime = new Date(value).getTime();
+                    if (endTime < startDate) {
+                        layer.msg('结束时间不能小于开始时间');
+                        $('#custom_endTime').val($('#custom_beginTime').val());
+                    }
+                }
+            });
+        }
         //获取软件的服务周期
-        // var getCycleTime=function(departmentId){
-        //     admin.req('api-opration/productorderdetail/getContractBeginEndTimeAndNum' , {departmentId: departmentId},
-        //         function (data) {
-        //             if(data.code==0){
-        //                     $("#contractBeginTime").val(layui.util.toDateString(data.data.beginTime,"yyyy-MM-dd"));
-        //                     $("#contractEndTime").val( layui.util.toDateString(data.data.endTime,"yyyy-MM-dd"));
-        //                     $("#contractNum").val(data.data.count);
-        //                     contractBeginTime.config.max = {
-        //                     year: layui.util.toDateString(data.data.beginTime, "yyyy"),
-        //                     month: layui.util.toDateString(data.data.beginTime, "MM") - 1,//关键
-        //                     date: layui.util.toDateString(data.data.beginTime, "dd"),
-        //                     hours: layui.util.toDateString(data.data.beginTime, "HH"),
-        //                     minutes: layui.util.toDateString(data.data.beginTime, "mm"),
-        //                     seconds: layui.util.toDateString(data.data.beginTime, "ss")
-        //                 }
-        //                 contractEndTime.config.min = {
-        //                     year: layui.util.toDateString(data.data.endTime, "yyyy"),
-        //                     month: layui.util.toDateString(data.data.endTime, "MM") - 1,//关键
-        //                     date: layui.util.toDateString(data.data.endTime, "dd"),
-        //                     hours: layui.util.toDateString(data.data.endTime, "HH"),
-        //                     minutes: layui.util.toDateString(data.data.endTime, "mm"),
-        //                     seconds: layui.util.toDateString(data.data.endTime, "ss")
-        //                 }
-        //             }
-                   
-        //         },"get")
-        // }
+        var getCycleTime = function (departmentId) {
+            admin.req('api-opration/productorderdetail/getContractBeginEndTimeAndNum', { departmentId: departmentId },
+                function (data) {
+                    if (data.code == 0) {
+                        $("#contractBeginTime").val(layui.util.toDateString(data.data.beginTime, "yyyy-MM-dd"));
+                        $("#contractEndTime").val(layui.util.toDateString(data.data.endTime, "yyyy-MM-dd"));
+                    }
 
+                }, "get")
+        }
 
         //回显医院基本数据
         let hospitalData = admin.getTempData('t_hospital');
@@ -604,7 +567,14 @@
                         } else {
                             hospitalData.contractBeginTime = layui.util.toDateString(hospitalData.contractBeginTime, 'yyyy-MM-dd')
                             hospitalData.contractEndTime = layui.util.toDateString(hospitalData.contractEndTime, 'yyyy-MM-dd')
+                            contractBeginTimeVVV=hospitalData.contractBeginTime
+                            contractEndTimeVVV=hospitalData.contractEndTime
                             form.val('recharge-form', hospitalData);
+                            $("#custom_beginTime").val( hospitalData.contractBeginTime)
+                            $("#custom_endTime").val( hospitalData.contractEndTime)
+                            //限制时间
+                            xianzhi();
+                            getCycleTime(hospitalData.departmentId);
                             getHospitalAddress(hospitalData.hospitalId);
                             //装载产品数据
                             table.render({
@@ -755,8 +725,8 @@
                     custom_beginTime = $("#custom_beginTime").val();
                     custom_endTime = $("#custom_endTime").val();
                 } else {
-                    custom_beginTime = $("#contractBeginTime").val();
-                    custom_endTime = $("#contractEndTime").val();
+                    custom_beginTime = contractBeginTimeVVV
+                    custom_endTime = contractEndTimeVVV
                 }
                 var listData = admin.getTempData("t_tempProduct");
                 //添加一个id,删除用
@@ -978,7 +948,6 @@
             }
         }
         function submit() {
-            console.log(1111111)
             if (!isRun) {
                 layer.load(2);
                 var listData = admin.getTempData("t_tempProduct");
@@ -1003,7 +972,7 @@
                                 proBegintime: item.beginTime != "" ? item.beginTime +
                                     ' 00:00:00' : "",
                                 proEndtime: item.endTime != "" ? item.endTime +
-                                    ' 23:59:59' : "",
+                                    ' 00:00:00' : "",
                                 orderAilightCount: item.ailightCount,
                                 orderRecordCount: item.recordCount != null ? item.recordCount : 0,
                             };

--
Gitblit v1.8.0