Merge remote-tracking branch 'origin/dev' into dev

luliqiang

2021-02-26 e7c3314727fc06444689c0e6ecab5fea337afeb0

 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/productdetail.html

@@ -1,9 +1,9 @@
<div class="layui-card">
    <div class="layui-card-header">
        <h2 class="header-title">产品消费记录</h2>
        <h2 class="header-title">产品充值记录</h2>
        <span class="layui-breadcrumb pull-right">
            <a href="#!console">首页</a>
            <a><cite>产品消费记录</cite></a>
            <a><cite>产品充值记录</cite></a>
        </span>
    </div>
    <div class="layui-card-body">
@@ -65,9 +65,10 @@
                headers: { 'Authorization': 'Bearer ' + config.getToken().access_token },
                page: true,
                cols: [[
                    { field: 'hospitalName', width: 300, title: '医院名称' },
                    { field: 'hospitalId', width: 180, title: '医院编号' },
                    { field: 'hospitalName', width: 200, title: '医院名称' },
                    { field: 'departmentName', width: 100, title: '科室名称' },
                    { field: 'proName', width: 250, title: '产品名称' },
                    { field: 'proName', width: 200, title: '产品名称' },
                    {
                    field: 'proType', sort: true, align: 'center', width: 80, templet: function (d) {
                        if (d.proType === 0)
@@ -92,11 +93,9 @@
                    { 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: 'createTime', width: 200, sort: true, title: '创建时间', templet: "<div>{{layui.util.toDateString(d.createTime, 'yyyy/MM/dd HH:mm')}}</div>" },
                    { align: 'center', width: 100, toolbar: '#product-table-bar', title: '操作' }
                    { align: 'center', width: 100, toolbar: '#product-table-bar', title: '操作',
                        fixed: 'right' }
                ]]
            });
        }
@@ -109,10 +108,14 @@
                    layer.load(2);
                    admin.req('api-opration/productorderrecord/' + obj.data.id, {}, function (data) {
                        layer.closeAll('loading');
                        layer.msg(data.msg, { icon: 1, time: 2000 }, function () {
                            renderTable();
                        });
                        obj.del();
                        if(data.code==200)
                        {
                            layer.msg("指定充值记录删除成功！", { icon: 1, time: 2000 });
                            obj.del();
                        }
                        else{
                        layer.msg(data.msg, { icon: 3, time: 2000 });
                    }
                    }, 'DELETE');
                });
            }
@@ -131,7 +134,11 @@
            }
            var proName = $('#product-search-value').val();
                var hospitalId = $('#hospitalId').val();
            table.reload('product-table', { where: { proName: proName,hospitalId: hospitalId,departmentId:'1252408277275664385',startTime: startTime, endTime: endTime } });
            table.reload('product-table', { 
                where: { proName: proName,hospitalId: hospitalId,startTime: startTime, endTime: endTime },
                page: {
                        curr: 1 
                    }  });
        });
       
        //比较日期大小