From e6a149ea753350d3bebbd76ce40315a8b6016b4e Mon Sep 17 00:00:00 2001
From: bingbing <zhaobingliang@aliyun.com>
Date: Thu, 23 Jul 2020 13:04:47 +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 | 109 +++++++++++++++++++++++++++++-------------------------
1 files changed, 59 insertions(+), 50 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 8e45cfb..c5fc16b 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
@@ -67,7 +67,7 @@
<label class="layui-form-label">合同编号</label>
<div class="layui-input-block">
<input name="contractNo" id="contractNo" type="text" class="layui-input" maxlength="50"
- style="width: 185px;" autocomplete="off"/>
+ style="width: 185px;" autocomplete="off" />
</div>
</div>
</div>
@@ -76,21 +76,22 @@
<div class="layui-row">
<div class="layui-col-sm4">
<label class="layui-form-label" style="padding: 10px 30px 0 0px;">开始日期</label>
- <input autocomplete="off" name="contractBeginTime" id="contractBeginTime" type="text" class="layui-input"
- style="width: 182px;" maxlength="50" lay-verify="required" required />
+ <input autocomplete="off" name="contractBeginTime" id="contractBeginTime" type="text"
+ class="layui-input" style="width: 182px;" maxlength="50" lay-verify="required"
+ required />
</div>
<div class="layui-col-sm4">
<label class="layui-form-label">截止日期</label>
<div class="layui-input-block">
- <input autocomplete="off" name="contractEndTime" id="contractEndTime" type="text" class="layui-input"
- maxlength="50" lay-verify="required" required />
+ <input autocomplete="off" name="contractEndTime" id="contractEndTime" type="text"
+ class="layui-input" maxlength="50" lay-verify="required" required />
</div>
</div>
<div class="layui-col-sm4">
<label class="layui-form-label">签订日期</label>
<div class="layui-input-block">
- <input autocomplete="off" name="contractTime" id="contractTime" type="text" class="layui-input"
- maxlength="50" lay-verify="required" required />
+ <input autocomplete="off" name="contractTime" id="contractTime" type="text"
+ class="layui-input" maxlength="50" lay-verify="required" required />
</div>
</div>
</div>
@@ -123,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" />
@@ -273,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) {
@@ -385,50 +389,55 @@
var listData = admin.getTempData("t_tempProduct");
if (listData != null) {
if (data.field != null) {
- admin.req('api-opration/contract', JSON.stringify(data.field), function (data) {
- layer.closeAll('loading');
- if (data.code === 0) {
- var orderData = data.data;
- //处理订单明细数据
- var listDetailData = new Array();
- $.each(listData, function (index, item) {
- var detailData = {
- orderId: orderData.id,
- proId: item.id,
- proType: item.proType,
- proName: item.proName,
- 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')
- };
- listDetailData.push(detailData);
- })
- if (listDetailData.length > 0) {
- //提交订单数据
- admin.req('api-opration/productorderdetail/saveall', JSON.stringify(listDetailData), function (data) {
- layer.closeAll('loading');
- if (data.code === 0) {
- //现将临时数据清理
- admin.putTempData("t_tempProduct", "");
- layer.msg(data.msg, { icon: 1, time: 1000 }, function () {
- admin.finishPopupCenter();
- });
- }
- else {
- layer.msg(data.msg, { icon: 2, time: 1000 });
- }
- }, 'POST');
+ 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) {
+ var orderData = data.data;
+ //处理订单明细数据
+ var listDetailData = new Array();
+ $.each(listData, function (index, item) {
+ var detailData = {
+ orderId: orderData.id,
+ proId: item.id,
+ proType: item.proType,
+ proName: item.proName,
+ isShare: item.isShare,
+ ailightCount: item.ailightCount,
+ recordCount: item.recordCount,
+ 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) {
+ layer.closeAll('loading');
+ if (data.code === 0) {
+ //现将临时数据清理
+ admin.putTempData("t_tempProduct", "");
+ layer.msg(data.msg, { icon: 1, time: 1000 }, function () {
+ admin.finishPopupCenter();
+ });
+ }
+ else {
+ layer.msg(data.msg, { icon: 2, time: 1000 });
+ }
+ }, 'POST');
+ }
+ else {
+ layer.msg("充值数据异常为空！", { icon: 2, time: 1000 });
+ }
}
else {
- layer.msg("充值数据异常为空！", { icon: 2, time: 1000 });
+ layer.msg(data.msg, { icon: 2, time: 1000 });
}
- }
- else {
- layer.msg(data.msg, { icon: 2, time: 1000 });
- }
- }, 'POST');
+ }, 'POST');
+ })
}
else {
layer.msg("数据异常！", { icon: 2, time: 1000 });
--
Gitblit v1.8.0