Merge remote-tracking branch 'origin/dev' into dev

houruijun

2020-11-27 fbf6a877aae46e19a8d3c0058cefa3f81c72715f

 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/rechargeupdate.html

@@ -534,6 +534,17 @@
                }
            });
        }
        //获取软件的服务周期
        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');
@@ -557,6 +568,7 @@
                            form.val('recharge-form', hospitalData);
                            //限制时间
                            xianzhi();
                            getCycleTime();
                            getHospitalAddress(hospitalData.hospitalId);
                            //装载产品数据
                            table.render({