From 68defbe491894e01c4402922de33c39633fca091 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 29 Mar 2022 14:25:54 +0800
Subject: [PATCH] 系统名称
---
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/service_all_list.html | 151 +++++++++++++++++++++++++++++++-------------------
1 files changed, 93 insertions(+), 58 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/service_all_list.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/service_all_list.html
index 2c4ebd7..a5dc90e 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/service_all_list.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/service_all_list.html
@@ -71,12 +71,18 @@
<input autocomplete="off" name="closureTime" type="text"
class="form-control datetimepicker" id="endTime">
</div>
-
+ <div class="form-group mr-20">
+ <label >所属门店</label>
+ <select class="form-control autoFull" data-filed="shopName" name="shopId" id="shopId"
+ th:data-url="@{/admin/shopInfo/findAll}">
+ <option value=''>--请选择部所属门店--</option>
+ </select>
+ </div>
<input type="hidden" value="待预约" name="state" id="state"/>
<div class="form-group mr-20">
<button type="button" class="btn btn-my btn-sm" id="btn4" value="">全部</button>
<button type="button" class="btn btn-my btn-sm active" id="btn1" value="待预约">待预约</button>
- <button type="button" class="btn btn-my btn-sm" id="btn2" value="预约成功待处理">待派单</button>
+ <!-- <button type="button" class="btn btn-my btn-sm" id="btn2" value="预约成功待处理">待派单</button>-->
<button type="button" class="btn btn-my btn-sm" id="btn3" value="需配料">待配料</button>
<button type="button" class="btn btn-my btn-sm" id="btn3" value="配料完成">待服务</button>
<button type="button" class="btn btn-my btn-sm" id="btn6" value="服务中">服务中</button>
@@ -111,9 +117,12 @@
<th data-field="money">消耗金额</th>
<th data-field="createTime" data-sortable="true" data-formatter="MGrid.getTime">下单时间</th>
<th data-field="yyTime" data-sortable="true" data-formatter="MGrid.getTime">预约时间</th>
+ <th data-field="consumeTime" data-sortable="true" data-formatter="MGrid.getTime">划扣时间</th>
<th data-field="totalTime" data-sortable="true">服务时长</th>
<th data-field="isOverTime" data-formatter="overTime">超时时间</th>
<th data-field="createStaffName">下单顾问</th>
+ <th data-field="cashierName">划扣人</th>
+ <th data-field="shopName">门店</th>
<th data-sortable="true" data-field="id" data-formatter="buidOperate">操作</th>
</tr>
</thead>
@@ -124,22 +133,22 @@
<script type="text/javascript" th:src="@{/js/systools/MJsBase.js}"></script>
<script type="text/javascript">
- $("#vipPhone").val($.query.get('vipPhone'));
- var _initParam = {format : 'yyyy-mm-dd hh:ii',
- todayBtn : true,
- autoclose : true,
- startView : 2,
- maxView : 3,
- minView : 0};
- MTools.ininDatetimepicker(_initParam);
- //限制结束时间不小于开始时间
- var initParam = {format : 'yyyy-mm-dd hh:ii',
- todayBtn : true,
- autoclose : true,
- startView : 2,
- maxView : 3,
- minView : 0};
- MTools.limitStartEndTime(initParam);
+ $("#vipPhone").val($.query.get('vipPhone'));
+ var _initParam = {format : 'yyyy-mm-dd hh:ii',
+ todayBtn : true,
+ autoclose : true,
+ startView : 2,
+ maxView : 3,
+ minView : 0};
+ MTools.ininDatetimepicker(_initParam);
+ //限制结束时间不小于开始时间
+ var initParam = {format : 'yyyy-mm-dd hh:ii',
+ todayBtn : true,
+ autoclose : true,
+ startView : 2,
+ maxView : 3,
+ minView : 0};
+ MTools.limitStartEndTime(initParam);
var myGrid;
$(function () {
@@ -171,9 +180,9 @@
}
}
- var btns=[];
- btns[0]="",btns[1]="",btns[2]="",btns[3]="",btns[4]="",btns[5]="",btns[6]="";
- function buidOperate(value, row, index) {
+ var btns=[];
+ btns[0]="",btns[1]="",btns[2]="",btns[3]="",btns[4]="",btns[5]="",btns[6]="";
+ function buidOperate(value, row, index) {
var status = row.state;
var html ='<a class="text-primary mr-5" onClick="selectFwz(' + value + ')" title="查看"><i class="fa fa-eye">查看</i></a> '
switch (status) {
@@ -186,11 +195,16 @@
break;
case '需配料':
html +=btns[3].replace('VALUE',value);
+ html += btns[2].replace('VALUE',value);
break;
case '配料完成':
break;
case '服务完成':
html +=btns[4].replace('VALUE',value);
+ html += btns[2].replace('VALUE',value);
+ break;
+ case '待确认':
+ html +=btns[7].replace('VALUE',value);
break;
}
html += btns[5].replace('VALUE',value);
@@ -205,7 +219,7 @@
title: "修改订单时间",
maxmin: true,
area: [MUI.SIZE_L, '500px'],
- content: [basePath + '/admin/projService/toServiceOrderUpdateTime?id=' + id]
+ content: [basePath + '/admin/redirect/hive/beautySalon/updateServiceOrderTimeV2?id=' +id]
});
}
@@ -262,42 +276,60 @@
- function removeOrder(id) {
- var id=myGrid.getSelectItemId();
- layer.confirm('确定取消此订单？', {
- btn: ['确认', '取消'] //可以无限个按钮
- }, function(index, layero){
- $.post(basePath+'/admin/projService/cancelOrder?id='+id, {}, function(data){
- parent.layer.msg(data.info,{icon: 1});
- layer.closeAll();
- myGrid.serchData();
- });
- //按钮【按钮一】的回调
- }, function(index){
- // alert("2 = "+index);
- //按钮【按钮二】的回调
- });
+ function removeOrder(id) {
+ var id=myGrid.getSelectItemId();
+ layer.confirm('确定取消此订单？', {
+ btn: ['确认', '取消'] //可以无限个按钮
+ }, function(index, layero){
+ $.post(basePath+'/admin/projService/cancelOrder?id='+id, {}, function(data){
+ parent.layer.msg(data.info,{icon: 1});
+ layer.closeAll();
+ myGrid.serchData();
+ });
+ //按钮【按钮一】的回调
+ }, function(index){
+ // alert("2 = "+index);
+ //按钮【按钮二】的回调
+ });
- }
+ }
- //打开查看界面
- function openEdit2() {
- var id=myGrid.getSelectItemId();
- layer.open({
- type : 2,
- title : "查看服务单详情",
- area : MUI.SIZE_M,
- maxmin : true,
- content : [ basePath+'/admin/projService/serviceInfo?pageFlae=pc&id=' + id]
- });
- }
+ function confirmServiceOrder(id) {
+ layer.confirm('确定确认订单吗?', {
+ btn: ['确认', '取消'] //可以无限个按钮
+ }, function(index, layero){
+ $.post(basePath+'/admin/projService/confirmServiceOrder?id='+id, {}, function(data){
+ parent.layer.msg(data.info,{icon: 1});
+ layer.closeAll();
+ myGrid.serchData();
+ });
+ //按钮【按钮一】的回调
+ }, function(index){
+ // alert("2 = "+index);
+ //按钮【按钮二】的回调
+ });
- //导出
- //导出
- function exportExcel(){
- var param=MForm.toUrlParam("#serchform");
- window.location.href=basePath+"/admin/projService/exportExcel?"+param;
- }
+ }
+
+
+ //打开查看界面
+ function openEdit2() {
+ var id=myGrid.getSelectItemId();
+ layer.open({
+ type : 2,
+ title : "查看服务单详情",
+ area : MUI.SIZE_M,
+ maxmin : true,
+ content : [ basePath+'/admin/projService/serviceInfo?pageFlae=pc&id=' + id]
+ });
+ }
+
+ //导出
+ //导出
+ function exportExcel(){
+ var param=MForm.toUrlParam("#serchform");
+ window.location.href=basePath+"/admin/projService/exportExcel?"+param;
+ }
</script>
@@ -305,9 +337,9 @@
btns[0]='<a class="text-primary mr-5" onClick="openPb(\'VALUE\')" title="排班"><i class="fa fa-calendar">排班</i></a> '
</script>
-<script matrix:btn="serviceClub-paidan" >
- btns[1]='<a class="text-primary mr-5" onClick="openPd(\'VALUE\')" title="派单"><i class="fa fa-sign-in">派单</i></a>'
-</script>
+<!--<script matrix:btn="serviceClub-paidan" >-->
+<!-- btns[1]='<a class="text-primary mr-5" onClick="openPd(\'VALUE\')" title="派单"><i class="fa fa-sign-in">派单</i></a>'-->
+<!--</script>-->
<script matrix:btn="serviceClub-edit" >
btns[2]='<a class="text-primary mr-5" onClick="updatePd(\'VALUE\')" title="修改"><i class="fa fa-edit">修改</i></a>'
@@ -327,5 +359,8 @@
<script matrix:btn="serviceClub-edit">
btns[6]='<a class="text-primary mr-5" onclick="updateTime(\'VALUE\')" title="修改时间"><i class="fa fa-edit">修改时间</i></a> '
</script>
+<script matrix:btn="serviceClub-edit">
+ btns[7]='<a class="text-primary mr-5" onclick="confirmServiceOrder(\'VALUE\')" title="确认服务单"><i class="fa fa-edit">确认服务单</i></a> '
+</script>
</html>
--
Gitblit v1.9.1