8 src/main/webapp/WEB-INF/views/system2shoot.jsp
View file
@@ -20,9 +20,7 @@
<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="system2header.jsp" flush="true"/>

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

@@ -43,7 +41,9 @@
<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>
<c:if test="${ orderShoot.photographer.id == user.id}">
<button id="btn-convert-done-${orderShoot.id}" class="btn btn-success ml10" onclick="confirmShootComplete(${orderShoot.id}, ${orderShoot.photographerId})">完成</button>
</c:if>
</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"
6 src/main/webapp/WEB-INF/views/system2sidebar.jsp
View file
@@ -12,8 +12,10 @@
<li><a class="icon icon-photo nav-sidebar" href="<c:url value='/fixBackground'/>">修背景</a></li>
<li><a class="icon icon-photo nav-sidebar" href="<c:url value='/cutLiquify'/>">裁图液化</a></li>
<li><a class="icon icon-location nav-sidebar" href="<c:url value='/verifyImage'/>">等待审核</a></li>
<li><a class="icon icon-location nav-sidebar" href="<c:url value='/employee'/>">员工管理</a></li>
<li><a class="icon icon-location nav-sidebar" href="<c:url value='/orderGoods'/>">货品管理</a></li>
<c:if test="${user.isAdmin == 1}">
<li><a class="icon icon-location nav-sidebar" href="<c:url value='/employee'/>">员工管理</a></li>
<li><a class="icon icon-location nav-sidebar" href="<c:url value='/orderGoods'/>">货品管理</a></li>
</c:if>
</ul>
</nav>
<script>
18 src/main/webapp/WEB-INF/views/system2transferimage.jsp
View file
@@ -17,9 +17,7 @@
<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="system2header.jsp" flush="true"/>

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

@@ -32,6 +30,8 @@
<div id="transferContainer"></div>

<jsp:include page="system2uploadimage.jsp"/>

<input type="hidden" id="user-id" value="${user.id}"/>
</div>
</div>
<input type="hidden" id="limitMinutes" value="${limitMinutes}"/>
@@ -41,6 +41,7 @@
<script src="<c:url value='/js/util/transferUploader.js'/>"></script>
<script>
var limitSecond = parseInt($("#limitMinutes").val()) * 60;
var userId = $("#user-id").val();
init();
@@ -77,10 +78,13 @@
}
function getTransferInfo(data) {
return '<p class="model-label transfer-label">'
+ '摄影师：<img src="' + data.operator.header + '"/><span class="ml10">' + data.operator.name + '</span>'
+ '<button id="btn-transfer-' + data.id + '" class="btn btn-info ml10" onclick="openUploadImageWindow(' + data.id + ', ' + data.orderId + ')">上传</button>'
+ '<button id="btn-transfer-done-' + data.id + '" class="btn btn-success ml10" onclick="setTransferComplete(' + data.id + ', ' + data.orderId + ')">完成</button></p>';
var infoHtml = '<p class="model-label transfer-label">'
+ '摄影师：<img src="' + data.operator.header + '"/><span class="ml10">' + data.operator.name + '</span>';
if (data.operator.id == userId) {
infoHtml += ('<button id="btn-transfer-' + data.id + '" class="btn btn-info ml10" onclick="openUploadImageWindow(' + data.id + ', ' + data.orderId + ')">上传</button>'
+ '<button id="btn-transfer-done-' + data.id + '" class="btn btn-success ml10" onclick="setTransferComplete(' + data.id + ', ' + data.orderId + ')">完成</button></p>');
}
return infoHtml;
}
function getTransferBar(data) {