展示微调

member/src/main/resources/template/tpl/member/memberInfo.html

@@ -152,6 +152,7 @@
                         <th>应付金额</th>
                         <th>实付金额</th>
                         <th>实付日期</th>
+                        <th>缴费门店</th>
                         <th>订单状态</th>
                         <th>操作时间</th>
                     </tr>
@@ -163,6 +164,7 @@
                         <td><div style="width: 100px;">{{payablePrice}}</div></td>
                         <td><div style="width: 100px;">{{payPrice}}</div></td>
                         <td><div style="width: 150px;">{{payTime}}</div></td>
+                        <td><div style="width: 150px;">{{storeName}}</div></td>
                         <td><div style="width: 80px;">{{{state}}}</div></td>
                         <td><div style="width: 150px;">{{createTime}}</div></td>
                     </tr>
@@ -187,6 +189,7 @@
                         <th>套餐名称</th>
                         <th>套餐内消耗</th>
                         <th>维修技师</th>
+                        <th>保养门店</th>
                         <th>订单状态</th>
                         <th>操作时间</th>
                     </tr>
@@ -198,6 +201,7 @@
                         <td><div style="width: 100px;">{{mealName}}</div></td>
                         <td><div style="width: 100px;">{{mealSinglePrice}}</div></td>
                         <td><div style="width: 100px;">{{serviceTechnicianName}}</div></td>
+                        <td><div style="width: 150px;">{{storeName}}</div></td>
                         <td><div style="width: 80px;">{{{state}}}</div></td>
                         <td><div style="width: 150px;">{{createTime}}</div></td>
                     </tr>

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

@@ -46,21 +46,24 @@ layui.config({
                     return "会员";
                 }
             }},
-            { field: 'memberCarPlate', title: '车牌号', width: 100, align: "left", rowspan: '2'},
             { field: 'contacts', title: '会员名称', width: 100, rowspan: '2' },
             { field: 'phone', title: '会员手机号', width: 100, align: "center", rowspan: '2'},
+            { field: 'modelType', title: '车型', width: 100, align: "left", rowspan: '2'},
+            { field: 'memberCarPlate', title: '车牌号', width: 100, align: "left", rowspan: '2'},
+            { field: 'vinCode', title: 'VIN码', width: 120, align: "left", rowspan: '2'},
+            { field: 'mealName', title: '套餐名称', align: 'left', width: 150, rowspan: '2' },
+            { field: 'mealPrice', title: '应缴金额', align: 'left', width: 100, rowspan: '2' },
+            { field: 'payPrice', title: '实缴金额', align: 'left', width: 100, rowspan: '2' },
+            { field: 'mealSinglePrice', title: '套餐内消耗', align: 'left', width: 120, rowspan: '2' },
+            { field: 'mealBuyStoreName', title: '缴费门店', align: 'left', width: 150, rowspan: '2' },
+            { field: 'storeName', title: '保养门店', align: 'left', width: 150, rowspan: '2' },
+            { field: 'createName', title: '服务顾问', width: 120, rowspan: '2' },
+            { field: 'serviceTechnicianName', title: '维修技师', align: 'left', width: 120, rowspan: '2' },
             /*{ field: 'payablePrice', title: '应付金额', width: 100, align: "left", rowspan: '2'},
             { field: 'servicePrice', title: '服务费', width: 100, align: "left", rowspan: '2'},*/
             { title: '下单地址', align: 'center', colspan: '2'},
-            { field: 'mealBuyStoreName', title: '套餐购买门店', align: 'left', rowspan: '2', width: 120 },
-            { field: 'state', title: '订单状态', width: 100, align: "center", rowspan: '2', templet: function(d){
-                return shopUtil.getKeepFitOrderStateName(d);
-            }},
             /*{ field: 'payPrice', title: '实付金额', width: 100, align: "left", rowspan: '2' },
             { field: 'payTime', title: '实付日期', align: 'center', width: 150, rowspan: '2' },*/
-            { field: 'mealName', title: '套餐名称', align: 'left', width: 150, rowspan: '2' },
-            { field: 'mealSinglePrice', title: '套餐内消耗', align: 'left', width: 120, rowspan: '2' },
-            { field: 'serviceTechnicianName', title: '维修技师', align: 'left', width: 120, rowspan: '2' },
             { field: 'type', title: '订单来源', width: 80, align: "center", rowspan: '2', templet: function(d){
                 if(d.type == 1){
                     return "线上下单";
@@ -68,10 +71,12 @@ layui.config({
                     return "线下下单";
                 }
             }},
+            { field: 'state', title: '订单状态', width: 100, rowspan: '2', align: "center", templet: function(d){
+                return shopUtil.getKeepFitOrderStateName(d);
+            }},
             { 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/keepFitOrder/storeKeepFitOrderList.js

@@ -42,21 +42,23 @@ layui.config({
                     return "会员";
                 }
             }},
-            { field: 'memberCarPlate', title: '车牌号', width: 100, align: "left"},
             { field: 'contacts', title: '会员名称', width: 100 },
             { field: 'phone', title: '会员手机号', width: 100, align: "center"},
+            { field: 'modelType', title: '车型', width: 100, align: "left"},
+            { field: 'memberCarPlate', title: '车牌号', width: 100, align: "left"},
+            { field: 'vinCode', title: 'VIN码', width: 120, align: "left"},
+            { field: 'mealName', title: '套餐名称', align: 'left', width: 150 },
+            { field: 'mealPrice', title: '应缴金额', align: 'left', width: 100 },
+            { field: 'payPrice', title: '实缴金额', align: 'left', width: 100 },
+            { field: 'mealSinglePrice', title: '套餐内消耗', align: 'left', width: 120 },
+            { field: 'mealBuyStoreName', title: '缴费门店', align: 'left', width: 150 },
+            { field: 'storeName', title: '保养门店', align: 'left', width: 150 },
+            { field: 'createName', title: '服务顾问', width: 120 },
+            { field: 'serviceTechnicianName', title: '维修技师', align: 'left', width: 120 },
             /*{ field: 'payablePrice', title: '应付金额', width: 100, align: "left"},
             { field: 'servicePrice', title: '服务费', width: 100, align: "left"},*/
-            { field: 'storeName', title: '保养门店', align: 'left', width: 120 },
-            { field: 'mealBuyStoreName', title: '套餐购买门店', align: 'left', width: 120 },
-            { field: 'state', title: '订单状态', width: 100, align: "center", templet: function(d){
-                return shopUtil.getKeepFitOrderStateName(d);
-            }},
             /*{ field: 'payPrice', title: '实付金额', width: 100, align: "left"},
             { field: 'payTime', title: '实付日期', align: 'center', width: 150 },*/
-            { field: 'mealName', title: '套餐名称', align: 'left', width: 150 },
-            { field: 'mealSinglePrice', title: '套餐内消耗', align: 'left', width: 120 },
-            { field: 'serviceTechnicianName', title: '维修技师', align: 'left', width: 120 },
             { field: 'type', title: '订单来源', width: 80, align: "center", templet: function(d){
                 if(d.type == 1){
                     return "线上下单";
@@ -64,10 +66,12 @@ layui.config({
                     return "线下下单";
                 }
             }},
-            { field: 'whetherGive', title: '是否赠送', width: 100, align: "center", rowspan: '2', templet: function(d){
+            { field: 'state', title: '订单状态', width: 100, align: "center", templet: function(d){
+                return shopUtil.getKeepFitOrderStateName(d);
+            }},
+            { 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/mealOrder/storeMealOrderAdd.js

@@ -148,6 +148,8 @@ layui.config({
                 id: "row" + rowNum.toString(), //checkbox的id
                 trId: "tr" + rowNum.toString(), //行的id
                 mealId: "mealId" + rowNum.toString(),
+                mealExplain: "mealExplain" + rowNum.toString(),
+                mealConsume: "mealConsume" + rowNum.toString(),
                 num: "num" + rowNum.toString(),
                 price: "price" + rowNum.toString(),
                 carId: "carId" + rowNum.toString()
@@ -191,6 +193,10 @@ layui.config({
                         var thisRowNum = trId.replace("tr", "");
 
                         $("#mealId" + thisRowNum.toString()).val(mealMation.name);
+                        $("#mealExplain" + thisRowNum.toString()).html(mealMation.memberDes);
+                        $("#mealExplain" + thisRowNum.toString()).attr("title", mealMation.memberDes);
+                        $("#mealConsume" + thisRowNum.toString()).html(mealMation.oilDes);
+                        $("#mealConsume" + thisRowNum.toString()).attr("title", mealMation.oilDes);
                         $("#num" + thisRowNum.toString()).html(mealMation.totalCount);
                         $("#price" + thisRowNum.toString()).html(mealMation.showPrice);
                         $("#mealId" + thisRowNum.toString()).attr("mealMaion", JSON.stringify(mealMation));

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

@@ -51,6 +51,8 @@
                         <tr>
                             <th style="width: 30px;"></th>
                             <th style="width: 150px;">套餐<i class="red">*</i></th>
+                            <th style="width: 150px;">套餐说明</th>
+                            <th style="width: 150px;">耗材说明</th>
                             <th style="width: 100px;">可使用次数</th>
                             <th style="width: 100px;">金额</th>
                             <th style="width: 100px;">车辆<i class="red">*</i></th>
@@ -89,6 +91,8 @@
                 <input type="text" id="{{mealId}}" name="{{mealId}}" placeholder="请选择套餐" class="layui-input" readonly="readonly"/>
                 <i class="fa fa-plus-circle input-icon chooseMealBtn" style="top: 12px;"></i>
             </td>
+            <td id="{{mealExplain}}"></td>
+            <td id="{{mealConsume}}"></td>
             <td id="{{num}}"></td>
             <td id="{{price}}"></td>
             <td>