|
|
@@ -130,12 +130,12 @@
|
|
|
</form>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <table width="99%" class="tableMargin">
|
|
|
+ <table width="960px" class="tableMargin">
|
|
|
<tr>
|
|
|
- <table width="100%" class="table table-bordered" style="margin-bottom: 0">
|
|
|
+ <table width="960px" class="table-bordered" style="margin-bottom: 0">
|
|
|
<tr class="thAlign">
|
|
|
- <th width="35px;" class="checkboxSize"><input type="checkbox" name="checkbox" ng-model="checkboxes.checked" ng-click="checkAll()"></th>
|
|
|
- <th width="87px;">本次对账数</th>
|
|
|
+ <th width="36px;" class="checkboxSize"><input type="checkbox" name="checkbox" ng-model="checkboxes.checked" ng-click="checkAll()"></th>
|
|
|
+ <th width="91px;">本次对账数</th>
|
|
|
<th width="70px;">客户名称</th>
|
|
|
<th width="60px;">单据编号</th>
|
|
|
<th width="35px;">序号</td>
|
|
|
@@ -144,23 +144,24 @@
|
|
|
<th width="73px;">应付供应商名称</th>
|
|
|
<th width="60px;">客户采购单号</th>
|
|
|
<th width="65px;">客户料号</th>
|
|
|
+ <th width="65px;">送货工厂</th>
|
|
|
<th width="55px;">数量</th>
|
|
|
<th width="40px;">单价</th>
|
|
|
<th width="30px;">币别</th>
|
|
|
<th width="39px;">税率</th>
|
|
|
- <th width="61px;">金额</th>
|
|
|
- <th width="61px;">本次对帐金额</th>
|
|
|
+ <th width="60px;">金额</th>
|
|
|
+ <th width="60px;">本次对帐金额</th>
|
|
|
<th width="17px" style="visibility: hidden;"></th>
|
|
|
</tr>
|
|
|
</table>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
<td>
|
|
|
- <div style="overflow-y:scroll; width:100%;max-height:500px">
|
|
|
- <table width="100%" class="table table-bordered table-striped table-hover">
|
|
|
+ <div style="overflow-y:scroll; width:960px;max-height:500px">
|
|
|
+ <table class="table table-bordered table-striped table-hover">
|
|
|
<tr ng-repeat="check in data | filter:condition.uuorname |filter:condition.venduuorname |orderBy: 'piDate': reverse=true"
|
|
|
ng-if="((condition.dateFrom == '') || ((condition.dateFrom !== '') && (condition.dateFrom <= check.piDate))) && ((condition.dateTo == '') || ((condition.dateTo !== '') && (condition.dateTo >= check.piDate)))" >
|
|
|
- <td width="35px;" style="text-align: center" class="checkboxSize" n><input ng-model="check.$selected" name="checkbox" ng-click="checkOne(check)" ng-change="getTotalMoney()" type="checkbox"></td>
|
|
|
+ <td width="36px;" style="text-align: center" class="checkboxSize" n><input ng-model="check.$selected" name="checkbox" ng-click="checkOne(check)" ng-change="getTotalMoney()" type="checkbox"></td>
|
|
|
<td width="87px;"><input ng-model="check.thisCheckQty" type="number" max="data.maxThisCheckQty" min="data.minThisCheckQty" ng-change="getTotalMoney()" style="width:70px;" class=" input-sm"></td>
|
|
|
<td width="70px;">{{check.custName}}</td>
|
|
|
<td width="60px;">{{check.inOutNo}}</td>
|
|
|
@@ -170,11 +171,12 @@
|
|
|
<td width="73px;">{{check.receiveName}}</td>
|
|
|
<td width="60px;">{{check.orderCode}}</td>
|
|
|
<td width="65px;">{{check.prodCode}}</td>
|
|
|
+ <td width="65px;">{{check.factory}}</td>
|
|
|
<td width="55px;">{{check.qty}}</td>
|
|
|
<td width="40px;">{{check.orderPrice}}</td>
|
|
|
<td width="30px;">{{check.currency}}</td>
|
|
|
<td width="39px;" align="center">{{check.taxrate}}</td>
|
|
|
- <td width="61px;">{{(check.qty || 0)*(check.orderPrice || 0) | number:2}}</td>
|
|
|
+ <td width="60px;">{{(check.qty || 0)*(check.orderPrice || 0) | number:2}}</td>
|
|
|
<td width="61px;">{{(check.orderPrice || 0)*(check.thisCheckQty || 0) | number:2}}</td>
|
|
|
</tr>
|
|
|
</table>
|