103 src/main/webapp/WEB-INF/views/system2ordersummary.jsp
View file
@@ -68,31 +68,81 @@
<div class="form-group">
<label class="col-sm-2 control-label">模特</label>
<div class="col-sm-4">
<input type="text" maxlength="10" id="modelName" name="modelName" class="form-control"/>
<div class="input-group">
<input type="text" maxlength="10" id="modelName" name="modelName" class="form-control"/>
<div class="input-group-btn">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false"><span class="caret"></span></button>
<ul class="dropdown-menu" role="menu">
<c:forEach items="${modelNameList}" var="modelName">
<li><a onclick="setControl('modelName', '${modelName.name}')">${modelName.name}</a></li>
</c:forEach>
</ul>
</div>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">搭配师</label>
<div class="col-sm-4">
<input type="text" maxlength="10" id="stylistName" name="stylistName" class="form-control"/>
<div class="input-group">
<input type="text" maxlength="10" id="stylistName" name="stylistName" class="form-control"/>
<div class="input-group-btn">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false"><span class="caret"></span></button>
<ul class="dropdown-menu" role="menu">
<c:forEach items="${stylistNameList}" var="stylistName">
<li><a onclick="setControl('stylistName', '${stylistName.name}')">${stylistName.name}</a></li>
</c:forEach>
</ul>
</div>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">化妆师</label>
<div class="col-sm-4">
<input type="text" maxlength="10" id="dresserName" name="dresserName" class="form-control"/>
<div class="input-group">
<input type="text" maxlength="10" id="dresserName" name="dresserName" class="form-control"/>
<div class="input-group-btn">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false"><span class="caret"></span></button>
<ul class="dropdown-menu" role="menu">
<c:forEach items="${dresserNameList}" var="dresserName">
<li><a onclick="setControl('dresserName', '${dresserName.name}')">${dresserName.name}</a></li>
</c:forEach>
</ul>
</div>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">经纪人</label>
<div class="col-sm-4">
<input type="text" maxlength="10" id="brokerName" name="brokerName" class="form-control"/>
<div class="input-group">
<input type="text" maxlength="10" id="brokerName" name="brokerName" class="form-control"/>
<div class="input-group-btn">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false"><span class="caret"></span></button>
<ul class="dropdown-menu" role="menu">
<c:forEach items="${brokerList}" var="broker">
<li><a onclick="setBroker('brokerName', '${broker.name}', 'brokerPhone', '${broker.phone}')">${broker.name}</a></li>
</c:forEach>
</ul>
</div>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">联系方式</label>
<div class="col-sm-4">
<input type="text" maxlength="11" id="brokerPhone" name="brokerPhone" class="form-control"/>
<div class="input-group">
<input type="text" maxlength="11" id="brokerPhone" name="brokerPhone" class="form-control"/>
<div class="input-group-btn">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false"><span class="caret"></span></button>
<ul class="dropdown-menu" role="menu">
<c:forEach items="${brokerList}" var="broker">
<li><a onclick="setControl('brokerPhone', '${broker.phone}')">${broker.phone}</a></li>
</c:forEach>
</ul>
</div>
</div>
</div>
</div>
<div class="form-group">
@@ -173,9 +223,9 @@

<div class="order-summary-block">
<p class="summary-label">
<a>上个月</a>
<span>四月订单一览</span>
<a>下个月</a>
<a onclick="queryPreMonth()">上个月</a>
<span id="month-title"></span>
<a onclick="queryNextMonth()">下个月</a>
</p>
<div>
<div class="order-date-row date-header">
@@ -208,6 +258,9 @@
<script>
$('#shootDate').datepicker();
var now = new Date();
var selectedQueryDate = new Date(now.getFullYear(), now.getMonth(), 1, 0, 0, 0);
getClientList();
getUserList();
getOrderList();
@@ -249,8 +302,25 @@ function getClientList() {
});
}
function queryPreMonth() {
selectedQueryDate = DateUtil.minusMonth(selectedQueryDate);
getOrderList();
}
function queryNextMonth() {
selectedQueryDate = DateUtil.plusMonth(selectedQueryDate);
getOrderList();
}
function getOrderList() {
$.get("<c:url value='/order/getOrderList'/>", function(list, status) {
var queryYear = selectedQueryDate.getFullYear();
var queryMonth = selectedQueryDate.getMonth();
var startDate = new Date(queryYear, queryMonth, 1);
var endDate = new Date(queryYear, queryMonth, DateUtil.getLastDayOfMonth(queryYear, queryMonth));
var queryStartDate = DateUtil.getDisplayDateString(startDate);
var queryEndDate = DateUtil.getDisplayDateString(endDate);
$("#month-title").text(selectedQueryDate.getFullYear() + "年" + (selectedQueryDate.getMonth() + 1) + "月订单一览");
$.get("<c:url value='/order/getOrderListByDate/" + queryStartDate + "/" + queryEndDate + "'/>", function(list, status) {
if (list) {
createDateRect();
for (var i in list) {
@@ -279,6 +349,7 @@ function getDateColHtml(data) {
colHtml += "下午：";
}
colHtml += ("<a href='<c:url value='/order/orderDetail/" + data.id + "'/>'>#O9" + data.id + "</a></p>");
colHtml += ("<p>状态：<span style='color:#5CB85C;'>[" + data.orderStatus.name + "]</span></p>");
if (data.photographer) {
colHtml += ("<p>摄影师：<img src='" + data.photographer.header + "'/>" + data.photographer.name + "</p>");
}
@@ -346,11 +417,10 @@ function addClientCallback(response) {
createDateRect();
function createDateRect() {
var now = new Date();
var startDate = now;
var startDate = new Date(selectedQueryDate.getFullYear(), selectedQueryDate.getMonth(), 1);
var rowIndex = 1;
var startDay = 1;
var lastDay = DateUtil.getLastDayOfMonth(now.getFullYear(), now.getMonth() + 1);
var lastDay = DateUtil.getLastDayOfMonth(startDate.getFullYear(), startDate.getMonth() + 1);
for (var i = 0; i < 5; i++) {
var rowBlock = $("#date-row-" + (i + 1));
rowBlock.html("");
@@ -372,6 +442,15 @@ function createDateRect() {
rowIndex++;
}
}
function setControl(id, value) {
$("#" + id).val(value);
}
function setBroker(nameId, name, phoneId, phone) {
$("#" + nameId).val(name);
$("#" + phoneId).val(phone);
}
</script>
</body>
</html>
84 src/main/webapp/WEB-INF/views/system2shoot.jsp
View file
@@ -0,0 +1,84 @@
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib uri="http://www.springframework.org/tags/form" prefix="sf" %>
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<title>Orange 9 System</title>
<link rel="stylesheet" type="text/css" href="<c:url value='/css/bootstrap-system.css'/>"/>
<link rel="stylesheet" type="text/css" href="<c:url value='/css/system.css'/>"/>
<link rel="stylesheet" type="text/css" href="<c:url value='/css/system/order.css'/>"/>
<link rel="stylesheet" type="text/css" href="<c:url value='/css/system/transfer.css'/>"/>
<link rel="stylesheet" type="text/css" href="<c:url value='/css/sidebar/component.css'/>" />
<script src="<c:url value='/js/jquery-1.11.2.min.js'/>"></script>
<script src="<c:url value='/js/bootstrap.min.js'/>"></script>
</head>
<body>
<div id="st-container" class="st-container">
<div class="st-pusher">
<div style="text-align:center;">
<p class="login-header"><span>ORANGE</span> 9 SYSTEM</p>
</div>

<jsp:include page="system2sidebar.jsp" flush="true"/>

<div id="st-trigger-effects">
<button class="btn btn-warning nav-btn" data-effect="st-effect-3">
<span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span>
</button>
</div>

<c:forEach items="${orderShootList}" var="orderShoot">
<input type="hidden" id="${orderShoot.id}" class="convert-time" value="${orderShoot.shootTime}"/>
<div class="order-block">
<p class="model-label transfer-label">
单号：<a href="<c:url value='/order/orderDetail/${orderShoot.id}'/>" target="_blank">O9${orderShoot.id}</a>
<span id="time-label-${orderShoot.id}" class="ml10" style="color:#F0AD4E;">剩余时间：</span>
<span id="remain-time-${orderShoot.id}"></span>
</p>
<p class="model-label transfer-label">
摄影师：
<img src="${orderShoot.photographer.header}"/><span class="ml10">${orderConvert.photographer.name}</span>
<button id="btn-convert-done-${orderShoot.id}" class="btn btn-success ml10" onclick="confirmShootComplete(${orderShoot.id}, ${orderShoot.photographerId})">完成</button>
</p>
<div id="time-progress-bar-${orderShoot.id}" class="progress" style="margin-bottom:0;">
<div id="time-bar-${orderShoot.id}" class="progress-bar progress-bar-success" role="progressbar"
aria-valuenow="40" aria-valuemin="0" aria-valuemax="100" style="width:0%">
</div>
</div>
</div>
</c:forEach>
</div>
</div>
<input type="hidden" id="limitMinutes" value="${limitMinutes}"/>
<script src="<c:url value='/js/svg/classie.js'/>"></script>
<script src="<c:url value='/js/sidebar/sidebarEffects.js'/>"></script>
<script src="<c:url value='/js/util/countDown.js'/>"></script>
<script>
var limitSecond = parseInt($("#limitMinutes").val()) * 60;
$(".convert-time").each(function(index, element) {
if (element.value != 0) {
var id = element.id;
var startTime = new Date();
startTime.setTime(element.value);
new CountDown(startTime, limitSecond, "time-bar-" + id, "time-label-" + id, "remain-time-" + id);
}
});
function confirmShootComplete(orderId, photographerId) {
var result = confirm("是否确认拍摄完成？");
if (result) {
$.post("<c:url value='/order/setOrderTransfer/" + orderId + "/" + photographerId + "'/>", null, function(data, status) {
if (data.status == "success") {
location.reload(true);
} else {
console.log(data);
}
});
}
}
</script>
</body>
</html>
2 src/main/webapp/WEB-INF/views/system2sidebar.jsp
View file
@@ -4,7 +4,7 @@
<h2 class="icon icon-lab"></h2>
<ul>
<li><a class="icon icon-data" href="<c:url value='/orderSummary'/>">订单一览</a></li>
<li><a class="icon icon-study nav-sidebar" href="#">拍摄中</a></li>
<li><a class="icon icon-study nav-sidebar" href="<c:url value='/shooting'/>">拍摄中</a></li>
<li><a class="icon icon-study nav-sidebar" href="<c:url value='/transferImage'/>">上传原片</a></li>
<li><a class="icon icon-photo nav-sidebar" href="<c:url value='/clientWaiting'/>">等待客户选片</a></li>
<li><a class="icon icon-photo nav-sidebar" href="<c:url value='/convertImage'/>">导图</a></li>