Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-pla...

luliqiang

2020-12-31 6fb14149d62199cfcc0448c82eb2f51f9c5181de

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

@@ -24,7 +24,7 @@
<!-- 表格操作列 -->
<script type="text/html" id="contract-table-bar">
    <!-- <a class="layui-btn layui-btn-danger layui-btn-xs permissions" permissions="contract-del" lay-event="del">删除</a> -->
<a class="layui-btn layui-btn-xs permissions" permissions="contract-edit" lay-event="edit"">修改</a>
<a class="layui-btn layui-btn-xs permissions" permissions="contract-edit" lay-event="edit">修改</a>
    <a class=" layui-btn layui-btn-primary layui-btn-xs permissions" permissions="productorderdetail-save"
    lay-event="detail">查看套餐</a>
</script>
@@ -85,6 +85,9 @@
                    },
                    {
                        field: 'contractTime', width: 120, title: '合同签订时间', templet: function (d) {
                            if(d.contractTime==null){
                                return new Date(d.createTime).dateFormat("yyyy/MM/dd");
                            }
                            return new Date(d.contractTime).dateFormat("yyyy/MM/dd");
                        }
                    },
@@ -125,7 +128,7 @@
                updateModel(obj.data);
            } else if (obj.event === 'detail') {
                //充值记录列表
                showModel(obj.data.id);
                showModel(obj.data);
            }
        });

@@ -143,7 +146,7 @@
            });
        });

        var showModel = function (orderId) {
        var showModel = function (data) {
            layer.open({
                type: 1,
                title: '查看产品',
@@ -153,9 +156,9 @@
                success: function () {
                    table.render({
                        elem: '#contract-table-detail',
                        url: config.base_server + 'api-opration/productorderrecord',
                        url: config.base_server + 'api-opration/productorderdetail/all',
                        method: 'GET',
                        where: { 'orderId': orderId },
                        where: { orderId: data.id,enabled: 1},
                        headers: { 'Authorization': 'Bearer ' + config.getToken().access_token },
                        page: true,
                        limit: 10,
@@ -163,6 +166,10 @@
                        cols: [[
                            { field: 'proName', width: 300, title: '产品名称' },
                            { field: 'ailightCount', width: 150, title: '读片量' },
                            { field: 'ailightCount', width: 150, title: '读片使用量' ,templet: function (d) {
                                    return d.orderAilightCount-d.ailightCount;
                                }
                            },
                            { field: 'recordCount', width: 100, title: '报告量' },
                            {
                                field: 'isShare', width: 150, title: '是否共享', templet: function (d) {