Przeglądaj źródła

fix:注释应付对账,应收对账 已收已付字段

shenjunjie 7 lat temu
rodzic
commit
d629f9c96b

+ 20 - 20
src/main/webapp/resources/tpl/index/fa/apCheck.html

@@ -319,7 +319,7 @@
 						<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>
 					</tr>
@@ -348,12 +348,12 @@
 					</td>
 					<td ng-if="check.thisMonthDoneCount.length === 0">-</td>
 
-					<td ng-if="check.apCheckAmounts.length > 0">
-						<div ng-repeat="count in check.apCheckAmounts">
-							<span ng-if="count.amount > 0">{{count.currency}}:{{count.amount | number:2}}</span>
-						</div>
-					</td>
-					<td ng-if="check.apCheckAmounts.length === 0">-</td>
+					<!--<td ng-if="check.apCheckAmounts.length > 0">-->
+						<!--<div ng-repeat="count in check.apCheckAmounts">-->
+							<!--<span ng-if="count.amount > 0">{{count.currency}}:{{count.amount | number:2}}</span>-->
+						<!--</div>-->
+					<!--</td>-->
+					<!--<td ng-if="check.apCheckAmounts.length === 0">-</td>-->
 
 					<td ng-if="check.totalCount.length > 0">
 						<div ng-repeat="count in check.totalCount">
@@ -367,7 +367,7 @@
 				</tbody>
 				<tbody ng-if="!ALLList || ALLList.length == 0">
 				<tr>
-					<td colspan="7">
+					<td colspan="6">
 						<div id="empty">
 							<div class="left_img">
 								<a><img src="static/img/empty/uas_empty.png"></a>
@@ -470,7 +470,7 @@
 				</tbody>
 				<tbody ng-if="tableParams.total() == 0">
 				<tr>
-					<td colspan="6">
+					<td colspan="5">
 						<div id="empty">
 							<div class="left_img">
 								<a><img src="static/img/empty/uas_empty.png"></a>
@@ -532,17 +532,17 @@
 						</label>
 					</div>
 
-					<div style="text-align: left;margin-top: 20px">
-						<label>本期间已收总额:</label>
-						<label style="text-align:left;vertical-align: top;">
-							<div ng-if="dataInfo.apCheckAmounts.length > 0" ng-repeat="count in dataInfo.apCheckAmounts">
-								<span>{{count.currency}}:{{count.amount | number:2}}</span>
-							</div>
-							<div ng-if="dataInfo.apCheckAmounts.length === 0">
-								0
-							</div>
-						</label>
-					</div>
+					<!--<div style="text-align: left;margin-top: 20px">-->
+						<!--<label>本期间已收总额:</label>-->
+						<!--<label style="text-align:left;vertical-align: top;">-->
+							<!--<div ng-if="dataInfo.apCheckAmounts.length > 0" ng-repeat="count in dataInfo.apCheckAmounts">-->
+								<!--<span>{{count.currency}}:{{count.amount | number:2}}</span>-->
+							<!--</div>-->
+							<!--<div ng-if="dataInfo.apCheckAmounts.length === 0">-->
+								<!--0-->
+							<!--</div>-->
+						<!--</label>-->
+					<!--</div>-->
 
 					<div style="text-align: left;margin-top: 20px">
 						<label>应收总额:</label>

+ 19 - 19
src/main/webapp/resources/tpl/index/fa/arCheck.html

@@ -296,7 +296,7 @@
 					<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>
 				</tr>
@@ -325,12 +325,12 @@
 					</td>
 					<td ng-if="check.thisMonthDoneCount.length === 0">-</td>
 
-					<td ng-if="check.apCheckAmounts.length > 0">
-						<div ng-repeat="count in check.apCheckAmounts">
-							<span ng-if="count.amount > 0">{{count.currency}}:{{count.amount | number:2}}</span>
-						</div>
-					</td>
-					<td ng-if="check.apCheckAmounts.length === 0">-</td>
+					<!--<td ng-if="check.apCheckAmounts.length > 0">-->
+						<!--<div ng-repeat="count in check.apCheckAmounts">-->
+							<!--<span ng-if="count.amount > 0">{{count.currency}}:{{count.amount | number:2}}</span>-->
+						<!--</div>-->
+					<!--</td>-->
+					<!--<td ng-if="check.apCheckAmounts.length === 0">-</td>-->
 
 					<td ng-if="check.totalCount.length > 0">
 						<div ng-repeat="count in check.totalCount">
@@ -344,7 +344,7 @@
 				</tbody>
 				<tbody ng-if="!ALLList || ALLList.length == 0">
 				<tr>
-					<td colspan="7">
+					<td colspan="6">
 						<div id="empty">
 							<div class="left_img">
 								<a><img src="static/img/empty/uas_empty.png"></a>
@@ -458,17 +458,17 @@
 						</label>
 					</div>
 
-					<div style="text-align: left;margin-top: 20px">
-						<label>本期间已付总额:</label>
-						<label style="text-align:left;vertical-align: top;">
-							<div ng-if="dataInfo.apCheckAmounts.length > 0" ng-repeat="count in dataInfo.apCheckAmounts">
-								<span>{{count.currency}}:{{count.amount | number:2}}</span>
-							</div>
-							<div ng-if="dataInfo.apCheckAmounts.length === 0">
-								0
-							</div>
-						</label>
-					</div>
+					<!--<div style="text-align: left;margin-top: 20px">-->
+						<!--<label>本期间已付总额:</label>-->
+						<!--<label style="text-align:left;vertical-align: top;">-->
+							<!--<div ng-if="dataInfo.apCheckAmounts.length > 0" ng-repeat="count in dataInfo.apCheckAmounts">-->
+								<!--<span>{{count.currency}}:{{count.amount | number:2}}</span>-->
+							<!--</div>-->
+							<!--<div ng-if="dataInfo.apCheckAmounts.length === 0">-->
+								<!--0-->
+							<!--</div>-->
+						<!--</label>-->
+					<!--</div>-->
 
 
 					<div style="text-align: left;margin-top: 20px">