Commit c2b04415 authored by 我在何方's avatar 我在何方

打印收款单收款日期修改

parent 951c0797
...@@ -5,18 +5,18 @@ ...@@ -5,18 +5,18 @@
<div style="text-align: center;font-weight: bold;font-size: 26px;padding: 22px 0;border-top: 1px solid #666;border-left:1px solid #666;border-right: 1px solid #666;">捷道货运收款单</div> <div style="text-align: center;font-weight: bold;font-size: 26px;padding: 22px 0;border-top: 1px solid #666;border-left:1px solid #666;border-right: 1px solid #666;">捷道货运收款单</div>
<table border="1" style="width: 100%;text-align: center;border-collapse: collapse; "> <table border="1" style="width: 100%;text-align: center;border-collapse: collapse; ">
<tr> <tr>
<td style="font-weight: bold;width:12.5%">部门</td> <td style="font-weight: bold;width:12.5%">{{$t('部门')}}</td>
<td style="width:12.5%">{{form?form.departmentName:''}}</td> <td style="width:12.5%">{{form?form.departmentName:$t('')}}</td>
<td style="font-weight: bold;width:12.5%">客户名称</td> <td style="font-weight: bold;width:12.5%">{{$t('客户名称')}}</td>
<td colspan="2" style="width: 25%;">{{form?form.customerName:''}}</td> <td colspan="2" style="width: 25%;">{{form?form.customerName:$t('')}}</td>
<td style="font-weight: bold;width:12.5%">收款日期</td> <td style="font-weight: bold;width:12.5%">{{$t('收款日期')}}</td>
<td colspan="2" style="width: 25%;">{{form?form.payedAt:''}}</td> <td colspan="2" style="width: 25%;">{{parseTime(date)||$t('')}}</td>
</tr> </tr>
<tr> <tr>
<td style="font-weight: bold;width:12.5%">收款单号</td> <td style="font-weight: bold;width:12.5%">{{$t('收款单号')}}</td>
<td style="width:12.5%">{{form?form.receiptNo:''}}</td> <td style="width:12.5%">{{form?form.receiptNo:$t('')}}</td>
<td style="font-weight: bold;width:12.5%">备注</td> <td style="font-weight: bold;width:12.5%">{{$t('备注')}}</td>
<td colspan="4" style="width: 50%;">{{form?form.remark:''}}</td> <td colspan="4" style="width: 50%;">{{form?form.remark:$t('')}}</td>
</tr> </tr>
<tr> <tr>
<td colspan="8">Form/To:{{orderData.logisticsInfoDto?orderData.logisticsInfoDto.startTitleZh:''}}>{{orderData.logisticsInfoDto?orderData.logisticsInfoDto.destAddressZh:''}}</td> <td colspan="8">Form/To:{{orderData.logisticsInfoDto?orderData.logisticsInfoDto.startTitleZh:''}}>{{orderData.logisticsInfoDto?orderData.logisticsInfoDto.destAddressZh:''}}</td>
...@@ -24,14 +24,14 @@ ...@@ -24,14 +24,14 @@
</table> </table>
<table border="1" style="width: 100%;text-align: center;border-collapse: collapse; border-top: 0;"> <table border="1" style="width: 100%;text-align: center;border-collapse: collapse; border-top: 0;">
<tr> <tr>
<th style="width: 12.5%;">序号</th> <th style="width: 12.5%;">{{$t('序号')}}</th>
<th style="width: 12.5%;">提单号</th> <th style="width: 12.5%;">{{$t('提单号')}}</th>
<th style="width: 12.5%;">订单号</th> <th style="width: 12.5%;">{{$t('订单号')}}</th>
<th style="width: 12.5%;">品名</th> <th style="width: 12.5%;">{{$t('品名')}}</th>
<th style="width: 12.5%;">收入类型</th> <th style="width: 12.5%;">{{$t('收入类型')}}</th>
<th style="width: 12.5%;">金额</th> <th style="width: 12.5%;">{{$t('金额')}}</th>
<th style="width: 12.5%;">币种</th> <th style="width: 12.5%;">{{$t('币种')}}</th>
<th style="width: 12.5%;">优惠金额</th> <th style="width: 12.5%;">{{$t('优惠金额')}}</th>
</tr> </tr>
<tr v-for="(item, index) in list" :key="index"> <tr v-for="(item, index) in list" :key="index">
<td>{{ index + 1 }}</td> <td>{{ index + 1 }}</td>
...@@ -44,38 +44,38 @@ ...@@ -44,38 +44,38 @@
<td>{{ item.discountTotal||0 }}</td> <td>{{ item.discountTotal||0 }}</td>
</tr> </tr>
<tr v-for="(items, indexs) in receiptAccountList" :key="indexs"> <tr v-for="(items, indexs) in receiptAccountList" :key="indexs">
<td><dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="items.currencyId" />应收合计</td> <td><dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="items.currencyId" />{{$t('应收合计')}}</td>
<td ><span v-if="items.discountTotal>0">{{ `${items.receivableAmount - items.discountTotal }(${items.receivableAmount} - ${items.discountTotal})` }}</span> <td ><span v-if="items.discountTotal>0">{{ `${items.receivableAmount - items.discountTotal }(${items.receivableAmount} - ${items.discountTotal})` }}</span>
<span v-else>{{ `${items.receivableAmount - items.discountTotal }` }}</span> <span v-else>{{ `${items.receivableAmount - items.discountTotal }` }}</span>
</td> </td>
<td>汇率</td> <td>{{$t('汇率')}}</td>
<td>{{ items.collectionRate}}</td> <td>{{ items.collectionRate}}</td>
<td>收款金额(<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="items.collectionCurrencyId" />)</td> <td>{{$t('收款金额')}}(<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="items.collectionCurrencyId" />)</td>
<td colspan="3">{{ items.collectionAmount}}</td> <td colspan="3">{{ items.collectionAmount}}</td>
</tr> </tr>
</table> </table>
<div style="text-align: center;border-left:1px solid #666;border-right: 1px solid #666;height: 36px;line-height: 36px;"> <div style="text-align: center;border-left:1px solid #666;border-right: 1px solid #666;height: 36px;line-height: 36px;">
银行信息 {{$t('银行信息')}}
</div> </div>
<div style="display: flex;align-items: center;border-top: 1px solid #666;border-left:1px solid #666;border-right: 1px solid #666;" v-for="(bankTiem,index) in detailed" :key="index"> <div style="display: flex;align-items: center;border-top: 1px solid #666;border-left:1px solid #666;border-right: 1px solid #666;" v-for="(bankTiem,index) in detailed" :key="index">
<div style="padding:6px 0;width: 12.5%;text-align: center;border-right: 1px solid #666;" > <div style="padding:6px 0;width: 12.5%;text-align: center;border-right: 1px solid #666;" >
<p style="margin: 0;word-break: break-all;">户名{{bankTiem.accountName}}</p> <p style="margin: 0;word-break: break-all;">{{$t('户名')}}{{bankTiem.accountName}}</p>
<p style="margin: 0;word-break: break-all;">银行名称{{bankTiem.accountBankName||''}}</p> <p style="margin: 0;word-break: break-all;">{{$t('银行名称')}}{{bankTiem.accountBankName||''}}</p>
<p style="margin: 0;word-break: break-all;">A/C NO{{bankTiem.accountNo}}</p> <p style="margin: 0;word-break: break-all;">A/C NO{{bankTiem.accountNo}}</p>
</div> </div>
<div style="padding:6px 0;width: 87.5%;text-align: center;"> <div style="padding:6px 0;width: 87.5%;text-align: center;">
<p style="margin: 0;">实收<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="bankTiem.currencyId" />{{bankTiem.writeOffAmount}}¥</p> <p style="margin: 0;">{{$t('实收')}}<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="bankTiem.currencyId" />{{bankTiem.writeOffAmount}}¥</p>
<!-- <p style="margin: 0;">未收:¥{{bankTiem.noReceipt}}</p> --> <!-- <p style="margin: 0;">未收:¥{{bankTiem.noReceipt}}</p> -->
</div> </div>
</div> </div>
<div style="display: flex;align-items: center;border: 1px solid #666;"> <div style="display: flex;align-items: center;border: 1px solid #666;">
<div style="font-weight: bold;width: 12.5%;text-align: center;border-right: 1px solid #666;height: 36px;line-height: 36px;">主管</div> <div style="font-weight: bold;width: 12.5%;text-align: center;border-right: 1px solid #666;height: 36px;line-height: 36px;">{{$t('主管')}}</div>
<div style="width: 12.5%;text-align: center;border-right: 1px solid #666;height: 36px;line-height: 36px;"></div> <div style="width: 12.5%;text-align: center;border-right: 1px solid #666;height: 36px;line-height: 36px;"></div>
<div style="font-weight: bold;width: 12.5%;text-align: center;border-right: 1px solid #666;height: 36px;line-height: 36px;">会计</div> <div style="font-weight: bold;width: 12.5%;text-align: center;border-right: 1px solid #666;height: 36px;line-height: 36px;">{{$t('会计')}}</div>
<div style="width: 12.5%;text-align: center;border-right: 1px solid #666;height: 36px;line-height: 36px;"></div> <div style="width: 12.5%;text-align: center;border-right: 1px solid #666;height: 36px;line-height: 36px;"></div>
<div style="font-weight: bold;width: 12.5%;text-align: center;border-right: 1px solid #666;height: 36px;line-height: 36px;">出纳</div> <div style="font-weight: bold;width: 12.5%;text-align: center;border-right: 1px solid #666;height: 36px;line-height: 36px;">{{$t('出纳')}}</div>
<div style="width: 12.5%;text-align: center;height: 36px;line-height: 36px;border-right: 1px solid #666;"></div> <div style="width: 12.5%;text-align: center;height: 36px;line-height: 36px;border-right: 1px solid #666;"></div>
<div style="font-weight: bold;width: 12.5%;text-align: center;border-right: 1px solid #666;height: 36px;line-height: 36px;">经手人</div> <div style="font-weight: bold;width: 12.5%;text-align: center;border-right: 1px solid #666;height: 36px;line-height: 36px;">{{$t('经手人')}}</div>
<div style="width: 12.5%;text-align: center;height: 36px;line-height: 36px;"></div> <div style="width: 12.5%;text-align: center;height: 36px;line-height: 36px;"></div>
</div> </div>
</div> </div>
...@@ -120,7 +120,8 @@ ...@@ -120,7 +120,8 @@
deptArr:[], deptArr:[],
id:0, id:0,
orderData:{}, orderData:{},
detailed:[] detailed:[],
date:''
} }
}, },
async created() { async created() {
...@@ -206,7 +207,14 @@ ...@@ -206,7 +207,14 @@
getList() { getList() {
getReceivableItem({ id: this.id }).then(res => { getReceivableItem({ id: this.id }).then(res => {
this.detailed = res.data this.detailed = res.data
this.detailed.forEach(item=>{
if(!this.date){
this.date = item.amountDate
}else if(this.date<item.amountDate){
this.date = item.amountDate
}
}) })
})
}, },
getCollectionData(){ getCollectionData(){
let that = this let that = this
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment