From fc794812405844496d869083c901658d00109f5d Mon Sep 17 00:00:00 2001 From: houruijun <411269194@kidgrow.com> Date: Fri, 21 Aug 2020 14:41:27 +0800 Subject: [PATCH] 1.取消了删除科室的时候,联动删除医院的公能 2.调整了运营平台部分页面的字段显示 --- kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital.html | 111 ++++++++++++++++++++++++++++++++++--------------------- 1 files changed, 69 insertions(+), 42 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 9e86f48..eac4af8 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 @@ -27,16 +27,17 @@ <option value="1">-是-</option> <option value="0">-否-</option> </select> -   --> +   <select id="hospitalstate" placeholder="选择医院状态" lay-filter="hospitalstate"> <option value="">-医院状态-</option> <option value="0">试用</option> <option value="1">正式</option> - </select> + </select> -->   - <input id="hospitalName" class="layui-input search-input" type="text" placeholder="按医院名" />  - <button id="hospita-btn-search" class="layui-btn icon-btn"><i class="layui-icon"></i>搜索</button>  - <button id="hospital-btn-add" class="layui-btn icon-btn"><i class="layui-icon"></i>添加</button> + <input id="hosName" class="layui-input search-input" type="text" placeholder="按医院名" />  + <button id="hospita-btn-search" class="layui-btn icon-btn"><i + class="layui-icon permissions" permissions="hospital-get"></i>搜索</button>  + <button id="hospital-btn-add" class="layui-btn icon-btn"><i class="layui-icon permissions" permissions="hospital-save"></i>添加医院/科室</button> </div> <!-- 数据表格 --> @@ -46,10 +47,10 @@ <!-- 表格操作列 --> <script type="text/html" id="businessRecords-table-bar"> - <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">查看详情</a> - <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="edit">修改</a> - <a class="layui-btn layui-btn-xs" lay-event="pay">充值</a> - <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a> + <a class="layui-btn layui-btn-xs permissions" permissions="product-rechage" lay-event="pay">充值</a> + <!-- <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">查看详情</a> --> + <a class="layui-btn layui-btn-primary layui-btn-xs permissions" permissions="hospital-save" lay-event="edit">修改</a> + <a class="layui-btn layui-btn-danger layui-btn-xs permissions" permissions="hospital-del" lay-event="del">删除科室</a> </script> <!-- 表格状态列 --> <script type="text/html" id="hospital-tpl-state"> @@ -57,7 +58,7 @@ {{d.enabled==true?'checked':''}}/> </script> <script> - layui.use(['form', 'table', 'laydate', 'util', 'config', 'admin', 'area'], function () { + layui.use(['form', 'table', 'laydate', 'util', 'config', 'admin', 'autocomplete', 'area'], function () { var form = layui.form; var table = layui.table; var config = layui.config; @@ -65,7 +66,7 @@ var util = layui.util; var admin = layui.admin; var area = layui.area; - + // 渲染表格 table.render({ elem: '#hospital-table', @@ -74,10 +75,10 @@ headers: { 'Authorization': 'Bearer ' + config.getToken().access_token }, page: true, cols: [[ - { field: 'hospitalName', width: 250, title: '医院名称' }, - { field: 'departmentName', width: 100, title: '科室' }, + { field: 'hospitalName', width: 250, title: '医院名称', fixed: 'left' }, + { field: 'departmentName', width: 100, title: '科室/部门', fixed: 'left' }, { - field: 'hospitalArea', width: 200, title: '所在地区', templet: function (d) { + field: 'hospitalArea', width: 360, title: '所在地区', templet: function (d) { return ((d.hospitalProvince == null) ? "" : d.hospitalProvince) + " " + ((d.hospitalCity == null) ? "" : d.hospitalCity) + " " + ((d.hospitalArea == null) ? "" : d.hospitalArea) @@ -85,25 +86,30 @@ }, { field: 'hospitalLink', width: 100, title: '联系人' }, { field: 'hospitalTel', width: 150, title: '联系方式' }, + // { + // field: 'enabled', width: 80, title: '状态', templet: function (d) { + // return d.hospitalState == 0 ? "试用" : "正式" + // } + // }, { - field: 'enabled', width: 80, sort: true, title: '状态', templet: function (d) { - return d.hospitalState == 0 ? "试用" : "正式" - } - }, - { - field: 'isScreen', width: 80, sort: true, title: '筛查', templet: function (d) { + field: 'isScreen', width: 80, title: '筛查', templet: function (d) { return d.isScreen ? "是" : "否" } }, - // { field: 'isAnswer', width: 80, sort: true, title: '医答',templet:function (d) { + // { field: 'isAnswer', width: 80, title: '医答',templet:function (d) { // return d.isScreen?"是":"否" // } }, - { field: 'serverUserName', width: 100, title: '服务人员' }, - { field: 'createTime', width: 120, sort: true, title: '创建时间', templet: "<div>{{layui.util.toDateString(d.createTime, 'yyyy/MM/dd')}}</div>" }, - { field: 'enabled', width: 100, templet: '#hospital-tpl-state', sort: true, title: '状态' }, - { field: 'hospitalId', width: 300, align: 'center', toolbar: '#businessRecords-table-bar', title: '操作' } - ]] + { field: 'serverUserName', width: 100, title: '服务人员' }, + { field: 'createTime', width: 150, title: '创建时间', templet:function (d) { + return new Date(d.createTime).dateFormat("yyyy-MM-dd hh:mm"); + } }, + { field: 'enabled', width: 100, templet: '#hospital-tpl-state', title: '状态' }, + { field: 'hospitalId', width: 200, align: 'center', toolbar: '#businessRecords-table-bar', title: '操作', fixed: 'right' } + ]], + done:function(res){ + permissionsInput(res,config); + } }); //省份数据加载 area.areaData("#province", 1, "", ""); @@ -112,20 +118,39 @@ var data = obj.data; var layEvent = obj.event; if (layEvent === 'del') { - layer.confirm('确定要删除吗?', function (i) { + layer.confirm('确定要删除科室数据吗?', function (i) { layer.load(2); - var whereModel={ + var whereModel = { id: obj.data.hospitalId, - departmentId: obj.data.departmentId - }; + departmentId: obj.data.departmentId + }; admin.req('api-user/syshospital/delete', whereModel, function (data) { layer.closeAll('loading'); - layer.msg(data.msg, { icon: 1, time: 500 }, function () { + layer.msg(data.msg, { icon: 1, time: 2000 }, function () { $('#hospita-btn-search').click(); }); obj.del(); }, 'GET'); }); + } + else if (layEvent === "edit") { + //修改 + admin.putTempData("t_hospital", data); + showEditModel("edit"); + } + else if(layEvent==="pay") + { + //充值 + admin.putTempData("t_hospital", data); + admin.popupCenter({ + title: '医院充值', + path: 'pages/opration/recharge.html', + area: '1200px', + offset:'10px', + finish: function () { + $('#hospita-btn-search').click(); + } + }); } }); // 搜索按钮点击事件 @@ -133,7 +158,7 @@ var isscreen = $('#isscreen').val(); var isanswer = $('#isanswer').val(); var hospitalstate = $('#hospitalstate').val(); - var hospitalName = $('#hospitalName').val(); + var hospitalName = $('#hosName').val(); var hospitalProvince = ($("#province").val() != "") ? $('#province option:selected').text() : ""; var hospitalCity = ($("#city").val() != "") ? $('#city option:selected').text() : ""; @@ -153,7 +178,14 @@ // // 显示编辑弹窗 var showEditModel = function (data) { - + admin.popupCenter({ + title: (strUtil.isEmpty(data))?'添加医院/科室':'编辑医院/科室', + path: 'pages/opration/hospital_form_base.html', + area: '900px', + finish: function () { + $('#hospita-btn-search').click(); + } + }); }; //装载市区数据 @@ -176,9 +208,9 @@ }, function (data) { layer.closeAll('loading'); if (data.code == 0) { - layer.msg(data.msg, { icon: 1, time: 500 }); + layer.msg(data.msg, { icon: 1, time: 2000 }); } else { - layer.msg(data.msg, { icon: 2, time: 500 }); + layer.msg(data.msg, { icon: 2, time: 2000 }); $(obj.elem).prop('checked', !obj.elem.checked); form.render('checkbox'); } @@ -186,13 +218,8 @@ }); // 添加按钮点击事件 $('#hospital-btn-add').click(function () { - admin.popupCenter({ - title: '添加医院', - path: 'pages/opration/hospital_form_base.html', - finish: function () { - //renderTable(); - } - }) + admin.putTempData("t_hospital",""); + showEditModel(); }); }); </script> \ No newline at end of file -- Gitblit v1.8.0