Merge branch 'dev' of ssh://192.168.2.240:29418/kidgrow-microservices-platf...

zhaoxiaohao

2020-11-17 e9cbc4b86621cfdc2b7039e56fad760e80865389

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

@@ -21,7 +21,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-primary layui-btn-xs permissions" permissions="productorderdetail-save" lay-event="detail">查看产品</a>
    <a class="layui-btn layui-btn-primary layui-btn-xs permissions" permissions="productorderdetail-save" lay-event="detail">查看套餐</a>
</script>
<!-- 表格状态列 -->
<script type="text/html" id="contract-tpl-state">
@@ -65,25 +65,26 @@
                page: true,
                cols: [[
                    { field: 'hospitalName', width: 300, title: '医院名称' },
                    { field: 'departmentName', width: 100, title: '科室名称' },
                    { field: 'departmentName', width: 200, title: '科室名称' },
                    { field: 'contractNo', width: 150, title: '合同编号' },
                    { field: 'contractTitle', width: 260, title: '合同名' },
                    { field: 'contractBeginTime', width: 150, title: '合同生效时间',templet:function(d)
                    { field: 'contractTitle', width: 200, title: '合同名' },
                    { field: 'contractBeginTime', width: 120, title: '合同生效时间',templet:function(d)
                    {
                        return new Date(d.contractBeginTime).dateFormat("yyyy/MM/dd");
                    }
                    },
                    { field: 'contractEndTime', width: 150, title: '合同到期时间',templet:function(d){
                    { field: 'contractEndTime', width: 120, title: '合同到期时间',templet:function(d){
                        return new Date(d.contractEndTime).dateFormat("yyyy/MM/dd");
                    } },
                    { field: 'contractTime', width: 180, title: '合同签订时间',templet:function(d){
                    { field: 'contractTime', width: 120, title: '合同签订时间',templet:function(d){
                        return new Date(d.contractTime).dateFormat("yyyy/MM/dd");
                    } },
                    // { field: 'enabled', width: 120, templet: '#contract-tpl-state', sort: true, title: '状态' },
                    { field: 'createTime', width: 160, title: '创建时间' , templet: function (d) {
                        return new Date(d.createTime).dateFormat("yyyy-MM-dd hh:mm");
                    }},
                    { align: 'center', width: 150, toolbar: '#contract-table-bar', title: '操作' }
                    { align: 'center', width: 150, toolbar: '#contract-table-bar', title: '操作',
                            fixed: 'right'}
                ]],
                done:function(res){
                    permissionsInput(res,config);
@@ -94,7 +95,7 @@
        // 工具条点击事件
        table.on('tool(contract-table)', function (obj) {
            if (obj.event === 'del') { // 删除
                layer.confirm('确定要删除吗？', function (i) {
                layer.confirm('确定要删除合同及关联套餐吗？', function (i) {
                    layer.close(i);
                    layer.load(2);
                    admin.req('api-opration/contract/' + obj.data.id, {}, function (data) {
@@ -119,7 +120,11 @@
            {
                $("#hospitalId").val("");
            }
            table.reload('contract-table', { where: { hospitalId: $("#hospitalId").val()} });
            table.reload('contract-table', { 
                where: { hospitalId: $("#hospitalId").val()},
                page: {
                        curr: 1 
                    }  });
        });

        var showModel=function(orderId){