新增导出功能

shop/src/main/resources/template/js/keepFitOrder/allKeepFitOrderList.js

@@ -44,6 +44,7 @@ layui.config({
         where: getTableParams(),
         even: true,
         page: true,
+        toolbar: true,
         limits: getLimits(),
         limit: getLimit(),
         cols: [[

shop/src/main/resources/template/js/keepFitOrder/dayKeepFitOrderList.js

@@ -23,6 +23,7 @@ layui.config({
         where: getTableParams(),
         even: true,
         page: true,
+        toolbar: true,
         limits: getLimits(),
         limit: getLimit(),
         cols: [[

shop/src/main/resources/template/js/keepFitOrder/storeKeepFitOrderList.js

@@ -41,6 +41,7 @@ layui.config({
         where: getTableParams(),
         even: true,
         page: true,
+        toolbar: true,
         limits: getLimits(),
         limit: getLimit(),
         cols: [[

shop/src/main/resources/template/js/mealOrder/allMealOrderList.js

@@ -42,6 +42,7 @@ layui.config({
         method: 'post',
         url: shopBasePath + 'mealOrder001',
         where: getTableParams(),
+        toolbar: true,
         even: true,
         page: true,
         limits: getLimits(),
@@ -56,6 +57,7 @@ layui.config({
             { title: '下单地址', align: 'center', colspan: '2'},
             { field: 'plate', title: '车牌号', width: 100, rowspan: '2', align: "left"},
             { field: 'vinCode', title: 'VIN码', width: 100, rowspan: '2', align: "left"},
+            { field: 'mealTitle', title: '套餐名称', width: 150, rowspan: '2', align: "left"},
             { field: 'payablePrice', title: '应付金额', width: 100, align: "left", rowspan: '2'},
             { field: 'payPrice', title: '实付金额', width: 100, align: "left", rowspan: '2'},
             { field: 'mealNum', title: '总保养次数', width: 100, align: "left", rowspan: '2'},
@@ -64,6 +66,7 @@ layui.config({
                 return shopUtil.getMealOrderStateName(d);
             }},
             { field: 'natureName', title: '订单性质', width: 80, rowspan: '2', align: "center"},
+            { field: 'createName', title: '专属顾问', width: 120, rowspan: '2' },
             { field: 'label', title: '员工标签', width: 120, rowspan: '2', align: "left"},
             { field: 'payTime', title: '支付时间', align: 'center', rowspan: '2', width: 150 },
             { field: 'type', title: '订单来源', width: 80, align: "center", rowspan: '2', templet: function(d){
@@ -76,7 +79,6 @@ layui.config({
             { field: 'whetherGive', title: '是否赠送', width: 100, align: "center", rowspan: '2', templet: function(d){
                 return shopUtil.getMealOrderWhetherGiveName(d);
             }},
-            { field: 'createName', title: '专属顾问', width: 120, rowspan: '2' },
             { field: 'createTime', title: '创建时间', align: 'center', width: 150, rowspan: '2' },
         ],[
             { field: 'areaName', title: '区域', align: 'left', width: 120},

shop/src/main/resources/template/js/mealOrder/storeMealOrderAdd.js

@@ -55,7 +55,7 @@ layui.config({
 
         // 加载套餐订单性质
         shopUtil.queryMealOrderNatureList(function (json){
-            $("#natureId").html(getDataUseHandlebars($("#selectTemplate").html(), json));
+            $("#natureId").html(getDataUseHandlebars(selOption, json));
             form.render('select');
         });
 

shop/src/main/resources/template/js/mealOrder/storeMealOrderList.js

@@ -43,6 +43,7 @@ layui.config({
         where: getTableParams(),
         even: true,
         page: true,
+        toolbar: true,
         limits: getLimits(),
         limit: getLimit(),
         cols: [[
@@ -54,6 +55,7 @@ layui.config({
             { field: 'phone', title: '会员手机号', width: 100, align: "center"},
             { field: 'plate', title: '车牌号', width: 100, align: "left"},
             { field: 'vinCode', title: 'VIN码', width: 100, align: "left"},
+            { field: 'mealTitle', title: '套餐名称', width: 150, align: "left"},
             { field: 'payablePrice', title: '应付金额', width: 100, align: "left"},
             { field: 'payPrice', title: '实付金额', width: 100, align: "left"},
             { field: 'mealNum', title: '总保养次数', width: 100, align: "left"},
@@ -62,6 +64,7 @@ layui.config({
                 return shopUtil.getMealOrderStateName(d);
             }},
             { field: 'natureName', title: '订单性质', width: 80, align: "center"},
+            { field: 'createName', title: '专属顾问', width: 120 },
             { field: 'label', title: '员工标签', width: 120, align: "left"},
             { field: 'payTime', title: '支付时间', align: 'center', width: 150 },
             { field: 'type', title: '订单来源', width: 80, align: "center", templet: function(d){
@@ -74,7 +77,6 @@ layui.config({
             { field: 'whetherGive', title: '是否赠送', width: 100, align: "center", templet: function(d){
                 return shopUtil.getMealOrderWhetherGiveName(d);
             }},
-            { field: 'createName', title: '专属顾问', width: 120 },
             { field: 'createTime', title: '创建时间', align: 'center', width: 150 },
             { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 200, toolbar: '#tableBar'}
         ]],

shop/src/main/resources/template/js/refundMealOrder/refundMealOrderList.js

@@ -40,6 +40,7 @@ layui.config({
         where: getTableParams(),
         even: true,
         page: true,
+        toolbar: true,
         limits: getLimits(),
         limit: getLimit(),
         cols: [[
@@ -74,6 +75,13 @@ layui.config({
             { field: 'remainMealNum', title: '剩余保养次数', width: 120, align: "left"},
             { field: 'mealSinglePrice', title: '单次保养金额', width: 120, align: "left"},
             { field: 'refundPrice', title: '退款金额', width: 120, align: "left"},
+            { field: 'type', title: '订单来源', width: 80, align: "center", templet: function(d){
+                if(d.type == 1){
+                    return "线上下单";
+                }else{
+                    return "线下下单";
+                }
+            }},
             { field: 'whetherGive', title: '是否赠送', width: 100, align: "center", templet: function(d){
                 return shopUtil.getMealOrderWhetherGiveName(d);
             }},
@@ -178,6 +186,7 @@ layui.config({
             createName: $("#createName").val(),
             consultantName: $("#consultantName").val(),
             state: $("#state").val(),
+            type: $("#type").val(),
             whetherGive: $("#whetherGive").val(),
             natureId: $("#natureId").val(),
             storeId: storeId,

shop/src/main/resources/template/tpl/keepFitOrder/keepFitOrderAdd.html

@@ -111,7 +111,7 @@
             <div class="layui-form-item layui-col-xs12">
                 <div class="layui-input-block">
                     <button class="winui-btn" id="cancle"><language showName="com.skyeye.cancel"></language></button>
-                    <button class="winui-btn" lay-submit lay-filter="formAddBean"><language showName="com.skyeye.save"></language></button>
+                    <button class="winui-btn" lay-submit lay-filter="formAddBean">保养</button>
                 </div>
             </div>
         </form>

shop/src/main/resources/template/tpl/refundMealOrder/refundMealOrderList.html

@@ -52,6 +52,14 @@
                             <option value="4">取消退款</option>
                         </select>
                     </div>
+                    <label class="layui-form-label">订单来源</label>
+                    <div class="layui-input-inline">
+                        <select id="type" name="type" lay-filter="type" lay-search="">
+                            <option value="">全部</option>
+                            <option value="1">线上订单</option>
+                            <option value="2">线下订单</option>
+                        </select>
+                    </div>
                     <label class="layui-form-label">是否赠送</label>
                     <div class="layui-input-inline">
                         <select id="whetherGive" name="whetherGive" lay-filter="whetherGive" lay-search="">

web/src/main/resources/template/assets/lib/layui/css/layui.css

@@ -824,6 +824,18 @@ a cite {
 	content: "\e66d";
 }
 
+.layui-icon-cols:before {
+	content: "\e610"
+}
+
+.layui-icon-export:before {
+	content: "\e67d"
+}
+
+.layui-icon-print:before {
+	content: "\e66d"
+}
+
 
 /* 基本布局 */
 
@@ -3129,6 +3141,48 @@ hr,
 	border-color: #e6e6e6;
 }
 
+.layui-table-tool .layui-table-tool-self .layui-inline[lay-event] {
+	margin: 0 0 0 10px;
+}
+
+.layui-table-tool .layui-inline[lay-event] {
+	position: relative;
+	width: 26px;
+	height: 26px;
+	padding: 5px;
+	line-height: 16px;
+	margin-right: 10px;
+	text-align: center;
+	color: #333;
+	border: 1px solid #ccc;
+	cursor: pointer;
+	-webkit-transition: .5s all;
+	transition: .5s all;
+}
+
+.layui-table-tool-panel {
+	position: absolute;
+	top: 29px;
+	left: -1px;
+	padding: 5px 0;
+	min-width: 150px;
+	min-height: 40px;
+	border: 1px solid #d2d2d2;
+	text-align: left;
+	overflow-y: auto;
+	background-color: #fff;
+	box-shadow: 0 2px 4px rgb(0 0 0 / 12%);
+	z-index: 100;
+	max-height: 400px;
+}
+
+.layui-table-tool-panel li {
+	padding: 0 10px;
+	line-height: 30px;
+	-webkit-transition: .5s all;
+	transition: .5s all;
+}
+
 .layui-table th,
 .layui-table td {
 	position: relative;