From f7ea5773570beb5ad8c6efb5c1cf743294ee079b Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Sun, 24 Jan 2021 14:16:04 +0800
Subject: [PATCH] modify

---
 zq-erp/src/main/resources/templates/views/admin/hive/vip/moneyCardUseFlow-list.html |   70 +++++++++++++---------------------
 1 files changed, 27 insertions(+), 43 deletions(-)

diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/vip/moneyCardUseFlow-list.html b/zq-erp/src/main/resources/templates/views/admin/hive/vip/moneyCardUseFlow-list.html
index aa2d486..f3a0475 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/vip/moneyCardUseFlow-list.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/vip/moneyCardUseFlow-list.html
@@ -16,25 +16,11 @@
 </head>
 <body class=" container-fluid">
 <div class="pd-10">
-    <!-- 搜索框部分start -->
-    <div class="row form-head">
-        <form class="form-inline" id="serchform">
-            <!-- 用于套餐的查询 -->
-            <input autocomplete="off"   type="hidden" name="vipId" value="" id="vipId">
 
-            <div class="form-group mr-20">
-                <label>操作内容</label>
-                <input autocomplete="off"   name="content" type="text" class="form-control">
-            </div>
-            <div class="form-group">
-                <button onclick="myGrid.serchData(1)" type="button"
-                        class="btn btn-sm btn-info">
-                    <i class="fa fa-search "></i> 搜索
-                </button>
-                <button type="reset" class="btn btn-sm btn-info ">
-                    <i class="fa fa-refresh "></i> 重置
-                </button>
-            </div>
+    <div class="row form-head">
+        <form class="form-inline" id="serchform2">
+            <!-- 用于套餐的查询 -->
+            <input autocomplete="off"   type="hidden" name="vipId" th:value="${param.vipId}" class="vipId">
         </form>
     </div>
     <div class="row mt-10">
@@ -42,48 +28,46 @@
 
         </div>
         <!-- 数据表格部分 -->
-        <table id="mgrid">
+        <table id="mgrid2">
             <thead>
             <tr>
                 <th data-formatter="MGrid.indexfn" data-align="center"
                     data-width="30px">序号</th>
-                <th data-field="vipName">客户姓名</th>
-                <!--
-                <th data-field="orderNo">订单编号/服务单编号</th>
-                 -->
-                <th data-field="content" data-sortable="true">操作内容</th>
-                <th data-field="staffName">操作人</th>
                 <th data-field="createTime" data-formatter="MGrid.getTime">操作时间</th>
+                <th data-field="cardName">充值卡名称</th>
+                <th data-field="vipName">客户姓名</th>
+                <th data-field="type">变更类型</th>
+                <th data-field="orderNo">单据编号</th>
+                <th data-field="total" data-formatter="MGrid.getYk" >本金</th>
+                <th data-field="giftMoney" data-formatter="MGrid.getYk" >赠送金额</th>
+                <th data-field="balance">余额</th>
+                <th data-field="times">次数</th>
+                <th data-field="staffName">操作人</th>
+                <th data-field="content" data-sortable="true">备注</th>
             </tr>
             </thead>
         </table>
         <!-- 数据表格部分end -->
+        <div class="form-group ">
+            <div class="col-sm-12 text-center fixed-button">
+                <a class="btn btn-danger radius" href="javascript:;"
+                   onclick="MTools.closeForm()"><i class="fa fa-close"></i> 关闭</a>
+            </div>
+        </div>
     </div>
 </div>
 
 <script type="text/javascript" th:src="@{/js/systools/MJsBase.js}"></script>
 <script type="text/javascript">
     //初始化表格
-    var myGrid;
-    myGrid=MGrid.initGrid({
-        url:basePath+"/admin/moneyCardUseFlow/showList?vipId="+$.query.get("vipId"),
+    //初始化表格
+    var myGrid2;
+    myGrid2=MGrid.initGrid({
+        tableSelecter: "#mgrid2",// 表格选择器 请保持唯一
+        serchFormSelecter: "#serchform2",// 搜索表单选择器
+        url:basePath+"/admin/moneyCardUse/showCardFlowList",
     });
 
-    function buidOperate(value, row, index){
-        return html;
-    }
-
-
-    function getYesOrNo(value, row, index){
-        switch(value){
-            case 'Y':
-                return "是";
-            case 'N':
-                return "否";
-            default:
-                return value;
-        }
-    }
 </script>
 
 </body>

--
Gitblit v1.9.1