Browse Source

fix:调整应付对账,对账明细显示格式不正确的问题
调整应收对账详情页,新增顶部返回按钮

shenjunjie 7 years ago
parent
commit
33e1520c4b

+ 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.101:8090/platform-b2b'
+                        $rootScope.b2bUrl = 'http://10.1.51.125:8090/platform-b2b/'
 					}
 				}
 				return $rootScope.b2bUrl;

+ 4 - 1
src/main/webapp/resources/view/usercenter/b2b/fa/arCheck.html

@@ -1033,10 +1033,13 @@
             <td width="40">{{::check.orderprice}}</td>
             <td width="40" align="center">{{::check.taxrate}}</td>
             <td width="70">{{::(check.orderprice || 0)*(check.thischeckqty || 0) | number:2}}</td>
-            <td width="100">
+            <td width="100" ng-if="check.haveChecked === 1">
               <div>{{::check.recorder || '-'}}</div>
               <div>{{::check.apCheckDate | date:'yyyy年MM月dd日'  || '-'}}</div>
             </td>
+            <td width="100" ng-if="check.haveChecked !== 1">
+              未对账
+            </td>
           </tr>
           <tr ng-if="!data || data.length==0">
             <td colspan="11">

+ 15 - 10
src/main/webapp/resources/view/vendor/b2b/apCheck_detail.html

@@ -191,6 +191,11 @@
       <!-- <a ng-click="print(order)" class="pull-right text-simple"><i
       class="fa fa-print fa-fw"></i>打印</a> -->
     </div>
+    <div class="btn-group btn-group-sm"  style="float: right;font-size: 14px;cursor: pointer;text-align: right;height: 40px;line-height: 40px; margin-right: 20px;;color: #fff;" ui-sref="fa_apCheck">
+      <img src="static/img/vendor/images/backIcon.png" width="20"/>返回
+      <!--<b class="new-dot" ng-if="unread.cancelled > 0">{{unread.cancelled > 99 ? '99+' : unread.cancelled}}</b>-->
+
+    </div>
   </div>
   <div class="pane-body">
     <div class="bottomB">
@@ -202,10 +207,10 @@
         <span class="title">客户名称</span>
         <div class="content" ng-bind="::data.custName"></div>
       </div>
-      <div class="col-xs-6">
-        <span class="title">应付供应商</span>
-        <div class="content" ng-bind="::data.items[0].receiveName"></div>
-      </div>
+      <!--<div class="col-xs-6">-->
+        <!--<span class="title">应付供应商</span>-->
+        <!--<div class="content" ng-bind="::data.items[0].receiveName"></div>-->
+      <!--</div>-->
     </div>
     <div class="row row-sm item">
       <div class="col-xs-6">
@@ -279,10 +284,10 @@
         <tr class="header">
           <th width="40">采购单号</th>
           <th width="100">验收单</th>
-          <th width="30" style="padding:8px 0;">行号</th>
+          <!--<th width="30" style="padding:8px 0;">行号</th>-->
           <th width="120">商品</th>
-          <th>采购序号</th>
-          <th>验收单序号</th>
+          <!--<th>采购序号</th>-->
+          <!--<th>验收单序号</th>-->
           <th>单价</th>
           <!--<th width="80">单据类型</th>-->
           <th>税率</th>
@@ -295,13 +300,13 @@
         <tr>
           <td ng-bind="item.orderCode"></td>
           <td ng-bind="item.inoutno"></td>
-          <td ng-bind="item.number" style="padding:8px 0;"></td>
+          <!--<td ng-bind="item.number" style="padding:8px 0;"></td>-->
           <td style="max-width: 250px;" class="text-left">
             <div>编号: <span ng-bind="item.prodCode"></span></div>
             <div>规格: <span ng-bind="item.prodSpec"></span></div>
           </td>
-          <td ng-bind="item.orderDetno"></td>
-          <td ng-bind="item.inoutnodetno"></td>
+          <!--<td ng-bind="item.orderDetno"></td>-->
+          <!--<td ng-bind="item.inoutnodetno"></td>-->
           <!--<td ng-bind="item.orderClass"></td>-->
           <td ng-bind="isUser?'-':item.price"></td>
           <td ng-bind="item.taxrate"></td>