公共询价列表和详情页字段展示值更新，先采用明细数据，后采用物料信息数据

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

@@ -752,11 +752,11 @@ input[type="radio"], input[type="checkbox"] {
         </thead>
         <tbody>
         <tr>
-            <td><span ng-bind="::inquiryItem.product.title || inquiryItem.prodTitle"></span></td>
-            <td><span ng-bind="::inquiryItem.product.cmpCode || inquiryItem.cmpCode"></span></td>
-            <td><span ng-bind="::inquiryItem.product.brand || inquiryItem.inbrand"></span></td>
-            <td><span ng-bind="::inquiryItem.product.spec || inquiryItem.spec"></span></td>
-            <td><span ng-bind="::inquiryItem.product.unit || inquiryItem.unit"></span></td>
+            <td><span ng-bind="::inquiryItem.prodTitle || inquiryItem.product.title"></span></td>
+            <td><span ng-bind="::inquiryItem.cmpCode || inquiryItem.product.cmpCode"></span></td>
+            <td><span ng-bind="::inquiryItem.inbrand || inquiryItem.product.brand"></span></td>
+            <td><span ng-bind="::inquiryItem.spec || inquiryItem.product.spec || '无'"></span></td>
+            <td><span ng-bind="::inquiryItem.unit || inquiryItem.product.unit"></span></td>
             <td><span ng-bind="::inquiryItem.needquantity"></span></td>
             <td>
                 <a class="file" ng-repeat="attach in inquiryItem.inquiry.attachs" href="file/{{attach.id}}">{{::attach.name}}</a>

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

@@ -338,21 +338,6 @@
                                    <a ng-if="msg.quteId != null" ui-sref="sale.pubinquiry_detail({id:msg.quteId})" title="点击查看详情"><img src="static/img/all/circle.png" alt="" class="circle"/> “<em ng-bind="msg.enName"></em>”发布关于“<em ng-bind="msg.pordName"></em>”的询价 <img src="static/img/home/new.png" class="new"/></a>
                                </span>
                            </marquee>
-                            <!--    指令
-                            <div class="slideUl">
-                                <slide-follow id="slide" dataset-data = "datasetData"></slide-follow>
-                            </div>-->
-                            <!--<div class="all">-->
-                                <!--<div id="slider01" class="slider01">-->
-                                    <!--<span ng-repeat="msg in message">-->
-                                        <!--{{msg.enName}}-->
-                                    <!--</span>-->
-                                    <!--&lt;!&ndash;<span><img src="static/img/all/circle.png" alt="" class="circle"/> 华商龙商务科技有限公司开展员工动员大会 <img src="static/img/home/new.png" class="new"/></span>-->
-                                    <!--<span><img src="static/img/all/circle.png" alt="" class="circle"/> 华商龙商务科技有限公司开展员工动员大会 <img src="static/img/home/new.png" class="new"/></span>-->
-                                    <!--<span><img src="static/img/all/circle.png" alt="" class="circle"/> 华商龙商务科技有限公司开展员工动员大会 <img src="static/img/home/new.png" class="new"/></span>-->
-                                <!--&ndash;&gt;</div>-->
-                                <!--<div id="slider02" class="slider02"></div>-->
-                            <!--</div>-->
                         </div>
                         <div class="filter row">
                             <div class="form-group">
@@ -399,10 +384,10 @@
                                <tbody ng-if="active != 'remind'">
                                     <tr ng-repeat="inquiryItem in $data">
                                         <td ng-click="toDetail(inquiryItem)" title="查看详情" ng-bind="inquiryItem.inquiry.date| date: 'yyyy-MM-dd'"></td>
-                                        <td ng-click="toDetail(inquiryItem)" title="查看详情" ng-bind="inquiryItem.product.brand || inquiryItem.inbrand || '无'"></td>
-                                        <td ng-click="toDetail(inquiryItem)" title="查看详情" ng-bind="inquiryItem.product.title || inquiryItem.prodTitle || '无'"></td>
-                                        <td ng-click="toDetail(inquiryItem)" title="查看详情" ng-bind="inquiryItem.product.cmpCode || inquiryItem.cmpCode"></td>
-                                        <td ng-click="toDetail(inquiryItem)" title="查看详情" ng-bind="inquiryItem.product.spec || inquiryItem.spec || '无'"></td>
+                                        <td ng-click="toDetail(inquiryItem)" title="查看详情" ng-bind="inquiryItem.inbrand || inquiryItem.product.brand || '无'"></td>
+                                        <td ng-click="toDetail(inquiryItem)" title="查看详情" ng-bind="inquiryItem.prodTitle || inquiryItem.product.title || '无'"></td>
+                                        <td ng-click="toDetail(inquiryItem)" title="查看详情" ng-bind="inquiryItem.cmpCode || inquiryItem.product.cmpCode"></td>
+                                        <td ng-click="toDetail(inquiryItem)" title="查看详情" ng-bind="inquiryItem.spec || inquiryItem.product.spec || '无'"></td>
                                         <td ng-click="toDetail(inquiryItem)" title="查看详情" ng-bind="inquiryItem.needquantity"></td>
                                         <td ng-click="toDetail(inquiryItem)" title="查看详情" ng-bind="inquiryItem.inquiry.enterprise.enName"><a></a></td>
                                         <td ng-click="toDetail(inquiryItem)" title="查看详情" ng-bind-html="inquiryItem.inquiry.endDate| datespan"></td>