将固定套餐去除， 去除打印和debugger

zhaoxiaohao

2020-12-02 3ca287938e02837ef01ccd681bf0262fee2fb424

将固定套餐去除， 去除打印和debugger

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/SysProductServiceImpl.java

@@ -60,6 +60,7 @@
     */
    @Override
    public PageResult<ProductAllVo> findAllList(Map<String, Object> params, SysUser sysUser){
        params.put("idNotIn",Arrays.asList(CommonConstant.PAY_USER_PRODUCT_ID, CommonConstant.REG_USER_PRODUCT_ID));
        List<ProductAllVo> list  =  baseMapper.findAllList(params);
        if (list != null) {
            for (int i = 0; i <list.size() ; i++) {

 kidgrow-web/kidgrow-web-manager/src/main/resources/static/module/admin.js

@@ -128,8 +128,6 @@
                if (jsonRs) {
                    if (jsonRs.code == 401) {
                        config.removeToken();
                        // var json=JSON.stringify(jsonRs)
                        // console.log(json,"jsonjsonjsonjsonjsonjsonjson")
                        var msg=jsonRs.msg;
                        if(msg.includes("Access token expired")){
                            layer.msg('登录过期', {icon: 2, time: 1500}, function () {

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

@@ -147,7 +147,6 @@
        });

        var showModel = function (data) {
            console.log(data)
            layer.open({
                type: 1,
                title: '查看产品',

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

@@ -145,7 +145,6 @@
            var data = obj.data;
            var layEvent = obj.event;
            if (layEvent === "select") {
                console.log(data,"333333")
                admin.req('api-opration/productorderrecord/pdfname/'+data.diagnosticId+"/0/"+data.diagnosticHospitalId+"/"+data.diagnosticDepartId, {},
                function (data) {
                    if (data.code == 0) {

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

@@ -315,7 +315,6 @@
                            $('#sure').hide();
                        }
                        form.val('app-form', data);
                        console.log(data,"1111111111111")
                         //重新装载科室
                        getdepartment(data.hospitalId);
                        form.render();

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

@@ -335,7 +335,6 @@
            if(listData!=null&&listData.length>0){
               
                listData.forEach((element,index) => {
                    debugger
                    if(index==0){
                        max=element.endTime;
                        min=element.beginTime;
@@ -556,7 +555,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);

                            //装载产品数据
@@ -815,8 +813,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;
@@ -952,7 +948,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;
@@ -1009,7 +1004,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',
@@ -1036,11 +1046,9 @@
                                                        });
                                                    }
                                                }, 'POST');
                                        } else {
                                            layer.closeAll();
                                            layer.msg("充值数据成功！");
                                            isRun = false;
                                        }
                                            // layer.closeAll();
                                            // layer.msg("充值数据成功！");
                                            // isRun = false;
                                    } else {
                                        layer.msg(data.msg, {
                                            icon: 2,

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

@@ -888,8 +888,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;

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

@@ -106,7 +106,6 @@
                layer.closeAll('loading');
                if (0 === data.code) {
                    let selected = false;
                    console.log(data.data)
                    let id = 0;
                    $("#departmentId").empty();
                    $.each(data.data, function (index, item) {
@@ -143,7 +142,6 @@
                layer.closeAll('loading');
                if (0 === data.code) {
                    let selected = false;
                    console.log(data.data)
                    $("#doctorId").empty();
                    $.each(data.data, function (index, item) {
                        //往下拉菜单里添加元素
@@ -152,7 +150,6 @@
                        } else {
                            selected = false
                        }
                        console.log(item)
                        $('#doctorId').append(new Option(item.doctorName, item.id,
                            false, selected));
                        form.render('select', 'doctor_clients');