git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@7618 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
@@ -39,7 +39,7 @@ public class PurchaseInquiryItemSaveReleaseEvent extends SaveReleaseEvent<Paging
}
String type = "新增询价单";
String title = from + type;
- String context = from + inquiryItem.getInquiry().getEnterprise().getEnName() + "的" + emName + type + ",单号:" + codeValue;
+ String context = inquiryItem.getInquiry().getEnterprise().getEnName() + "的" + emName + "给您发送了一张询价单(" + codeValue + ")!";
PagingRelease release = new PagingRelease(emUU, emName, enUU, date, codeValue, from, title, context, type);
Long vendUU = inquiryItem.getVendUU();
Long vendUserUU = inquiryItem.getVendUserUU();
@@ -34,7 +34,7 @@ public class PurchaseOrderReplyReleaseEvent extends SaveReleaseEvent<PagingRelea
String from = "B2B";
String type = "回复采购订单";
- String context = from + orderAll.getEnterprise().getEnName() + "的" + emName + type + ",单号:" + codeValue;
+ String context = orderAll.getEnterprise().getEnName() + "回复了采购单(" + codeValue + ")的交期,请及时确认!";
Long vendUU = orderAll.getVendUU();
Long vendUserUU = orderAll.getVendUserUU();
@@ -38,7 +38,7 @@ public class PurchaseOrderSaveReleaseEvent extends SaveReleaseEvent<PagingReleas
String type = "新增采购订单";
+ String context = orderAll.getEnterprise().getEnName() + "的" + emName + "给您发送了一张新的采购单(" + codeValue + ")!";
@@ -9726,7 +9726,7 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
var pageParams = params.url();
var realActive = {};
pageParams.searchFilter = { // 筛选条件
- keyword: $scope.keyword,
+ keyword: $scope.keyword
// fromDate: getDateTime($scope.condition.dateFrom),
// endDate: getDateTime($scope.condition.dateTo)
};
@@ -76,6 +76,9 @@
<li ng-repeat="tender in tenders | orderBy : - date">
<a ui-sref="sale.tender({id:tender.id})" class="text-light" ng-bind="::tender.title"></a>
</li>
+ <li ng-show="tenders == null || tenders == ''">
+ 您还未收到客户的招标信息!
+ </li>
</ul>
</div>
@@ -88,7 +91,10 @@
<li ng-repeat="tender in openTenders | orderBy : - date">
- </ul>
+ 未找到公开的招标信息!
+ </ul>