From 6fb14149d62199cfcc0448c82eb2f51f9c5181de Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Thu, 31 Dec 2020 16:55:30 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into parter
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/contract.html | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
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 407b48d..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
@@ -128,7 +128,7 @@
updateModel(obj.data);
} else if (obj.event === 'detail') {
//充值记录列表
- showModel(obj.data.id);
+ showModel(obj.data);
}
});
@@ -146,7 +146,7 @@
});
});
- var showModel = function (orderId) {
+ var showModel = function (data) {
layer.open({
type: 1,
title: '查看产品',
@@ -156,9 +156,9 @@
success: function () {
table.render({
elem: '#contract-table-detail',
- url: config.base_server + 'api-opration/productorderrecord',
+ url: config.base_server + 'api-opration/productorderdetail/all',
method: 'GET',
- where: { 'orderId': orderId },
+ where: { orderId: data.id,enabled: 1},
headers: { 'Authorization': 'Bearer ' + config.getToken().access_token },
page: true,
limit: 10,
@@ -166,6 +166,10 @@
cols: [[
{ field: 'proName', width: 300, title: '产品名称' },
{ field: 'ailightCount', width: 150, title: '读片量' },
+ { field: 'ailightCount', width: 150, title: '读片使用量' ,templet: function (d) {
+ return d.orderAilightCount-d.ailightCount;
+ }
+ },
{ field: 'recordCount', width: 100, title: '报告量' },
{
field: 'isShare', width: 150, title: '是否共享', templet: function (d) {
--
Gitblit v1.8.0