From a04d76dc568b4a13455ea6ca4ae2a92e6387736d Mon Sep 17 00:00:00 2001 From: zhaoxiaohao <279049017@qq.com> Date: Wed, 25 Nov 2020 16:36:14 +0800 Subject: [PATCH] Merge branch 'development' into dev --- kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital.html | 42 ++++++++++++++++++++++-------------------- 1 files changed, 22 insertions(+), 20 deletions(-) diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital.html index bec3632..05840bf 100644 --- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital.html +++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital.html @@ -77,27 +77,25 @@ page: true, cols: [ [ - { - field: 'hospitalId', - width: 80, - title: '医院编号', - fixed: 'left' - }, + { field: 'hospitalName', - width: 100, + width: "10%", title: '医院名称', fixed: 'left' }, { field: 'departmentName', - width: 100, + width: "6%", title: '科室/部门', fixed: 'left' }, { + field: 'hospitalId',width: '12%',title: '医院编号', + }, + { field: 'hospitalArea', - width: 200, + width: "10%", title: '所在地区', templet: function (d) { return ((d.hospitalProvince == null) ? "" : d.hospitalProvince) + @@ -108,12 +106,12 @@ }, { field: 'hospitalLink', - width: 100, + width: "6%", title: '联系人' }, { field: 'hospitalTel', - width: 150, + width: "8%", title: '联系方式' }, // { @@ -123,7 +121,7 @@ // }, { field: 'isScreen', - width: 80, + width: "4%", title: '筛查', templet: function (d) { return d.isScreen ? "是" : "否" @@ -134,12 +132,12 @@ // } }, { field: 'serverUserName', - width: 100, + width: "6%", title: '服务人员' }, { field: 'createTime', - width: 150, + width: "10%", title: '创建时间', templet: function (d) { return new Date(d.createTime).dateFormat("yyyy-MM-dd hh:mm"); @@ -147,15 +145,15 @@ }, { field: 'enabled', - width: 80, + width: "7%", templet: '#hospital-tpl-state', title: '状态', align: 'center', fixed: 'right' }, { - field: 'hospitalId', - width: 240, + // field: 'hospitalId', + width: "20%", align: 'center', toolbar: '#businessRecords-table-bar', title: '操作', @@ -225,7 +223,7 @@ } }); } else if(layEvent=="health"){ - //充值 + //运动处方服务 admin.putTempData("t_hospital", data); admin.popupCenter({ title: '运动处方服务', @@ -259,10 +257,14 @@ hospitalName: hospitalName, hospitalProvince: hospitalProvince, hospitalCity: hospitalCity, - hospitalArea: hospitalArea + hospitalArea: hospitalArea, + // page: 1, }; table.reload('hospital-table', { - where: whereModel + where: whereModel, + page: { + curr: 1 + } }); }); -- Gitblit v1.8.0