Browse Source

公共询价首页最近一周数据错误的处理,页面需求数据量错误的处理

hejq 8 years ago
parent
commit
12e0f857c1

+ 1 - 1
src/main/webapp/resources/js/index/app.js

@@ -5206,7 +5206,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                 date.setDate(date.getDate() - 7);
                 date.setDate(date.getDate() - 7);
                 condition.dateFrom = date;
                 condition.dateFrom = date;
                 var ndate = new Date();
                 var ndate = new Date();
-                ndate.setDate(date.getDate() - 1);
+                ndate.setDate(ndate.getDate() - 1);
                 condition.dateTo = ndate;
                 condition.dateTo = ndate;
             } else if (zone == 1) { // 一个月内
             } else if (zone == 1) { // 一个月内
                 date.setMonth(date.getMonth() - 1);
                 date.setMonth(date.getMonth() - 1);

+ 13 - 13
src/main/webapp/resources/tpl/index/baseInfo/inquiry_list.html

@@ -387,25 +387,25 @@
                                </thead>
                                </thead>
                                <tbody ng-if="active == 'all'">
                                <tbody ng-if="active == 'all'">
                                     <tr ng-repeat="inquiryItem in $data">
                                     <tr ng-repeat="inquiryItem in $data">
-                                        <td ng-click="toDetail(inquiryItem.id)" title="查看详情">{{::inquiryItem.inquiry.date| date: 'yyyy-MM-dd'}}</td>
+                                        <td ng-click="toDetail(inquiryItem.id)" title="查看详情" ng-bind="inquiryItem.inquiry.date| date: 'yyyy-MM-dd'"></td>
                                         <td ng-click="toDetail(inquiryItem.id)" title="查看详情">{{::inquiryItem.product.spec}}</td>
                                         <td ng-click="toDetail(inquiryItem.id)" title="查看详情">{{::inquiryItem.product.spec}}</td>
-                                        <td ng-click="toDetail(inquiryItem.id)" title="查看详情">{{::inquiryItem.product.brand || '无'}}</td>
-                                        <td ng-click="toDetail(inquiryItem.id)" title="查看详情">{{::inquiryItem.product.title}}</td>
-                                        <td ng-click="toDetail(inquiryItem.id)" title="查看详情">{{::inquiryItem.number}}</td>
-                                        <td ng-click="toDetail(inquiryItem.id)" title="查看详情"><a>{{::inquiryItem.inquiry.enterprise.enName}}</a></td>
-                                        <td ng-click="toDetail(inquiryItem.id)" title="查看详情">{{::inquiryItem.inquiry.endDate| date: 'yyyy-MM-dd'}}</td>
+                                        <td ng-click="toDetail(inquiryItem.id)" title="查看详情" ng-bind="inquiryItem.product.brand || '无'"></td>
+                                        <td ng-click="toDetail(inquiryItem.id)" title="查看详情" ng-bind="inquiryItem.product.title"></td>
+                                        <td ng-click="toDetail(inquiryItem.id)" title="查看详情" ng-bind="inquiryItem.needquantity"></td>
+                                        <td ng-click="toDetail(inquiryItem.id)" title="查看详情" ng-bind="inquiryItem.inquiry.enterprise.enName"><a></a></td>
+                                        <td ng-click="toDetail(inquiryItem.id)" title="查看详情" ng-bind="inquiryItem.inquiry.endDate| date: 'yyyy-MM-dd'"></td>
                                         <td><a class="offer" ng-click="transtoInquiry(inquiryItem.id)">我要报价</a></td>
                                         <td><a class="offer" ng-click="transtoInquiry(inquiryItem.id)">我要报价</a></td>
                                     </tr>
                                     </tr>
                                </tbody>
                                </tbody>
                                <tbody ng-if="active == 'teams'">
                                <tbody ng-if="active == 'teams'">
                                    <tr ng-repeat="inquiryItem in $data" ui-sref="sale.inquiry_detail({id:inquiryItem.inquiry.id})" title="查看详情">
                                    <tr ng-repeat="inquiryItem in $data" ui-sref="sale.inquiry_detail({id:inquiryItem.inquiry.id})" title="查看详情">
-                                       <td>{{::inquiryItem.inquiry.date| date: 'yyyy-MM-dd'}}</td>
-                                       <td>{{::inquiryItem.product.spec}}</td>
-                                       <td>{{::inquiryItem.product.brand || '无'}}</td>
-                                       <td>{{::inquiryItem.product.title}}</td>
-                                       <td>{{::inquiryItem.number}}</td>
-                                       <td><a>{{::inquiryItem.inquiry.enterprise.enName}}</a></td>
-                                       <td>{{::inquiryItem.inquiry.endDate| date: 'yyyy-MM-dd'}}</td>
+                                       <td ng-bind="inquiryItem.inquiry.date| date: 'yyyy-MM-dd'"></td>
+                                       <td ng-bind="inquiryItem.product.spec"></td>
+                                       <td ng-bind="inquiryItem.product.brand || '无'"></td>
+                                       <td ng-bind="inquiryItem.product.title"></td>
+                                       <td ng-bind="inquiryItem.needquantity"></td>
+                                       <td ng-bind="inquiryItem.inquiry.enterprise.enName"><a></a></td>
+                                       <td ng-bind="inquiryItem.inquiry.endDate| date: 'yyyy-MM-dd'"></td>
                                        <td><a class="offer"  ui-sref="sale.inquiry_detail({id:inquiryItem.inquiry.id})">查看详情</a></td>
                                        <td><a class="offer"  ui-sref="sale.inquiry_detail({id:inquiryItem.inquiry.id})">查看详情</a></td>
                                    </tr>
                                    </tr>
                                </tbody>
                                </tbody>