~admin/kidgrow-microservices-platform.git

			@@ -80,11 +80,12 @@
			<div class="layui-row">
			<div class="layui-col-sm6">
			<label class="layui-form-label">当前软件服务周期：</label>
			<div class="layui-input-block">
			<div class="layui-input-block" >
			<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%;" />
			<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
			@@ -120,6 +121,7 @@
			<input autocomplete="off" name="contractBeginTime" id="contractBeginTime"
			type="text" placeholder="请输开始时间" class="layui-input" maxlength="50"
			lay-verify="required" required style="display: inline-block;width: 40%;" />
			--
			<input autocomplete="off" name="contractEndTime" id="contractEndTime" type="text"
			placeholder="请输入结束时间" class="layui-input" maxlength="50" lay-verify="required"
			required style="display: inline-block;width: 40%;" />
			@@ -129,7 +131,7 @@
			<label class="layui-form-label">合同读片充值量：</label>
			<div class="layui-input-inline">
			<input autocomplete="off" name="contractNum" id="contractNum"
			onkeyup="this.value=this.value.replace(/[^\d]/g,'') " type="text"
			onkeyup="this.value=this.value.replace(/[^\d]/g,'0') " type="text" value="0"
			class="layui-input" maxlength="50" lay-verify="required" required />
			</div>
			</div>
			@@ -167,7 +169,7 @@
			<label class="layui-form-label">读片充值量：</label>
			<div class="layui-input-inline">
			<input autocomplete="off" id="custom_ailightCount"
			onkeyup="this.value=this.value.replace(/[^\d]/g,'') " type="text"
			onkeyup="this.value=this.value.replace(/[^\d]/g,'') " type="text"
			class="layui-input" maxlength="50" />
			</div>
			</div>
			@@ -446,25 +448,37 @@
			admin.req('api-opration/productorderdetail/getContractBeginEndTimeAndNum', { departmentId: departmentId },
			function (data) {
			if (data.code == 0) {
			$("#contractBeginTime_not").val(layui.util.toDateString(data.data.beginTime, "yyyy-MM-dd"));
			$("#contractEndTime_not").val(layui.util.toDateString(data.data.endTime, "yyyy-MM-dd"));
			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")
			}
			if(data.data.beginTime==undefined){
			$("#contractBeginTime_not").hide();
			$("#contractEndTime_not").hide();
			$("#contractBeginTime_not_heng").hide();
			$("#contractNum_not").hide();
			form.render();
			}else{
			$("#contractBeginTime_not").val(layui.util.toDateString(data.data.beginTime, "yyyy-MM-dd"));
			$("#contractEndTime_not").val(layui.util.toDateString(data.data.endTime, "yyyy-MM-dd"));
			$("#contractBeginTime").val(layui.util.toDateString(data.data.beginTime, "yyyy-MM-dd"));
			$("#contractEndTime").val(layui.util.toDateString(data.data.endTime, "yyyy-MM-dd"));
			$("#custom_beginTime").val(layui.util.toDateString(data.data.beginTime, "yyyy-MM-dd"));
			$("#custom_endTime").val(layui.util.toDateString(data.data.endTime, "yyyy-MM-dd"));
			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")
			}
			$("#contractNum_not").val(data.data.count);
			}
			}

			}, "get")
			@@ -607,9 +621,9 @@
			}, 'get');
			//报告数量事件
			$("#contractNum").blur(function () {
			if ($("#contractNum").val() <= 0) {
			if ($("#contractNum").val() < 0) {
			layer.msg("输入的读片量大于0");
			$("#contractNum").val("")
			$("#contractNum").val(0)
			return false;
			}
			var listData = admin.getTempData("t_tempProduct");
			@@ -671,7 +685,8 @@
			proName: custom_proName,
			proTime: "",
			proType: 1,
			termType: termType
			termType: termType,
			type: 1
			}
			tempDataList(data);
			waitRecharge();
			@@ -733,6 +748,24 @@
			return false;
			}
			}
			//将所选的时间不得大于合同的时间
			var contractBeginTime = $("#contractBeginTime").val();
			var contractEndTime = $("#contractEndTime").val();
			if (!strUtil.isEmpty(data.beginTime)){
			if (dateUtil.compareDate( contractBeginTime,data.beginTime)) {
			layer.msg("开始时间必须大于合同的开始时间！");
			return false;
			}
			}
			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;
			}
			}

			if (!strUtil.isEmpty(data.beginTime) && !strUtil.isEmpty(data.endTime)) {
			if (dateUtil.compareDate(data.endTime, data.beginTime)) {
			data.id = data.id + '';
			@@ -847,10 +880,25 @@
			form.on('submit(recharge-form-submit)', function (data) {
			if (!isRun) {
			layer.load(2);
			debugger
			var listData = admin.getTempData("t_tempProduct");
			if (listData != null) {
			// if (listData != null) {
			var count= 0;
			if(listData!=null){
			listData.forEach(element => {
			if(element.proType==1){
			count+=element.ailightCount;
			}
			});
			}
			if(count!=data.field.contractNum){
			layer.closeAll('loading');
			layer.msg("合同读片充值量与套餐数量不一致")
			return false;
			}
			if (data.field != null) {
			layer.confirm("确定要将待充值列表中的" + listData.length + "个产品充值给当前医院的科室吗？", {
			var len=listData!=null&&listData.length>0 ? listData.length : 0
			layer.confirm("确定要将待充值列表中的" + len + "个产品充值给当前医院的科室吗？", {
			btn: ["确定", "返回"]
			}, function () {
			isRun = true;
			@@ -938,12 +986,12 @@
			time: 1000
			});
			}
			} else {
			layer.msg("请先将要充值的产品加入待充值！", {
			icon: 2,
			time: 2000
			});
			}
			// } else {
			// layer.msg("请先将要充值的产品加入待充值！", {
			// icon: 2,
			// time: 2000
			// });
			// }
			layer.closeAll('loading');
			return false;
			}