From 6fb14149d62199cfcc0448c82eb2f51f9c5181de Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Thu, 31 Dec 2020 16:55:30 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into parter
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/verifyRecharge.html | 88 ++++++++++++++++++++++++-------------------
1 files changed, 49 insertions(+), 39 deletions(-)
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..82ae38f 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,68 +35,78 @@
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: [[
- { field: 'hospitalName', width: 300, title: '医院名称' },
- { field: 'departmentName', width: 100, title: '科室名称' },
- { field: 'proName', width: 250, title: '产品名称' },
+ { field: 'hospitalName',align:'center', width: 300, title: '医院名称' },
+ { field: 'departmentName', align:'center',width: 100, title: '科室名称' },
+ { field: 'proName',align:'center', width: 250, title: '产品名称' },
+ { field: 'ailightCount', align:'center',width: 150, title: '读片量' },
+ { field: 'recordCount',align:'center', width: 100, 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',align:'center', 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: 'enabled', width: 100, templet: '#product-tpl-state', sort: true, title: '审核' }
- ]]
+ {
+ field: 'proBegintime',align:'center', width: 120, title: '开始时间', templet: function (d) {
+ return new Date(d.proBegintime).dateFormat("yyyy/MM/dd");
+ }
+ },
+ {
+ field: 'proEndtime',align:'center', width: 120, title: '结束时间', templet: function (d) {
+ return new Date(d.proEndtime).dateFormat("yyyy/MM/dd");
+ }
+ },
+ {
+ field: 'createTime',align:'center', width: 160, sort: true, title: '创建时间', templet: function (d) {
+ return new Date(d.createTime).dateFormat("yyyy/MM/dd hh:mm");
+ }
+ },
+ { field: 'enabled',align:'center', width: 100, templet: '#product-tpl-state', sort: true, title: '审核' }
+ ]],
+ done:function(res){
+ permissionsInput(res,config);
+ }
});
}
renderTable();
// 修改状态
form.on('switch(product-tpl-state)', function (obj) {
- layer.load(2);
- admin.req('api-opration/productorderdetail/updateEnabled', {
+ layer.confirm("确定要通过此试用吗?",{btn: ["确定", "返回"]},function(){
+ admin.req('api-opration/productorderdetail/updateEnabled', {
id: obj.elem.value,
enabled: obj.elem.checked ? true : false
}, 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 });
+ renderTable();
} 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');
}
}, 'GET');
+ },function(){
+ $(obj.elem).prop('checked', !obj.elem.checked);
+ form.render('checkbox');
+ });
});
// 搜索按钮点击事件
$('#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 },
+ page: {
+ curr: 1
+ } });
});
});
</script>
\ No newline at end of file
--
Gitblit v1.8.0