Skip to content

J
jiedao-app-operator-master
Commit e1c2fb3a authored by 我在何方's avatar 我在何方
Browse files
Options

应收款查询bug

parent df66098f
Hide whitespace changes
Inline Side-by-side
Showing with 93 additions and 49 deletions
src/views/ecw/financial/printVoucher.vue
View file @ e1c2fb3a
<template> <template>
<div class="app-container" > <div class="app-container" >
<div id="print" style="font-size: 18px;"> <div id="print" style="font-size: 18px;">
<div style="text-align: center;font-weight: bold;font-size: 20px;">收款单</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>
<div style="margin-top: 20px;"> <div style="display: flex;align-items: center;border-top: 1px solid #666;border-left:1px solid #666;border-right: 1px solid #666;">
<div style="display: flex;width: 80%;align-items: center;margin-bottom: 10px;"> <div style="font-weight: bold;width: 12.5%;text-align: center;border-right: 1px solid #666;height: 36px;line-height: 36px;">部门</div>
<div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">部门：</div><span>{{form?form.departmentName:'无'}}</span></div> <div style="width: 12.5%;text-align: center;border-right: 1px solid #666;height: 36px;line-height: 36px;"><span>{{form?form.departmentName:'无'}}</span></div>
</div>
<div style="display: flex;width: 80%;align-items: center;margin-bottom: 10px;"> <div style="font-weight: bold;width: 12.5%;text-align: center;border-right: 1px solid #666;height: 36px;line-height: 36px;">客户名称</div>
<div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">收款单号：</div> <span>{{form?form.receiptNo:'无'}}</span></div> <div style="width: 25%;text-align: center;border-right: 1px solid #666;height: 36px;line-height: 36px;"><span>{{form?form.customerName:'无'}}</span></div>
<div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">收款日期：</div><span>{{form?form.payedAt:'无'}}</span></div> <div style="font-weight: bold;width: 12.5%;text-align: center;border-right: 1px solid #666;height: 36px;line-height: 36px;">收款日期</div>
</div> <div style="width: 25%;text-align: center;height: 36px;line-height: 36px;"><span>{{form?form.payedAt:'无'}}</span></div>
<div style="display: flex;width: 80%;align-items: center;margin-bottom: 10px;">
<div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">客户名称：</div><span>{{form?form.customerName:'无'}}</span></div>
<div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">收款户名：</div><span>{{form?form.payeeName:'无'}}</span></div>
</div>
<div style="display: flex;width: 80%;align-items: center;margin-bottom: 10px;">
<div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">银行名称：</div><span>{{form?form.accountBank:'无'}}</span></div>
<div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">银行账号：</div><span>{{form?form.platformAccount:'无'}}</span></div>
</div> </div>
<div style="display: flex;width: 80%;align-items: center;margin-bottom: 10px;"> <div style="display: flex;align-items: center;border-top: 1px solid #666;border-left:1px solid #666;border-right: 1px solid #666;">
<div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">水单号：</div><span>{{form?form.waterBillNo:'无'}}</span></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="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">手续费：</div><span>{{form?form.feeRate:'无'}}</span></div> <div style="width: 12.5%;text-align: center;border-right: 1px solid #666;height: 36px;line-height: 36px;"><span>{{form?form.receiptNo:'无'}}</span></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="width: 62.5%;text-align: center;height: 36px;line-height: 36px;"><span>{{form?form.remark:'无'}}</span></div>
</div> </div>
<div style="display: flex;width: 80%;align-items: center;"> <div style="text-align: center;border-top: 1px solid #666;border-left:1px solid #666;border-right: 1px solid #666;height: 36px;line-height: 36px;">
<div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">备注：</div><span>{{form?form.remark:'无'}}</span></div> Form/To:
</div> </div>
</div> <table border="1" style="width: 100%;text-align: center;border-collapse: collapse; ">
<table border="1" style="margin-top: 20px;width: 100%;text-align: center;border-collapse: collapse; ">
<tr> <tr>
<th style="width: 8%;">序号</th> <th style="width: 12.5%;">序号</th>
<th style="width: 12%;">订单号</th> <th style="width: 12.5%;">提单号</th>
<th style="width: 18%;">收入类型</th> <th style="width: 12.5%;">订单号</th>
<th style="width: 22%;">品名</th> <th style="width: 12.5%;">品名</th>
<th style="width: 8%;">汇率</th> <th style="width: 12.5%;">收入类型</th>
<th style="width: 12%;">总金额</th> <th style="width: 12.5%;">金额</th>
<th style="width: 20%;">实收金额</th> <th style="width: 12.5%;">币种</th>
<th style="width: 12.5%;">优惠金额</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>
<td>{{ item.orderNo }}</td> <td>{{ item.orderNo }}</td>
<td>{{ item.orderNo }}</td>
<td>-</td> <td>-</td>
<td>{{ item.titleZh }}</td> <td>{{ item.titleZh }}</td>
<td>{{ item.exchangeRate }}</td> <td>{{ item.exchangeRate }}</td>
...@@ -46,20 +43,67 @@ ...@@ -46,20 +43,67 @@
<td>{{ item.actualAmount }}</td> <td>{{ item.actualAmount }}</td>
</tr> </tr>
<tr> <tr>
<td colspan="2">合计(大写)</td> <td>人民币应收合计</td>
<td colspan="2">{{ convertCurrency(totalMoney()) }}</td> <td >{{ convertCurrency(totalMoney()) }}</td>
<td colspan="2">合计实收</td> <td>汇率</td>
<td>{{ totalMoney() }}</td>
<td>收款金额(人民币)</td>
<td colspan="3">234</td>
</tr>
<tr>
<td>美元应收合计</td>
<td >{{ convertCurrency(totalMoney()) }}</td>
<td>汇率</td>
<td>{{ totalMoney() }}</td> <td>{{ totalMoney() }}</td>
<td>收款金额(美元)</td>
<td colspan="3">234</td>
</tr>
<tr>
<td>奈拉应收合计</td>
<td >{{ convertCurrency(totalMoney()) }}</td>
<td>汇率</td>
<td>{{ totalMoney() }}</td>
<td>收款金额(奈拉)</td>
<td colspan="3">234</td>
</tr> </tr>
</table> </table>
<div style="margin-top: 20px;"> <div style="text-align: center;border-left:1px solid #666;border-right: 1px solid #666;height: 36px;line-height: 36px;">
<div style="display: flex;width: 100%;align-items: center;"> 银行信息
<div style="flex:1"><span style="width: 120px;">主管：</span></div> </div>
<div style="flex:1"><span style="width: 120px;">会计：</span></div> <div style="display: flex;align-items: center;border-top: 1px solid #666;border-left:1px solid #666;border-right: 1px solid #666;">
<div style="flex:1"><span style="width: 120px;">出纳：</span></div> <div style="padding:6px 0;width: 12.5%;text-align: center;border-right: 1px solid #666;">
<div style="flex:1"><span style="width: 120px;">经手人：</span></div> <p style="margin: 0;word-break: break-all;">户名：</p>
<p style="margin: 0;word-break: break-all;">银行名称：</p>
<p style="margin: 0;word-break: break-all;">A/C NO：</p>
</div>
<div style="padding:6px 0;width: 87.5%;text-align: center;">
<p style="margin: 0;">应收人民币：¥</p>
<p style="margin: 0;">优惠后人民币：¥</p>
<p style="margin: 0;">未收：¥</p>
</div> </div>
</div> </div>
<div style="display: flex;align-items: center;border-top: 1px solid #666;border-left:1px solid #666;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;">户名：</p>
<p style="margin: 0;word-break: break-all;">银行名称：</p>
<p style="margin: 0;word-break: break-all;">A/C NO：</p>
</div>
<div style="padding:6px 0;width: 87.5%;text-align: center;">
<p style="margin: 0;">应收美元：$</p>
<p style="margin: 0;">优惠后美元：$</p>
<p style="margin: 0;">未收：$</p>
</div>
</div>
<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="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="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="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="width: 12.5%;text-align: center;height: 36px;line-height: 36px;"></div>
</div>
</div> </div>
<div slot="footer" class="card"> <div slot="footer" class="card">
<el-button type="primary" @click="print">确订打印</el-button> <el-button type="primary" @click="print">确订打印</el-button>
...@@ -188,7 +232,7 @@ ...@@ -188,7 +232,7 @@
var chineseStr = ''; var chineseStr = '';
//分离金额后用的数组，预定义 //分离金额后用的数组，预定义
var parts; var parts;
// 传入的参数为空情况 // 传入的参数为空情况
if(money === '') { if(money === '') {
return ''; return '';
} }
...@@ -196,7 +240,7 @@ ...@@ -196,7 +240,7 @@
if(money >= maxNum){ if(money >= maxNum){
return '' return ''
} }
// 传入的参数为0情况 // 传入的参数为0情况
if (money === 0) { if (money === 0) {
chineseStr = cnNums[0] + cnIntLast + cnInteger; chineseStr = cnNums[0] + cnIntLast + cnInteger;
return chineseStr return chineseStr
...@@ -231,7 +275,7 @@ ...@@ -231,7 +275,7 @@
chineseStr += cnNums[parseInt(n)] + cnIntRadice[m]; chineseStr += cnNums[parseInt(n)] + cnIntRadice[m];
} }
if(m == 0 && zeroCount < 4){ if(m == 0 && zeroCount < 4){
chineseStr += cnIntUnits[q]; chineseStr += cnIntUnits[q];
} }
} }
// 最后+ 元 // 最后+ 元
......
src/views/ecw/financial/receiptDetail.vue
View file @ e1c2fb3a
...@@ -261,21 +261,21 @@ ...@@ -261,21 +261,21 @@
{{ form.receivableTotalAmount }} {{ form.receivableTotalAmount }}
</el-descriptions-item> --> </el-descriptions-item> -->
<el-descriptions-item label="已核销总金额"> <el-descriptions-item label="已核销总金额">
<el-tag>{{ verificationData.usCount }}美元</el-tag> <el-tag>{{ verificationData.usCount.toFixed(6) }}美元</el-tag>
<el-tag>{{ verificationData.rmbCount }}人民币</el-tag> <el-tag>{{ verificationData.rmbCount.toFixed(6) }}人民币</el-tag>
<el-tag>{{ verificationData.nairaCount }}奈拉</el-tag> <el-tag>{{ verificationData.nairaCount.toFixed(6) }}奈拉</el-tag>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> <template slot="label">
已核销金额（<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="showCurrencyId" />） 已核销金额（<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="showCurrencyId" />）
</template> </template>
{{ verificationData.writtenOff }} {{ verificationData.writtenOff.toFixed(6) }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> <template slot="label">
已核销比例（<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="showCurrencyId" />） 已核销比例（<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="showCurrencyId" />）
</template> </template>
{{ verificationData.WriteOffProportion }}% {{ parseFloat(verificationData.WriteOffProportion/100).toFixed(2) }}%
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
</el-card> </el-card>
......
src/views/ecw/financial/receivable.vue
View file @ e1c2fb3a
...@@ -162,7 +162,7 @@ ...@@ -162,7 +162,7 @@
clearable clearable
/> />
</el-form-item> </el-form-item>
<el-form-item label="自编号:"> <!-- <el-form-item label="自编号:">
<el-input <el-input
style="max-width: 188px" style="max-width: 188px"
v-model="queryParams.selfNo" v-model="queryParams.selfNo"
...@@ -170,7 +170,7 @@ ...@@ -170,7 +170,7 @@
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item> -->
<el-form-item label="创建时间:"> <el-form-item label="创建时间:">
<!-- <dict-selector :type="DICT_TYPE.BEGINTIME_TYPE_ENDTIME" v-model="queryParams.date"></dict-selector> --> <!-- <dict-selector :type="DICT_TYPE.BEGINTIME_TYPE_ENDTIME" v-model="queryParams.date"></dict-selector> -->
<el-date-picker <el-date-picker
......
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