|
|
@@ -5,69 +5,377 @@
|
|
|
<title>订单列表</title>
|
|
|
<meta name="decorator" content="default"/>
|
|
|
<style type="text/css">
|
|
|
- *{margin:0;padding:0}
|
|
|
- a{list-style:none;text-decoration:none}
|
|
|
- body{background-color:rgb(255,255,255)}
|
|
|
- h3{line-height:20px;padding:20px 0 20px 15px;border-bottom:1px solid #CCCCCC}
|
|
|
- .now-status p{padding:20px}
|
|
|
- .now-status span{display:inline-block;width:160px;line-height:35px;margin-right:15px;cursor:pointer;border:1px solid #CCCCCC;text-align:center;border-radius:5px}
|
|
|
- .buyInfo p{padding:15px 5px 0}
|
|
|
- .buyInfo p label{width:60px;display:inline-block}
|
|
|
- .buyInfo p span{padding-left:10px}
|
|
|
- .table th{background-color:#CCCCCC}
|
|
|
- .table th,.table td{font-weight:normal;border:1px solid #CCCCCC;height:35px;text-align:center}
|
|
|
- .table td .div-img{box-sizing:border-box}
|
|
|
- .table td .div-img img{width:100px;height:100px;vertical-align:middle}
|
|
|
- .table td .div-img span{}
|
|
|
- .div-order span{width:260px;display:inline-block;margin-right:50px}
|
|
|
- .text-result p{padding-top:15px}
|
|
|
- .text-cost p{padding:20px 0}
|
|
|
- .moeny-cost p{padding:10px 0 0 0;text-align:left}
|
|
|
- .moeny-cost p label{display:inline-block}
|
|
|
- .Staging table{width:100%;border-collapse:collapse;margin-top:20px}
|
|
|
- .Staging table th,.Staging table td{font-weight:normal;border:1px solid #000;height:35px;text-align:center;width:10%}
|
|
|
- .change-info{position:fixed;top:0%;left:50%;transform:translateX(-50%);z-index:999;width:800px;background-color:#fff;box-shadow:0px 0px 15px #ccc}
|
|
|
- .item-div label{width:260px;text-align:right;display:inline-block;margin-right:50px}
|
|
|
- .item-div input{width:300px;line-height:35px;height:35px;box-sizing:border-box;border:1px solid #CCCCCC;display:inline-block}
|
|
|
- .item-div select{width:90px;height:35px;margin-right:10px}
|
|
|
- .item-div textarea{border:1px solid #CCCCCC;margin-top:20px;width:300px;height:80px;resize:none;display:block}
|
|
|
- .layer-status span{display:inline-block;width:80px;line-height:35px;background-color:#00A6C7;text-align:center;color:#fff;cursor:pointer}
|
|
|
- .layer-status span:nth-of-type(1){}
|
|
|
- .layer-status span:nth-of-type(2){margin-left:72px}
|
|
|
- .same-style{position:fixed;top:20%;left:50%;transform:translateX(-50%);width:500px;background-color:#fff;z-index:999;box-shadow:0 0 15px #666}
|
|
|
- .reason-cancel label{margin-right:20px}
|
|
|
- .reason-cancel textarea{width:270px;height:80px;resize:none;vertical-align:text-top;border:1px solid #CCCCCC}
|
|
|
- .order-details-heading{background:#eee}
|
|
|
- .order-details-heading td{white-space:nowrap;padding:0 10px}
|
|
|
- .order-rows,.order-details-heading{width:100%;border-bottom:1px solid #ccc;border-left:1px solid #ccc;border-right:1px solid #ccc;color:#666;padding:10px;line-height:30px}
|
|
|
- .order-details-heading{border-top:1px solid #ccc}
|
|
|
- .order-details-heading span,.order-rows span{margin-right:80px}
|
|
|
- .order-details-heading span{width:230px;margin-right:0px;display:inline-block}
|
|
|
- .order-details-heading span label,.order-rows span label{font-weight:bold}
|
|
|
- .order-rows .supplier-img{width:100px}
|
|
|
- .operation-wrapper{position:relative}
|
|
|
- .operation-btn{cursor:pointer}
|
|
|
- .operation-block{background:#fff;width:125px;position:absolute;left:35px;top:30px;padding:10px;border:1px solid #666;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;z-index:100001;display:none}
|
|
|
- .operation-block a{display:block;padding:3px 0}
|
|
|
- .print-wrapper{display:inline-block}
|
|
|
- .supplier-product-name,.supplier-product-alias{width:200px;line-height:20px}
|
|
|
- .supplier-product-info{width:50%;display:inline-block;position:relative;top:50%;transform:translateY(30%)}
|
|
|
- .supplier-product-promotionInfo{width:20%;display:inline-block;position:relative;top:50%;transform:translateY(30%)}
|
|
|
- .supplier-product-item{margin-bottom:10px}
|
|
|
- .supplier-product-alias{display:inline-block;margin-top:5px}
|
|
|
- .supplier-name{display:inline-block;vertical-align:middle;margin:0 10px}
|
|
|
- #auditBox{padding:20px;line-height:30px}
|
|
|
- #auditBox p{font-size:16px;margin:0 0 0 0}
|
|
|
- #auditBox .note-div{font-size:16px}
|
|
|
- .downSpan{display:block;margin-left:5px;margin-bottom:-8px}
|
|
|
- .upSpan{display:block;margin-left:5px;margin-top:-8px}
|
|
|
- .promotionsName{margin:2px}
|
|
|
- .ladderPrice>span{text-decoration:underline;color:red}
|
|
|
- .ladderPrice .list{display:none;position:absolute;z-index:999;background:#FFF;white-space:nowrap;border:1px solid #EEE;padding:10px 0;color:#333}
|
|
|
- .ladderPrice:hover .list{display:block}
|
|
|
- .ladderPrice .list span{margin:0 20px;width:60px;text-align:center;display:inline-block}
|
|
|
- .ladderPrice .list span.price{color:red}
|
|
|
- .weishaIcon {background:darkorange;color:white;margin:0 0px;padding:0 3px;font-style:normal;font-size: 12px; display:inline-block;border-radius:2px}
|
|
|
+ * {
|
|
|
+ margin: 0;
|
|
|
+ padding: 0
|
|
|
+ }
|
|
|
+
|
|
|
+ a {
|
|
|
+ list-style: none;
|
|
|
+ text-decoration: none
|
|
|
+ }
|
|
|
+
|
|
|
+ body {
|
|
|
+ background-color: rgb(255, 255, 255)
|
|
|
+ }
|
|
|
+
|
|
|
+ h3 {
|
|
|
+ line-height: 20px;
|
|
|
+ padding: 20px 0 20px 15px;
|
|
|
+ border-bottom: 1px solid #CCCCCC
|
|
|
+ }
|
|
|
+
|
|
|
+ .now-status p {
|
|
|
+ padding: 20px
|
|
|
+ }
|
|
|
+
|
|
|
+ .now-status span {
|
|
|
+ display: inline-block;
|
|
|
+ width: 160px;
|
|
|
+ line-height: 35px;
|
|
|
+ margin-right: 15px;
|
|
|
+ cursor: pointer;
|
|
|
+ border: 1px solid #CCCCCC;
|
|
|
+ text-align: center;
|
|
|
+ border-radius: 5px
|
|
|
+ }
|
|
|
+
|
|
|
+ .buyInfo p {
|
|
|
+ padding: 15px 5px 0
|
|
|
+ }
|
|
|
+
|
|
|
+ .buyInfo p label {
|
|
|
+ width: 60px;
|
|
|
+ display: inline-block
|
|
|
+ }
|
|
|
+
|
|
|
+ .buyInfo p span {
|
|
|
+ padding-left: 10px
|
|
|
+ }
|
|
|
+
|
|
|
+ .table th {
|
|
|
+ background-color: #CCCCCC
|
|
|
+ }
|
|
|
+
|
|
|
+ .table th, .table td {
|
|
|
+ font-weight: normal;
|
|
|
+ border: 1px solid #CCCCCC;
|
|
|
+ height: 35px;
|
|
|
+ text-align: center
|
|
|
+ }
|
|
|
+
|
|
|
+ .table td .div-img {
|
|
|
+ box-sizing: border-box
|
|
|
+ }
|
|
|
+
|
|
|
+ .table td .div-img img {
|
|
|
+ width: 100px;
|
|
|
+ height: 100px;
|
|
|
+ vertical-align: middle
|
|
|
+ }
|
|
|
+
|
|
|
+ .table td .div-img span {
|
|
|
+ }
|
|
|
+
|
|
|
+ .div-order span {
|
|
|
+ width: 260px;
|
|
|
+ display: inline-block;
|
|
|
+ margin-right: 50px
|
|
|
+ }
|
|
|
+
|
|
|
+ .text-result p {
|
|
|
+ padding-top: 15px
|
|
|
+ }
|
|
|
+
|
|
|
+ .text-cost p {
|
|
|
+ padding: 20px 0
|
|
|
+ }
|
|
|
+
|
|
|
+ .moeny-cost p {
|
|
|
+ padding: 10px 0 0 0;
|
|
|
+ text-align: left
|
|
|
+ }
|
|
|
+
|
|
|
+ .moeny-cost p label {
|
|
|
+ display: inline-block
|
|
|
+ }
|
|
|
+
|
|
|
+ .Staging table {
|
|
|
+ width: 100%;
|
|
|
+ border-collapse: collapse;
|
|
|
+ margin-top: 20px
|
|
|
+ }
|
|
|
+
|
|
|
+ .Staging table th, .Staging table td {
|
|
|
+ font-weight: normal;
|
|
|
+ border: 1px solid #000;
|
|
|
+ height: 35px;
|
|
|
+ text-align: center;
|
|
|
+ width: 10%
|
|
|
+ }
|
|
|
+
|
|
|
+ .change-info {
|
|
|
+ position: fixed;
|
|
|
+ top: 0%;
|
|
|
+ left: 50%;
|
|
|
+ transform: translateX(-50%);
|
|
|
+ z-index: 999;
|
|
|
+ width: 800px;
|
|
|
+ background-color: #fff;
|
|
|
+ box-shadow: 0px 0px 15px #ccc
|
|
|
+ }
|
|
|
+
|
|
|
+ .item-div label {
|
|
|
+ width: 260px;
|
|
|
+ text-align: right;
|
|
|
+ display: inline-block;
|
|
|
+ margin-right: 50px
|
|
|
+ }
|
|
|
+
|
|
|
+ .item-div input {
|
|
|
+ width: 300px;
|
|
|
+ line-height: 35px;
|
|
|
+ height: 35px;
|
|
|
+ box-sizing: border-box;
|
|
|
+ border: 1px solid #CCCCCC;
|
|
|
+ display: inline-block
|
|
|
+ }
|
|
|
+
|
|
|
+ .item-div select {
|
|
|
+ width: 90px;
|
|
|
+ height: 35px;
|
|
|
+ margin-right: 10px
|
|
|
+ }
|
|
|
+
|
|
|
+ .item-div textarea {
|
|
|
+ border: 1px solid #CCCCCC;
|
|
|
+ margin-top: 20px;
|
|
|
+ width: 300px;
|
|
|
+ height: 80px;
|
|
|
+ resize: none;
|
|
|
+ display: block
|
|
|
+ }
|
|
|
+
|
|
|
+ .layer-status span {
|
|
|
+ display: inline-block;
|
|
|
+ width: 80px;
|
|
|
+ line-height: 35px;
|
|
|
+ background-color: #00A6C7;
|
|
|
+ text-align: center;
|
|
|
+ color: #fff;
|
|
|
+ cursor: pointer
|
|
|
+ }
|
|
|
+
|
|
|
+ .layer-status span:nth-of-type(1) {
|
|
|
+ }
|
|
|
+
|
|
|
+ .layer-status span:nth-of-type(2) {
|
|
|
+ margin-left: 72px
|
|
|
+ }
|
|
|
+
|
|
|
+ .same-style {
|
|
|
+ position: fixed;
|
|
|
+ top: 20%;
|
|
|
+ left: 50%;
|
|
|
+ transform: translateX(-50%);
|
|
|
+ width: 500px;
|
|
|
+ background-color: #fff;
|
|
|
+ z-index: 999;
|
|
|
+ box-shadow: 0 0 15px #666
|
|
|
+ }
|
|
|
+
|
|
|
+ .reason-cancel label {
|
|
|
+ margin-right: 20px
|
|
|
+ }
|
|
|
+
|
|
|
+ .reason-cancel textarea {
|
|
|
+ width: 270px;
|
|
|
+ height: 80px;
|
|
|
+ resize: none;
|
|
|
+ vertical-align: text-top;
|
|
|
+ border: 1px solid #CCCCCC
|
|
|
+ }
|
|
|
+
|
|
|
+ .order-details-heading {
|
|
|
+ background: #eee
|
|
|
+ }
|
|
|
+
|
|
|
+ .order-details-heading td {
|
|
|
+ white-space: nowrap;
|
|
|
+ padding: 0 10px
|
|
|
+ }
|
|
|
+
|
|
|
+ .order-rows, .order-details-heading {
|
|
|
+ width: 100%;
|
|
|
+ border-bottom: 1px solid #ccc;
|
|
|
+ border-left: 1px solid #ccc;
|
|
|
+ border-right: 1px solid #ccc;
|
|
|
+ color: #666;
|
|
|
+ padding: 10px;
|
|
|
+ line-height: 30px
|
|
|
+ }
|
|
|
+
|
|
|
+ .order-details-heading {
|
|
|
+ border-top: 1px solid #ccc
|
|
|
+ }
|
|
|
+
|
|
|
+ .order-details-heading span, .order-rows span {
|
|
|
+ margin-right: 80px
|
|
|
+ }
|
|
|
+
|
|
|
+ .order-details-heading span {
|
|
|
+ width: 230px;
|
|
|
+ margin-right: 0px;
|
|
|
+ display: inline-block
|
|
|
+ }
|
|
|
+
|
|
|
+ .order-details-heading span label, .order-rows span label {
|
|
|
+ font-weight: bold
|
|
|
+ }
|
|
|
+
|
|
|
+ .order-rows .supplier-img {
|
|
|
+ width: 100px
|
|
|
+ }
|
|
|
+
|
|
|
+ .operation-wrapper {
|
|
|
+ position: relative
|
|
|
+ }
|
|
|
+
|
|
|
+ .operation-btn {
|
|
|
+ cursor: pointer
|
|
|
+ }
|
|
|
+
|
|
|
+ .operation-block {
|
|
|
+ background: #fff;
|
|
|
+ width: 125px;
|
|
|
+ position: absolute;
|
|
|
+ left: 35px;
|
|
|
+ top: 30px;
|
|
|
+ padding: 10px;
|
|
|
+ border: 1px solid #666;
|
|
|
+ -webkit-border-radius: 5px;
|
|
|
+ -moz-border-radius: 5px;
|
|
|
+ border-radius: 5px;
|
|
|
+ z-index: 100001;
|
|
|
+ display: none
|
|
|
+ }
|
|
|
+
|
|
|
+ .operation-block a {
|
|
|
+ display: block;
|
|
|
+ padding: 3px 0
|
|
|
+ }
|
|
|
+
|
|
|
+ .print-wrapper {
|
|
|
+ display: inline-block
|
|
|
+ }
|
|
|
+
|
|
|
+ .supplier-product-name, .supplier-product-alias {
|
|
|
+ width: 200px;
|
|
|
+ line-height: 20px
|
|
|
+ }
|
|
|
+
|
|
|
+ .supplier-product-info {
|
|
|
+ width: 50%;
|
|
|
+ display: inline-block;
|
|
|
+ position: relative;
|
|
|
+ top: 50%;
|
|
|
+ transform: translateY(30%)
|
|
|
+ }
|
|
|
+
|
|
|
+ .supplier-product-promotionInfo {
|
|
|
+ width: 20%;
|
|
|
+ display: inline-block;
|
|
|
+ position: relative;
|
|
|
+ top: 50%;
|
|
|
+ transform: translateY(30%)
|
|
|
+ }
|
|
|
+
|
|
|
+ .supplier-product-item {
|
|
|
+ margin-bottom: 10px
|
|
|
+ }
|
|
|
+
|
|
|
+ .supplier-product-alias {
|
|
|
+ display: inline-block;
|
|
|
+ margin-top: 5px
|
|
|
+ }
|
|
|
+
|
|
|
+ .supplier-name {
|
|
|
+ display: inline-block;
|
|
|
+ vertical-align: middle;
|
|
|
+ margin: 0 10px
|
|
|
+ }
|
|
|
+
|
|
|
+ #auditBox {
|
|
|
+ padding: 20px;
|
|
|
+ line-height: 30px
|
|
|
+ }
|
|
|
+
|
|
|
+ #auditBox p {
|
|
|
+ font-size: 16px;
|
|
|
+ margin: 0 0 0 0
|
|
|
+ }
|
|
|
+
|
|
|
+ #auditBox .note-div {
|
|
|
+ font-size: 16px
|
|
|
+ }
|
|
|
+
|
|
|
+ .downSpan {
|
|
|
+ display: block;
|
|
|
+ margin-left: 5px;
|
|
|
+ margin-bottom: -8px
|
|
|
+ }
|
|
|
+
|
|
|
+ .upSpan {
|
|
|
+ display: block;
|
|
|
+ margin-left: 5px;
|
|
|
+ margin-top: -8px
|
|
|
+ }
|
|
|
+
|
|
|
+ .promotionsName {
|
|
|
+ margin: 2px
|
|
|
+ }
|
|
|
+
|
|
|
+ .ladderPrice > span {
|
|
|
+ text-decoration: underline;
|
|
|
+ color: red
|
|
|
+ }
|
|
|
+
|
|
|
+ .ladderPrice .list {
|
|
|
+ display: none;
|
|
|
+ position: absolute;
|
|
|
+ z-index: 999;
|
|
|
+ background: #FFF;
|
|
|
+ white-space: nowrap;
|
|
|
+ border: 1px solid #EEE;
|
|
|
+ padding: 10px 0;
|
|
|
+ color: #333
|
|
|
+ }
|
|
|
+
|
|
|
+ .ladderPrice:hover .list {
|
|
|
+ display: block
|
|
|
+ }
|
|
|
+
|
|
|
+ .ladderPrice .list span {
|
|
|
+ margin: 0 20px;
|
|
|
+ width: 60px;
|
|
|
+ text-align: center;
|
|
|
+ display: inline-block
|
|
|
+ }
|
|
|
+
|
|
|
+ .ladderPrice .list span.price {
|
|
|
+ color: red
|
|
|
+ }
|
|
|
+
|
|
|
+ .weishaIcon {
|
|
|
+ background: darkorange;
|
|
|
+ color: white;
|
|
|
+ margin: 0 0px;
|
|
|
+ padding: 0 3px;
|
|
|
+ font-style: normal;
|
|
|
+ font-size: 12px;
|
|
|
+ display: inline-block;
|
|
|
+ border-radius: 2px
|
|
|
+ }
|
|
|
</style>
|
|
|
<script type="text/javascript" src="${ctxStatic}/QRCode/jquery.qrcode.min.js"></script>
|
|
|
<script type="text/javascript" src="static/common/clipboard.min.js"></script>
|
|
|
@@ -117,38 +425,44 @@
|
|
|
<c:if test="${order.receiptStatus == 3}">
|
|
|
<font color="green">已收款</font>
|
|
|
</c:if>
|
|
|
- <%--抹平明细--%>
|
|
|
- <c:if test="${order.confirmType eq 1}">
|
|
|
- <c:if test="${order.receiptOrderFlag}">
|
|
|
- <font color="red">(一款多单:少收抹平金额未知)</font>
|
|
|
- </c:if>
|
|
|
- <c:if test="${!order.receiptOrderFlag}">
|
|
|
- <font color="red">(少收抹平:
|
|
|
- ￥<fmt:formatNumber value="${order.payableAmount - (empty order.orderReceivedAmount ? 0 : order.orderReceivedAmount)}" pattern="#0.00"/>)
|
|
|
- </font>
|
|
|
- </c:if>
|
|
|
+ <%--抹平明细--%>
|
|
|
+ <c:if test="${order.confirmType eq 1}">
|
|
|
+ <c:if test="${order.receiptOrderFlag}">
|
|
|
+ <font color="red">(一款多单:少收抹平金额未知)</font>
|
|
|
</c:if>
|
|
|
- <c:if test="${order.confirmType eq 2}">
|
|
|
- <c:if test="${order.receiptOrderFlag}">
|
|
|
- <font color="red">(一款多单:多收抹平金额未知)</font>
|
|
|
- </c:if>
|
|
|
- <c:if test="${!order.receiptOrderFlag}">
|
|
|
- <font color="red">(多收抹平:
|
|
|
- ￥<fmt:formatNumber value="${(empty order.orderReceivedAmount ? 0 : order.orderReceivedAmount) - order.payableAmount}" pattern="#0.00"/>)
|
|
|
- </font>
|
|
|
- </c:if>
|
|
|
+ <c:if test="${!order.receiptOrderFlag}">
|
|
|
+ <font color="red">(少收抹平:
|
|
|
+ ￥<fmt:formatNumber
|
|
|
+ value="${order.payableAmount - (empty order.orderReceivedAmount ? 0 : order.orderReceivedAmount)}"
|
|
|
+ pattern="#0.00"/>)
|
|
|
+ </font>
|
|
|
</c:if>
|
|
|
- <c:if test="${order.confirmType eq 3}">
|
|
|
- <c:if test="${order.receiptOrderFlag}">
|
|
|
- <font color="red">(一款多单:多收退余额)</font>
|
|
|
- </c:if>
|
|
|
- <c:if test="${!order.receiptOrderFlag}">
|
|
|
- <font color="red">(多收退余额 ${order.associationType eq 2 ? "(自动)" : ""}:
|
|
|
- ￥<fmt:formatNumber value="${(empty order.returnBalanceAmount ? 0 : order.returnBalanceAmount)}" pattern="#0.00"/>)
|
|
|
- </font>
|
|
|
- </c:if>
|
|
|
+ </c:if>
|
|
|
+ <c:if test="${order.confirmType eq 2}">
|
|
|
+ <c:if test="${order.receiptOrderFlag}">
|
|
|
+ <font color="red">(一款多单:多收抹平金额未知)</font>
|
|
|
+ </c:if>
|
|
|
+ <c:if test="${!order.receiptOrderFlag}">
|
|
|
+ <font color="red">(多收抹平:
|
|
|
+ ￥<fmt:formatNumber
|
|
|
+ value="${(empty order.orderReceivedAmount ? 0 : order.orderReceivedAmount) - order.payableAmount}"
|
|
|
+ pattern="#0.00"/>)
|
|
|
+ </font>
|
|
|
+ </c:if>
|
|
|
+ </c:if>
|
|
|
+ <c:if test="${order.confirmType eq 3}">
|
|
|
+ <c:if test="${order.receiptOrderFlag}">
|
|
|
+ <font color="red">(一款多单:多收退余额)</font>
|
|
|
</c:if>
|
|
|
- </td>
|
|
|
+ <c:if test="${!order.receiptOrderFlag}">
|
|
|
+ <font color="red">(多收退余额 ${order.associationType eq 2 ? "(自动)" : ""}:
|
|
|
+ ￥<fmt:formatNumber
|
|
|
+ value="${(empty order.returnBalanceAmount ? 0 : order.returnBalanceAmount)}"
|
|
|
+ pattern="#0.00"/>)
|
|
|
+ </font>
|
|
|
+ </c:if>
|
|
|
+ </c:if>
|
|
|
+ </td>
|
|
|
<td>发货状态:
|
|
|
<c:if test="${order.sendOutStatus == 1}">
|
|
|
<font color="red">待发货</font>
|
|
|
@@ -187,8 +501,10 @@
|
|
|
</c:if>
|
|
|
</td>
|
|
|
</c:if>
|
|
|
- <td>机构：${order.buyer}<font id="svipFlagLabel" style="margin-left:10px" color="red">${order.bpOrderUserinfo.svipFlag eq 1?'(超级会员)':''}</font>
|
|
|
- <c:if test="${order.organizeID >= 3}"><label style="margin-left: 20px">门店：${order.organizeStoreName}</label> </c:if></td>
|
|
|
+ <td>机构：${order.buyer}<font id="svipFlagLabel" style="margin-left:10px"
|
|
|
+ color="red">${order.bpOrderUserinfo.svipFlag eq 1?'(超级会员)':''}</font>
|
|
|
+ <c:if test="${order.organizeID >= 3}"><label
|
|
|
+ style="margin-left: 20px">门店：${order.organizeStoreName}</label> </c:if></td>
|
|
|
<td>收货人: ${order.bpOrderUserinfo.shouHuoRen}</td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
@@ -200,19 +516,23 @@
|
|
|
订单金额：<fmt:formatNumber value="${order.payTotalFee}" type="currency"/>
|
|
|
<c:if test="${not empty order.couponOrderRecord}">
|
|
|
<c:if test="${order.couponOrderRecord.couponType eq 0}">
|
|
|
- <a href="${ctx}/coupon/cmCouponClub/couponDetails?userId=${order.userID}"><font color="red">（活动券抵扣￥${order.couponOrderRecord.couponAmount}，满${order.couponOrderRecord.touchPrice}减${order.couponOrderRecord.couponAmount}）</font></a>
|
|
|
+ <a href="${ctx}/coupon/cmCouponClub/couponDetails?userId=${order.userID}"><font
|
|
|
+ color="red">（活动券抵扣￥${order.couponOrderRecord.couponAmount}，满${order.couponOrderRecord.touchPrice}减${order.couponOrderRecord.couponAmount}）</font></a>
|
|
|
</c:if>
|
|
|
<c:if test="${order.couponOrderRecord.couponType eq 1}">
|
|
|
- <a href="${ctx}/coupon/cmCouponClub/couponDetails?userId=${order.userID}"><font color="red">（品类券抵扣￥${order.couponOrderRecord.couponAmount}，满${order.couponOrderRecord.touchPrice}减${order.couponOrderRecord.couponAmount}）</font></a>
|
|
|
+ <a href="${ctx}/coupon/cmCouponClub/couponDetails?userId=${order.userID}"><font
|
|
|
+ color="red">（品类券抵扣￥${order.couponOrderRecord.couponAmount}，满${order.couponOrderRecord.touchPrice}减${order.couponOrderRecord.couponAmount}）</font></a>
|
|
|
</c:if>
|
|
|
<c:if test="${order.couponOrderRecord.couponType eq 2}">
|
|
|
<a href="${ctx}/coupon/cmCouponClub/couponDetails?userId=${order.userID}"><font color="red">（用户专享券抵扣￥${order.couponOrderRecord.couponAmount}，满${order.couponOrderRecord.touchPrice}减${order.couponOrderRecord.couponAmount}）</font></a>
|
|
|
</c:if>
|
|
|
<c:if test="${order.couponOrderRecord.couponType eq 3}">
|
|
|
- <a href="${ctx}/coupon/cmCouponClub/couponDetails?userId=${order.userID}"><font color="red">（店铺券抵扣￥${order.couponOrderRecord.couponAmount}，满${order.couponOrderRecord.touchPrice}减${order.couponOrderRecord.couponAmount}）</font></a>
|
|
|
+ <a href="${ctx}/coupon/cmCouponClub/couponDetails?userId=${order.userID}"><font
|
|
|
+ color="red">（店铺券抵扣￥${order.couponOrderRecord.couponAmount}，满${order.couponOrderRecord.touchPrice}减${order.couponOrderRecord.couponAmount}）</font></a>
|
|
|
</c:if>
|
|
|
<c:if test="${order.couponOrderRecord.couponType eq 4}">
|
|
|
- <a href="${ctx}/coupon/cmCouponClub/couponDetails?userId=${order.userID}"><font color="red">（新用户券抵扣￥${order.couponOrderRecord.couponAmount}，满${order.couponOrderRecord.touchPrice}减${order.couponOrderRecord.couponAmount}）</font></a>
|
|
|
+ <a href="${ctx}/coupon/cmCouponClub/couponDetails?userId=${order.userID}"><font
|
|
|
+ color="red">（新用户券抵扣￥${order.couponOrderRecord.couponAmount}，满${order.couponOrderRecord.touchPrice}减${order.couponOrderRecord.couponAmount}）</font></a>
|
|
|
</c:if>
|
|
|
</c:if>
|
|
|
</td>
|
|
|
@@ -222,12 +542,13 @@
|
|
|
应收金额：<fmt:formatNumber value="${order.payableAmount}" type="currency"/>
|
|
|
<span style="color: red">
|
|
|
<c:if test="${order.balancePayFee gt 0}">
|
|
|
- <a href="${ctx}/user/cmUserBalanceRecord/userBalanceRecord?userId=${order.userID}" style="color: red;text-decoration: underline">
|
|
|
+ <a href="${ctx}/user/cmUserBalanceRecord/userBalanceRecord?userId=${order.userID}"
|
|
|
+ style="color: red;text-decoration: underline">
|
|
|
(账户余额抵扣: <fmt:formatNumber value="${order.balancePayFee}" type="currency"/>)
|
|
|
</a>
|
|
|
</c:if>
|
|
|
<c:if test="${order.balancePayFee le 0}">
|
|
|
- (账户余额抵扣: <fmt:formatNumber value="${order.balancePayFee}" type="currency"/>)
|
|
|
+ (账户余额抵扣: <fmt:formatNumber value="${order.balancePayFee}" type="currency"/>)
|
|
|
</c:if>
|
|
|
|
|
|
|
|
|
@@ -242,7 +563,7 @@
|
|
|
<fmt:formatNumber value="${receiptAmount}" type="currency"/>
|
|
|
</c:if>
|
|
|
<c:if test="${order.receiptStatus == 3 && order.confirmType != null && order.confirmType != ''}">
|
|
|
-<%-- <span style='color:#FF0000'>（已抹平收款）</span>--%>
|
|
|
+ <%-- <span style='color:#FF0000'>（已抹平收款）</span>--%>
|
|
|
</c:if>
|
|
|
</td>
|
|
|
<td>
|
|
|
@@ -316,17 +637,17 @@
|
|
|
<a href="${ctx}/order/cancelOrder?orderID=${order.orderID}"
|
|
|
onclick="return confirmx('是否取消订单?', this.href)">取消订单</a>
|
|
|
</c:if>
|
|
|
- <c:if test="${order.status eq 11 || order.status eq 12 || order.status eq 13 ||order.status eq 21 ||order.status eq 22 ||
|
|
|
+ <c:if test="${order.status eq 11 || order.status eq 12 || order.status eq 13 ||order.status eq 21 ||order.status eq 22 ||
|
|
|
order.status eq 23 || order.status eq 0}">
|
|
|
- <c:if test="${empty order.rechargeGoods && (order.ableUserMoney > 0 || order.status eq 0)}">
|
|
|
- <c:if test="${order.postageOrderFlag == 0 && order.secondHandOrderFlag != 1}">
|
|
|
- <a href="${ctx}/order/form?id=${order.orderID}">修改订单</a>
|
|
|
- </c:if>
|
|
|
- <c:if test="${order.postageOrderFlag == 0 && order.secondHandOrderFlag == 1}">
|
|
|
- <a href="${ctx}/order/secondeProductOrderForm?id=${order.orderID}">修改订单</a>
|
|
|
+ <c:if test="${empty order.rechargeGoods && (order.ableUserMoney > 0 || order.status eq 0)}">
|
|
|
+ <c:if test="${order.postageOrderFlag == 0 && order.secondHandOrderFlag != 1}">
|
|
|
+ <a href="${ctx}/order/form?id=${order.orderID}">修改订单</a>
|
|
|
+ </c:if>
|
|
|
+ <c:if test="${order.postageOrderFlag == 0 && order.secondHandOrderFlag == 1}">
|
|
|
+ <a href="${ctx}/order/secondeProductOrderForm?id=${order.orderID}">修改订单</a>
|
|
|
+ </c:if>
|
|
|
</c:if>
|
|
|
</c:if>
|
|
|
- </c:if>
|
|
|
<c:if test="${order.status == 0}">
|
|
|
<c:if test="${order.postageOrderFlag == 1}">
|
|
|
<a href="${ctx}/order/postageOrderForm?id=${order.orderID}">修改邮费订单</a>
|
|
|
@@ -338,7 +659,8 @@
|
|
|
onclick="modelShow('${order.orderID}')">编辑经理折扣</a>
|
|
|
</c:if>
|
|
|
<c:if test="${order.rebateFlag eq 0 && order.receiptStatus eq 1 && order.payStatus eq 1}">
|
|
|
- <a href="${ctx}/order/modifyRebate?orderId=${order.orderID}" onclick="return confirmx('确定将订单转为返佣订单吗？', this.href)">转为返佣订单</a>
|
|
|
+ <a href="${ctx}/order/modifyRebate?orderId=${order.orderID}"
|
|
|
+ onclick="return confirmx('确定将订单转为返佣订单吗？', this.href)">转为返佣订单</a>
|
|
|
</c:if>
|
|
|
</shiro:hasPermission>
|
|
|
<shiro:hasPermission name="order:order:applyrefound">
|
|
|
@@ -485,25 +807,32 @@
|
|
|
<span><label>供应商：</label>${shopOrder.shopName}</span>
|
|
|
<c:if test="${shopOrder.shopPromotion ne null && shopOrder.shopPromotion.type eq 3}">
|
|
|
<c:if test="${shopOrder.shopPromotion.mode eq 2}">
|
|
|
- <span><label style="background-color: #F60;color: white">${shopOrder.shopPromotion.name}</label> 满<fmt:formatNumber value="${shopOrder.shopPromotion.touchPrice}" pattern="#,##0.00" maxFractionDigits="2"/>,减<fmt:formatNumber value="${shopOrder.shopPromotion.reducedPrice}" pattern="#,##0.00" maxFractionDigits="2"/></span>
|
|
|
+ <span><label
|
|
|
+ style="background-color: #F60;color: white">${shopOrder.shopPromotion.name}</label> 满<fmt:formatNumber
|
|
|
+ value="${shopOrder.shopPromotion.touchPrice}" pattern="#,##0.00"
|
|
|
+ maxFractionDigits="2"/>,减<fmt:formatNumber value="${shopOrder.shopPromotion.reducedPrice}"
|
|
|
+ pattern="#,##0.00" maxFractionDigits="2"/></span>
|
|
|
</c:if>
|
|
|
<c:if test="${shopOrder.shopPromotion.mode eq 3}">
|
|
|
- <span><label style="background-color: purple;color: white">${shopOrder.shopPromotion.name}</label> 满<fmt:formatNumber value="${shopOrder.shopPromotion.touchPrice}" pattern="#,##0.00" maxFractionDigits="2"/>,赠送商品</span>
|
|
|
+ <span><label
|
|
|
+ style="background-color: purple;color: white">${shopOrder.shopPromotion.name}</label> 满<fmt:formatNumber
|
|
|
+ value="${shopOrder.shopPromotion.touchPrice}" pattern="#,##0.00"
|
|
|
+ maxFractionDigits="2"/>,赠送商品</span>
|
|
|
</c:if>
|
|
|
</c:if>
|
|
|
<div>
|
|
|
- <c:forEach items="${shopOrder.newOrderProducts}" var="op" varStatus="varIndex">
|
|
|
+ <c:forEach items="${shopOrder.newOrderProducts}" var="op" varStatus="varIndex">
|
|
|
<div class="supplier-product-item" style="z-index:${100000 - varIndex.index};position:relative;">
|
|
|
- <%--二手订单详情--%>
|
|
|
+ <%--二手订单详情--%>
|
|
|
<c:if test="${order.secondHandOrderFlag eq 1}">
|
|
|
<a href="${fns:getConfig('wwwServer')}product-${op.productID}.html" target="_blank">
|
|
|
- <img class="supplier-img" src="${op.image}"/>
|
|
|
+ <img class="supplier-img" src="${op.image}"/>
|
|
|
</a>
|
|
|
</c:if>
|
|
|
- <%--正常订单详情--%>
|
|
|
+ <%--正常订单详情--%>
|
|
|
<c:if test="${order.secondHandOrderFlag ne 1}">
|
|
|
<a href="${fns:getConfig('wwwServer')}product-${op.productID}.html" target="_blank">
|
|
|
- <img class="supplier-img" src="${op.image}"/>
|
|
|
+ <img class="supplier-img" src="${op.image}"/>
|
|
|
</a>
|
|
|
</c:if>
|
|
|
<div class="supplier-name">
|
|
|
@@ -533,44 +862,49 @@
|
|
|
</c:if>
|
|
|
</div>
|
|
|
<c:if test="${op.productID ne 999}">
|
|
|
- <div class="supplier-product-info" >
|
|
|
+ <div class="supplier-product-info">
|
|
|
<span>单价:
|
|
|
<c:if test="${op.svipPriceFlag eq 1 or op.productPromotion.mode eq 1}">
|
|
|
- <label style="text-decoration: line-through"><fmt:formatNumber value="${op.price}" type="currency"/></label>
|
|
|
+ <label style="text-decoration: line-through"><fmt:formatNumber value="${op.price}"
|
|
|
+ type="currency"/></label>
|
|
|
</c:if>
|
|
|
<c:if test="${op.svipPriceFlag ne 1 and op.productPromotion.mode ne 1}">
|
|
|
<fmt:formatNumber value="${op.price}" type="currency"/>
|
|
|
</c:if>
|
|
|
<c:if test="${op.svipPriceFlag eq 1}">
|
|
|
- <label style="margin-left:5px"><fmt:formatNumber value="${op.discountPrice}" type="currency"/></label>
|
|
|
+ <label style="margin-left:5px"><fmt:formatNumber value="${op.discountPrice}"
|
|
|
+ type="currency"/></label>
|
|
|
<font color="red">(超级会员价)</font></span>
|
|
|
- </c:if>
|
|
|
- <c:if test="${op.ladderPriceFlag eq 1 || op.isActProduct eq 2}">
|
|
|
- <a href="javascript:;" class="ladderPrice"><span> (阶梯价格)</span>
|
|
|
- <c:if test="${not empty op.orderProductLadderPriceList}">
|
|
|
- <div class="list">
|
|
|
- <p><span>起订量</span><span>价格</span></p>
|
|
|
- <c:forEach items="${op.orderProductLadderPriceList}" var="ladderPrice">
|
|
|
- <p data-num="${ladderPrice.buyNum}"><span>${ladderPrice.buyNumRangeShow}</span><span class="price">${ladderPrice.buyPrice}</span></p>
|
|
|
- </c:forEach>
|
|
|
- </div>
|
|
|
- </c:if>
|
|
|
- </a>
|
|
|
- </c:if>
|
|
|
+ </c:if>
|
|
|
+ <c:if test="${op.ladderPriceFlag eq 1 || op.isActProduct eq 2}">
|
|
|
+ <a href="javascript:;" class="ladderPrice"><span> (阶梯价格)</span>
|
|
|
+ <c:if test="${not empty op.orderProductLadderPriceList}">
|
|
|
+ <div class="list">
|
|
|
+ <p><span>起订量</span><span>价格</span></p>
|
|
|
+ <c:forEach items="${op.orderProductLadderPriceList}" var="ladderPrice">
|
|
|
+ <p data-num="${ladderPrice.buyNum}">
|
|
|
+ <span>${ladderPrice.buyNumRangeShow}</span><span
|
|
|
+ class="price">${ladderPrice.buyPrice}</span></p>
|
|
|
+ </c:forEach>
|
|
|
+ </div>
|
|
|
+ </c:if>
|
|
|
+ </a>
|
|
|
+ </c:if>
|
|
|
</span>
|
|
|
<span>折扣: ${op.discount}%</span>
|
|
|
<span>折后单价:
|
|
|
<c:if test="${op.productPromotion.mode eq 1}">
|
|
|
- <label style="text-decoration: line-through"><fmt:formatNumber value="${op.discountPrice}" type="currency"/></label></span>
|
|
|
- </c:if>
|
|
|
- <c:if test="${op.productPromotion.mode ne 1}">
|
|
|
- <fmt:formatNumber value="${op.discountPrice}" type="currency"/></span>
|
|
|
- </c:if>
|
|
|
+ <label style="text-decoration: line-through"><fmt:formatNumber
|
|
|
+ value="${op.discountPrice}" type="currency"/></label></span>
|
|
|
+ </c:if>
|
|
|
+ <c:if test="${op.productPromotion.mode ne 1}">
|
|
|
+ <fmt:formatNumber value="${op.discountPrice}" type="currency"/></span>
|
|
|
+ </c:if>
|
|
|
<span>数量: x${op.num}</span>
|
|
|
|
|
|
<br>
|
|
|
<span>税率: ${(op.includedTax != '' and op.includedTax eq 0 and op.invoiceType eq 3)?'---': op.taxRate ne null?op.taxRate:0.0}%</span>
|
|
|
- <span>税费: ${(op.includedTax eq 1 or (op.includedTax != '' and op.includedTax eq 0 and op.invoiceType eq 3))?'---': empty op.totalAddedValueTax ?0.00:(op.totalAddedValueTax)}</span>
|
|
|
+ <span>税费: ${(op.includedTax eq 1 or (op.includedTax != '' and op.includedTax eq 0 and op.invoiceType eq 3))?'---': empty op.totalAddedValueTax ?0.00:(op.totalAddedValueTax)}</span>
|
|
|
<span>总额: <fmt:formatNumber value="${op.totalFee}" type="currency"/></span>
|
|
|
<c:if test="${order.sendOutStatus == 2 || order.sendOutStatus == 3}">
|
|
|
<span>已发/已收 ${(op.num == null ? 0 : op.num)+ (op.presentNum == null ? 0 : op.presentNum)- (op.notOutStore == null ? 0 : op.notOutStore)}/${op.receivedNum}</span>
|
|
|
@@ -583,22 +917,30 @@
|
|
|
<c:if test="${op.productPromotion.type eq 2}">
|
|
|
<div class="supplier-product-promotionInfo">
|
|
|
<table>
|
|
|
- <tr >
|
|
|
+ <tr>
|
|
|
<td rowspan="2">
|
|
|
<c:if test="${op.productPromotion.mode eq 2}">
|
|
|
- <label style="background-color: #F60;color: white"><label class="promotionsName">${op.productPromotion.name}</label></label>
|
|
|
+ <label style="background-color: #F60;color: white"><label
|
|
|
+ class="promotionsName">${op.productPromotion.name}</label></label>
|
|
|
</c:if>
|
|
|
<c:if test="${op.productPromotion.mode eq 3}">
|
|
|
- <label style="background-color: purple;color: white"><label class="promotionsName">${op.productPromotion.name}</label></label>
|
|
|
+ <label style="background-color: purple;color: white"><label
|
|
|
+ class="promotionsName">${op.productPromotion.name}</label></label>
|
|
|
</c:if>
|
|
|
</td>
|
|
|
<td>
|
|
|
<span class="downSpan">${op.productPromotion.description}</span>
|
|
|
<c:if test="${op.productPromotion.mode eq 2}">
|
|
|
- <span class="upSpan"> 满<fmt:formatNumber value="${op.productPromotion.touchPrice}" pattern="#,##0.00" maxFractionDigits="2"/>,减<fmt:formatNumber value="${op.productPromotion.reducedPrice}" pattern="#,##0.00" maxFractionDigits="2"/></span>
|
|
|
+ <span class="upSpan"> 满<fmt:formatNumber
|
|
|
+ value="${op.productPromotion.touchPrice}" pattern="#,##0.00"
|
|
|
+ maxFractionDigits="2"/>,减<fmt:formatNumber
|
|
|
+ value="${op.productPromotion.reducedPrice}"
|
|
|
+ pattern="#,##0.00" maxFractionDigits="2"/></span>
|
|
|
</c:if>
|
|
|
<c:if test="${op.productPromotion.mode eq 3}">
|
|
|
- <span class="upSpan"> 满<fmt:formatNumber value="${op.productPromotion.touchPrice}" pattern="#,##0.00" maxFractionDigits="2"/>,赠送商品</span>
|
|
|
+ <span class="upSpan"> 满<fmt:formatNumber
|
|
|
+ value="${op.productPromotion.touchPrice}" pattern="#,##0.00"
|
|
|
+ maxFractionDigits="2"/>,赠送商品</span>
|
|
|
</c:if>
|
|
|
</td>
|
|
|
</tr>
|
|
|
@@ -610,16 +952,30 @@
|
|
|
<table>
|
|
|
<tr>
|
|
|
<c:if test="${op.productPromotion.mode eq 1}">
|
|
|
- <td><label style="background-color: green;color: white"><label class="promotionsName">${op.productPromotion.name}</label></label></td>
|
|
|
- <td> 优惠价: <label style="color: red"><fmt:formatNumber value="${op.productPromotion.touchPrice}" pattern="#,##0.00" maxFractionDigits="2"/></label></td>
|
|
|
+ <td><label style="background-color: green;color: white"><label
|
|
|
+ class="promotionsName">${op.productPromotion.name}</label></label>
|
|
|
+ </td>
|
|
|
+ <td> 优惠价: <label style="color: red"><fmt:formatNumber
|
|
|
+ value="${op.productPromotion.touchPrice}" pattern="#,##0.00"
|
|
|
+ maxFractionDigits="2"/></label></td>
|
|
|
</c:if>
|
|
|
<c:if test="${op.productPromotion.mode eq 2}">
|
|
|
- <td><label style="background-color: #F60;color: white"><label class="promotionsName">${op.productPromotion.name}</label></label></td>
|
|
|
- <td> 满<fmt:formatNumber value="${op.productPromotion.touchPrice}" pattern="#,##0.00" maxFractionDigits="2"/>,减<fmt:formatNumber value="${op.productPromotion.reducedPrice}" pattern="#,##0.00" maxFractionDigits="2"/></td>
|
|
|
+ <td><label style="background-color: #F60;color: white"><label
|
|
|
+ class="promotionsName">${op.productPromotion.name}</label></label>
|
|
|
+ </td>
|
|
|
+ <td> 满<fmt:formatNumber value="${op.productPromotion.touchPrice}"
|
|
|
+ pattern="#,##0.00"
|
|
|
+ maxFractionDigits="2"/>,减<fmt:formatNumber
|
|
|
+ value="${op.productPromotion.reducedPrice}" pattern="#,##0.00"
|
|
|
+ maxFractionDigits="2"/></td>
|
|
|
</c:if>
|
|
|
<c:if test="${op.productPromotion.mode eq 3}">
|
|
|
- <td><label style="background-color: purple;color: white"><label class="promotionsName">${op.productPromotion.name}</label></label></td>
|
|
|
- <td> 满<fmt:formatNumber value="${op.productPromotion.touchPrice}" pattern="#,##0.00" maxFractionDigits="2"/>,赠送商品</td>
|
|
|
+ <td><label style="background-color: purple;color: white"><label
|
|
|
+ class="promotionsName">${op.productPromotion.name}</label></label>
|
|
|
+ </td>
|
|
|
+ <td> 满<fmt:formatNumber value="${op.productPromotion.touchPrice}"
|
|
|
+ pattern="#,##0.00" maxFractionDigits="2"/>,赠送商品
|
|
|
+ </td>
|
|
|
</c:if>
|
|
|
</tr>
|
|
|
</table>
|
|
|
@@ -639,22 +995,34 @@
|
|
|
</c:forEach>
|
|
|
<%--组织订单暂时不显示发票和条款信息--%>
|
|
|
<c:if test="${order.organizeID == 0}">
|
|
|
+ <div class="order-rows">
|
|
|
+ <label>订单对机构是否可见：</label>
|
|
|
+ <c:if test="${order.orderSeen eq 1}">
|
|
|
+ <label>可见</label>
|
|
|
+ </c:if>
|
|
|
+ <c:if test="${order.orderSeen eq 2}">
|
|
|
+ <label>不可见</label>
|
|
|
+ </c:if>
|
|
|
+ <c:if test="${order.orderSeen ne 1 and order.orderSeen ne 2}">
|
|
|
+ <label>未定义</label>
|
|
|
+ </c:if>
|
|
|
+ </div>
|
|
|
<div class="order-rows">
|
|
|
<label>发票信息：</label>
|
|
|
<c:if test="${order.orderInvoice.type eq 0}">
|
|
|
- <input name="invoice" type="radio" checked="checked">
|
|
|
+ <%-- <input name="invoice" type="radio" checked="checked">--%>
|
|
|
<label>不需要发票</label>
|
|
|
</c:if>
|
|
|
<c:if test="${order.orderInvoice.type eq 1}">
|
|
|
- <input name="invoice" type="radio" checked="checked">
|
|
|
+ <%-- <input name="invoice" type="radio" checked="checked">--%>
|
|
|
<label>增值税普通发票</label>
|
|
|
</c:if>
|
|
|
<c:if test="${order.orderInvoice.type eq 2}">
|
|
|
- <input name="invoice" type="radio" checked="checked">
|
|
|
+ <%-- <input name="invoice" type="radio" checked="checked">--%>
|
|
|
<label>增值税专用发票</label>
|
|
|
</c:if>
|
|
|
<c:if test="${order.orderInvoice.type eq null}">
|
|
|
- <input name="invoice" type="radio" checked="checked">
|
|
|
+ <%-- <input name="invoice" type="radio" checked="checked">--%>
|
|
|
<label>不需要发票</label>
|
|
|
</c:if>
|
|
|
<c:if test="${order.orderInvoice.type == 1}">
|
|
|
@@ -880,7 +1248,7 @@
|
|
|
$.jBox.tip(msg, 'info', {timeout: 1000});
|
|
|
setTimeout(function () {
|
|
|
window.location.href = "${ctx}/order/detail?id=${order.orderID}"
|
|
|
- },1000)
|
|
|
+ }, 1000)
|
|
|
}
|
|
|
</script>
|
|
|
|
|
|
@@ -971,7 +1339,7 @@
|
|
|
'orderID': orderId,
|
|
|
'balanceAccountsRemark': content
|
|
|
});
|
|
|
- window.location.href = "${ctx}/order/detail?id="+orderId;
|
|
|
+ window.location.href = "${ctx}/order/detail?id=" + orderId;
|
|
|
}
|
|
|
}
|
|
|
});
|
