From 346ae7f3ce0e30785b9cc0aea1d92204534a83d6 Mon Sep 17 00:00:00 2001
From: 侯瑞军 <411269194@kidgrow.com>
Date: Thu, 14 May 2020 18:37:26 +0800
Subject: [PATCH] 1.增加运营管理部分的所有的功能按钮权限显示隐藏功能 2.修改了部分已知的bug
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/sysdictionaries.html | 29 ++--
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/dataNeed.html | 26 ++--
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/org_form.html | 3
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/productdetail.html | 11 +
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/feedback.html | 14 +
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/company.html | 20 +-
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/recordNote.html | 3
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital.html | 27 ++-
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml | 5
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/product_form.html | 4
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/product.html | 21 ++-
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital_form_base.html | 4
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/vo/ProductOrderJoinDetail.java | 8 +
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/recharge.html | 3
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/contract.html | 46 ++++++-
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/groupProduct.html | 9 -
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctorTemplete.html | 2
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/diagnosisRecord.html | 17 +-
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/verifyRecharge.html | 66 ++++++----
19 files changed, 194 insertions(+), 124 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/vo/ProductOrderJoinDetail.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/vo/ProductOrderJoinDetail.java
index 31a2cd8..78e65c0 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/vo/ProductOrderJoinDetail.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/vo/ProductOrderJoinDetail.java
@@ -2,6 +2,8 @@
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@@ -25,14 +27,20 @@
/**
* 对应product_order_detail表中的id
*/
+
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
/**
* 对应product_order表中的id
*/
+
+ @JsonSerialize(using = ToStringSerializer.class)
private Long orderId;
/**
* 产品/明细ID
*/
+
+ @JsonSerialize(using = ToStringSerializer.class)
private Long proId;
/**
* 产品类型
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml
index 384ca6a..f2afa67 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml
@@ -93,7 +93,10 @@
and id = #{p.id}
</if>
<if test="p.proType != null and p.proType !=''">
- and pro_type = #{p.proType}
+ and DE.pro_type = #{p.proType}
+ </if>
+ <if test="p.enabled != null and p.enabled !=''">
+ and DE.enabled = #{p.enabled}
</if>
<if test="p.hospitalName != null and p.hospitalName !=''">
and PRO.hospital_name like concat ('%',#{p.hospitalName},'%')
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/company.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/company.html
index 8a0370f..b983928 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/company.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/company.html
@@ -164,15 +164,15 @@
page: true,
cols: [[
{ type: 'numbers' },
- { field: 'companyName', width: 180, sort: true, title: '公司名称' },
- { field: 'companyProvince', width: 200, sort: true, title: '省' },
- { field: 'companyCity', width: 180, sort: true, title: '市' },
- { field: 'companyArea', width: 300, sort: true, title: '区县' },
- { field: 'companyTel', width: 250, align: 'center', sort: true, title: '联系方式' },
- { field: 'tenantId', width: 250, align: 'center', sort: true, title: '应用' },
- { field: 'enabled', width: 250, align: 'center', templet: '#company-tpl-state', sort: true, title: '状态' },
- { field: 'createTime', width: 250, sort: true, title: '时间', templet: "<div>{{layui.util.toDateString(d.createTime, 'yyyy年MM月dd日 HH:mm:ss')}}</div>" },
- { field: 'id', width: 250, align: 'center', toolbar: '#company-table-bar', sort: true, title: '操作' },
+ { field: 'companyName', width: 180, title: '公司名称' },
+ { field: 'companyProvince', width: 200, title: '省' },
+ { field: 'companyCity', width: 180, title: '市' },
+ { field: 'companyArea', width: 300, title: '区县' },
+ { field: 'companyTel', width: 250, align: 'center', title: '联系方式' },
+ { field: 'tenantId', width: 250, align: 'center', title: '应用' },
+ { field: 'enabled', width: 250, align: 'center', templet: '#company-tpl-state', title: '状态' },
+ { field: 'createTime', width: 250, title: '时间', templet: "<div>{{layui.util.toDateString(d.createTime, 'yyyy-MM-dd HH:mm')}}</div>" },
+ { field: 'id', width: 250, align: 'center', toolbar: '#company-table-bar', title: '操作' },
]],
done:function(){
permissionsInput();
@@ -189,7 +189,7 @@
layer.closeAll('loading');
if (data.code == 0) {
layer.msg(data.msg, { icon: 1, time: 500 });
- //table.reload('table-user', {});
+ table.reload('table-user', {});
} else {
layer.msg(data.msg, { icon: 2, time: 500 });
$(obj.elem).prop('checked', !obj.elem.checked);
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 ae3a65a..e1487df 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
@@ -7,17 +7,21 @@
</span>
</div>
<div class="layui-card-body">
- <div class="layui-form toolbar"> 
- <input id="hospital-search-value" class="layui-input search-input" type="text" placeholder="输入医院名" /> 
- <button id="contract-btn-search" class="layui-btn icon-btn"><i class="layui-icon"></i>搜索</button>
+ <div class="layui-form toolbar">
+ <div class="layui-form-item">
+ <div class="layui-inline" style="margin-bottom: -25px;"> 
+ <input id="hospital-search-value" class="layui-input search-input" type="text" placeholder="按医院名..." autocomplete="off" width="400px" /></div> 
+ <button id="contract-btn-search" class="layui-btn icon-btn permissions" permissions="contract-list" style="margin-bottom: -25px;"><i class="layui-icon"></i>搜索</button>
</div>
<table class="layui-table" id="contract-table" lay-filter="contract-table"></table>
+ </div></div>
</div>
</div>
+<input id="hospitalId" type="hidden" />
<!-- 表格操作列 -->
<script type="text/html" id="contract-table-bar">
- <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
- <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">查看产品</a>
+ <a class="layui-btn layui-btn-danger layui-btn-xs permissions" permissions="contract-del" lay-event="del">删除</a>
+ <a class="layui-btn layui-btn-primary layui-btn-xs permissions" permissions="productorderdetail-save" lay-event="detail">查看产品</a>
</script>
<!-- 表格状态列 -->
<script type="text/html" id="contract-tpl-state">
@@ -29,13 +33,27 @@
<table class="layui-table" id="contract-table-detail" lay-filter="contract-table-detail"></table>
</script>
<script>
- layui.use(['table', 'util', 'admin', 'config', 'form'], function () {
+ layui.use(['table', 'util', 'admin', 'config', 'form', 'autocomplete'], function () {
let table = layui.table;
let util = layui.util;
let admin = layui.admin;
let form = layui.form;
let laydate = layui.laydate;
let config = layui.config;
+ var autocomplete = layui.autocomplete;
+ var $ = layui.jquery;
+
+ //自动完成-医院名称
+ autocomplete.render({
+ elem: $('#hospital-search-value')[0],
+ keywordsName: 'hospitalName',//查询关键字名称
+ url: config.base_server + 'api-user/syshospital/findByName',
+ template_val: '{{d.hospitalName}}',//选择后文本框显示的数据字段
+ template_txt: "<div class='layui-table-cell'>{{d.hospitalName}}</div>",//下拉列表模板
+ onselect: function (resp) {
+ $("#hospitalId").val(resp.id);
+ }
+ });
// 渲染表格
var renderTable = function () {
@@ -62,9 +80,14 @@
return new Date(d.contractTime).dateFormat("yyyy/MM/dd");
} },
// { field: 'enabled', width: 120, templet: '#contract-tpl-state', sort: true, title: '状态' },
- { field: 'createTime', width: 160, sort: true, title: '创建时间' },
+ { field: 'createTime', width: 160, title: '创建时间' , templet: function (d) {
+ return new Date(d.createTime).dateFormat("yyyy-MM-dd hh:mm");
+ }},
{ align: 'center', width: 150, toolbar: '#contract-table-bar', title: '操作' }
- ]]
+ ]],
+ done:function(){
+ permissionsInput();
+ }
});
}
renderTable();
@@ -77,7 +100,6 @@
admin.req('api-opration/contract/' + obj.data.id, {}, function (data) {
layer.closeAll('loading');
layer.msg(data.msg, { icon: 1, time: 500 }, function () {
-
renderTable();
});
obj.del();
@@ -93,7 +115,11 @@
// 搜索按钮点击事件
$('#contract-btn-search').click(function () {
var hospitalName = $('#hospital-search-value').val();
- table.reload('contract-table', { where: { hospitalName: hospitalName} });
+ if(strUtil.isEmpty(hospitalName))
+ {
+ $("#hospitalId").val("");
+ }
+ table.reload('contract-table', { where: { hospitalId: $("#hospitalId").val()} });
});
var showModel=function(orderId){
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/dataNeed.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/dataNeed.html
index 7106b72..8081d87 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/dataNeed.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/dataNeed.html
@@ -11,9 +11,9 @@
<input id="app-edit-search" class="layui-input search-input" type="text" placeholder="输入医生姓名" /> 
<input type="text" class="layui-input search-input" id="test1"> 至 <input type="text"
class="layui-input search-input" id="test2">  
- <button id="app-btn-search" class="layui-btn icon-btn"><i class="layui-icon"></i>搜索</button>
+ <button id="app-btn-search" class="layui-btn icon-btn permissions" permissions="diagnostic-get"><i class="layui-icon"></i>搜索</button>
<!-- <button id="app-btn-add" class="layui-btn icon-btn"><i class="layui-icon"></i>添加</button> -->
- <button id="app-btn-export" class="layui-btn icon-btn"><i class="layui-icon"></i>导出</button>
+ <button id="app-btn-export" class="layui-btn icon-btn permissions" permissions="dataneed-export"><i class="layui-icon"></i>导出</button>
</div>
<!-- 数据表格 -->
@@ -142,15 +142,17 @@
page: true,
cols: [[
{ type: 'numbers' },
- { field: 'doctorName', width: 180, sort: true, title: '医生姓名' },
- { field: 'doctorTel', width: 200, sort: true, title: '联系电话' },
- { field: 'hospitalName', width: 180, sort: true, title: '所在医院' },
- { field: 'needBegintime', width: 300, sort: true, title: '时间段', templet: "<div>{{layui.util.toDateString(d.needBegintime, 'yyyy年MM月dd日')}}至{{layui.util.toDateString(d.needEndtime, 'yyyy年MM月dd日')}}</div>" },
- { field: 'needType', width: 250, sort: true, title: '数据类型', templet: function (d) { if (d.needType == 1) { return '筛查' } else { return '就诊' } } },// 0就诊数据 1筛查
- { field: 'needTags', width: 250, align: 'center', toolbar: '#app-table-bar', sort: true, title: '需求标签' },
- { field: 'enabled', width: 250, sort: true, toolbar: '#app-table-bar1', title: '处理状态', },
- { field: 'downTime', width: 250, sort: true, title: '时间', templet: "<div>{{layui.util.toDateString(d.downTime, 'yyyy年MM月dd日')}}</div>" }
- ]]
+ { field: 'doctorName', width: 100, title: '医生姓名' },
+ { field: 'doctorTel', width: 150, title: '联系电话' },
+ { field: 'hospitalName', width: 300, title: '所在医院' },
+ { field: 'needBegintime', width: 240, title: '时间段', templet: "<div>{{layui.util.toDateString(d.needBegintime, 'yyyy-MM-dd')}}至{{layui.util.toDateString(d.needEndtime, 'yyyy-MM-dd')}}</div>" },
+ { field: 'needType', width: 100, title: '数据类型', templet: function (d) { if (d.needType == 1) { return '筛查' } else { return '就诊' } } },// 0就诊数据 1筛查
+ { field: 'needTags', width: 100, align: 'center', toolbar: '#app-table-bar', title: '需求标签' },
+ { field: 'enabled', width: 200, toolbar: '#app-table-bar1', title: '处理状态', },
+ { field: 'downTime', width: 250, title: '下载时间', templet: "<div>{{layui.util.toDateString(d.downTime, 'yyyy-MM-dd HH:mm')}}</div>" }
+ ]],done:function(){
+ permissionsInput();
+ }
});
// 工具条点击事件
@@ -163,7 +165,7 @@
} else if (layEvent === 'upload') { // 上传
layer.open({
type: 1,
- title: '上传图片',
+ title: '上传数据',
area: ["500px", "150px"],
content: $('#app-upload').html(),
success: function () {
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/diagnosisRecord.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/diagnosisRecord.html
index ac98c35..1d742fc 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/diagnosisRecord.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/diagnosisRecord.html
@@ -19,7 +19,7 @@
placeholder="按诊断医生名" /> 
<input id="hospitalName" class="layui-input search-input" type="text" placeholder="按医院名,必选条件！"
autocomplete="off" /></div> 
- <button id="diagnostic-btn-search" class="layui-btn icon-btn">
+ <button id="diagnostic-btn-search" class="layui-btn icon-btn permissions" permissions="diagnostic-get">
<i class="layui-icon"></i>搜索</button>
<table class="layui-table" id="diagnostic-table" lay-filter="diagnostic-table"></table>
@@ -30,7 +30,7 @@
<input id="hospitalId" type="hidden" />
<!-- 表格操作列 -->
<script type="text/html" id="diagnostic-table-bar">
- <a class="layui-btn layui-btn-xs" lay-event="select"">查看报告</a>
+ <a class="layui-btn layui-btn-xs permissions" permissions="diagnostic-get" lay-event="select"">查看报告</a>
</script>
<script>
@@ -76,7 +76,7 @@
{ field: 'childName', width: 100, title: '患者姓名' },
{ field: 'childSex', width: 80, title: '性别' },
{ field: 'childBirthday', width: 120, title: '出生日期',templet:function(d){
- return new Date(d.createTime).dateFormat("yyyy/MM/dd");
+ return new Date(d.createTime).dateFormat("yyyy-MM-dd");
}},
{ field: 'childPhone', width: 150, title: '联系电话' },
{
@@ -89,20 +89,23 @@
},
{
field: 'createTime', width: 170, sort: true, title: '创建时间', templet: function (d) {
- return new Date(d.createTime).dateFormat("yyyy/MM/dd hh:mm:ss");
+ return new Date(d.createTime).dateFormat("yyyy-MM-dd hh:mm");
}
},{
field: 'diagnosticDiagnoseTime', width: 120, sort: true, title: '诊断时间', templet: function (d) {
- return new Date(d.diagnosticDiagnoseTime).dateFormat("yyyy/MM/dd");
+ return new Date(d.diagnosticDiagnoseTime).dateFormat("yyyy-MM-dd");
}
},
{
field: 'updateTime', width: 170, sort: true, title: '修改时间', templet: function (d) {
- return new Date(d.createTime).dateFormat("yyyy/MM/dd hh:mm:ss");
+ return new Date(d.createTime).dateFormat("yyyy-MM-dd hh:mm");
}
},
{ field: 'enabled', width: 100, templet: '#diagnostic-table-bar', title: '查看' }
- ]]
+ ]],
+ done:function(){
+ permissionsInput();
+ }
});
// 搜索按钮点击事件
$('#diagnostic-btn-search').click(function () {
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctorTemplete.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctorTemplete.html
index b3a284e..fc2013c 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctorTemplete.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctorTemplete.html
@@ -8,7 +8,6 @@
</div>
<div class="layui-card-body">
<div class="layui-form toolbar">
- <button id="docto-templete-btn-add" class="layui-btn icon-btn permissions" permissions="doctortemplete-edit"><i class="layui-icon"></i>添加</button>
<select id="templeteType" placeholder="话术类型">
<option value="">-请选择-</option>
<option value="0">结论</option>
@@ -23,6 +22,7 @@
<input name="templeteTitle" id="templeteTitle" placeholder="请输入标题名称" type="text"
class="layui-input search-input" maxlength="20" />
<button id="app-btn-search" class="layui-btn icon-btn"><i class="layui-icon"></i>搜索</button>
+ <button id="docto-templete-btn-add" class="layui-btn icon-btn permissions" permissions="doctortemplete-edit"><i class="layui-icon"></i>添加</button>
</div>
<!-- 数据表格 -->
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/feedback.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/feedback.html
index 0c04123..4f03084 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/feedback.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/feedback.html
@@ -14,7 +14,7 @@
至
<input type="text" name="date" id="dateend" lay-verify="date" placeholder="yyyy-MM-dd" autocomplete="off"
class="layui-input search-input">  
- <button id="user-btn-search" class="layui-btn icon-btn"><i class="layui-icon"></i>搜索</button>
+ <button id="user-btn-search" class="layui-btn icon-btn permissioins" permissioins="feedback-list"><i class="layui-icon"></i>搜索</button>
</div>
<table class="layui-table" id="feedback-table" lay-filter="feedback-table"></table>
@@ -24,7 +24,7 @@
<!-- 表格操作列 -->
<script type="text/html" id="feeedback-table-bar">
<a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">查看详情</a>
- <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
+ <a class="layui-btn layui-btn-danger layui-btn-xs permissioins" permissioins="feedback-del" lay-event="del">删除</a>
</script>
<!-- 表格状态列 -->
<script type="text/html" id="user-tpl-state">
@@ -65,10 +65,14 @@
{ field: 'doctorTel', width: 200, title: '联系电话' },
{ field: 'hospitalName', width: 300, title: '医院' },
{ field: 'departmentName', width: 180, title: '科室' },
- { field: 'enabled', width: 150, templet: '#user-tpl-state', sort: true, title: '状态' },
- { field: 'createTime', width: 200, sort: true, title: '创建时间' },
+ { field: 'enabled', width: 150, templet: '#user-tpl-state', title: '状态' },
+ { field: 'createTime', width: 200, title: '创建时间',templet:function(d){
+ return new Date(d.createTime).dateFormat("yyyy-MM-dd hh:mm");
+ } },
{ align: 'center', width: 200, toolbar: '#feeedback-table-bar', title: '操作' }
- ]]
+ ]],done:function(){
+ permissionsInput();
+ }
});
// 修改状态
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/groupProduct.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/groupProduct.html
index 7eb5f0f..64b2380 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/groupProduct.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/groupProduct.html
@@ -18,15 +18,6 @@
<table class="layui-table" id="product-table" lay-filter="product-table"></table>
</div>
</div>
-<!-- 表格操作列 -->
-<script type="text/html" id="product-table-bar">
- <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
-</script>
-<!-- 表格状态列 -->
-<script type="text/html" id="product-tpl-state">
- <input type="checkbox" lay-filter="product-tpl-state" value="{{d.id}}" lay-skin="switch" lay-text="未处理|已处理"
- {{d.enabled==true?'checked':''}}/>
-</script>
<script>
layui.use(['table', 'config','laydate'], function () {
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 1cc5e0c..4a919aa 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
@@ -36,8 +36,8 @@
 
<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"></i>搜索</button> 
- <button id="hospital-btn-add" class="layui-btn icon-btn"><i class="layui-icon"></i>添加医院</button>
+ 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>
<!-- 数据表格 -->
@@ -47,10 +47,10 @@
<!-- 表格操作列 -->
<script type="text/html" id="businessRecords-table-bar">
- <a class="layui-btn layui-btn-xs" lay-event="pay">充值</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" lay-event="edit">修改</a>
- <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</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">
@@ -87,24 +87,29 @@
{ field: 'hospitalLink', width: 100, title: '联系人' },
{ field: 'hospitalTel', width: 100, title: '联系方式' },
{
- field: 'enabled', width: 80, sort: true, title: '状态', templet: function (d) {
+ field: 'enabled', width: 80, 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: 'createTime', width: 120, 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: 300, align: 'center', toolbar: '#businessRecords-table-bar', title: '操作', fixed: 'right' }
- ]]
+ ]],
+ done:function(){
+ permissionsInput();
+ }
});
//省份数据加载
area.areaData("#province", 1, "", "");
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital_form_base.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital_form_base.html
index 593a308..7d2a762 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital_form_base.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital_form_base.html
@@ -132,7 +132,7 @@
</div>
<div class="layui-form-item model-form-footer">
<button class="layui-btn layui-btn-primary" ew-event="closeDialog" type="button">取消</button>
- <button class="layui-btn" lay-filter="hospital-form-submit" lay-submit>保存</button>
+ <button class="layui-btn permissions" permissions="hospital-save" lay-filter="hospital-form-submit" lay-submit>保存</button>
</div>
<input type="hidden" name="departmentId" id="departmentId" value="" />
<input type="hidden" name="orgId" id="orgId" value="" />
@@ -153,6 +153,8 @@
var autocomplete = layui.autocomplete;
var $ = layui.jquery;
+ permissionsInput();
+
//医院资质数据
dic.dicData("#hospitalQualifiedName", "HOSPITAL_QUALIFIED", "");
//医院类型数据
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/org_form.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/org_form.html
index 48d81cc..d9815ba 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/org_form.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/org_form.html
@@ -50,7 +50,7 @@
</div>
<div class="layui-form-item model-form-footer">
<button class="layui-btn layui-btn-primary" ew-event="closeDialog" type="button">取消</button>
- <button class="layui-btn" id="sure" lay-filter="org-form-submit" lay-submit>保存</button>
+ <button class="layui-btn permissions" permissions="sysorganization-edit" id="sure" lay-filter="org-form-submit" lay-submit>保存</button>
</div>
</form>
<script>
@@ -65,6 +65,7 @@
var tree = parent.layui.tree;
var $ = parent.layui.jquery;
+ permissionsInput();
//组织结构树
var getData = function () {
admin.req('api-user/sysorganization/getTree', { is_del: 0, enabled: 1 }, function (data) {
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/product.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/product.html
index 175e7ce..35ebbf8 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/product.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/product.html
@@ -9,15 +9,17 @@
<div class="layui-card-body">
<div class="layui-form toolbar"> 
<input id="product-search-value" class="layui-input search-input" type="text" placeholder="输入产品名" /> 
- <button id="product-btn-search" class="layui-btn icon-btn"><i class="layui-icon"></i>搜索</button>
- <button id="product-btn-add" class="layui-btn icon-btn"><i class="layui-icon"></i>添加</button>
+ <button id="product-btn-search" class="layui-btn icon-btn"><i class="layui-icon permissions"
+ permissions="product-list"></i>搜索</button>
+ <button id="product-btn-add" class="layui-btn icon-btn permissions" permissions="product-edit"><i
+ class="layui-icon"></i>添加</button>
</div>
<table class="layui-table" id="product-table" lay-filter="product-table"></table>
</div>
</div>
<!-- 表格操作列 -->
<script type="text/html" id="product-table-bar">
- <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
+ <a class="layui-btn layui-btn-danger layui-btn-xs permissions" permissions="product-del" lay-event="del">删除</a>
</script>
<!-- 表格状态列 -->
<script type="text/html" id="product-tpl-state">
@@ -45,7 +47,7 @@
cols: [[
{ field: 'proName', width: 300, title: '产品名称' },
{
- field: 'proType',align: 'center', width: 100, templet: function (d) {
+ field: 'proType', align: 'center', width: 100, templet: function (d) {
if (d.proType === 0)
return "试用"
else
@@ -71,9 +73,16 @@
{ field: 'recordCount', width: 180, title: '报告数' },
{ field: 'ailightCount', width: 180, title: '读片量' },
{ field: 'enabled', width: 150, templet: '#product-tpl-state', sort: true, title: '状态' },
- { field: 'createTime', width: 200, sort: true, title: '创建时间' },
+ {
+ field: 'createTime', width: 200, sort: true, title: '创建时间', templet: function (d) {
+ return new Date(d.createTime).dateFormat("yyyy-MM-dd HH:mm");
+ }
+ },
{ align: 'center', width: 100, toolbar: '#product-table-bar', title: '操作' }
- ]]
+ ]],
+ done: function () {
+ permissionsInput();
+ }
});
}
renderTable();
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/product_form.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/product_form.html
index 55aa09e..3c49f00 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/product_form.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/product_form.html
@@ -46,7 +46,7 @@
</div>
<div class="layui-form-item model-form-footer">
<button class="layui-btn layui-btn-primary" ew-event="closeDialog" type="button">取消</button>
- <button class="layui-btn" lay-filter="product-form-submit" lay-submit>保存</button>
+ <button class="layui-btn permissions" permissions="product-edit" lay-filter="product-form-submit" lay-submit>保存</button>
</div>
</form>
@@ -98,4 +98,6 @@
});
});
+
+ permissionsInput();
</script>
\ No newline at end of file
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 ed14d56..ab13ea9 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
@@ -10,14 +10,14 @@
<div class="layui-form toolbar"> 
<input id="product-search-value" class="layui-input search-input" type="text" placeholder="按产品名" /> 
<input id="hospital-search-value" class="layui-input search-input" type="text" placeholder="按医院名" /> 
- <button id="product-btn-search" class="layui-btn icon-btn"><i class="layui-icon"></i>搜索</button>
+ <button id="product-btn-search" class="layui-btn icon-btn permissions" permissions="productorderdetail-get"><i class="layui-icon"></i>搜索</button>
</div>
<table class="layui-table" id="product-table" lay-filter="product-table"></table>
</div>
</div>
<!-- 表格操作列 -->
<script type="text/html" id="product-table-bar">
- <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
+ <a class="layui-btn layui-btn-danger layui-btn-xs permissions" permissions="productorderdetail-del" lay-event="del">删除</a>
</script>
<!-- 表格状态列 -->
<script type="text/html" id="product-tpl-state">
@@ -70,10 +70,13 @@
return new Date(d.proEndtime).dateFormat("yyyy/MM/dd");
} },
{ field: 'createTime', width: 160, sort: true, title: '创建时间',templet:function(d){
- return new Date(d.createTime).dateFormat("yyyy/MM/dd hh:mm:ss");
+ return new Date(d.createTime).dateFormat("yyyy-MM-dd hh:mm");
} },
{ align: 'center', width: 100, toolbar: '#product-table-bar', title: '操作' }
- ]]
+ ]],
+ done:function(){
+ permissionsInput();
+ }
});
}
renderTable();
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/recharge.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/recharge.html
index 13f676e..2d9e63c 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/recharge.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/recharge.html
@@ -124,7 +124,7 @@
</div>
<div class="layui-form-item model-form-footer" style="margin-right: 20px;">
<button class="layui-btn layui-btn-primary" ew-event="closeDialog" type="button">取消</button>
- <button class="layui-btn" lay-filter="recharge-form-submit" lay-submit>确定充值</button>
+ <button class="layui-btn permissions" permissions="product-rechage" lay-filter="recharge-form-submit" lay-submit>确定充值</button>
</div>
<input type="hidden" value="" id="departmentId" name="departmentId" />
<input type="hidden" value="" id="hospitalId" name="hospitalId" />
@@ -444,4 +444,5 @@
return false;
});
});
+ permissionsInput();
</script>
\ No newline at end of file
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/recordNote.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/recordNote.html
index 9c175ab..9122940 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/recordNote.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/recordNote.html
@@ -1,6 +1,3 @@
-
-
-
<script>
layui.use(['layer', 'admin', 'form', 'table', 'config'], function () {
var table = layui.table;
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/sysdictionaries.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/sysdictionaries.html
index 4ac5b2b..6975e2e 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/sysdictionaries.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/sysdictionaries.html
@@ -9,8 +9,8 @@
<div class="layui-card-body">
<div class="layui-form toolbar">
<input id="app-edit-search" class="layui-input search-input" type="text" placeholder="按名称" /> 
- <button id="app-btn-search" class="layui-btn icon-btn"><i class="layui-icon"></i>搜索</button>
- <button id="user-btn-add" class="layui-btn icon-btn"><i class="layui-icon"></i>添加</button>
+ <button id="app-btn-search" class="layui-btn icon-btn permissions" permissions="sysdictionaries-list"><i class="layui-icon"></i>搜索</button>
+ <button id="user-btn-add" class="layui-btn icon-btn permissions" permissions="sysdictionaries-edit"><i class="layui-icon"></i>添加</button>
</div>
<!-- 数据表格 -->
@@ -20,8 +20,8 @@
<!-- 表格操作列 -->
<script type="text/html" id="dictionaries-table-bar">
- <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="edit">修改</a>
- <a class="layui-btn layui-btn-xs" lay-event="del">删除</a>
+ <a class="layui-btn layui-btn-primary layui-btn-xs permissions" permissions="sysdictionaries-edit" lay-event="edit">修改</a>
+ <a class="layui-btn layui-btn-xs permissions" permissions="sysdictionaries-del" lay-event="del">删除</a>
</script>
<!-- 表格状态列 -->
<script type="text/html" id="dictionaries-tpl-state">
@@ -114,20 +114,23 @@
cols: [[
{ type: 'numbers' },
{
- field: 'dictionariesClassId', width: 180, sort: true, title: '字典类型', templet: function (d) {
+ field: 'dictionariesClassId', width: 180, title: '字典类型', templet: function (d) {
return d.dictionariesClassId == undefined ? "分类" : "字典"
}
},
- { field: 'dictionariesClassName', width: 200, sort: true, title: '字典分类' },
- { field: 'dictionariesKey', width: 180, sort: true, title: '字典Key' },
- { field: 'dictionariesName', width: 264, sort: true, title: '字典值' },
- { field: 'id', width: 250, align: 'center', toolbar: '#dictionaries-tpl-state', sort: true, title: '状态' },// 0就诊数据 1筛查
- { field: 'createTime', width: 250, sort: true, title: '创建时间', templet: "<div>{{layui.util.toDateString(d.createTime, 'yyyy年MM月dd日 HH:mm:ss')}}</div>" },
- { field: 'id', width: 250, align: 'center', toolbar: '#dictionaries-table-bar', sort: true, title: '操作' },// 0就诊数据 1筛查
- ]]
+ { field: 'dictionariesClassName', width: 200, title: '字典分类' },
+ { field: 'dictionariesKey', width: 180, title: '字典Key' },
+ { field: 'dictionariesName', width: 264, title: '字典值' },
+ { field: 'id', width: 250, align: 'center', toolbar: '#dictionaries-tpl-state', title: '状态' },// 0就诊数据 1筛查
+ { field: 'createTime', width: 250, title: '创建时间', templet: "<div>{{layui.util.toDateString(d.createTime, 'yyyy-MM-dd HH:mm')}}</div>" },
+ { field: 'id', width: 250, align: 'center', toolbar: '#dictionaries-table-bar', title: '操作' },// 0就诊数据 1筛查
+ ]],
+ done:function(){
+ permissionsInput();
+ }
});
- // 修改菜单类型
+ // 修改类型
let changeType = function (type) {
if (type == 1) {
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/verifyRecharge.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/verifyRecharge.html
index edee941..d511991 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/verifyRecharge.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/verifyRecharge.html
@@ -10,15 +10,15 @@
<div class="layui-form toolbar"> 
<input id="product-search-value" class="layui-input search-input" type="text" placeholder="按产品名" /> 
<input id="hospital-search-value" class="layui-input search-input" type="text" placeholder="按医院名" /> 
- <button id="product-btn-search" class="layui-btn icon-btn"><i class="layui-icon"></i>搜索</button>
+ <button id="product-btn-search" class="layui-btn icon-btn permissions" permissions="updateEnabled-detail"><i class="layui-icon"></i>搜索</button>
</div>
- <table class="layui-table" id="product-table" lay-filter="product-table"></table>
+ <table class="layui-table permissions" id="product-table" lay-filter="product-table" permissions="productorderdetail-verify"></table>
</div>
</div>
<!-- 表格状态列 -->
<script type="text/html" id="product-tpl-state">
<input type="checkbox" lay-filter="product-tpl-state" value="{{d.id}}" lay-skin="switch" lay-text="生效|待审核"
- {{d.enabled!=true?'checked':''}}/>
+ {{d.enabled==true?'checked':''}}/>
</script>
<script>
@@ -35,7 +35,7 @@
elem: '#product-table',
url: config.base_server + 'api-opration/productorderdetail/all',
method: 'GET',
- where:{enabled:0,proType:0},
+ where: { enabled: 0, proType: 0 },
headers: { 'Authorization': 'Bearer ' + config.getToken().access_token },
page: true,
cols: [[
@@ -43,34 +43,43 @@
{ field: 'departmentName', width: 100, title: '科室名称' },
{ field: 'proName', width: 250, title: '产品名称' },
{
- field: 'proType', sort: true, align: 'center', width: 80, templet: function (d) {
- if (d.proType === 0)
- return "试用"
- else
- return "正式"
- }, title: '类型'
- },
+ field: 'proType', sort: true, align: 'center', width: 80, templet: function (d) {
+ if (d.proType === 0)
+ return "试用"
+ else
+ return "正式"
+ }, title: '类型'
+ },
{ field: 'ailightCount', width: 150, title: '读片量' },
{ field: 'recordCount', width: 100, title: '报告量' },
- { field: 'isShare', width: 100, title: '是否共享',templet:function(d)
{
- if(d.isShare)
- return '共享'
- else
- return '私有'
- }
+ field: 'isShare', width: 100, title: '是否共享', templet: function (d) {
+ if (d.isShare)
+ return '共享'
+ else
+ return '私有'
+ }
},
- { field: 'proBegintime', width: 120, title: '开始时间',templet:function(d){
- return new Date(d.proBegintime).dateFormat("yyyy/MM/dd");
- } },
- { field: 'proEndtime', width: 120, title: '结束时间',templet:function(d){
- return new Date(d.proEndtime).dateFormat("yyyy/MM/dd");
- } },
- { field: 'createTime', width: 160, sort: true, title: '创建时间',templet:function(d){
- return new Date(d.createTime).dateFormat("yyyy/MM/dd hh:mm:ss");
- } },
+ {
+ field: 'proBegintime', width: 120, title: '开始时间', templet: function (d) {
+ return new Date(d.proBegintime).dateFormat("yyyy/MM/dd");
+ }
+ },
+ {
+ field: 'proEndtime', width: 120, title: '结束时间', templet: function (d) {
+ return new Date(d.proEndtime).dateFormat("yyyy/MM/dd");
+ }
+ },
+ {
+ field: 'createTime', width: 160, sort: true, title: '创建时间', templet: function (d) {
+ return new Date(d.createTime).dateFormat("yyyy/MM/dd hh:mm");
+ }
+ },
{ field: 'enabled', width: 100, templet: '#product-tpl-state', sort: true, title: '审核' }
- ]]
+ ]],
+ done:function(){
+ permissionsInput();
+ }
});
}
renderTable();
@@ -85,6 +94,7 @@
layer.closeAll('loading');
if (data.code == 0) {
layer.msg(data.msg, { icon: 1, time: 500 });
+ renderTable();
} else {
layer.msg(data.msg, { icon: 2, time: 500 });
$(obj.elem).prop('checked', !obj.elem.checked);
@@ -96,7 +106,7 @@
$('#product-btn-search').click(function () {
var proName = $('#product-search-value').val();
var hospitalName = $('#hospital-search-value').val();
- table.reload('product-table', { where: { proName: proName,hospitalName: hospitalName } });
+ table.reload('product-table', { where: { proName: proName, hospitalName: hospitalName } });
});
});
</script>
\ No newline at end of file
--
Gitblit v1.8.0