From f6d390988b1c9b5695338214e95ff0d6da70b300 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Wed, 25 Nov 2020 16:34:41 +0800
Subject: [PATCH] 完善功能

---
 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/contract.html |  177 ++++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 109 insertions(+), 68 deletions(-)

diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/contract.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/contract.html
index 9364a57..cdf70b6 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/contract.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/contract.html
@@ -10,18 +10,23 @@
         <div class="layui-form toolbar">
             <div class="layui-form-item">
                 <div class="layui-inline" style="margin-bottom: -25px;">&emsp;
-            <input id="hospital-search-value" class="layui-input  search-input" type="text" placeholder="按医院名" autocomplete="off" width="400px" /></div>&emsp;
-            <button id="contract-btn-search" class="layui-btn icon-btn permissions" permissions="contract-list" style="margin-bottom: -25px;"><i class="layui-icon">&#xe615;</i>搜索</button>
+                    <input id="hospital-search-value" class="layui-input  search-input" type="text" placeholder="按医院名"
+                        autocomplete="off" width="400px" /></div>&emsp;
+                <button id="contract-btn-search" class="layui-btn icon-btn permissions" permissions="contract-list"
+                    style="margin-bottom: -25px;"><i class="layui-icon">&#xe615;</i>搜索</button>
+            </div>
+            <table class="layui-table" id="contract-table" lay-filter="contract-table"></table>
         </div>
-        <table class="layui-table" id="contract-table" lay-filter="contract-table"></table>
-    </div></div>
     </div>
+</div>
 </div>
 <input id="hospitalId" type="hidden" />
 <!-- 表格操作列 -->
 <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-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-primary layui-btn-xs permissions" permissions="productorderdetail-save"
+    lay-event="detail">查看套餐</a>
 </script>
 <!-- 表格状态列 -->
 <script type="text/html" id="contract-tpl-state">
@@ -65,28 +70,40 @@
                 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: '合同名' },
                     {
-                        return new Date(d.contractBeginTime).dateFormat("yyyy/MM/dd");
-                    }
+                        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){
-                        return new Date(d.contractEndTime).dateFormat("yyyy/MM/dd");
-                    } },
-                    { field: 'contractTime', width: 180, title: '合同签订时间',templet:function(d){
-                        return new Date(d.contractTime).dateFormat("yyyy/MM/dd");
-                    } },
+                    {
+                        field: 'contractEndTime', width: 120, title: '合同到期时间', templet: function (d) {
+                            return new Date(d.contractEndTime).dateFormat("yyyy/MM/dd");
+                        }
+                    },
+                    {
+                        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");
+                        }
+                    },
                     // { 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: '操作' }
+                    {
+                        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: '操作',
+                        fixed: 'right'
+                    }
                 ]],
-                done:function(res){
-                    permissionsInput(res,config);
+                done: function (res) {
+                    permissionsInput(res, config);
                 }
             });
         }
@@ -94,7 +111,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) {
@@ -106,8 +123,11 @@
                     }, 'DELETE');
                 });
             }
-            else
-            {
+            else if (obj.event === 'edit') {
+                //修改
+                updateModel(obj.data);
+            } else if (obj.event === 'detail') {
+                //充值记录列表
                 showModel(obj.data.id);
             }
         });
@@ -115,53 +135,74 @@
         // 搜索按钮点击事件
         $('#contract-btn-search').click(function () {
             var hospitalName = $('#hospital-search-value').val();
-            if(strUtil.isEmpty(hospitalName))
-            {
+            if (strUtil.isEmpty(hospitalName)) {
                 $("#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){
-        layer.open({
-            type:1,
-            title:'查看产品',
-            area: '1200px',
-            offset: '100px',
-            content: $('#contract-model').html(),
-            success:function(){
-                table.render({
-                elem: '#contract-table-detail',
-                url: config.base_server + 'api-opration/productorderrecord',
-                method: 'GET',
-                where:{'orderId':orderId},
-                headers: { 'Authorization': 'Bearer ' + config.getToken().access_token },
-                page: true,
-                limit:10,
-                limits:[5,10],
-                cols: [[
-                    { field: 'proName', width: 300, title: '产品名称' },
-                    { field: 'ailightCount', width: 150, title: '读片量' },
-                    { field: 'recordCount', width: 100, title: '报告量' },
-                    { field: 'isShare', width: 150, title: '是否共享',templet:function(d)
-                    {
-                        if(d.isShare)
-                        return '共享'
-                        else
-                        return '私有'
-                    }
-                    },
-                    { field: 'proBegintime', width: 150, title: '开始时间',templet:function(d){
-                        return new Date(d.proBegintime).dateFormat("yyyy/MM/dd");
-                    } },
-                    { field: 'proEndtime', width: 180, title: '结束时间',templet:function(d){
-                        return new Date(d.proEndtime).dateFormat("yyyy/MM/dd");
-                    } },
-                    { field: 'createTime', width: 160, sort: true, title: '创建时间' }
-                ]]
+        var showModel = function (orderId) {
+            layer.open({
+                type: 1,
+                title: '查看产品',
+                area: '1200px',
+                offset: '100px',
+                content: $('#contract-model').html(),
+                success: function () {
+                    table.render({
+                        elem: '#contract-table-detail',
+                        url: config.base_server + 'api-opration/productorderrecord',
+                        method: 'GET',
+                        where: { 'orderId': orderId },
+                        headers: { 'Authorization': 'Bearer ' + config.getToken().access_token },
+                        page: true,
+                        limit: 10,
+                        limits: [5, 10],
+                        cols: [[
+                            { field: 'proName', width: 300, title: '产品名称' },
+                            { field: 'ailightCount', width: 150, title: '读片量' },
+                            { field: 'recordCount', width: 100, title: '报告量' },
+                            {
+                                field: 'isShare', width: 150, title: '是否共享', templet: function (d) {
+                                    if (d.isShare)
+                                        return '共享'
+                                    else
+                                        return '私有'
+                                }
+                            },
+                            {
+                                field: 'proBegintime', width: 150, title: '开始时间', templet: function (d) {
+                                    return new Date(d.proBegintime).dateFormat("yyyy/MM/dd");
+                                }
+                            },
+                            {
+                                field: 'proEndtime', width: 180, title: '结束时间', templet: function (d) {
+                                    return new Date(d.proEndtime).dateFormat("yyyy/MM/dd");
+                                }
+                            },
+                            { field: 'createTime', width: 160, sort: true, title: '创建时间' }
+                        ]]
+                    });
+                }
             });
-            }
-        });
+        }
+        var updateModel = function (data) {
+            //修改充值记录
+            admin.putTempData("t_hospital", data);
+            admin.popupCenter({
+                title: '修改合同',
+                path: 'pages/opration/rechargeupdate.html',
+                area: '1200px',
+                offset: '0px',
+                finish: function () {
+                    $('#hospita-btn-search').click();
+                }
+            });
         }
     });
 </script>
\ No newline at end of file

--
Gitblit v1.8.0