~admin/kidgrow-microservices-platform.git

			@@ -84,12 +84,12 @@
			<input autocomplete="off" name="contractBeginTime_not" disabled
			id="contractBeginTime_not" type="text" placeholder="请输开始时间" class="layui-input"
			maxlength="50" readonly
			style="border: none; display: inline-block;width: 40%;" />
			style="border: none; display: inline-block;width: 30%;" />
			<span id="contractBeginTime_not_heng"> 至 </span>
			<input autocomplete="off" name="contractEndTime_not" disabled
			id="contractEndTime_not" type="text" placeholder="请输入结束时间" class="layui-input"
			maxlength="50" readonly
			style="border: none; display: inline-block;width: 40%;" />
			style="border: none; margin-left: 10%;display: inline-block;width: 30%;" />
			</div>
			</div>
			<div class="layui-col-sm6">
			@@ -256,6 +256,8 @@
			var laydate = layui.laydate;

			var contractNum = 0;
			var contractBeginTime_cheng = "";
			var contractEndTime_cheng = "";

			//充值进行中
			var isRun = false;
			@@ -265,10 +267,16 @@
			done: function (value, date, endDate) {
			var startDate = new Date(value).getTime();
			var endTime = new Date($('#contractEndTime').val()).getTime();
			if (endTime < startDate) {
			layer.msg('结束时间不能小于开始时间');
			$('#contractBeginTime').val($('#contractEndTime').val());
			if (endTime <= startDate) {
			layer.msg('结束时间不能小于或等于开始时间');
			var end = new Date($('#contractEndTime').val())
			end.setDate(end.getDate()-1)
			$('#contractBeginTime').val(util.toDateString(end, "yyyy-MM-dd"));
			} else {
			var flag=termTypeTime();
			if(!false){
			return false;
			}
			$('#custom_beginTime').val($("#contractBeginTime").val())
			custom_beginTimes.config.min = {
			year: date.year,
			@@ -287,10 +295,17 @@
			done: function (value, date, endDate) {
			var startDate = new Date($('#contractBeginTime').val()).getTime();
			var endTime = new Date(value).getTime();
			if (endTime < startDate) {
			layer.msg('结束时间不能小于开始时间');
			$('#contractEndTime').val($('#contractBeginTime').val());
			if (endTime <= startDate) {
			layer.msg('结束时间不能小于或等于开始时间');
			var begin = new Date($('#contractBeginTime').val())
			begin.setDate(begin.getDate()+1)
			$('#contractEndTime').val(util.toDateString(begin, "yyyy-MM-dd"));
			// $('#contractEndTime').val($('#contractBeginTime').val());
			} else {
			var flag=termTypeTime();
			if(!false){
			return false;
			}
			$('#custom_endTime').val($("#contractEndTime").val())
			custom_endTimes.config.max = {
			year: date.year,
			@@ -313,6 +328,43 @@
			}
			}
			});
			function termTypeTime(){
			var listData = admin.getTempData("t_tempProduct");
			var max= "";
			var min= '';
			if(listData!=null&&listData.length>0){

			listData.forEach((element,index) => {
			if(index==0){
			max=element.endTime;
			min=element.beginTime;
			}else{
			if (dateUtil.compareDate(min, element.beginTime)) {
			min=element.beginTime;
			}
			if (dateUtil.compareDate( element.endTime,max)) {
			max=element.endTime;
			}
			}

			});
			}
			if(dateUtil.compareDate( $('#contractBeginTime').val(),min)){
			layer.msg("合同的时间必须小于待充值的开始时间")
			$('#contractBeginTime').val(contractBeginTime_cheng);
			return false;
			}else{
			contractBeginTime_cheng=$('#contractBeginTime').val()
			}
			if(dateUtil.compareDate(max, $('#contractEndTime').val())){
			layer.msg("合同的时间必须小于待充值的开始时间")
			$('#contractEndTime').val(contractEndTime_cheng);
			return false;
			}else{
			contractEndTime_cheng=$('#contractEndTime').val()
			}

			}
			laydate.render({
			elem: '#contractBeginTime_not' //指定元素
			});
			@@ -477,6 +529,40 @@
			minutes: layui.util.toDateString(data.data.endTime, "mm"),
			seconds: layui.util.toDateString(data.data.endTime, "ss")
			}
			//自定义的时间段开始时间进行限制
			custom_beginTimes.config.min = {
			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")
			}
			custom_beginTimes.config.max = {
			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")
			}
			//自定义的时间段结束时间进行限制
			custom_endTimes.config.min = {
			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")
			}
			custom_endTimes.config.max = {
			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")
			}
			$("#contractNum_not").val(data.data.count);
			}
			}
			@@ -503,7 +589,6 @@
			var hospitalProvince = hospitalData.hospitalProvince != null ? hospitalData.hospitalProvince : "";
			var hospitalCity = hospitalData.hospitalCity != null ? hospitalData.hospitalCity : "";
			var hospitalArea = hospitalData.hospitalArea != null ? hospitalData.hospitalArea : "";
			// console.log(hospitalProvince + " " + hospitalCity + " " +hospitalArea)
			$("#hospitalAreas").val(hospitalProvince + " " + hospitalCity + " " + hospitalArea);

			//装载产品数据
			@@ -762,8 +847,6 @@
			}
			}
			if (!strUtil.isEmpty(data.endTime)){
			console.log(contractEndTime,"contractEndTime")
			console.log(data.endTime,"data.endTimedata.endTime")
			if (dateUtil.compareDate(data.endTime,contractEndTime)) {
			layer.msg("结束时间必须小于合同的结束时间！");
			return false;
			@@ -899,7 +982,6 @@
			form.on('submit(recharge-form-submit)', function (data) {
			if (!isRun) {
			layer.load(2);
			debugger
			var listData = admin.getTempData("t_tempProduct");
			// if (listData != null) {
			var count= 0;
			@@ -956,7 +1038,22 @@
			listDetailData.push(detailData);
			})

			if (listDetailData.length > 0) {
			if (listDetailData.length <=0) {
			var detailData = {
			orderId: orderData.id + '',
			proId: "0",
			proType: 1,
			proName: "软件服务周期",
			isShare: 0,
			ailightCount: 0,
			recordCount: 0,
			proBegintime: $("#contractBeginTime").val()+' 00:00:00' ,
			proEndtime: $("#contractEndTime").val()+' 00:00:00' ,
			orderAilightCount: 0,
			orderRecordCount: 0,
			};
			listDetailData.push(detailData)
			}
			//提交订单数据
			admin.req(
			'api-opration/productorderdetail/saveall',
			@@ -983,13 +1080,9 @@
			});
			}
			}, 'POST');
			} else {
			layer.msg("充值数据异常为空！", {
			icon: 2,
			time: 1000
			});
			isRun = false;
			}
			// layer.closeAll();
			// layer.msg("充值数据成功！");
			// isRun = false;
			} else {
			layer.msg(data.msg, {
			icon: 2,