shenjunjie пре 7 година
родитељ
комит
d90b9ceb26

+ 1 - 1
src/main/webapp/resources/js/common/services.js

@@ -160,7 +160,7 @@ define([ 'angular', 'common/utils', 'big'], function(angular, utils, Big) {
                     } else if (this.getRootPath().indexOf('b2c.usoftchina.com') > -1 || this.getRootPath().indexOf('mall.usoftchina.com') > -1) {
                         $rootScope.b2bUrl = 'https://b2b.usoftchina.com'
 					} else {
-                        $rootScope.b2bUrl = 'http://10.1.51.8090/platform-b2b'
+                        $rootScope.b2bUrl = 'http://10.1.51.125:8090/platform-b2b'
 					}
 				}
 				return $rootScope.b2bUrl;

+ 1 - 3
src/main/webapp/resources/js/vendor/controllers/b2b/apCheck.js

@@ -197,9 +197,7 @@ define(['app/app'], function (app) {
 
       $scope.data = [];// 列表数据
 
-      $scope.condition = {
-          $fromOpened: false
-      }
+      $scope.condition.$fromOpened = false
 
       $scope.openDatePicker = function ($event, item, openParam) {
           $event.preventDefault();

+ 28 - 3
src/main/webapp/resources/view/vendor/b2b/apCheck.html

@@ -520,8 +520,8 @@
   <div class="com_tab tab_top" style="margin-bottom: 0px">
     <ul>
       <li ng-class="{'active': active=='all'}" ng-click="setActive('all')"><a> 未对账</a></li>
-      <li ng-class="{'active': active=='done'}" ng-click="setActive('done')"><a>待确认(<em ng-class="{'color-black': !unread.replied }" ng-bind="unread.replied || 0"></em>)</a></li>
-      <li ng-class="{'active': active=='todo'}" ng-click="setActive('todo')"><a>未对账</a></li>
+      <li ng-class="{'active': active=='todo'}" ng-click="setActive('todo')"><a>待确认(<em ng-class="{'color-black': !unread.replied }" ng-bind="unread.replied || 0"></em>)</a></li>
+      <li ng-class="{'active': active=='done'}" ng-click="setActive('done')"><a>已确认</a></li>
       <li ng-class="{'active': active=='end'}" ng-click="setActive('end')"><a>已作废(<em ng-class="{'color-black': !unread.cancelled }" ng-bind="unread.cancelled || 0"></em>)</a></li>
     </ul>
   </div>
@@ -707,6 +707,23 @@
           </td>
         </tr>
         </tbody>
+        <tbody ng-show="active === 'all' && ALLList.length === 0">
+          <tr>
+            <td colspan="6">
+              <div id="empty">
+                <div class="left_img">
+                  <a><img src="static/img/all/empty-cart.png"></a>
+                  <a>B2B 商务</a>
+                </div>
+                <div class="right_link">
+                  <p ng-if="active != 'all'">暂无对账信息!</p>
+                  <p ng-if="active == 'all'">您还未生成对账单,请立即新增对账!</p>
+                  <a ng-if="active == 'all'" ui-sref="fa_apCheckList"><i class="fa fa-plus-square fa-fw"></i> 新增对账单</a>
+                </div>
+              </div>
+            </td>
+          </tr>
+        </tbody>
       </table>
     </div>
   </div>
@@ -880,7 +897,7 @@
       <div style="padding: 10px 20px">总金额合计:{{totalMoney | number:2 || 0}}</div>
     </div>
   </div>
-  <div ng-if="infoCommon.totalElement > 0" class="text-mns text-right" ng-class="infoCommon.totalElement > 20 ? '': 'Boom18'">
+  <div ng-if="infoCommon.totalElement > 0 && !showNotCheck" class="text-mns text-right" ng-class="infoCommon.totalElement > 20 ? '': 'Boom18'">
     显示&nbsp;{{(infoCommon .page - 1 ) * infoCommon.size + 1}}-{{infoCommon.all >= 20 ? infoCommon.page *  infoCommon.size: (infoCommon.page - 1 ) * infoCommon.size + infoCommon.all}}&nbsp;条,共&nbsp;{{infoCommon.totalElement}}&nbsp;条
   </div>
 </div>
@@ -891,6 +908,14 @@
   }
 </style>
 <style>
+  .wui-date-picker.left {
+    margin-right : 0 !important;
+    right: 0;
+    left: auto
+  }
+  .wui-date-picker.left table tbody tr td {
+    border: 0
+  }
   .add-apCheckList {
     background: #fff
   }