维沙组织和机构逻辑修改part2

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

@@ -420,7 +420,7 @@
         </tr>
         <tr>
             <td>
-            机构：${order.buyer}<c:if test="${order.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if>
+            机构：${order.buyer}<c:if test="${order.organizeID == 3}"></c:if>
             </td>
             <td>
             收货人：${order.bpOrderUserinfo.shouHuoRen}(${order.bpOrderUserinfo.mobile})

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

@@ -322,7 +322,7 @@
     </tr>
     <tr>
         <td>
-            机构：${order.buyer}<c:if test="${order.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if>
+            机构：${order.buyer}<c:if test="${order.organizeID == 3}"></c:if>
         </td>
         <td>
             收货人：${order.bpOrderUserinfo.shouHuoRen}(${order.bpOrderUserinfo.mobile})

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

@@ -439,7 +439,7 @@
             </tr>
             <tr>
                 <td>
-                    机构：${order.buyer}<c:if test="${order.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if>
+                    机构：${order.buyer}<c:if test="${order.organizeID == 3}"></c:if>
                 </td>
                 <td>
                     收货人：${order.bpOrderUserinfo.shouHuoRen}(${order.bpOrderUserinfo.mobile})

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

@@ -401,7 +401,7 @@
     </tr>
     <tr>
         <td>
-            机构：${order.buyer}<c:if test="${order.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if>
+            机构：${order.buyer}<c:if test="${order.organizeID == 3}"></c:if>
         </td>
         <td>
             收货人：${order.bpOrderUserinfo.shouHuoRen}(${order.bpOrderUserinfo.mobile})

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

@@ -163,7 +163,7 @@
     </tr>
     <tr>
         <td>
-            机构：${order.bpOrderUserinfo.name}<c:if test="${order.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if>
+            机构：${order.bpOrderUserinfo.name}<c:if test="${order.organizeID == 3}"></c:if>
         </td>
         <td>
             收货人：${order.bpOrderUserinfo.shouHuoRen}

src/main/webapp/WEB-INF/views/modules/hehe/heheNewOrderDetail.jsp

@@ -184,7 +184,7 @@
                 </c:if>
             </td>
         </c:if>
-        <td>机构：${order.buyer}<c:if test="${order.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if></td>
+        <td>机构：${order.buyer}<c:if test="${order.organizeID == 3}"></c:if></td>
         <td>收货人: ${order.bpOrderUserinfo.shouHuoRen}</td>
     </tr>
     <tr>

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

@@ -262,7 +262,7 @@
                             <font color="red">(呵呵商城)</font>
                         </c:if>
                         <c:if test="${s.organizeID == 3}">
-                            <em class="weishaIcon">维沙</em>
+
                         </c:if>
                     </td>
                     <td><fmt:formatNumber value="${s.discountFee}" type="number" pattern="#,##0.00"/></td>

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

@@ -275,7 +275,7 @@
                                     </c:if>
                                         ${orderInfo.customerName}
                         <c:if test="${orderInfo.organizeID == 3}">
-                            <em class="weishaIcon">维沙</em>
+
                         </c:if>
                                 </span>
                     <span><label>订单状态：</label>

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

@@ -224,7 +224,7 @@
                     <font color="red">(呵呵商城)</font>
                 </c:if>
                 <c:if test="${cmDiscernReceipt.organizeID == 3}">
-                    <em class="weishaIcon">维沙</em>
+
                 </c:if>
             </td>
             <td>${cmDiscernReceipt.orderType}</td>

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

@@ -134,7 +134,7 @@
 							<span><font color="red">(呵呵商城)</font></span>
 						</c:if>
 						<c:if test="${shopOrder.organizeID == 3}">
-							<em class="weishaIcon">维沙</em>
+
 						</c:if><br>
 					</c:forEach>
 				</td>

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

@@ -144,7 +144,7 @@
 					</tr>
 					<tr>
 						<td>${s.shopName}</td>
-						<td colspan="3">${s.buyer}<c:if test="${s.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if></td>
+						<td colspan="3">${s.buyer}<c:if test="${s.organizeID == 3}"></c:if></td>
 						<td>
                         <c:if test="${s.freight == 0}">
                             包邮

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

@@ -154,7 +154,7 @@
 					<td colspan="3">
 							${s.clubName}
 						<c:if test="${s.orderType eq 2}"><font color="red">(呵呵商城)</font></c:if>
-						<c:if test="${s.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if>
+						<c:if test="${s.organizeID == 3}"></c:if>
 					</td>
 					<td>
                         <c:if test="${s.freight == 0}">

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

@@ -149,7 +149,7 @@
                     </tr>
                     <tr>
                         <td>${s.shopName}</td>
-                        <td colspan="3">${s.buyer}<c:if test="${s.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if></td>
+                        <td colspan="3">${s.buyer}<c:if test="${s.organizeID == 3}"></c:if></td>
                         <td>
                         <c:if test="${s.freight == 0}">
                             包邮

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

@@ -168,7 +168,7 @@
 					<td colspan="3">
 							${s.buyer}
 						<c:if test="${s.orderType eq 2}"><font color="red">(呵呵商城)</font></c:if>
-						<c:if test="${s.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if></td>
+						<c:if test="${s.organizeID == 3}"></c:if></td>
 					<td>
                         <c:if test="${s.freight == 0}">
                             包邮

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

@@ -458,7 +458,7 @@
                         <c:if test="${s.organizeID eq 1}"><span class="org-note">星范</span></c:if>
                             ${s.clubName}
                         <c:if test="${s.orderType eq 2}"><font color="red">(呵呵商城)</font></c:if>
-                        <c:if test="${s.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if>
+                        <c:if test="${s.organizeID == 3}"></c:if>
                     </td>
                     <td>
                         <c:if test="${s.freight == 0}">

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

@@ -146,7 +146,7 @@
 				</tr>
 				<tr>
 					<td>${s.shopName}</td>
-					<td colspan="3">${s.buyer}<c:if test="${s.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if></td>
+					<td colspan="3">${s.buyer}<c:if test="${s.organizeID == 3}"></c:if></td>
 					<td>
                         <c:if test="${s.freight == 0}">
                             包邮

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

@@ -231,7 +231,7 @@
 					<td>${s.shopName}</td>
 					<td colspan="3">
 						<c:if test="${s.organizeID eq 1}"><span class="org-note">星范</span></c:if>
-						${s.clubName}<c:if test="${s.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if>
+						${s.clubName}<c:if test="${s.organizeID == 3}"></c:if>
 					</td>
 					<td>
                         <c:if test="${s.freight == 0}">

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

@@ -144,7 +144,7 @@
 							<td>${s.shopName}</td>
 							<td colspan="3">
 								<c:if test="${s.organizeID == 1}"><span class="org-note">星范</span></c:if>
-									${s.buyer}<c:if test="${s.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if>
+									${s.buyer}<c:if test="${s.organizeID == 3}"></c:if>
 							</td>
 							<td>
 								<c:if test="${s.freight == 0}">

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

@@ -147,7 +147,7 @@
 					</tr>
 					<tr>
 						<td>${s.shopName}</td>
-						<td colspan="3">${s.buyer}<c:if test="${s.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if></td>
+						<td colspan="3">${s.buyer}<c:if test="${s.organizeID == 3}"></c:if></td>
 						<td>
 							<c:if test="${s.freight == 0}">
 								包邮

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

@@ -163,7 +163,7 @@
 					<c:if test="${cmReturnedPurchase.organizeID == 1}">
 						<span class="org-note">星范</span>
 					</c:if>
-						${cmReturnedPurchase.name}<c:if test="${cmReturnedPurchase.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if>
+						${cmReturnedPurchase.name}<c:if test="${cmReturnedPurchase.organizeID == 3}"></c:if>
 				</td>
 				<td>${cmReturnedPurchase.orderNo}(${cmReturnedPurchase.orderID})</td>
 				<td><fmt:formatNumber type="number" pattern="#,##0.00"

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

@@ -112,7 +112,7 @@
             <td>${s.shopName}</td>
             <td colspan="3">
                 <c:if test="${s.organizeID == 1}"><span class="org-note">星范</span></c:if>
-                ${s.buyer}<c:if test="${s.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if>
+                ${s.buyer}<c:if test="${s.organizeID == 3}"></c:if>
             </td>
             <td>
                         <c:if test="${s.freight == 0}">

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

@@ -191,7 +191,7 @@
                     <c:if test="${order.organizeID == '1'}">
                         <span class="org-note">星范</span>
                     </c:if>
-                        ${order.buyer}<c:if test="${order.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if>
+                        ${order.buyer}<c:if test="${order.organizeID == 3}"></c:if>
                 </td>
                 <td><fmt:formatNumber value="${order.discountFee}" type="number" pattern="#,##0.00"/></td>
                 <td>