plf 3 vuotta sitten
vanhempi
commit
057e8440fb

+ 2 - 2
src/main/webapp/WEB-INF/views/modules/order/cmPayShopList.jsp

@@ -892,12 +892,12 @@
                 alertx('请选择一个子订单');
                 return false;
             }
-            if (checked.length > 1){
+            if (checked.length > 1) {
                 alertx('每次只能选择一个子订单进行付第三方申请');
                 return false;
             }
             var isPayShopOtherFee = $(checked[0]).attr('data-isPayShopOtherFee');
-            if (!isPayShopOtherFee){
+            if ("false" == isPayShopOtherFee) {
                 alertx("付第三方处于待审核状态,暂不能操作");
                 return false;
             }

+ 7 - 2
src/main/webapp/WEB-INF/views/modules/order/paidShopOrderList.jsp

@@ -299,7 +299,7 @@
             <table class="table table-striped table-bordered table-condensed pay-table">
                 <tr>
                     <th style="width:20px;">
-                        <input type="checkbox" ${s.status eq 7 ?'disabled':''} data-shoporderid="${s.shopOrderID}" data-shopid="${s.shopID}"/>
+                        <input type="checkbox" ${s.status eq 7 ?'disabled':''} data-shoporderid="${s.shopOrderID}" data-shopid="${s.shopID}" data-isPayShopOtherFee="${s.payShopOtherFee}"/>
                     </th>
                     <th>子订单编号(ID)</th>
                     <th colspan="3">订单编号(ID)</th>
@@ -517,10 +517,15 @@
                 alertx('请选择一个子订单');
                 return false;
             }
-            if (checked.length > 1){
+            if (checked.length > 1) {
                 alertx('每次只能选择一个子订单进行付第三方申请');
                 return false;
             }
+            var isPayShopOtherFee = $(checked[0]).attr('data-isPayShopOtherFee');
+            if ("false" == isPayShopOtherFee) {
+                alertx("付第三方处于待审核状态,暂不能操作");
+                return false;
+            }
             var shopOrderId = $(checked[0]).attr('data-shoporderid');
             window.location.href = '${ctx}/order/cmPayShop/shopOtherFeeForm?shopOrderId=' + shopOrderId;
         });