From 5de71af808d0e5838826ea641b92f5bf1af91571 Mon Sep 17 00:00:00 2001
From: zxh <279049017@qq.com>
Date: Mon, 24 Aug 2020 19:45:03 +0800
Subject: [PATCH] Merge branch 'dev' of ssh://192.168.2.240:29418/kidgrow-microservices-platform into dev
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital.html | 7 ++++---
1 files changed, 4 insertions(+), 3 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 d69a32d..dfffdb2 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
@@ -50,7 +50,7 @@
<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>
+ <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">
@@ -75,6 +75,7 @@
headers: { 'Authorization': 'Bearer ' + config.getToken().access_token },
page: true,
cols: [[
+ { field: 'hospitalId', width: 180, title: '医院编号', fixed: 'left' },
{ field: 'hospitalName', width: 250, title: '医院名称', fixed: 'left' },
{ field: 'departmentName', width: 100, title: '科室/部门', fixed: 'left' },
{
@@ -118,7 +119,7 @@
var data = obj.data;
var layEvent = obj.event;
if (layEvent === 'del') {
- layer.confirm('确定要删除吗？', function (i) {
+ layer.confirm('确定要删除科室数据吗？', function (i) {
layer.load(2);
var whereModel = {
id: obj.data.hospitalId,
@@ -179,7 +180,7 @@
// // 显示编辑弹窗
var showEditModel = function (data) {
admin.popupCenter({
- title: (strUtil.isEmpty(data))?'添加医院':'编辑医院',
+ title: (strUtil.isEmpty(data))?'添加医院/科室':'编辑医院/科室',
path: 'pages/opration/hospital_form_base.html',
area: '900px',
finish: function () {
--
Gitblit v1.8.0