From 26d15716f44e8e936d8cd39e8027eaab4d3a8172 Mon Sep 17 00:00:00 2001
From: dougang <78125310@kidgrow.com>
Date: Wed, 03 Mar 2021 11:43:29 +0800
Subject: [PATCH] 筛查机构增加字段,支持H端同步

---
 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/contract.html |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 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 22df40e..3dca191 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: '查看产品',
@@ -157,9 +156,9 @@
                 success: function () {
                     table.render({
                         elem: '#contract-table-detail',
-                        url: config.base_server + 'api-opration/productorderdetail/alldetail',
+                        url: config.base_server + 'api-opration/productorderdetail/all',
                         method: 'GET',
-                        where: { hospitalId: data.hospitalId,departmentId:data.departmentId},
+                        where: { orderId: data.id,enabled: 1},
                         headers: { 'Authorization': 'Bearer ' + config.getToken().access_token },
                         page: true,
                         limit: 10,
@@ -167,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) {
@@ -178,12 +181,16 @@
                             },
                             {
                                 field: 'proBegintime', width: 150, title: '开始时间', templet: function (d) {
-                                    return new Date(d.proBegintime).dateFormat("yyyy/MM/dd");
+                                    return new Date(d.proBegintime).dateFormat("yyyy/MM/dd hh:mm:ss");
                                 }
                             },
                             {
                                 field: 'proEndtime', width: 180, title: '结束时间', templet: function (d) {
-                                    return new Date(d.proEndtime).dateFormat("yyyy/MM/dd");
+                                    var dateTime=new Date(d.proEndtime);
+                                         dateTime=dateTime.setDate(dateTime.getDate()-1);
+                                        dateTime=new Date(dateTime);
+                                        return dateTime
+                                            .dateFormat("yyyy/MM/dd")+" 24:00:00";
                                 }
                             },
                             { field: 'createTime', width: 160, sort: true, title: '创建时间' }

--
Gitblit v1.8.0