From 6b19c95198431912cbc1792553353c14ac2993ab Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 12 Mar 2021 10:55:08 +0800
Subject: [PATCH] modify

---
 zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java        |    2 +-
 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/underlineOrder.html |   18 ++++++++++--------
 2 files changed, 11 insertions(+), 9 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 bfe6257..8deed2b 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
@@ -509,7 +509,7 @@
         if (balanceverifyResult.isError()) {
             return new AjaxResult(AjaxResult.STATUS_FAIL, balanceverifyResult.getMsg());
         }
-        sysProjServices.setState(Dictionary.SERVICE_STATU_YYCG);
+        sysProjServices.setState(Dictionary.SERVICE_STATU_DYY);
         SysProjServices newSysProjServices = sysProjServicesService.addSysProjServices(sysProjServices);
         if (newSysProjServices != null) {
             return AjaxResult.buildSuccessInstance(Arrays.asList(newSysProjServices));
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/underlineOrder.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/underlineOrder.html
index b69b459..787fd6f 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/underlineOrder.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/underlineOrder.html
@@ -220,7 +220,7 @@
     function cancelOrder() {
         var id=myGrid.getSelectItemId();
         layer.confirm('确定取消此订单?', {
-            btn: ['确认', '取消并删除', '取消'] //可以无限个按钮
+            btn: ['确认', '取消'] //可以无限个按钮
         }, function(index, layero){
             $.post(basePath+'/admin/order/cancelOrder?id='+id+'&del=0', {}, function(data){
                 if (data.status == '200') {
@@ -231,13 +231,15 @@
                 layer.closeAll();
                 myGrid.serchData();
             });
-        }, function(index){
-            $.post(basePath+'/admin/order/cancelOrder?id='+id+'&del=1', {}, function(data){
-                parent.layer.msg(data.info,{icon: 1});
-                layer.closeAll();
-                myGrid.serchData();
-            });
-        }, function(index){
+        },
+        //     function(index){
+        //     $.post(basePath+'/admin/order/cancelOrder?id='+id+'&del=1', {}, function(data){
+        //         parent.layer.msg(data.info,{icon: 1});
+        //         layer.closeAll();
+        //         myGrid.serchData();
+        //     });
+        // },
+            function(index){
             //按钮【按钮二】的回调
         });
     }

--
Gitblit v1.9.1