From 88b335cf1352479a5ffdb6305ce42b32e0122622 Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Tue, 11 Aug 2020 09:45:14 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/recharge.html | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
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..e07c53b 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" />
@@ -274,7 +274,10 @@
},
{ field: 'isShare', fixed: 'right', align: 'center', width: 100, templet: '#product-tpl-isShare', title: '共享' },
{ field: 'id', fixed: 'right', align: 'center', width: 100, toolbar: '#product-tpl-bar', title: '操作' }
- ]]
+ ]],
+ done:function(res){
+ permissionsInput(res,config);
+ }
});
//待充值列表功能操作
table.on('tool(product-table-temp)', function (obj) {
@@ -387,6 +390,9 @@
if (listData != null) {
if (data.field != null) {
layer.confirm("确定要将待充值列表中的" + listData.length + "个产品充值给当前医院吗？", { btn: ["确定", "返回"] }, function () {
+ data.field.contractBeginTime=data.field.contractBeginTime+" 00:00:00";
+ data.field.contractEndTime=data.field.contractEndTime+" 23:59:59";
+ data.field.contractTime=data.field.contractTime+" 00:00:00";
admin.req('api-opration/contract', JSON.stringify(data.field), function (data) {
layer.closeAll('loading');
if (data.code === 0) {
@@ -402,11 +408,12 @@
isShare: item.isShare,
ailightCount: item.ailightCount,
recordCount: item.recordCount,
- proBegintime: new Date(item.beginTime + ' 00:00:00'),
- proEndtime: new Date(item.endTime + ' 23:59:59')
+ proBegintime: item.beginTime + ' 00:00:00',
+ proEndtime: item.endTime + ' 23:59:59'
};
listDetailData.push(detailData);
})
+
if (listDetailData.length > 0) {
//提交订单数据
admin.req('api-opration/productorderdetail/saveall', JSON.stringify(listDetailData), function (data) {
@@ -414,7 +421,7 @@
if (data.code === 0) {
//现将临时数据清理
admin.putTempData("t_tempProduct", "");
- layer.msg(data.msg, { icon: 1, time: 1000 }, function () {
+ layer.msg(data.msg, { icon: 1, time: 20000 }, function () {
admin.finishPopupCenter();
});
}
--
Gitblit v1.8.0