Merge remote-tracking branch 'origin/release-201846-wangcz' into release-201846-wangcz

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

@@ -734,9 +734,9 @@
         <thead ng-show="active === 'all'">
         <tr class="header">
           <th width="180">应付供应商名称</th>
-          <th width="140">本月应付</th>
-          <th width="140">本月未对</th>
-          <th width="140">本月已对</th>
+          <th width="140">本期应付</th>
+          <th width="140">本期未对账</th>
+          <th width="140">本期已对账</th>
           <!--<th width="140">本月已付</th>-->
           <th width="140">应付总额</th>
           <th width="80">操作</th>
@@ -832,7 +832,7 @@
             </label>
           </div>
           <div style="text-align: left;margin-top: 20px">
-            <label>本期间应付总额：</label>
+            <label>本期应付：</label>
             <label style="text-align:left;vertical-align: top;">
               <div ng-if="dataInfo.thisMonthCount.length > 0" ng-repeat="count in dataInfo.thisMonthCount">
                 <span>{{count.currency}}：{{count.amount | number:2}}</span>
@@ -844,7 +844,7 @@
           </div>
 
           <div style="text-align: left;margin-top: 20px">
-            <label>本期间未对总额：</label>
+            <label>本期未对账：</label>
             <label style="text-align:left;vertical-align: top;">
               <div ng-if="dataInfo.thisMonthTodoCount.length > 0" ng-repeat="count in dataInfo.thisMonthTodoCount">
                 <span>{{count.currency}}：{{count.amount | number:2}}</span>
@@ -856,7 +856,7 @@
           </div>
 
           <div style="text-align: left;margin-top: 20px">
-            <label>本期间已对总额：</label>
+            <label>本期已对账：</label>
             <label style="text-align:left;vertical-align: top;">
               <div ng-if="dataInfo.thisMonthDoneCount.length > 0" ng-repeat="count in dataInfo.thisMonthDoneCount">
                 <span>{{count.currency}}：{{count.amount | number:2}}</span>
@@ -1098,7 +1098,7 @@
           </tr>
         </table>
       </div>
-      <div style="padding: 10px 20px">本期间应付总额：{{totalMoney | number:2 || 0}}</div>
+      <div style="padding: 10px 20px">本期应付：{{totalMoney | number:2 || 0}}</div>
     </div>
   </div>
   <div ng-if="infoCommon.totalElement > 0 && !showNotCheck" class="text-mns text-right" ng-class="infoCommon.totalElement > 20 ? '': 'Boom18'">

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

@@ -733,9 +733,9 @@
         <thead ng-show="active === 'all'">
           <tr class="header">
               <th width="180">客户名称</th>
-              <th width="140">本月应收</th>
-              <th width="140">本月未对</th>
-              <th width="140">本月已对</th>
+              <th width="140">本期应收</th>
+              <th width="140">本期未对账</th>
+              <th width="140">本期已对账</th>
               <!--<th width="140">本月已收</th>-->
               <th width="140">应收总额</th>
               <th width="80">操作</th>
@@ -831,7 +831,7 @@
             </label>
           </div>
         <div style="text-align: left;margin-top: 20px">
-            <label>本期间应收总额：</label>
+            <label>本期应收：</label>
             <label style="text-align:left;vertical-align: top;">
                <div ng-if="dataInfo.thisMonthCount.length > 0" ng-repeat="count in dataInfo.thisMonthCount">
                    <span>{{count.currency}}：{{count.amount | number:2}}</span>
@@ -842,7 +842,7 @@
             </label>
         </div>
             <div style="text-align: left;margin-top: 20px">
-                <label>本期间未对总额：</label>
+                <label>本期未对账：</label>
                 <label style="text-align:left;vertical-align: top;">
                     <div ng-if="dataInfo.thisMonthTodoCount.length > 0" ng-repeat="count in dataInfo.thisMonthTodoCount">
                         <span>{{count.currency}}：{{count.amount | number:2}}</span>
@@ -853,7 +853,7 @@
                 </label>
             </div>
             <div style="text-align: left;margin-top: 20px">
-                <label>本期间已对总额：</label>
+                <label>本期已对账：</label>
                 <label style="text-align:left;vertical-align: top;">
                     <div ng-if="dataInfo.thisMonthDoneCount.length > 0" ng-repeat="count in dataInfo.thisMonthDoneCount">
                         <span>{{count.currency}}：{{count.amount | number:2}}</span>
@@ -1111,7 +1111,7 @@
               </tr>
           </table>
       </div>
-      <div style="padding: 10px 20px">本期间应收总额：{{totalMoney | number:2 || 0}}</div>
+      <div style="padding: 10px 20px">本期应收：{{totalMoney | number:2 || 0}}</div>
     </div>
   </div>
   <div ng-if="infoCommon.totalElement > 0 && !showNotCheck" class="text-mns text-right" ng-class="infoCommon.totalElement > 20 ? '': 'Boom18'">