功能修复

src/main/webapp/WEB-INF/views/modules/order/cmPayShopCheck.jsp

@@ -377,14 +377,14 @@
                         </c:if>
                     </td>
                     <td>
-                        <a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&from=1"
+                        <a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&shopOrderID=${s.shopOrderID}&from=1"
                            style="text-decoration: underline">
                             <c:if test="${s.receiptStatus == 1}"><font color="red">待收款</font></c:if>
                             <c:if test="${s.receiptStatus == 2}"><font color="#ff8c00">部分收款</font></c:if>
                             <c:if test="${s.receiptStatus == 3}"><font color="green">已收款</font></c:if></a>
                     </td>
                     <td colspan="3">
-                        <a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&from=1"
+                        <a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&shopOrderID=${s.shopOrderID}&from=1"
                            style="text-decoration: underline">${s.receiptTotalFee}</a>
                     </td>
                     <td>

src/main/webapp/WEB-INF/views/modules/order/cmPayShopOtherCheck.jsp

@@ -390,14 +390,14 @@
                         </c:if>
                     </td>
                     <td>
-                        <a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&from=1"
+                        <a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&shopOrderID=${s.shopOrderID}&from=1"
                            style="text-decoration: underline">
                             <c:if test="${s.receiptStatus == 1}"><font color="red">待收款</font></c:if>
                             <c:if test="${s.receiptStatus == 2}"><font color="#ff8c00">部分收款</font></c:if>
                             <c:if test="${s.receiptStatus == 3}"><font color="green">已收款</font></c:if></a>
                     </td>
                     <td colspan="3">
-                        <a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&from=1"
+                        <a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&shopOrderID=${s.shopOrderID}&from=1"
                            style="text-decoration: underline">${s.receiptTotalFee}</a>
                     </td>
                     <td>

src/main/webapp/WEB-INF/views/modules/product-new/productList.jsp

@@ -1049,7 +1049,7 @@
     function auditThis(id, name, status, costCheckFlag, costPrice, shopPercent, newvalidFlag, showtime, addtime, newProductType, validFlag) {
 
         // 商品成本判断
-        if (null == costCheckFlag || "" == costCheckFlag) {
+        /*if (null == costCheckFlag || "" == costCheckFlag) {
             alertx("成本价未填写，请编辑成本价后再审核");
             return;
         } else if (costCheckFlag == 1) {
@@ -1064,7 +1064,7 @@
                 alertx("成本价未填写，请编辑成本价后再审核");
                 return;
             }
-        }
+        }*/
 
 
         // 0:待审核，1:审核通过，2:审核失败