|
@@ -592,7 +592,7 @@
|
|
<a id="applyShopOtherFee" href="${ctx}/order/cmPayShop/shopOtherFeeForm?shopOrderId=${s.shopOrderID}">付第三方申请</a>
|
|
<a id="applyShopOtherFee" href="${ctx}/order/cmPayShop/shopOtherFeeForm?shopOrderId=${s.shopOrderID}">付第三方申请</a>
|
|
<c:if test="${s.paying ne '1' and s.payStatus eq '1' and !s.modifyPayable}">
|
|
<c:if test="${s.paying ne '1' and s.payStatus eq '1' and !s.modifyPayable}">
|
|
<shiro:hasPermission name="order:cmPayShop:modifyPay">
|
|
<shiro:hasPermission name="order:cmPayShop:modifyPay">
|
|
- <a onclick="applypayWay(${s.shopReceiptStatus},${s.payWay})" href="${ctx}/shopOrder/toChangePayShopAmount?shopOrderID=${s.shopOrderID}">修改成本</a>
|
|
|
|
|
|
+ <a onclick="applypayWay(${s.shopReceiptStatus},${s.payWay});" href="${ctx}/shopOrder/toChangePayShopAmount?shopOrderID=${s.shopOrderID}">修改成本</a>
|
|
</shiro:hasPermission>
|
|
</shiro:hasPermission>
|
|
</c:if>
|
|
</c:if>
|
|
<c:if test="${(s.modifyPayable and s.paying ne '1') || s.payStatus eq '2'}">
|
|
<c:if test="${(s.modifyPayable and s.paying ne '1') || s.payStatus eq '2'}">
|
|
@@ -694,7 +694,16 @@
|
|
|
|
|
|
<script>
|
|
<script>
|
|
|
|
|
|
-
|
|
|
|
|
|
+ //线上支付的子订单不能直接修改成本
|
|
|
|
+ function applypayWay(shopReceiptStatus,payWay) {
|
|
|
|
+ console.log(payWay);
|
|
|
|
+ console.log(shopReceiptStatus);
|
|
|
|
+ if (payWay == 1 && shopReceiptStatus==2) {
|
|
|
|
+ alertx('线上支付的子订单不能直接修改成本!');
|
|
|
|
+ window.event.returnValue=false;
|
|
|
|
+ // return false;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
|
|
|
|
|
|
(function () {
|
|
(function () {
|
|
@@ -903,16 +912,7 @@
|
|
window.location.href = '${ctx}/order/cmPayShop/applyEdit' + params;
|
|
window.location.href = '${ctx}/order/cmPayShop/applyEdit' + params;
|
|
});
|
|
});
|
|
|
|
|
|
- //线上支付的子订单不能直接修改成本
|
|
|
|
- function applypayWay(shopReceiptStatus,payWay) {
|
|
|
|
- console.log(payWay)
|
|
|
|
- console.log(shopReceiptStatus)
|
|
|
|
- if (payWay == 1 && shopReceiptStatus==2) {
|
|
|
|
- alertx('线上支付的子订单不能直接修改成本!')
|
|
|
|
- return false;
|
|
|
|
- }
|
|
|
|
|
|
|
|
- }
|
|
|
|
|
|
|
|
|
|
|
|
$('#applyShopOtherFee').on('click', function () {
|
|
$('#applyShopOtherFee').on('click', function () {
|