公共询价列表数据展示调整

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

@@ -23191,7 +23191,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             $scope.active = $rootScope.active;
             $rootScope.active = null;
         } else {
-            $scope.active = 'todo';
+            $scope.active = 'all';
         }
         $scope.agreedText = '全部';
         $scope.dateZoneText = '最近一个月';

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

@@ -324,10 +324,10 @@ margin-left: 55px;
 							<b class="new-dot" ng-if="unread.replied>0">{{unread.replied>99?'99+':unread.replied}}</b>
 						</button>
 					</div>
-					<div class="btn-group btn-group-sm">
+					<!--<div class="btn-group btn-group-sm">
 						<button type="button" class="btn btn-default btn-line"
 								ng-class="{'btn-info':active=='todo'}" ng-click="setActive('todo')">待报价</button>
-					</div>
+					</div>-->
 					<div class="btn-group btn-group-sm">
 						<button type="button" class="btn btn-default btn-line"
 								ng-class="{'btn-info':active=='agreed'}" ng-click="setActive('agreed')">已采纳</button>
@@ -507,7 +507,7 @@ margin-left: 55px;
 			<td class="product">
 				<div class="text-num text-bold" ng-bind="::inquiryItem.product.code"></div>
 				<div ng-bind="::inquiryItem.product.title"></div>
-				<div class="text-muted" ng-bind="::inquiryItem.product.spec"></div>
+				<div class="text-muted" ng-bind="inquiryItem.product.spec || inquiryItem.spec"></div>
 				<div ng-if="inquiryItem.inquiry.attachs.length" class="text-muted">
 					<i class="fa fa-paperclip fa-fw" style="color: #ffa340; font-size: 18px;"></i>附件：<a class="file" ng-repeat="attach in inquiryItem.inquiry.attachs" href="file/{{attach.id}}">{{::attach.name}}</a>
 				</div>
@@ -566,31 +566,6 @@ margin-left: 55px;
 						<span ng-if="!isUser" ng-bind="reply.price | number:6"></span> <span
 							ng-show="reply.price == null || isUser" class="text-muted">-</span>
 					</div>
-					<!-- <div class="dropdown">
-						<a href="javascript:void(0);" class="dropdown-toggle text-default"
-						   ng-mouseover="getHistory(inquiryItem)">报价信息<i
-								class="fa fa-fw fa-angle-down"></i></a>
-						<div class="dropdown-menu pane" style="width: 270px;">
-							<div class="pane-body">
-								<ul class="list-unstyled list-menu">
-									<li ng-repeat="reply in inquiryItem.replies">
-										<div ng-class="{'text-inverse': $index==0}">
-											<div class="row row-sm"
-												 ng-repeat="reply in inquiryItem.replies">
-												<div class="col-xs-5">≥{{reply.lapQty}}</div>
-												<div class="col-xs-5">价格{{reply.price | number:6}}</div>
-											</div>
-										</div>
-										<div class="text-muted">{{reply.inquiry.date |
-											date:'yyyy-MM-dd'}}{{reply.inquiry.enterprise.enName}}
-										</div>
-									</li>
-								</ul>
-								<div ng-show="!inquiryItem.replies || inquiryItem.replies.length == 0"
-										class="text-center text-muted">暂无报价信息</div>
-							</div>
-						</div>
-					</div> -->
 				</div>
 				<div style="margin: 0 auto;" ng-if="inquiryItem.$editing">
 					<div ng-repeat="reply in inquiryItem.replies">

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

@@ -373,21 +373,21 @@
 				<div class="text-num text-bold">
 					<a class="dropdown-toggle"
 					   ng-mouseover="getHistory(inquiryItem)">
-						<span ng-bind="::inquiryItem.product.code"></span>
+						<span ng-bind="::inquiryItem.product.code || inquiryItem.cmpCode"></span>
 						<i class="fa fa-fw fa-sort-desc"></i>
 						<div class="dropdown-menu pane" style="width: 270px;">
 							<div class="pane-body">
 								<div>
 									<div>
 										<span>产品规格：</span>
-										<em ng-bind="::inquiryItem.product.spec"></em>
+										<em ng-bind="inquiryItem.product.spec || inquiryItem.spec || '无'"></em>
 									</div>
 									<div>
 										<span>产品名称：</span>
-										<em ng-bind="::inquiryItem.product.title"></em>
+										<em ng-bind="::inquiryItem.product.title || inquiryItem.prodTitle || '无'"></em>
 									</div>
 								</div>
-								<div ng-show="!inquiryItem.product.spec && !inquiryItem.product.title"
+								<div ng-show="!inquiryItem.product.spec && !inquiryItem.product.title && !inquiryItem.spec && !inquiryItem.prodTitle"
 									 class="text-center text-muted">暂无产品信息</div>
 							</div>
 						</div>
@@ -395,7 +395,7 @@
 				</div>
 			</td>
 			<td class="text-center">
-				<span ng-bind="inquiryItem.product.brand ? inquiryItem.product.brand : '-'"></span>
+				<span ng-bind="inquiryItem.product.brand || inquiryItem.inbrand || '-'"></span>
 			</td>
 			<td class="text-center">
 				<div ng-repeat="reply in inquiryItem.replies">