From c49b95fc3576f9a5dad5bcaa6874157d5091f6e0 Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Thu, 27 Aug 2020 09:19:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/productdetail.html | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/productdetail.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/productdetail.html
index 011453c..a12b18e 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/productdetail.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/productdetail.html
@@ -65,9 +65,10 @@
headers: { 'Authorization': 'Bearer ' + config.getToken().access_token },
page: true,
cols: [[
- { field: 'hospitalName', width: 300, title: '医院名称' },
+ { field: 'hospitalId', width: 180, title: '医院编号' },
+ { field: 'hospitalName', width: 200, title: '医院名称' },
{ field: 'departmentName', width: 100, title: '科室名称' },
- { field: 'proName', width: 250, title: '产品名称' },
+ { field: 'proName', width: 200, title: '产品名称' },
{
field: 'proType', sort: true, align: 'center', width: 80, templet: function (d) {
if (d.proType === 0)
@@ -96,7 +97,8 @@
// return new Date(d.createTime).dateFormat("yyyy/MM/dd hh:mm:ss");
// } },
{ field: 'createTime', width: 200, sort: true, title: '创建时间', templet: "<div>{{layui.util.toDateString(d.createTime, 'yyyy/MM/dd HH:mm')}}</div>" },
- { align: 'center', width: 100, toolbar: '#product-table-bar', title: '操作' }
+ { align: 'center', width: 100, toolbar: '#product-table-bar', title: '操作',
+ fixed: 'right' }
]]
});
}
@@ -131,7 +133,7 @@
}
var proName = $('#product-search-value').val();
var hospitalId = $('#hospitalId').val();
- table.reload('product-table', { where: { proName: proName,hospitalId: hospitalId,departmentId:'1252408277275664385',startTime: startTime, endTime: endTime } });
+ table.reload('product-table', { where: { proName: proName,hospitalId: hospitalId,startTime: startTime, endTime: endTime } });
});
//比较日期大小
--
Gitblit v1.8.0