From c253b555c7905c5136d47cd615ef545fa50cc6ad Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Sun, 20 Feb 2022 21:24:16 +0800
Subject: [PATCH] Merge branch 'api_score_meger'
---
zq-erp/src/main/resources/templates/views/admin/hive-erp/order/projService-list.html | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive-erp/order/projService-list.html b/zq-erp/src/main/resources/templates/views/admin/hive-erp/order/projService-list.html
index 72e8f44..c1f81ad 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive-erp/order/projService-list.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive-erp/order/projService-list.html
@@ -38,10 +38,7 @@
<input autocomplete="off" name="closureTime" type="text"
class="form-control datetimepicker" id="endTime">
</div>
- <div class="form-group mr-20">
- <label >超时时长 > </label>
- <input autocomplete="off" name="isOverTime" type="text" class="form-control" placeholder="单位分钟" id="isOverTime">
- </div>
+
<div class="form-group mr-20">
<label >所属门店</label>
<select class="form-control autoFull" data-filed="shopName" name="shopId" id="shopId"
@@ -54,7 +51,7 @@
<select class="form-control" name="state" id="state">
<option value="">-- 请选择服务状态 --</option>
<option value="待预约">待预约</option>
- <option value="预约成功待处理">预约成功待处理</option>
+<!-- <option value="预约成功待处理">预约成功待处理</option>-->
<option value="预约失败">预约失败</option>
<option value="预约取消">预约取消</option>
<option value="需配料">需配料</option>
@@ -79,6 +76,7 @@
<div id="option-bar">
<button matrix:btn="mdfwd-exportExcel" onclick="exportExcel()" type="button" class="btn btn-info btn-sm"><i class="fa fa-download" ></i> 导出</button>
<button class="btn btn-info btn-sm" onClick="openEdit2()" title=""><i class="fa fa-lg fa-eye"></i> 查看详情</button>
+ <button matrix:btn="mdfwd-del" onClick="removeOrder()" type="button" class="btn btn-danger btn-sm"><i class="fa fa-trash" ></i> 删除</button>
</div>
<!-- 数据表格部分 -->
<table id="mgrid">
@@ -135,6 +133,24 @@
});
});
+ function removeOrder(id) {
+ var id=myGrid.getSelectItemId();
+ layer.confirm('确定取消此订单？', {
+ btn: ['确认', '取消'] //可以无限个按钮
+ }, function(index, layero){
+ $.post(basePath+'/admin/projService/erpCancelOrder?id='+id, {}, function(data){
+ parent.layer.msg(data.info,{icon: 1});
+ layer.closeAll();
+ myGrid.serchData();
+ });
+ //按钮【按钮一】的回调
+ }, function(index){
+ // alert("2 = "+index);
+ //按钮【按钮二】的回调
+ });
+
+ }
+
/**
超时
**/
--
Gitblit v1.9.1