diff --git a/shop/src/main/resources/template/js/keepFitOrder/allKeepFitOrderList.js b/shop/src/main/resources/template/js/keepFitOrder/allKeepFitOrderList.js index ea26a022487fa1122ab324d0f4e69b57140e94fe..0132de7c9031f4034d146b2812af5d62e8e78165 100644 --- a/shop/src/main/resources/template/js/keepFitOrder/allKeepFitOrderList.js +++ b/shop/src/main/resources/template/js/keepFitOrder/allKeepFitOrderList.js @@ -64,7 +64,7 @@ layui.config({ return "线下下单"; } }}, - { field: 'createName', title: '录入人', width: 120, rowspan: '2' }, + { 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/complateKeepFitOrder.js b/shop/src/main/resources/template/js/keepFitOrder/complateKeepFitOrder.js new file mode 100644 index 0000000000000000000000000000000000000000..272977cbd4c503985686092979ed3bbe371359d4 --- /dev/null +++ b/shop/src/main/resources/template/js/keepFitOrder/complateKeepFitOrder.js @@ -0,0 +1,53 @@ + +layui.config({ + base: basePath, + version: skyeyeVersion +}).extend({ + window: 'js/winui.window' +}).define(['window', 'table', 'jquery', 'winui', 'laydate'], function (exports) { + winui.renderColor(); + layui.use(['form'], function (form) { + var index = parent.layer.getFrameIndex(window.name); + var $ = layui.$, + laydate = layui.laydate; + + laydate.render({ + elem: '#nextServiceTime', + range: false + }); + + matchingLanguage(); + form.render(); + form.on('submit(formAddBean)', function (data) { + if (winui.verifyForm(data.elem)) { + var params = { + id: parent.rowId, + serviceTechnicianId: shopUtil.staffMation.staffId, + nextServiceMileage: $("#nextServiceMileage").val(), + nextServiceTime: $("#nextServiceTime").val() + }; + + AjaxPostUtil.request({url: shopBasePath + "complateKeepFitOrder", params: params, type: 'json', method: "POST", callback: function(json){ + if(json.returnCode == 0){ + parent.layer.close(index); + parent.refreshCode = '0'; + }else{ + winui.window.msg(json.returnMessage, {icon: 2, time: 2000}); + } + }, async: true}); + } + return false; + }); + + // 维修技师选择 + $("body").on("click", ".chooseServiceTechnicianBtn", function(e){ + shopUtil.openStoreStaffChoosePage(function (staffMation){ + $("#serviceTechnician").val(staffMation.userName); + }); + }); + + $("body").on("click", "#cancle", function(){ + parent.layer.close(index); + }); + }); +}); \ No newline at end of file diff --git a/shop/src/main/resources/template/js/keepFitOrder/keepFitOrderAdd.js b/shop/src/main/resources/template/js/keepFitOrder/keepFitOrderAdd.js index d0c43bdecc9a25054c8c734df5aaa0fb3d5fa7cf..e8f6a8d8185ca16bf32e823b9c38341b82646f6f 100644 --- a/shop/src/main/resources/template/js/keepFitOrder/keepFitOrderAdd.js +++ b/shop/src/main/resources/template/js/keepFitOrder/keepFitOrderAdd.js @@ -65,15 +65,15 @@ layui.config({ form.on('submit(formAddBean)', function (data) { if (winui.verifyForm(data.elem)) { var tableData = new Array(); - $.each($("#useTable tr"), function(i, item) { - // 获取行编号 - var rowNum = $(item).attr("trcusid").replace("tr", ""); - var row = { - consumeExplain: $("#consumeExplain" + rowNum.toString()).val(), - price: $("#price" + rowNum.toString()).val() - }; - tableData.push(row); - }); + // $.each($("#useTable tr"), function(i, item) { + // // 获取行编号 + // var rowNum = $(item).attr("trcusid").replace("tr", ""); + // var row = { + // consumeExplain: $("#consumeExplain" + rowNum.toString()).val(), + // price: $("#price" + rowNum.toString()).val() + // }; + // tableData.push(row); + // }); var userType = $("input[name='userType']:checked").val(); @@ -84,7 +84,8 @@ layui.config({ memberCarId: userType == 1 ? "" : $("#memberCar").val(), memberCarPlate: userType == 1 ? $("#memberCarPlate").val() : $("#memberCar").find("option:selected").text(), mealOrderChildId: userType == 1 ? "" : $("#mealId").val(), - servicePrice: $("#servicePrice").val(), + // servicePrice: $("#servicePrice").val(), + servicePrice: 0, remark: $("#remark").val(), type: 2, source: 2, diff --git a/shop/src/main/resources/template/js/keepFitOrder/storeKeepFitOrderList.js b/shop/src/main/resources/template/js/keepFitOrder/storeKeepFitOrderList.js index 99f4a06b8cd640d3f1a9f0d207cd471e68fe0684..3d726d77d723832d82857866c7e65a347e2df760 100644 --- a/shop/src/main/resources/template/js/keepFitOrder/storeKeepFitOrderList.js +++ b/shop/src/main/resources/template/js/keepFitOrder/storeKeepFitOrderList.js @@ -60,7 +60,7 @@ layui.config({ return "线下下单"; } }}, - { field: 'createName', title: '录入人', width: 120 }, + { 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'} ]], @@ -72,12 +72,10 @@ layui.config({ table.on('tool(messageTable)', function (obj) { var data = obj.data; var layEvent = obj.event; - if (layEvent === 'delete') { // 删除 - delet(data); - }else if(layEvent == 'select'){ // 详情 + if(layEvent == 'select'){ // 详情 select(data) - }else if(layEvent == 'complatePay'){ // 完成支付 - complatePay(data) + }else if(layEvent == 'complateKeepFit'){ // 完成保养 + complateKeepFit(data) }else if(layEvent == 'verification'){ // 核销 verification(data) }else if(layEvent == 'cancleOrder'){ // 取消订单 @@ -85,21 +83,6 @@ layui.config({ } }); - // 删除 - function delet(data){ - layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function(index){ - layer.close(index); - AjaxPostUtil.request({url: shopBasePath + "deleteKeepFitOrder", params: {id: data.id}, type: 'json', method: "POST", callback: function(json){ - if(json.returnCode == 0){ - winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000}); - loadTable(); - }else{ - winui.window.msg(json.returnMessage, {icon: 2, time: 2000}); - } - }}); - }); - } - // 核销 function verification(data){ layer.confirm("确认对该单据进行核销吗？", {icon: 3, title: "核销操作"}, function(index){ @@ -143,13 +126,13 @@ layui.config({ }); } - // 完成支付 - function complatePay(data){ + // 保养完成 + function complateKeepFit(data){ rowId = data.id; _openNewWindows({ - url: "../../tpl/keepFitOrder/complatePayKeepFitOrder.html", - title: '完成支付', - pageId: "complatePayKeepFitOrder", + url: "../../tpl/keepFitOrder/complateKeepFitOrder.html", + title: '保养完成', + pageId: "complateKeepFitOrder", area: ['90vw', '90vh'], callBack: function(refreshCode){ if (refreshCode == '0') { diff --git a/shop/src/main/resources/template/js/storeStaff/storeStaffChoose.js b/shop/src/main/resources/template/js/storeStaff/storeStaffChoose.js new file mode 100644 index 0000000000000000000000000000000000000000..7108162c7e82764858e42c9de74d5e29efe8d84f --- /dev/null +++ b/shop/src/main/resources/template/js/storeStaff/storeStaffChoose.js @@ -0,0 +1,107 @@ +var rowId = ""; + +layui.config({ + base: basePath, + version: skyeyeVersion +}).extend({ + window: 'js/winui.window' +}).define(['window', 'table', 'jquery', 'winui', 'form', 'fsCommon'], function (exports) { + winui.renderColor(); + var index = parent.layer.getFrameIndex(window.name); + var $ = layui.$, + form = layui.form, + table = layui.table; + + // 设置提示信息 + var s = "店员选择规则：1.单选，双击指定行数据即可选中"; + s += '如没有查到要选择的店员，请检查店员信息是否满足当前规则。'; + $("#showInfo").html(s); + + // 加载我所在的门店 + shopUtil.queryStaffBelongStoreList(function (json){ + $("#storeId").html(getDataUseHandlebars(getFileContent('tpl/template/select-option-must.tpl'), json)); + }); + + form.on('select(storeId)', function(data) { + table.reload("messageTable", {page: {curr: 1}, where: getTableParams()}) + }); + + initTable(); + function initTable(){ + table.render({ + id: 'messageTable', + elem: '#messageTable', + method: 'post', + url: shopBasePath + 'storeStaff001', + where: getTableParams(), + even: true, + page: true, + limits: [8, 16, 24, 32, 40, 48, 56], + limit: 8, + cols: [[ + { type: 'radio', fixed: 'left'}, + { field: 'jobNumber', title: '工号', align: 'left', width: 140 }, + { field: 'userName', title: '姓名', width: 120 }, + { field: 'companyName', title: '企业', width: 150 }, + { field: 'departmentName', title: '部门', width: 140 }, + { field: 'jobName', title: '职位', width: 140 }, + ]], + done: function(res, curr, count){ + matchingLanguage(); + $('#messageTable').next().find('.layui-table-body').find("table" ).find("tbody").children("tr").on('dblclick',function(){ + var dubClick = $('#messageTable').next().find('.layui-table-body').find("table").find("tbody").find(".layui-table-hover"); + dubClick.find("input[type='radio']").prop("checked", true); + form.render(); + var chooseIndex = JSON.stringify(dubClick.data('index')); + var obj = res.rows[chooseIndex]; + parent.shopUtil.staffMation = obj; + + parent.refreshCode = '0'; + parent.layer.close(index); + }); + + $('#messageTable').next().find('.layui-table-body').find("table" ).find("tbody").children("tr").on('click',function(){ + var click = $('#messageTable').next().find('.layui-table-body').find("table").find("tbody").find(".layui-table-hover"); + click.find("input[type='radio']").prop("checked", true); + form.render(); + }) + } + }); + + table.on('tool(messageTable)', function (obj) { + var data = obj.data; + var layEvent = obj.event; + }); + + form.render(); + } + + form.render(); + form.on('submit(formSearch)', function (data) { + if (winui.verifyForm(data.elem)) { + table.reload("messageTable", {page: {curr: 1}, where: getTableParams()}); + } + return false; + }); + + $("body").on("click", "#reloadTable", function(){ + loadTable(); + }); + + function loadTable(){ + table.reload("messageTable", {where: getTableParams()}); + } + + function getTableParams(){ + var storeId = "-"; + if(!isNull($("#storeId").val())){ + storeId = $("#storeId").val(); + } + return { + userName: $("#userName").val(), + storeId: storeId + }; + } + + exports('storeStaffChoose', {}); +}); \ No newline at end of file diff --git a/shop/src/main/resources/template/tpl/keepFitOrder/allKeepFitOrderList.html b/shop/src/main/resources/template/tpl/keepFitOrder/allKeepFitOrderList.html index 990de2a9a75178f6d5a7ac6990003147d3b12ade..a82eb6bbea4cb58d04f6df739ffd2b93db01f30d 100644 --- a/shop/src/main/resources/template/tpl/keepFitOrder/allKeepFitOrderList.html +++ b/shop/src/main/resources/template/tpl/keepFitOrder/allKeepFitOrderList.html @@ -39,9 +39,9 @@
diff --git a/shop/src/main/resources/template/tpl/keepFitOrder/complateKeepFitOrder.html b/shop/src/main/resources/template/tpl/keepFitOrder/complateKeepFitOrder.html new file mode 100644 index 0000000000000000000000000000000000000000..44c6721b77f3fa9b98aefb6b7740001a3a7e24bb --- /dev/null +++ b/shop/src/main/resources/template/tpl/keepFitOrder/complateKeepFitOrder.html @@ -0,0 +1,47 @@ + + + + + + + + + +
+
+
+ +
+ + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ +
+
+ + +
+
+
+
+ + + + + + \ No newline at end of file diff --git a/shop/src/main/resources/template/tpl/keepFitOrder/keepFitOrderAdd.html b/shop/src/main/resources/template/tpl/keepFitOrder/keepFitOrderAdd.html index 46be2ad5ca6ec9248171310b50fb9720c1ff1d4d..dc44e18d6ce4a0e62d0b3d4e5b68f46372777f43 100644 --- a/shop/src/main/resources/template/tpl/keepFitOrder/keepFitOrderAdd.html +++ b/shop/src/main/resources/template/tpl/keepFitOrder/keepFitOrderAdd.html @@ -43,9 +43,9 @@
- +
-
@@ -56,7 +56,7 @@
-
+
diff --git a/shop/src/main/resources/template/tpl/keepFitOrder/keepFitOrderDetails.html b/shop/src/main/resources/template/tpl/keepFitOrder/keepFitOrderDetails.html index 500e04b4a948f03497c2655d918b207c5b4e9c0f..dd5aee968c32f8e228535253f7ae84d96d384e8d 100644 --- a/shop/src/main/resources/template/tpl/keepFitOrder/keepFitOrderDetails.html +++ b/shop/src/main/resources/template/tpl/keepFitOrder/keepFitOrderDetails.html @@ -15,6 +15,9 @@ diff --git a/shop/src/main/resources/template/tpl/keepFitOrder/storeKeepFitOrderList.html b/shop/src/main/resources/template/tpl/keepFitOrder/storeKeepFitOrderList.html index 54fa4f1507b9c2cad8748571134cf96deb4b0af6..408acd529593e1d740bc6fca116c153e80d9e081 100644 --- a/shop/src/main/resources/template/tpl/keepFitOrder/storeKeepFitOrderList.html +++ b/shop/src/main/resources/template/tpl/keepFitOrder/storeKeepFitOrderList.html @@ -34,9 +34,9 @@
@@ -59,17 +59,14 @@
diff --git a/shop/src/main/resources/template/tpl/storeStaff/storeStaffChoose.html b/shop/src/main/resources/template/tpl/storeStaff/storeStaffChoose.html new file mode 100644 index 0000000000000000000000000000000000000000..6d4c87bea7f112c99cb91ca4e42edad76dafc547 --- /dev/null +++ b/shop/src/main/resources/template/tpl/storeStaff/storeStaffChoose.html @@ -0,0 +1,48 @@ + + + + + + + + + +
+
+ +
+
+
+
+ +
+
+
+
+ +
+ +
+ + +
+
+
+
+
+
+ +
+
+
+
+
+ + + + + \ No newline at end of file diff --git a/web/src/main/resources/template/assets/lib/layui/customer/shopUtil.js b/web/src/main/resources/template/assets/lib/layui/customer/shopUtil.js index 7e9ecc668c544bb66634c90df91b0f7f3b9b376c..890e897044f1b5f44e37bb64db09d88f80bc47f4 100644 --- a/web/src/main/resources/template/assets/lib/layui/customer/shopUtil.js +++ b/web/src/main/resources/template/assets/lib/layui/customer/shopUtil.js @@ -51,11 +51,11 @@ var shopUtil = { getKeepFitOrderStateName: function (data){ if(data.cancleState == 1){ if(data.state == 1){ - return "待支付"; + return "保养中"; }else if(data.state == 2){ - return "已支付(待核销)"; + return "待核销"; }else if(data.state == 3){ - return "已支付(已核销)"; + return "已核销"; } }else{ return '已取消'; @@ -134,4 +134,27 @@ var shopUtil = { }, async: false}); }, + /** + * 门店员工选择页面 + * + * @param callback 回调函数 + */ + staffMation: {}, + openStoreStaffChoosePage: function (callback){ + _openNewWindows({ + url: "../../tpl/storeStaff/storeStaffChoose.html", + title: "选择店员", + pageId: "storeStaffChoose", + area: ['90vw', '90vh'], + callBack: function(refreshCode){ + if (refreshCode == '0') { + if(typeof(callback) == "function") { + callback(shopUtil.staffMation); + } + } else if (refreshCode == '-9999') { + winui.window.msg(systemLanguage["com.skyeye.operationFailed"][languageType], {icon: 2,time: 2000}); + } + }}); + }, + };