BUG0091 套餐订单页面，查询项和列表字段共计缺失11个（已和产品确认 需要添加）

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

@@ -5,10 +5,11 @@ layui.config({
     version: skyeyeVersion
 }).extend({
     window: 'js/winui.window'
-}).define(['window', 'table', 'jquery', 'winui', 'form'], function (exports) {
+}).define(['window', 'table', 'jquery', 'winui', 'form', 'laydate'], function (exports) {
     winui.renderColor();
     var $ = layui.$,
         form = layui.form,
+        laydate = layui.laydate,
         table = layui.table;
     var selOption = getFileContent('tpl/template/select-option.tpl');
 
@@ -24,6 +25,17 @@ layui.config({
         });
     });
 
+    // 加载所有门店
+    shopUtil.queryAllStoreList(function (json){
+        $("#mealByStoreId").html(getDataUseHandlebars(selOption, json));
+        form.render('select');
+    });
+
+    laydate.render({
+        elem: '#createTime',
+        range: '~'
+    });
+
     table.render({
         id: 'messageTable',
         elem: '#messageTable',
@@ -126,17 +138,26 @@ layui.config({
     }
 
     function getTableParams(){
+        var startTime = "", endTime = "";
+        if(!isNull($("#createTime").val())){
+            startTime = $("#createTime").val().split('~')[0].trim() + ' 00:00:00';
+            endTime = $("#createTime").val().split('~')[1].trim() + ' 23:59:59';
+        }
         return {
             orderNum: $("#orderNum").val(),
             memberName: $("#memberName").val(),
             memberPhone: $("#memberPhone").val(),
             state: $("#state").val(),
+            vinCode: $("#vinCode").val(),
             memberCarPlate: $("#memberCarPlate").val(),
             areaId: $("#areaId").val(),
             type: $("#type").val(),
             serviceTechnicianName: $("#serviceTechnicianName").val(),
             createName: $("#createName").val(),
-            storeId: $("#storeId").val()
+            mealByStoreId: $("#mealByStoreId").val(),
+            storeId: $("#storeId").val(),
+            startTime: startTime,
+            endTime: endTime
         };
     }
 

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

@@ -5,10 +5,11 @@ layui.config({
     version: skyeyeVersion
 }).extend({
     window: 'js/winui.window'
-}).define(['window', 'table', 'jquery', 'winui', 'form'], function (exports) {
+}).define(['window', 'table', 'jquery', 'winui', 'form', 'laydate'], function (exports) {
     winui.renderColor();
     var $ = layui.$,
         form = layui.form,
+        laydate = layui.laydate,
         table = layui.table;
     var selOption = getFileContent('tpl/template/select-option.tpl');
 
@@ -30,6 +31,11 @@ layui.config({
         form.render('select');
     });
 
+    laydate.render({
+        elem: '#createTime',
+        range: '~'
+    });
+
     table.render({
         id: 'messageTable',
         elem: '#messageTable',
@@ -48,8 +54,12 @@ layui.config({
             { field: 'contacts', title: '会员名称', width: 100, rowspan: '2' },
             { field: 'phone', title: '会员手机号', width: 100, rowspan: '2', align: "center"},
             { 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: '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'},
+            { field: 'remainMealNum', title: '剩余保养次数', width: 100, align: "left", rowspan: '2'},
             { field: 'state', title: '订单状态', width: 80, align: "center", rowspan: '2', templet: function(d){
                 return shopUtil.getMealOrderStateName(d);
             }},
@@ -116,15 +126,26 @@ layui.config({
     }
 
     function getTableParams(){
+        var startTime = "", endTime = "";
+        if(!isNull($("#createTime").val())){
+            startTime = $("#createTime").val().split('~')[0].trim() + ' 00:00:00';
+            endTime = $("#createTime").val().split('~')[1].trim() + ' 23:59:59';
+        }
         return {
             orderNum: $("#orderNum").val(),
             memberName: $("#memberName").val(),
             memberPhone: $("#memberPhone").val(),
+            vinCode: $("#vinCode").val(),
+            plate: $("#plate").val(),
+            createName: $("#createName").val(),
+            type: $("#type").val(),
             natureId: $("#natureId").val(),
             label: $("#label").val(),
             state: $("#state").val(),
             areaId: $("#areaId").val(),
-            storeId: $("#storeId").val()
+            storeId: $("#storeId").val(),
+            startTime: startTime,
+            endTime: endTime
         };
     }
 

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

@@ -7,10 +7,11 @@ layui.config({
     version: skyeyeVersion
 }).extend({
     window: 'js/winui.window'
-}).define(['window', 'table', 'jquery', 'winui', 'form'], function (exports) {
+}).define(['window', 'table', 'jquery', 'winui', 'form', 'laydate'], function (exports) {
     winui.renderColor();
     var $ = layui.$,
         form = layui.form,
+        laydate = layui.laydate,
         table = layui.table;
     var selOption = getFileContent('tpl/template/select-option.tpl');
 
@@ -29,6 +30,11 @@ layui.config({
         table.reload("messageTable", {page: {curr: 1}, where: getTableParams()})
     });
 
+    laydate.render({
+        elem: '#createTime',
+        range: '~'
+    });
+
     table.render({
         id: 'messageTable',
         elem: '#messageTable',
@@ -46,8 +52,12 @@ layui.config({
                 }},
             { field: 'contacts', title: '会员名称', width: 100 },
             { field: 'phone', title: '会员手机号', width: 100, align: "center"},
+            { field: 'plate', title: '车牌号', width: 100, align: "left"},
+            { field: 'vinCode', title: 'VIN码', width: 100, align: "left"},
             { field: 'payablePrice', title: '应付金额', width: 100, align: "left"},
             { field: 'payPrice', title: '实付金额', width: 100, align: "left"},
+            { field: 'mealNum', title: '总保养次数', width: 100, align: "left"},
+            { field: 'remainMealNum', title: '剩余保养次数', width: 100, align: "left"},
             { field: 'state', title: '订单状态', width: 80, align: "center", templet: function(d){
                 return shopUtil.getMealOrderStateName(d);
             }},
@@ -207,14 +217,25 @@ layui.config({
         if(isNull(storeId)){
             storeId = "-";
         }
+        var startTime = "", endTime = "";
+        if(!isNull($("#createTime").val())){
+            startTime = $("#createTime").val().split('~')[0].trim() + ' 00:00:00';
+            endTime = $("#createTime").val().split('~')[1].trim() + ' 23:59:59';
+        }
         return {
             orderNum: $("#orderNum").val(),
             memberName: $("#memberName").val(),
             memberPhone: $("#memberPhone").val(),
+            vinCode: $("#vinCode").val(),
+            plate: $("#plate").val(),
+            createName: $("#createName").val(),
+            type: $("#type").val(),
             natureId: $("#natureId").val(),
             label: $("#label").val(),
             state: $("#state").val(),
-            storeId: storeId
+            storeId: storeId,
+            startTime: startTime,
+            endTime: endTime
         };
     }
 

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

@@ -67,7 +67,7 @@
                     </div>
                     <label class="layui-form-label">缴费门店</label>
                     <div class="layui-input-inline">
-                        <select id="mealBuyStoreId" name="mealBuyStoreId" lay-filter="mealBuyStoreId" lay-search="">
+                        <select id="mealByStoreId" name="mealByStoreId" lay-filter="mealBuyStoreId" lay-search="">
 
                         </select>
                     </div>

shop/src/main/resources/template/tpl/mealOrder/allMealOrderList.html

@@ -35,6 +35,26 @@
                     <div class="layui-input-inline">
                         <input type="text" id="memberPhone" name="memberPhone" placeholder="请输入会员手机号" class="layui-input" />
                     </div>
+                    <label class="layui-form-label">车牌号</label>
+                    <div class="layui-input-inline">
+                        <input type="text" id="plate" name="plate" placeholder="请输入车牌号" class="layui-input" />
+                    </div>
+                    <label class="layui-form-label">VIN码</label>
+                    <div class="layui-input-inline">
+                        <input type="text" id="vinCode" name="vinCode" placeholder="请输入VIN码" class="layui-input" />
+                    </div>
+                    <label class="layui-form-label">专属顾问</label>
+                    <div class="layui-input-inline">
+                        <input type="text" id="createName" name="createName" placeholder="请输入专属顾问" class="layui-input" />
+                    </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="state" name="state" lay-filter="state" lay-search="">
@@ -57,6 +77,10 @@
                     <div class="layui-input-inline">
                         <input type="text" id="label" name="label" placeholder="请输入员工标签" class="layui-input" />
                     </div>
+                    <label class="layui-form-label">创建时间</label>
+                    <div class="layui-input-inline">
+                        <input type="text" id="createTime" name="createTime" placeholder="请输入创建时间" class="layui-input" />
+                    </div>
                     <button type="reset" class="layui-btn layui-btn-primary list-form-search"><language showName="com.skyeye.reset"></language></button>
                     <button class="layui-btn list-form-search" lay-submit lay-filter="formSearch"><language showName="com.skyeye.search2"></language></button>
                 </div>

shop/src/main/resources/template/tpl/mealOrder/storeMealOrderList.html

@@ -30,6 +30,26 @@
                     <div class="layui-input-inline">
                         <input type="text" id="memberPhone" name="memberPhone" placeholder="请输入会员手机号" class="layui-input" />
                     </div>
+                    <label class="layui-form-label">车牌号</label>
+                    <div class="layui-input-inline">
+                        <input type="text" id="plate" name="plate" placeholder="请输入车牌号" class="layui-input" />
+                    </div>
+                    <label class="layui-form-label">VIN码</label>
+                    <div class="layui-input-inline">
+                        <input type="text" id="vinCode" name="vinCode" placeholder="请输入VIN码" class="layui-input" />
+                    </div>
+                    <label class="layui-form-label">专属顾问</label>
+                    <div class="layui-input-inline">
+                        <input type="text" id="createName" name="createName" placeholder="请输入专属顾问" class="layui-input" />
+                    </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="state" name="state" lay-filter="state" lay-search="">
@@ -52,6 +72,10 @@
                     <div class="layui-input-inline">
                         <input type="text" id="label" name="label" placeholder="请输入员工标签" class="layui-input" />
                     </div>
+                    <label class="layui-form-label">创建时间</label>
+                    <div class="layui-input-inline">
+                        <input type="text" id="createTime" name="createTime" placeholder="请输入创建时间" class="layui-input" />
+                    </div>
                     <button type="reset" class="layui-btn layui-btn-primary list-form-search"><language showName="com.skyeye.reset"></language></button>
                     <button class="layui-btn list-form-search" lay-submit lay-filter="formSearch"><language showName="com.skyeye.search2"></language></button>
                 </div>