退款字段bugfix

src/main/webapp/WEB-INF/views/modules/bulkpurchase/applyRefoundForm.jsp

@@ -528,7 +528,6 @@
                                         <%--已取消数量=所有已取消数量总和--%>
                                         <td><font color="red">已取消：<span id="toBeShipped${status.index}${productStatus.index}">${newOrderProduct.cancelProductNum}</span></font></td>
                                         <td colspan="4"><font color="red"><span>本次取消：<input ${newOrderProduct.presentNum>0?"readonly":""} id="applicationCancelNum${status.index}${productStatus.index}" class="cancelGoodsInput shopOrderInput" name="cmReturnedPurchaseProductList[${status.index}][${productStatus.index}].applicationCancelNum" value="${newOrderProduct.notOutStore - newOrderProduct.cancelProductNum}" oninput="this.value=this.value.replace(/\D/g,'').replace(/^0+(?=\d)/,1)" class="input cancel" type="text" onchange="setApplicationCancelNum(${status.index},${productStatus.index})"></span></font></td>
-                                        <form:hidden path="cmReturnedPurchaseProductList[${status.index}][${productStatus.index}].returnedReceiver"/>
                                         <form:hidden path="cmReturnedPurchaseProductList[${status.index}][${productStatus.index}].shopOrderID" value="${newOrderProduct.shopOrderID}"/>
                                         <form:hidden path="cmReturnedPurchaseProductList[${status.index}][${productStatus.index}].productID" value="${newOrderProduct.productID}"/>
                                         <form:hidden path="cmReturnedPurchaseProductList[${status.index}][${productStatus.index}].orderProductID" value="${newOrderProduct.orderProductID}"/>
@@ -606,7 +605,6 @@
                                         <td><font color="red">待发货：<span id="toBeShipped${status.index}${productStatus.index}">${newOrderProduct.notOutStore - newOrderProduct.cancelProductNum}</span></font></td>
                                         <td><font color="red">已取消：<span id="toBeShipped${status.index}${productStatus.index}">${newOrderProduct.cancelProductNum}</span></font></td>
                                         <td colspan="4"><font color="red"><span>本次取消：<input ${newOrderProduct.presentNum>0?"readonly":""} id="applicationCancelNum${status.index}${productStatus.index}" class="cancelGoodsInput shopOrderInput" name="cmReturnedPurchaseProductList[${status.index}][${productStatus.index}].applicationCancelNum" value="${newOrderProduct.notOutStore - newOrderProduct.cancelProductNum}" oninput="this.value=this.value.replace(/\D/g,'').replace(/^0+(?=\d)/,1)" class="input cancel" type="text" onchange="setApplicationCancelNum(${status.index},${productStatus.index})"></span></font></td>
-                                        <form:hidden path="cmReturnedPurchaseProductList[${status.index}][${productStatus.index}].returnedReceiver"/>
                                         <form:hidden path="cmReturnedPurchaseProductList[${status.index}][${productStatus.index}].shopOrderID" value="${newOrderProduct.shopOrderID}"/>
                                         <form:hidden path="cmReturnedPurchaseProductList[${status.index}][${productStatus.index}].productID" value="${newOrderProduct.productID}"/>
                                         <form:hidden path="cmReturnedPurchaseProductList[${status.index}][${productStatus.index}].orderProductID" value="${newOrderProduct.orderProductID}"/>
@@ -937,12 +935,6 @@
         });
     }
 
-    function setReturnReceiver(index) {
-        var status = $("#productReturnedReceiver").val();
-        if(status != undefined && status != 0 ){
-            $('#shopOrderTable'+index).find("[name*='returnedReceiver']").val(status);
-        }
-    }
     function setApplicationReturnedNum(a,b){
         var num = $("#applicationReturnedNum"+a+b).val();
         var max = Number($("#shipped"+a+b).html()  - $("#returning"+a+b).html() - $("#returned"+a+b).html());

src/main/webapp/WEB-INF/views/modules/bulkpurchase/orderConfirmReturnRecord.jsp

@@ -770,31 +770,31 @@
     })();
 
     $(document).ready(function () {
-        var shopOrder = JSON.parse($("#shopOrderSize").val());
-        for (var a = 0; a < shopOrder.length; a++) {
-            a
-            $("#productReturnedReceiver" + a).val(shopOrder[a].returnedReceiver);
-            var name = "请选择";
-            if (shopOrder[a].returnedReceiver == "1") {
-                name = "采美";
-            }
-            if (shopOrder[a].returnedReceiver == "2") {
-                name = "供应商";
-            }
-            if (shopOrder[a].returnedReceiver == "3") {
-                name = "采美及供应商";
-            }
-            $('#s2id_productReturnedReceiver' + a).find('.select2-chosen').html(name);
-
-        }
+        // var shopOrder = JSON.parse($("#shopOrderSize").val());
+        // for (var a = 0; a < shopOrder.length; a++) {
+        //     a
+        //     $("#productReturnedReceiver" + a).val(shopOrder[a].returnedReceiver);
+        //     var name = "请选择";
+        //     if (shopOrder[a].returnedReceiver == "1") {
+        //         name = "采美";
+        //     }
+        //     if (shopOrder[a].returnedReceiver == "2") {
+        //         name = "供应商";
+        //     }
+        //     if (shopOrder[a].returnedReceiver == "3") {
+        //         name = "采美及供应商";
+        //     }
+        //     $('#s2id_productReturnedReceiver' + a).find('.select2-chosen').html(name);
+        //
+        // }
     });
 
-    function setReturnReceiver(index) {
-        var status = $("#productReturnedReceiver" + index).val();
-        if (status != undefined && status != 0) {
-            $('#shopOrderReturnedTable' + index).find("[name*='returnedReceiver']").val(status);
-        }
-    }
+    // function setReturnReceiver(index) {
+    //     var status = $("#productReturnedReceiver" + index).val();
+    //     if (status != undefined && status != 0) {
+    //         $('#shopOrderReturnedTable' + index).find("[name*='returnedReceiver']").val(status);
+    //     }
+    // }
 
     function setSelectChecked(selectId, checkValue) {
         var select = document.getElementById(selectId);

src/main/webapp/WEB-INF/views/modules/bulkpurchase/orderReturnRecord.jsp

@@ -527,7 +527,7 @@
                                         </font>
                                         </td>
                                     </tr>
-                                    <form:hidden path="cmReturnedPurchaseProductList[${shopOrderReturnedStatus.index}][${cmReturnedPurchaseProductStatus.index}].returnedReceiver" value="${cmReturnedPurchaseProduct.returnedReceiver}"/>
+                                    <%--<form:hidden path="cmReturnedPurchaseProductList[${shopOrderReturnedStatus.index}][${cmReturnedPurchaseProductStatus.index}].returnedReceiver" value="${cmReturnedPurchaseProduct.returnedReceiver}"/>--%>
                                 </c:forEach>
                             </table>
                         </td>

src/main/webapp/WEB-INF/views/modules/bulkpurchase/orderReviewReturnRecord.jsp

@@ -728,30 +728,30 @@
         })
     })();
 
-    $(document).ready(function(){
-        var shopOrder = JSON.parse($("#shopOrderSize").val());
-        for(var a = 0 ; a < shopOrder.length; a++){a
-            $("#productReturnedReceiver"+a).val(shopOrder[a].returnedReceiver);
-            var name = "请选择";
-            if(shopOrder[a].returnedReceiver == "1"){
-                name = "采美";
-            }
-            if(shopOrder[a].returnedReceiver == "2"){
-                name = "供应商";
-            }
-            if(shopOrder[a].returnedReceiver == "3"){
-                name = "采美及供应商";
-            }
-            $('#s2id_productReturnedReceiver'+a).find('.select2-chosen').html(name);
-
-        }
-    });
-    function setReturnReceiver(index) {
-        var status = $("#productReturnedReceiver"+index).val();
-        if(status != undefined && status != 0 ){
-            $('#shopOrderReturnedTable'+index).find("[name*='returnedReceiver']").val(status);
-        }
-    }
+    // $(document).ready(function(){
+    //     var shopOrder = JSON.parse($("#shopOrderSize").val());
+    //     for(var a = 0 ; a < shopOrder.length; a++){a
+    //         $("#productReturnedReceiver"+a).val(shopOrder[a].returnedReceiver);
+    //         var name = "请选择";
+    //         if(shopOrder[a].returnedReceiver == "1"){
+    //             name = "采美";
+    //         }
+    //         if(shopOrder[a].returnedReceiver == "2"){
+    //             name = "供应商";
+    //         }
+    //         if(shopOrder[a].returnedReceiver == "3"){
+    //             name = "采美及供应商";
+    //         }
+    //         $('#s2id_productReturnedReceiver'+a).find('.select2-chosen').html(name);
+    //
+    //     }
+    // });
+    // function setReturnReceiver(index) {
+    //     var status = $("#productReturnedReceiver"+index).val();
+    //     if(status != undefined && status != 0 ){
+    //         $('#shopOrderReturnedTable'+index).find("[name*='returnedReceiver']").val(status);
+    //     }
+    // }
 
     function setSelectChecked(selectId, checkValue){
         var select = document.getElementById(selectId);

src/main/webapp/WEB-INF/views/modules/bulkpurchase/organizeOrderReturnRecord.jsp

@@ -643,7 +643,7 @@
                                         <td><%--税率：${cmReturnedPurchaseProduct.taxRate}--%></td>
                                         <td><%--税费：￥${cmReturnedPurchaseProduct.totalAddedValueTax}--%></td>
                                     </tr>
-                                    <form:hidden path="cmReturnedPurchaseProductList[${shopOrderReturnedStatus.index}][${cmReturnedPurchaseProductStatus.index}].returnedReceiver" value="${cmReturnedPurchaseProduct.returnedReceiver}"/>
+                                    <%--<form:hidden path="cmReturnedPurchaseProductList[${shopOrderReturnedStatus.index}][${cmReturnedPurchaseProductStatus.index}].returnedReceiver" value="${cmReturnedPurchaseProduct.returnedReceiver}"/>--%>
                                 </c:forEach>
                             </table>
                         </td>

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

@@ -69,18 +69,18 @@
 				<form:input path="returnedWay" htmlEscape="false" maxlength="11" class="input-xlarge "/>
 			</div>
 		</div>
-		<div class="control-group">
-			<label class="control-label">退款银行信息（银行名称、户名、开户行、银行账号）：</label>
-			<div class="controls">
-				<form:input path="returnedBankInfo" htmlEscape="false" maxlength="300" class="input-xlarge "/>
-			</div>
-		</div>
-		<div class="control-group">
+<%--		<div class="control-group">--%>
+<%--			<label class="control-label">退款银行信息（银行名称、户名、开户行、银行账号）：</label>--%>
+<%--			<div class="controls">--%>
+<%--				<form:input path="returnedBankInfo" htmlEscape="false" maxlength="300" class="input-xlarge "/>--%>
+<%--			</div>--%>
+<%--		</div>--%>
+		<%--<div class="control-group">
 			<label class="control-label">退款接收方：1采美、2供应商、3采美及供应商：</label>
 			<div class="controls">
 				<form:input path="returnedReceiver" htmlEscape="false" maxlength="2" class="input-xlarge "/>
 			</div>
-		</div>
+		</div>--%>
 		<div class="control-group">
 			<label class="control-label">退款(退货)总金额：</label>
 			<div class="controls">