页面单号链接样式修改；采购变更单过滤修改

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@10545 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/java/com/uas/platform/b2b/controller/SaleOrderChangeController.java

@@ -1,19 +1,5 @@
 package com.uas.platform.b2b.controller;
 
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.servlet.ModelAndView;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2b.model.PurchaseOrderChange;
@@ -36,6 +22,19 @@ import com.uas.search.b2b.model.SPage;
 import com.uas.search.b2b.model.Sort;
 import com.uas.search.b2b.model.Sort.Type;
 import com.uas.search.b2b.util.SearchConstants;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 卖家对变更单的操作
@@ -161,7 +160,7 @@ public class SaleOrderChangeController {
 	}
 
 	/**
-	 * 作为卖家，收到的采购变更单（已处理）
+	 * 作为卖家，收到的采购变更单（无需确认）
 	 *
      * @param params
      * @param searchFilter

src/main/webapp/resources/css/index.css

@@ -4311,4 +4311,8 @@ input[required]:invalid, input:focus:invalid, textarea[required]:invalid, textar
 
 #image-box .x-close-wrap:hover {
 	opacity: .7
+}
+
+a.order-detail {
+	color: #327ebe !important;
 }

src/main/webapp/resources/js/index/app.js

@@ -2240,6 +2240,10 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             case 'standard':
                 fn = 'getStandard';
                 break;
+            // 变更单无需确认
+            case 'unread':
+                fn = 'getUnread';
+                break;
         }
         return fn;
     };

src/main/webapp/resources/tpl/index/baseInfo/prodList.html

@@ -294,8 +294,8 @@ width: 80px;
                 <td class="text-center" title="{{product.code}}" ng-bind="::product.code"></td>
                 <td class="line-h20 first text-center">
                     <div class="order-main">
-                        <a ng-bind="::product.title" ui-sref="sale.productDetail({id:product.id})" target="_self"  title="查看详情" ng-if="product.standard != 1"></a>
-                        <a ng-bind="::product.kind" ui-sref="sale.productDetail({id:product.id})" target="_self"  title="查看详情" ng-if="product.standard == 1"></a>
+                        <a class="order-detail" ng-bind="::product.title" ui-sref="sale.productDetail({id:product.id})" target="_self"  title="查看详情" ng-if="product.standard != 1"></a>
+                        <a class="order-detail" ng-bind="::product.kind" ui-sref="sale.productDetail({id:product.id})" target="_self"  title="查看详情" ng-if="product.standard == 1"></a>
                     </div>
                 </td>
                <td class="hover-show text-center" ng-class="{'bg01' : product.standard == 1 , 'bg02' :  product.standard != 1}" ng-if="product.standard != 1">

src/main/webapp/resources/tpl/index/baseInfo/servicerInfo.html

@@ -115,6 +115,20 @@
 	margin-left: 0px;
 	line-height: 30px;
 }
+.order-table .company-list tr .first{
+	border-bottom: #e8e8e8 1px solid;
+}
+#customer-tab tbody tr.height16{
+	height: 16px;
+	border-left: #f5f5f5 2px solid;
+	border-right: #f5f5f5 2px solid;
+}
+#customer-tab tbody tr.height16 td{
+	background: #f5f5f5;
+}
+#myquest-public .customer-tab tbody{
+	border-bottom: none;
+}
 </style>
 <div style="margin-left: -240px; width: 1170px; background: #fff;" id="myquest-public">
 <div ng-include src="'static/tpl/index/baseInfo/vendorAndCustomer.html'"></div>
@@ -193,6 +207,9 @@
 							<!--<a ng-if="vendor.vendswitch == 1" ng-click="purcByEn(vendor.vendorEnterprise.enBussinessCode)" class="btn02">下采购单</a>-->
 						<!--</td>-->
 					</tr>
+					<tr class="height16">
+						<td colspan="5"></td>
+					</tr>
 			</tbody>
 			<tbody ng-if="customerParams.total() == 0" class="no-record-tab">
 				<tr>

src/main/webapp/resources/tpl/index/make/accept.html

@@ -275,7 +275,7 @@
 				</td>
 				<td class="br-l" colspan="2">
 					<div>
-						单据编号：<a ui-sref="sale.makeorder_detail({id:item.order.id})"
+						单据编号：<a class="order-detail" title="查看采购单详情" ui-sref="sale.makeorder_detail({id:item.order.id})"
 							ng-bind="item.order.code"></a>
 					</div>
 					<div>

src/main/webapp/resources/tpl/index/make/change.html

@@ -206,9 +206,9 @@
 					<span class="text-num text-bold"
 						ng-bind="::change.orderChange.date | date:'yyyy-MM-dd'"></span>
 					<span ng-bind="::change.orderChange.enterprise.enName"></span>
-					<span>流水号：<a
-						class="text-num" ng-bind="::change.orderChange.code" ui-sref="sale.makechange_detail({id:change.id})" target="_self"></a></span> <span>订单：<a
-						class="text-num text-bold" ng-bind="::change.orderCode" ui-sref="sale.makeorder_detail({id:change.orderId})" target="_blank"></a></span>
+					<span>流水号：<a title="查看变更单详情"
+						class="text-num order-detail" ng-bind="::change.orderChange.code" ui-sref="sale.makechange_detail({id:change.id})" target="_self"></a></span> <span>订单：<a
+						class="text-num text-bold order-detail" title="查看委外单详情" ng-bind="::change.orderCode" ui-sref="sale.makeorder_detail({id:change.orderId})" target="_blank"></a></span>
 				</div>
 			</td>
 			<td colspan="1" class="" title="{{change.orderChange.remark}}">

src/main/webapp/resources/tpl/index/make/order.html

@@ -257,8 +257,8 @@
 					<span class="text-num text-bold" ng-bind="::order.date | date:'yyyy-MM-dd'"></span>
 					<span ng-bind="::order.enterprise.enName"></span>
 					<span>订单号：
-					  <a class="text-num" ng-bind="::order.code" ui-sref="sale.makeorder_detail({id:order.id})" target="_self"
-						 ng-click="setOrdersRead(order.id)"></a></span>
+					  <a class="text-num order-detail" ng-bind="::order.code" ui-sref="sale.makeorder_detail({id:order.id})" target="_self"
+						 ng-click="setOrdersRead(order.id)" title="查看详情"></a></span>
 				</div>
 			</td>
 			<td colspan="1" class="order-sum">{{::order.currency}}： <span

src/main/webapp/resources/tpl/index/make/outorder.html

@@ -212,7 +212,7 @@
 							ng-bind="::order.date | date:'yyyy-MM-dd'"></span>
 						<span ng-bind="::order.enterprise.enName"></span>
 						<span>订单号：
-							<a class="text-num" ng-bind="::order.code"
+							<a class="text-num order-detail" ng-bind="::order.code" title="查看详情"
 							   ui-sref="purc.outorder_detail({id:order.id})" target="_self"></a>
 						</span>
 					</div>

src/main/webapp/resources/tpl/index/make/returns.html

@@ -257,7 +257,7 @@
 				</td>
 				<td class="br-l" colspan="2">
 					<div>
-						单据编号：<a ui-sref="sale.makeorder_detail({id:item.order.id})"
+						单据编号：<a class="order-detail" title="查看采购单详情" ui-sref="sale.makeorder_detail({id:item.order.id})"
 							ng-bind="::item.order.code"></a>
 					</div>
 					<div>

src/main/webapp/resources/tpl/index/purc/inquiry.html

@@ -482,8 +482,8 @@ margin-left: 55px;
 									  ng-bind="::inquiryItem.inquiry.date | date:'yyyy-MM-dd'"></span>
 					<span
 							ng-bind="::inquiryItem.enterprise.enName"></span>
-					<span>流水号：<a
-						class="text-num" ng-bind="::inquiryItem.inquiry.code" target="_self"
+					<span>流水号：<a title="查看详情"
+						class="text-num order-detail" ng-bind="::inquiryItem.inquiry.code" target="_self"
 						href="#/purc/purcinquirydetail/{{inquiryItem.inquiry.id}}" ng-click="setOrdersRead(inquiryItem.id)"></a></span>
 				</div>
 			</td>

src/main/webapp/resources/tpl/index/purc/order.html

@@ -337,8 +337,8 @@
 					<span class="text-num text-bold"
 						ng-bind="::order.date | date:'yyyy-MM-dd'"></span>
 					<span ng-bind="::order.receiveName"></span>
-					<span>订单号：<a
-						class="text-num" ng-bind="::order.code" ui-sref="purc.order_detail({id:order.id})" target="_self"
+					<span>订单号：<a title="查看详情"
+						class="text-num order-detail" ng-bind="::order.code" ui-sref="purc.order_detail({id:order.id})" target="_self"
 						ng-click="setOrdersRead(order.id)"></a></span>
 				</div>
 			</td>

src/main/webapp/resources/tpl/index/purc/prodList.html

@@ -265,8 +265,8 @@
                 <td class="text-center" title="{{product.code}}" ng-bind="::product.code"></td>
                 <td class="line-h20 first text-center">
                     <div class="order-main">
-                        <a ng-bind="::product.title" ui-sref="purc.productDetail({id:product.id})" target="_self"  title="查看详情" ng-if="product.standard != 1"></a>
-                        <a ng-bind="::product.kind" ui-sref="purc.productDetail({id:product.id})" target="_self"  title="查看详情" ng-if="product.standard == 1"></a>
+                        <a class="order-detail" ng-bind="::product.title" ui-sref="purc.productDetail({id:product.id})" target="_self"  title="查看详情" ng-if="product.standard != 1"></a>
+                        <a class="order-detail" ng-bind="::product.kind" ui-sref="purc.productDetail({id:product.id})" target="_self"  title="查看详情" ng-if="product.standard == 1"></a>
                     </div>
                 </td>
                 <td class="hover-show text-center" ng-class="{'bg01' : product.standard == 1 , 'bg02' :  product.standard != 1}" ng-if="product.standard != 1">

src/main/webapp/resources/tpl/index/purc/vendor.html

@@ -123,7 +123,7 @@
 			<tbody>
 					<tr ng-repeat="vendor in $data">
 						<td ng-bind="::vendor.vendorEnterprise.uu"></td>
-						<td class="text-center"><a  href="#/purc/vendor/{{vendor.id}}" ng-bind="::vendor.vendorEnterprise.enName" class="color32"></a></td>
+						<td class="text-center"><a href="#/purc/vendor/{{vendor.id}}" ng-bind="::vendor.vendorEnterprise.enName" title="查看供应商资料" class="color32 order-detail"></a></td>
 						<td class="text-center" ng-bind="::vendor.vendorEnterprise.enShortname"></td>
 						<td class="text-center" ng-bind="::vendor.vendorEnterprise.enAddress"></td>
 						<td class="text-center" ng-bind="::vendor.vendorUser.userName"></td>

src/main/webapp/resources/tpl/index/sale/accept.html

@@ -208,7 +208,7 @@
 							ng-bind="accept.date | date:'yyyy-MM-dd'"></span> <span
 							title="客户名称"
 							ng-bind="accept.enterprise.enName"></span>
-						<span>流水号：<a class="text-num" ng-bind="accept.code" ui-sref="sale.accept_detail({id: accept.id})"></a></span>
+						<span>流水号：<a class="text-num order-detail" title="查看详情" ng-bind="accept.code" ui-sref="sale.accept_detail({id: accept.id})"></a></span>
 						<span class="text-info" ng-if="accept.sendCode != null"
 							title="送货单号：{{::accept.sendCode}}"> 送货单号： <span
 							ng-bind="accept.sendCode" class="text-num"></span>
@@ -270,7 +270,7 @@
 				</td>
 				<td class="br-l" colspan="2" ng-if="item.orderItem.order.code">
 					<div>
-						单据编号：<a ui-sref="sale.order_detail({id:item.orderItem.order.id})"
+						单据编号：<a class="order-detail" title="查看采购单详情" ui-sref="sale.order_detail({id:item.orderItem.order.id})"
 							ng-bind="item.orderItem.order.code"></a>
 					</div>
 					<div>

src/main/webapp/resources/tpl/index/sale/approval.html

@@ -249,7 +249,7 @@
 						</span> -->
 						<span class="text-num text-bold" title="{{approval.inDate | date: 'yyyy年MM月dd日 hh:mm'}}" ng-bind="::approval.inDate | date:'yyyy-MM-dd'"></span>
 						<span title="客户名称" ng-bind="::approval.enterprise.enName"></span>
-						<span
+						单号：<span
 							title="认定单号" ng-bind="::approval.code"></span>
 					</div>
 				</td>

src/main/webapp/resources/tpl/index/sale/change.html

@@ -257,12 +257,12 @@
 						ng-bind="::change.date | date:'yyyy-MM-dd'"></span>
 					<span
 							ng-bind="::change.enterprise.enName"></span>
-					<span>流水号：<a
-						class="text-num" ng-bind="::change.code" ui-sref="sale.change_detail({id:change.id})" target="_self"
+					<span>流水号：<a title="查看变更单详情"
+						class="text-num order-detail" ng-bind="::change.code" ui-sref="sale.change_detail({id:change.id})" target="_self"
 						ng-click="setOrdersRead(change.id)"></a>
 					</span>
-					<span>订单：<a
-						class="text-num text-bold" ng-bind="::change.orderCode" ui-sref="sale.order_detail({id:change.orderId})" target="_blank"></a></span>
+					<span>订单：<a title="查看采购单详情"
+						class="text-num text-bold order-detail" ng-bind="::change.orderCode" ui-sref="sale.order_detail({id:change.orderId})" target="_blank"></a></span>
 				</div>
 			</td>
 			<td colspan="1" class="" style="line-height: 20px; padding-top: 5px;">

src/main/webapp/resources/tpl/index/sale/customer.html

@@ -136,7 +136,7 @@
 			<tbody ng-repeat="customer in $data" ng-mouseenter="showUserInfo(customer,true)" ng-mouseleave="showUserInfo(customer,false)">
 					<tr>
 						<td class="text-center" ng-bind="::customer.myEnterprise.uu"></td>
-						<td class="text-center"><a ng-click="viewDetail(customer.id)" ng-bind="::customer.myEnterprise.enName" class="color32"></a></td>
+						<td class="text-center"><a ng-click="viewDetail(customer.id)" title="查看客户资料" ng-bind="::customer.myEnterprise.enName" class="color32 order-detail"></a></td>
 						<td class="text-center" ng-bind="::customer.myEnterprise.enAddress"></td>
 						<td class="text-center" ng-bind="::customer.myUser.userName"></td>
 						<td ng-bind="::customer.myUser.userTel"></td>

src/main/webapp/resources/tpl/index/sale/inquiry.html

@@ -335,8 +335,8 @@
 									  ng-bind="::inquiryItem.inquiry.date | date:'yyyy-MM-dd'"></span>
 					<span
 							ng-bind="::inquiryItem.inquiry.enterprise.enName"></span>
-					<span>流水号：<a
-						class="text-num" ng-bind="::inquiryItem.inquiry.code" ui-sref="sale.inquiry_detail({id:inquiryItem.inquiry.id})" target="_self"
+					<span>流水号：<a title="查看详情"
+						class="text-num order-detail" ng-bind="::inquiryItem.inquiry.code" ui-sref="sale.inquiry_detail({id:inquiryItem.inquiry.id})" target="_self"
 						ng-click="setOrdersRead(inquiryItem.id)"></a>
 					</span>
 				</div>

src/main/webapp/resources/tpl/index/sale/inquiry_mould.html

@@ -369,7 +369,7 @@ tbody td div.text-mould {
 							ng-model="inquiryMould.$selected">
 						</span>--> <span class="text-num text-bold" title="{{inquiryMould.date}}" ng-bind="::inquiryMould.date | date:'yyyy-MM-dd'"></span>
 						<span ng-bind="::inquiryMould.enterprise.enName"></span>
-						<span>流水号：<a class="text-num" ng-bind="::inquiryMould.code" ui-sref="sale.inquiry_mould_detail({id:inquiryMould.id})" target="_self"
+						<span>流水号：<a class="text-num order-detail" ng-bind="::inquiryMould.code" ui-sref="sale.inquiry_mould_detail({id:inquiryMould.id})" target="_self"
 							ng-click="setOrdersRead(inquiryMould.id)" title="查看详情"></a>
 						</span>
 						币别：<span ng-bind="inquiryMould.currency"></span>

src/main/webapp/resources/tpl/index/sale/notice.html

@@ -352,8 +352,8 @@
                             ng-bind="notice.orderItem.order.enterprise.enName"></span>
                 </div>
             </td>
-            <td class="text-right" colspan="2" class="order-sum"><a
-                    class="dropdown-toggle" ui-sref="sale.order_detail({id:notice.orderItem.order.id})" target="_self"> <span
+            <td class="text-right" colspan="2" class="order-sum"><a title="查看采购单详情"
+                    class="dropdown-toggle order-detail" ui-sref="sale.order_detail({id:notice.orderItem.order.id})" target="_self"> <span
                     class="text-num text-bold" ng-bind="::notice.orderItem.order.code" ng-click="setOrdersRead(notice.id)"></span>
                 第{{notice.orderItem.number}}行 <i class="fa fa-fw fa-angle-down"></i>
             </a>

src/main/webapp/resources/tpl/index/sale/order.html

@@ -402,7 +402,7 @@
 					&nbsp;&nbsp;<span class="text-num text-bold"
 						ng-bind="::order.date | date:'yyyy-MM-dd'"></span>
 					<span ng-bind="::order.enterprise.enName"></span>
-					<span>订单号：<a class="text-num" ng-bind="::order.code" ui-sref="sale.order_detail({id:order.id})" target="_self"  ng-click="setOrdersRead(order.id)"></a></span>
+					<span>订单号：<a class="text-num order-detail" ng-bind="::order.code" ui-sref="sale.order_detail({id:order.id})" target="_self" title="查看详情" ng-click="setOrdersRead(order.id)"></a></span>
 				</div>
 			</td>
 			<td colspan="1" class="order-sum">{{::order.currency}}： <span

src/main/webapp/resources/tpl/index/sale/quotation_list.html

@@ -167,7 +167,7 @@
 					<!--<span> <input type="checkbox" class="selector" ng-model="quotationItem.$selected"></span>-->
 					<span class="text-num text-bold" title="{{quotationItem.date}}" ng-bind="::quotationItem.date | date:'yyyy-MM-dd'"></span>
 					<span ng-bind="::quotationItem.cust.enName"></span>
-					<span>流水号：<a class="text-num" ng-bind="::quotationItem.code" ui-sref="sale.quotation.item({id:quotationItem.id})" target="_self"></a></span>
+					<span>流水号：<a class="text-num order-detail" ng-bind="::quotationItem.code" ui-sref="sale.quotation.item({id:quotationItem.id})" title="查看详情" target="_self"></a></span>
 				</div>
 			</td>
 			<td>

src/main/webapp/resources/tpl/index/sale/returns.html

@@ -207,8 +207,8 @@
 						<span title="客户名称"
 								ng-bind="::returns.returnItems[0].orderItem.order.enterprise.enName" ng-if="returns.returnItems[0].orderItem"></span>
 						<span title="客户名称">{{returns.enName}}</span>
-						<span>流水号：<a
-							class="text-num" ng-bind="::returns.code" ui-sref="sale.return_detail({id: returns.id})"></a></span>
+						<span>流水号：<a title="查看详情"
+							class="text-num order-detail" ng-bind="::returns.code" ui-sref="sale.return_detail({id: returns.id})"></a></span>
 					</div>
 				</td>
 				<td colspan="1" class="order-sum">
@@ -260,7 +260,7 @@
 				</td>
 				<td class="br-l" colspan="2">
 					<div>
-						单据编号：<a ui-sref="sale.order_detail({id:item.orderItem.order.id})"
+						单据编号：<a class="order-detail" title="查看采购单详情" ui-sref="sale.order_detail({id:item.orderItem.order.id})"
 							ng-bind="::item.orderItem.order.code"></a>
 					</div>
 					<div>

src/main/webapp/resources/tpl/index/sale/sample.html

@@ -271,7 +271,7 @@
 						ng-bind="sample.proofing.date | date:'yyyy-MM-dd'"></span>
 					<span title="客户名称"
 						  ng-bind="sample.proofing.enterprise.enName"></span>
-					<span>流水号：<a class="text-num" ng-bind="::sample.proofing.code"
+					<span>流水号：<a class="text-num order-detail" ng-bind="::sample.proofing.code" title="查看详情"
 								 ui-sref="sale.sample_detail({id:sample.id})" target="_self"
 								 ng-click="setOrdersRead(sample.id)"></a>
 					</span>

src/main/webapp/resources/tpl/index/sale/send.html

@@ -248,7 +248,7 @@
 					</span> -->
 					<span class="text-num text-bold" title="{{::send.date | date: 'yyyy年MM月dd日 hh:mm'}}" ng-bind="send.date | date:'yyyy-MM-dd'"></span>
 					<span title="客户名称" ng-bind="::send.sendItems[0].orderItem.order.enterprise.enName"></span>
-					<span>发货单号：<a class="text-num" ng-bind="::send.code" ui-sref="sale.send_detail({id:send.id})"></a></span>
+					<span>发货单号：<a class="text-num order-detail" title="查看详情" ng-bind="::send.code" ui-sref="sale.send_detail({id:send.id})"></a></span>
 				</div>
 			</td>
 			<td colspan="1" class="order-sum">

src/main/webapp/resources/tpl/index/sale/tenderlist.html

@@ -431,7 +431,7 @@
                         招标标题：{{tender.title}}
                     </div>
                     <div>
-                        单号：<a ui-sref="sale.tender({id:tender.id})" target="_self" title="点击查看详情" ng-click="setOrdersRead(tender.id)">{{tender.code}}</a>
+                        单号：<a class="order-detail" ui-sref="sale.tender({id:tender.id})" target="_self" title="点击查看详情" ng-click="setOrdersRead(tender.id)">{{tender.code}}</a>
                     </div>
                     <div>
                         <strong ng-if="tender.ifOpen == 0">指定招标</strong>