Merge remote-tracking branch 'origin/developerB' into developerB

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

@@ -293,7 +293,7 @@
 		<div style="font-weight: bold;width: 100%;float: left;"><span style="float: left;">${cmRefundShop.shopDifference.systemName}</span><span style="float: left;margin-left:10px;"><fmt:formatDate value="${cmRefundShop.shopDifference.updateTime}" pattern="yyyy-MM-dd HH:mm"/></span></div>
 		<br><br>
 		<div>
-			<ul><b>差价类型：</b>${cmRefundShop.shopDifference.type eq 1 ? "少付":"多付"}</ul>
+			<ul><b>差价类型：</b>${cmRefundShop.shopDifference.type eq 1 ? "成本上升":"成本降低"}</ul>
 			<ul><b>差价金额：</b>${cmRefundShop.shopDifference.differencePrice}</ul>
 			<c:if test="${not empty cmRefundShop}">
 				<ul><b>接收退款方式：</b></ul>

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

@@ -263,8 +263,8 @@
     <br>
     <div class="control-group">
         <label class="control-label">差价类型：</label>&nbsp;&nbsp;&nbsp;
-            <input type="radio" name="type" value="1" ${(payShopDifference.differencePrice > 0 && payShopDifference.type eq 2) ? 'disabled="disabled"':'checked="true"'} onclick="showInfo()">少付&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-            <input type="radio" name="type" value="2" ${(payShopDifference.differencePrice > 0 && payShopDifference.type eq 1) ? 'disabled="disabled"':'checked="true"'} onclick="showInfo()">多付&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+            <input type="radio" name="type" value="1" ${(payShopDifference.differencePrice > 0 && payShopDifference.type eq 2) ? 'disabled="disabled"':'checked="true"'} onclick="showInfo()">成本上升&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+            <input type="radio" name="type" value="2" ${(payShopDifference.differencePrice > 0 && payShopDifference.type eq 1) ? 'disabled="disabled"':'checked="true"'} onclick="showInfo()">成本降低&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
             <img src="/static/images/info.jpg" style="height: 20px;width: 20px" onclick="alertx('“少付”指成本变高了，按旧成本付款的话相当于会少付供应商，\n'+
 '在已不能修改成本的情况下，通过补差价的方式来弥补；\n'+
 '\n'+

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

@@ -111,7 +111,7 @@
             <div style="font-weight: bold;width: 100%;float: left;"><span style="float: left;">${difference.systemName}</span><span style="float: left;margin-left:10px;"><fmt:formatDate value="${difference.updateTime}" pattern="yyyy-MM-dd HH:mm"/></span></div>
             <br><br>
             <div>
-                <ul>差价类型：${difference.type eq 1 ? "少付":"多付"}</ul>
+                <ul>差价类型：${difference.type eq 1 ? "成本上升":"成本降低"}</ul>
                 <ul>差价金额：${difference.differencePrice}</ul>
                 <c:if test="${not empty difference.payShopId}">
                     <ul>付款单名称：${difference.name}</ul>