From 0f378483f21bdea4fec42d08eb491237ed1dde8e Mon Sep 17 00:00:00 2001 From: weizhiqiang <598748873@qq.com> Date: Tue, 15 Mar 2022 23:26:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../template/tpl/member/memberInfo.html | 4 +++ .../js/keepFitOrder/allKeepFitOrderList.js | 23 +++++++++------- .../js/keepFitOrder/storeKeepFitOrderList.js | 26 +++++++++++-------- .../js/mealOrder/storeMealOrderAdd.js | 6 +++++ .../tpl/mealOrder/storeMealOrderAdd.html | 4 +++ 5 files changed, 43 insertions(+), 20 deletions(-) diff --git a/member/src/main/resources/template/tpl/member/memberInfo.html b/member/src/main/resources/template/tpl/member/memberInfo.html index d5609f91c..da549b151 100644 --- a/member/src/main/resources/template/tpl/member/memberInfo.html +++ b/member/src/main/resources/template/tpl/member/memberInfo.html @@ -152,6 +152,7 @@ 应付金额 实付金额 实付日期 + 缴费门店 订单状态 操作时间 @@ -163,6 +164,7 @@
{{payablePrice}}
{{payPrice}}
{{payTime}}
+
{{storeName}}
{{{state}}}
{{createTime}}
@@ -187,6 +189,7 @@ 套餐名称 套餐内消耗 维修技师 + 保养门店 订单状态 操作时间 @@ -198,6 +201,7 @@
{{mealName}}
{{mealSinglePrice}}
{{serviceTechnicianName}}
+
{{storeName}}
{{{state}}}
{{createTime}}
diff --git a/shop/src/main/resources/template/js/keepFitOrder/allKeepFitOrderList.js b/shop/src/main/resources/template/js/keepFitOrder/allKeepFitOrderList.js index c12045c98..d64c71dd0 100644 --- a/shop/src/main/resources/template/js/keepFitOrder/allKeepFitOrderList.js +++ b/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}, diff --git a/shop/src/main/resources/template/js/keepFitOrder/storeKeepFitOrderList.js b/shop/src/main/resources/template/js/keepFitOrder/storeKeepFitOrderList.js index 66da4fab2..a8472b1bd 100644 --- a/shop/src/main/resources/template/js/keepFitOrder/storeKeepFitOrderList.js +++ b/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'} ]], diff --git a/shop/src/main/resources/template/js/mealOrder/storeMealOrderAdd.js b/shop/src/main/resources/template/js/mealOrder/storeMealOrderAdd.js index 43f002779..daa87da2b 100644 --- a/shop/src/main/resources/template/js/mealOrder/storeMealOrderAdd.js +++ b/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)); diff --git a/shop/src/main/resources/template/tpl/mealOrder/storeMealOrderAdd.html b/shop/src/main/resources/template/tpl/mealOrder/storeMealOrderAdd.html index 0c01f08a4..69779a49c 100644 --- a/shop/src/main/resources/template/tpl/mealOrder/storeMealOrderAdd.html +++ b/shop/src/main/resources/template/tpl/mealOrder/storeMealOrderAdd.html @@ -51,6 +51,8 @@ 套餐* + 套餐说明 + 耗材说明 可使用次数 金额 车辆* @@ -89,6 +91,8 @@ + + -- GitLab