新增应收应付页面，单据日期字段

src/main/webapp/resources/view/usercenter/b2b/fa/arCheck.html

@@ -516,6 +516,12 @@
       <!--<i class="fa fa-plus-square fa-fw"></i>新增对账单-->
       <!--</a>-->
       <!--</li>-->
+
+      <li style="float: right;font-size: 14px;cursor: pointer;" ng-show="active !== 'all'">
+        <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;"  ng-click="setActive('all')">
+          <img src="static/img/vendor/images/backIcon.png" width="20"/>返回
+        </div>
+      </li>
       <li style="float: right;font-size: 14px;cursor: pointer;" ng-show="active === 'all'">
         <div class="btn-group btn-group-sm"  style="float: right;
     font-size: 14px;
@@ -531,11 +537,6 @@
           <!--<b class="new-dot" ng-if="unread.cancelled > 0">{{unread.cancelled > 99 ? '99+' : unread.cancelled}}</b>-->
         </div>
       </li>
-      <li style="float: right;font-size: 14px;cursor: pointer;" ng-show="active !== 'all'">
-        <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;"  ng-click="setActive('all')">
-          <img src="static/img/vendor/images/backIcon.png" width="20"/>返回
-        </div>
-      </li>
 
     </ul>
   </div>
@@ -1014,6 +1015,7 @@
             <!--<th width="70">客户<br>名称</th>-->
             <th width="70">采购单</th>
             <th width="60">发货单</th>
+            <th width="90">单据日期</th>
             <th width="60">验收单</th>
             <th width="70">物料编号</th>
             <th width="70">物料名称</th>
@@ -1042,6 +1044,7 @@
           <tr ng-repeat="check in data" ng-click="checkOne(check);getTotalMoney()" class="thAlign" style="height: 40px;">
             <td width="70">{{::check.ordercode}}</td>
             <td width="60">{{::check.sendcode}}</td>
+            <td width="90">{{::check.pidate | date:'yyyy年MM月dd日'  || '-'}}</td>
             <td width="60">{{::check.inoutno}}</td>
             <td width="70" title="{{check.prodcode}}">
               <div style="display: -webkit-box; text-overflow: ellipsis; overflow: hidden; text-overflow: ellipsis; -webkit-line-clamp: 3; -webkit-box-orient: vertical;">{{::check.prodcode}}</div>

src/main/webapp/resources/view/usercenter/b2b/fa/arCheck_detail.html

@@ -318,12 +318,14 @@
       <table class="block table table-default table-striped table-hover">
         <thead>
         <tr class="header">
-          <th width="40" style="padding:8px 0;font-size: 16px">行号</th>
-          <th width="150" style="font-size: 16px">商品</th>
+          <!--<th width="40" style="padding:8px 0;font-size: 16px">行号</th>-->
           <th width="80" style="font-size: 16px">采购单号</th>
-          <th style="font-size: 16px">采购序号</th>
           <th width="100" style="font-size: 16px">验收单</th>
-          <th style="font-size: 16px">验收单序号</th>
+          <th width="150" style="font-size: 16px">商品</th>
+
+          <!--<th style="font-size: 16px">采购序号</th>-->
+
+          <!--<th style="font-size: 16px">验收单序号</th>-->
           <th style="font-size: 16px">单价</th>
           <!--<th width="80">单据类型</th>-->
           <th style="font-size: 16px">税率</th>
@@ -333,15 +335,17 @@
         </thead>
         <tbody>
         <tr ng-repeat="item in order.items track by item.id">
-          <td ng-bind="item.number" style="padding:8px 0;"></td>
+          <!--<td ng-bind="item.number" style="padding:8px 0;"></td>-->
+          <td ng-bind="item.orderCode"></td>
+          <td ng-bind="item.inoutno"></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.orderCode"></td>
-          <td style="text-align: center" ng-bind="item.orderDetno"></td>
-          <td ng-bind="item.inoutno"></td>
-          <td style="text-align: center" ng-bind="item.inoutnodetno"></td>
+
+          <!--<td style="text-align: center" ng-bind="item.orderDetno"></td>-->
+
+          <!--<td style="text-align: center" ng-bind="item.inoutnodetno"></td>-->
 
           <!--<td ng-bind="item.orderClass"></td>-->
           <td ng-bind="isUser?'-':item.price"></td>
@@ -350,9 +354,7 @@
           <td style="text-align: center" ng-bind="isUser?'-':(item.amount | number:2)"></td>
         </tr>
         <tr>
-          <td></td>
-          <td></td>
-          <td></td>
+
           <td></td>
           <td></td>
           <td></td>

src/main/webapp/resources/view/vendor/b2b/apCheck.html

@@ -515,6 +515,12 @@
           <!--<i class="fa fa-plus-square fa-fw"></i>新增对账单-->
         <!--</a>-->
       <!--</li>-->
+
+        <li style="float: right;font-size: 14px;cursor: pointer;" ng-show="active !== 'all'">
+            <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;"  ng-click="setActive('all')">
+                <img src="static/img/vendor/images/backIcon.png" width="20"/>返回
+            </div>
+        </li>
         <li style="float: right;font-size: 14px;cursor: pointer;" ng-show="active === 'all'">
             <div class="btn-group btn-group-sm"  style="    float: right;
     font-size: 14px;
@@ -530,11 +536,6 @@
                 <!--<b class="new-dot" ng-if="unread.cancelled > 0">{{unread.cancelled > 99 ? '99+' : unread.cancelled}}</b>-->
             </div>
         </li>
-        <li style="float: right;font-size: 14px;cursor: pointer;" ng-show="active !== 'all'">
-            <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;"  ng-click="setActive('all')">
-                <img src="static/img/vendor/images/backIcon.png" width="20"/>返回
-            </div>
-        </li>
 
     </ul>
   </div>
@@ -1012,6 +1013,7 @@
                   <!--<th width="70">客户<br>名称</th>-->
                   <th width="70">采购单</th>
                   <th width="60">发货单</th>
+                  <th width="90">单据日期</th>
                   <th width="60">验收单</th>
                   <th width="70">物料编号</th>
                   <th width="70">物料名称</th>
@@ -1045,6 +1047,7 @@
                   </td>
                   <td width="70">{{::check.ordercode}}</td>
                   <td width="60">{{::check.sendcode}}</td>
+                  <td width="90">{{::check.pidate | date:'yyyy年MM月dd日'  || '-'}}</td>
                   <td width="60">{{::check.inoutno}}</td>
                   <td width="70" title="{{check.prodcode}}">
                       <div style="display: -webkit-box; text-overflow: ellipsis; overflow: hidden; text-overflow: ellipsis; -webkit-line-clamp: 3; -webkit-box-orient: vertical;">{{::check.prodcode}}</div>

src/main/webapp/resources/view/vendor/b2b/apCheck_detail.html

@@ -282,10 +282,10 @@
       <table class="block table table-default table-striped table-hover">
         <thead>
         <tr class="header">
-          <th width="40">采购单号</th>
-          <th width="100">验收单</th>
+          <th width="150">采购单号</th>
+          <th width="150">验收单</th>
           <!--<th width="30" style="padding:8px 0;">行号</th>-->
-          <th width="120">商品</th>
+          <th width="150">商品</th>
           <!--<th>采购序号</th>-->
           <!--<th>验收单序号</th>-->
           <th>单价</th>