订单详情展示修改

member/src/main/resources/template/js/member/memberInfo.js

@@ -93,15 +93,7 @@ layui.config({
             AjaxPostUtil.request({url: shopBasePath + "keepFitOrder001", params: params, type: 'json', method: "POST", callback: function(json){
                 if(json.returnCode == 0){
                     $.each(json.rows, function (i, item){
-                        if(item.cancleState == 1){
-                            if(item.state == '1'){
-                                item.state = "待支付";
-                            }else if(item.state == '2' || item.state == '3'){
-                                item.state = "已支付";
-                            }
-                        } else {
-                            item.state = '已取消';
-                        }
+                        item.state = shopUtil.getKeepFitOrderStateName(item);
                     });
                     $("#showForm").append(getDataUseHandlebars($("#memberKeepFitOrderTemplate").html(), json));
                 }else{

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

@@ -150,8 +150,8 @@
                         <th>应付金额</th>
                         <th>实付金额</th>
                         <th>实付日期</th>
-                        <th>支付状态</th>
-                        <th>单据日期</th>
+                        <th>订单状态</th>
+                        <th>操作时间</th>
                     </tr>
                     </thead>
                     <tbody class="insurance-table">
@@ -182,21 +182,21 @@
                     <thead>
                     <tr>
                         <th>订单编号</th>
-                        <th>应付金额</th>
-                        <th>实付金额</th>
-                        <th>实付日期</th>
-                        <th>支付状态</th>
-                        <th>单据日期</th>
+                        <th>套餐名称</th>
+                        <th>套餐内消耗</th>
+                        <th>维修技师</th>
+                        <th>订单状态</th>
+                        <th>操作时间</th>
                     </tr>
                     </thead>
                     <tbody class="insurance-table">
                     {{#each rows}}
                     <tr>
                         <td><div style="width: 180px;">{{orderNum}}</div></td>
-                        <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: 80px;">{{state}}</div></td>
+                        <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: 80px;">{{{state}}}</div></td>
                         <td><div style="width: 150px;">{{createTime}}</div></td>
                     </tr>
                     {{/each}}

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

@@ -49,14 +49,17 @@ layui.config({
             { 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: 'payablePrice', title: '应付金额', width: 100, align: "left", rowspan: '2'},
-            { field: 'servicePrice', title: '服务费', width: 100, align: "left", 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: 'state', title: '订单状态', width: 150, align: "center", rowspan: '2', templet: function(d){
+            { 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: '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 "线上下单";
@@ -65,10 +68,10 @@ layui.config({
                 }
             }},
             { field: 'createName', title: '服务顾问', width: 120, rowspan: '2' },
-            { field: 'createTime', title: '单据日期', align: 'center', width: 150, rowspan: '2' },
+            { field: 'createTime', title: '操作时间', align: 'center', width: 150, rowspan: '2' },
         ],[
             { field: 'areaName', title: '区域', align: 'left', width: 120},
-            { field: 'storeName', title: '门店', align: 'left', width: 120}
+            { field: 'storeName', title: '保养门店', align: 'left', width: 120}
         ]],
         done: function(){
             matchingLanguage();

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

@@ -45,14 +45,17 @@ layui.config({
             { field: 'memberCarPlate', title: '车牌号', width: 100, align: "left"},
             { field: 'contacts', title: '会员名称', width: 100 },
             { field: 'phone', title: '会员手机号', width: 100, align: "center"},
-            { field: 'payablePrice', title: '应付金额', width: 100, align: "left"},
-            { field: 'servicePrice', title: '服务费', width: 100, align: "left"},
-            { field: 'storeName', title: '所属门店', align: 'left', width: 120 },
-            { field: 'state', title: '订单状态', width: 150, align: "center", templet: function(d){
+            /*{ field: 'payablePrice', title: '应付金额', width: 100, align: "left"},
+            { field: 'servicePrice', title: '服务费', width: 100, align: "left"},*/
+            { field: 'storeName', 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: '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 "线上下单";
@@ -61,7 +64,7 @@ layui.config({
                 }
             }},
             { field: 'createName', title: '服务顾问', width: 120 },
-            { field: 'createTime', title: '单据日期', align: 'center', width: 150 },
+            { field: 'createTime', title: '操作时间', align: 'center', width: 150 },
             { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 200, toolbar: '#tableBar'}
         ]],
         done: function(){

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

@@ -37,7 +37,7 @@
             </div>
         </div>
         <div class="layui-form-item layui-col-xs6">
-            <label class="layui-form-label">操作员：</label>
+            <label class="layui-form-label">服务顾问：</label>
             <div class="layui-input-block ver-center">
                 {{createName}}
             </div>
@@ -66,12 +66,6 @@
                 {{memberCarPlate}}
             </div>
         </div>
-        <div class="layui-form-item layui-col-xs6">
-            <label class="layui-form-label">套餐：</label>
-            <div class="layui-input-block ver-center">
-                {{mealName}}
-            </div>
-        </div>
         <!--<div class="layui-form-item layui-col-xs12">
             <label class="layui-form-label">耗材</label>
             <div class="layui-input-block">
@@ -92,19 +86,19 @@
                     </tbody>
                 </table>
             </div>
-        </div>-->
+        </div>
         <div class="layui-form-item layui-col-xs12">
             <label class="layui-form-label">应付金额：</label>
             <div class="layui-input-block ver-center">
                 {{payablePrice}}
             </div>
         </div>
-        <!--<div class="layui-form-item layui-col-xs12">
+        <div class="layui-form-item layui-col-xs12">
             <label class="layui-form-label">服务费：</label>
             <div class="layui-input-block ver-center">
                 {{servicePrice}}
             </div>
-        </div>-->
+        </div>
         <div class="layui-form-item layui-col-xs6">
             <label class="layui-form-label">实付金额：</label>
             <div class="layui-input-block ver-center">
@@ -116,13 +110,40 @@
             <div class="layui-input-block ver-center">
                 {{payTime}}
             </div>
-        </div>
+        </div>-->
         <div class="layui-form-item layui-col-xs12">
             <label class="layui-form-label">备注：</label>
             <div class="layui-input-block ver-center">
                 {{{remark}}}
             </div>
         </div>
+        <div class="layui-form-item layui-col-xs12">
+            <span class="hr-title">套餐信息</span><hr>
+        </div>
+        <div class="layui-form-item layui-col-xs6">
+            <label class="layui-form-label">套餐：</label>
+            <div class="layui-input-block ver-center">
+                {{mealName}}
+            </div>
+        </div>
+        <div class="layui-form-item layui-col-xs6">
+            <label class="layui-form-label">套餐内消耗：</label>
+            <div class="layui-input-block ver-center">
+                {{mealSinglePrice}}
+            </div>
+        </div>
+        <div class="layui-form-item layui-col-xs12">
+            <label class="layui-form-label">套餐说明：</label>
+            <div class="layui-input-block ver-center">
+                {{mealExplain}}
+            </div>
+        </div>
+        <div class="layui-form-item layui-col-xs12">
+            <label class="layui-form-label">耗材说明：</label>
+            <div class="layui-input-block ver-center">
+                {{mealConsume}}
+            </div>
+        </div>
         <div class="layui-form-item layui-col-xs12">
             <span class="hr-title">保养信息</span><hr>
         </div>
@@ -135,7 +156,7 @@
         <div class="layui-form-item layui-col-xs6">
             <label class="layui-form-label">下次保养公里数：</label>
             <div class="layui-input-block ver-center">
-                {{nextServiceMileage}}
+                {{nextServiceMileage}} KM
             </div>
         </div>
         <div class="layui-form-item layui-col-xs6">