From f5df017deac69032a31b6f637c3ce80cd1c414cb Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Wed, 03 Mar 2021 10:42:10 +0800
Subject: [PATCH] 将查看套餐的开始时间和结束时间与h端对应

---
 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/productdetail.html |   41 ++++++++++++++++++++++++-----------------
 1 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/productdetail.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/productdetail.html
index 5cc539d..98ac489 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/productdetail.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/productdetail.html
@@ -1,17 +1,17 @@
 <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">
         <div class="layui-form toolbar">&emsp;
             <div  class="layui-col-sm10">
                 <div class="layui-col-sm4">
-                    <input type="text" class="layui-input search-input" id="startTime" placeholder="yyyy-MM-dd"> 至 <input type="text"
-                    class="layui-input search-input" id="endTime" placeholder="yyyy-MM-dd"> &emsp;
+                    <input type="text" class="layui-input search-input" id="startTime" placeholder="开始时间"> 至 <input type="text"
+                    class="layui-input search-input" id="endTime" placeholder="结束时间"> &emsp;
                 </div>
                 <div class="layui-col-sm2">
                     <input id="product-search-value" class="layui-input search-input" type="text" placeholder="按产品名" />&emsp;
@@ -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: 250, 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: '操作' }
+                    { 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: '操作',
+                        fixed: 'right' }
                 ]]
             });
         }
@@ -104,15 +103,19 @@
         // 工具条点击事件
         table.on('tool(product-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/productorderrecord/' + obj.data.id, {}, function (data) {
                         layer.closeAll('loading');
-                        layer.msg(data.msg, { icon: 1, time: 500 }, 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 
+                    }  });
         });
        
         //比较日期大小

--
Gitblit v1.8.0