~jiangyouyao/beauty-erp.git

			@@ -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,11 @@
			<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="shopName">门店</th>
			<th data-sortable="true" data-field="id" data-formatter="buidOperate">操作</th>
			</tr>
			</thead>
			@@ -186,11 +194,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 +218,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]
			});
			}

			@@ -280,6 +293,24 @@

			}

			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 openEdit2() {
			var id=myGrid.getSelectItemId();
			@@ -305,9 +336,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 +358,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>