Browse Source

处理非标bug问题

hulh 8 years ago
parent
commit
656faf88fd

+ 4 - 1
src/main/webapp/resources/view/vendor/forstore/vendor_material.html

@@ -2070,7 +2070,10 @@
 										<option value="20">20</option>
 									</select>
 								</span>
-									显示<span>{{(param.currentPage - 1) * param.count + 1}}</span>-<span>{{param.currentPage * param.count}}</span>,共:<span style="color: #5078cb;">{{materialAll.totalElements}}</span>个
+									显示<span>{{(param.currentPage - 1) * param.count + 1}}</span>-
+									<span ng-if="param.currentPage != materialAll.totalPages">{{param.currentPage * param.count}}</span>
+									<span ng-if="param.currentPage == materialAll.totalPages">{{materialAll.totalElements}}</span>
+									,共:<span style="color: #5078cb;">{{materialAll.totalElements}}</span>个
 								</div>
 							</td>
 						</tr>