From 3ca287938e02837ef01ccd681bf0262fee2fb424 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Wed, 02 Dec 2020 17:42:43 +0800
Subject: [PATCH] 将固定套餐去除， 去除打印和debugger
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/equipmentDocking.html | 1 -
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/recharge.html | 30 +++++++++++++++++++-----------
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/contract.html | 1 -
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/saasClientPay.html | 3 ---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/SysProductServiceImpl.java | 1 +
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/diagnosisRecord.html | 1 -
kidgrow-web/kidgrow-web-manager/src/main/resources/static/module/admin.js | 2 --
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/rechargeupdate.html | 2 --
8 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/SysProductServiceImpl.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/SysProductServiceImpl.java
index 8ba559b..afa10d7 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/SysProductServiceImpl.java
+++ b/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++) {
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/module/admin.js b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/module/admin.js
index f26bf3e..66bc9a0 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/module/admin.js
+++ b/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 () {
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/contract.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/contract.html
index 97d29b7..7a650b2 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/contract.html
+++ b/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: '查看产品',
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/diagnosisRecord.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/diagnosisRecord.html
index 7b7b905..789a050 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/diagnosisRecord.html
+++ b/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) {
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/equipmentDocking.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/equipmentDocking.html
index 12c196e..c803a5b 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/equipmentDocking.html
+++ b/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();
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/recharge.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/recharge.html
index ec0b7e0..a5c65f0 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/recharge.html
+++ b/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,
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 3eb852d..52ba677 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
@@ -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;
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/saasClientPay.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/saasClientPay.html
index ddfee6d..92bd631 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/saasClientPay.html
+++ b/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');
--
Gitblit v1.8.0