From 997831bb8c314d781e6cc5533898ffbe077dd3b6 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Tue, 06 Apr 2021 11:19:56 +0800 Subject: [PATCH] modify --- zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java | 8 +------- zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip.html | 2 +- zq-erp/src/main/resources/static/js/function/vip.js | 4 ++-- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java index 155bb91..00b210a 100644 --- a/zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java +++ b/zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java @@ -186,13 +186,7 @@ AjaxResult result = AjaxResult.buildSuccessInstance("查询成功"); SysProjUse queryUse = new SysProjUse(); - if(Objects.nonNull(vipId)){ - queryUse.setVipId(vipId); - }else{ - SysVipInfo vipInfo = getCurrentVioInfo(); - queryUse.setVipId(vipInfo.getId()); - } - + queryUse.setVipId(vipId); queryUse.setType(Dictionary.SHOPPING_GOODS_TYPE_XM); queryUse.setTaocanId(-1L); queryUse.setStatus(Dictionary.TAOCAN_STATUS_YX); diff --git a/zq-erp/src/main/resources/static/js/function/vip.js b/zq-erp/src/main/resources/static/js/function/vip.js index 06e6fd5..a1a4475 100644 --- a/zq-erp/src/main/resources/static/js/function/vip.js +++ b/zq-erp/src/main/resources/static/js/function/vip.js @@ -222,13 +222,13 @@ } -function openAddService() { +function openAddService(id) { layer.full(layer.open({ type: 2, title: "添加服务单", maxmin: true, area: [MUI.SIZE_L, '500px'], - content: [basePath + '/admin/redirect/hive/beautySalon/servicceAddForm'] + content: [basePath + '/admin/redirect/hive/beautySalon/servicceAddForm?id='+id] })); } diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip.html index 15d5daa..ce54cfa 100644 --- a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip.html +++ b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip.html @@ -1535,7 +1535,7 @@ return; } vipId = this.vipInfo.id; - openAddService(); + openAddService(vipId); }, // 开订单 addOrder() { -- Gitblit v1.9.1