应收款查询bug

src/views/ecw/financial/printVoucher.vue

 <template>
   <div class="app-container" >
       <div id="print" style="font-size: 18px;">
-        <div style="text-align: center;font-weight: bold;font-size: 20px;">收款单</div>
-        <div style="margin-top: 20px;">
-          <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.departmentName:'无'}}</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.receiptNo:'无'}}</span></div>
-            <div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">收款日期：</div><span>{{form?form.payedAt:'无'}}</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.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 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.waterBillNo:'无'}}</span></div>
-            <div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">手续费：</div><span>{{form?form.feeRate:'无'}}</span></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="display: flex;align-items: center;border-top: 1px solid #666;border-left:1px solid #666;border-right: 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;"><span>{{form?form.departmentName:'无'}}</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: 25%;text-align: center;border-right: 1px solid #666;height: 36px;line-height: 36px;"><span>{{form?form.customerName:'无'}}</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: 25%;text-align: center;height: 36px;line-height: 36px;"><span>{{form?form.payedAt:'无'}}</span></div>
           </div>
-          <div style="display: flex;width: 80%;align-items: center;">
-            <div style="flex:1"><div style="width: 120px;text-align: right;display:inline-block;">备注：</div><span>{{form?form.remark:'无'}}</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="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;"><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 style="text-align: center;border-top: 1px solid #666;border-left:1px solid #666;border-right: 1px solid #666;height: 36px;line-height: 36px;">
+             Form/To:
           </div>
-      <table border="1" style="margin-top: 20px;width: 100%;text-align: center;border-collapse: collapse; ">
+      <table border="1" style="width: 100%;text-align: center;border-collapse: collapse; ">
           <tr>
-            <th style="width: 8%;">序号</th>
-            <th style="width: 12%;">订单号</th>
-            <th style="width: 18%;">收入类型</th>
-            <th style="width: 22%;">品名</th>
-            <th style="width: 8%;">汇率</th>
-            <th style="width: 12%;">总金额</th>
-            <th style="width: 20%;">实收金额</th>
+            <th style="width: 12.5%;">序号</th>
+            <th style="width: 12.5%;">提单号</th>
+            <th style="width: 12.5%;">订单号</th>
+            <th style="width: 12.5%;">品名</th>
+            <th style="width: 12.5%;">收入类型</th>
+            <th style="width: 12.5%;">金额</th>
+            <th style="width: 12.5%;">币种</th>
+            <th style="width: 12.5%;">优惠金额</th>
           </tr>
           <tr v-for="(item, index) in list" :key="index">
             <td>{{ index + 1 }}</td>
             <td>{{ item.orderNo }}</td>
+            <td>{{ item.orderNo }}</td>
             <td>-</td>
             <td>{{ item.titleZh }}</td>
             <td>{{ item.exchangeRate }}</td>
@@ -46,19 +43,66 @@
             <td>{{ item.actualAmount }}</td>
           </tr>
           <tr>
-            <td colspan="2">合计(大写)</td>
-            <td colspan="2">{{ convertCurrency(totalMoney()) }}</td>
-            <td colspan="2">合计实收</td>
+            <td>人民币应收合计</td>
+            <td >{{ convertCurrency(totalMoney()) }}</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>收款金额(美元)</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>
         </table>
-        <div style="margin-top: 20px;">
-          <div style="display: flex;width: 100%;align-items: center;">
-            <div style="flex:1"><span style="width: 120px;">主管：</span></div>
-            <div style="flex:1"><span style="width: 120px;">会计：</span></div>
-            <div style="flex:1"><span style="width: 120px;">出纳：</span></div>
-            <div style="flex:1"><span style="width: 120px;">经手人：</span></div>
+        <div style="text-align: center;border-left:1px solid #666;border-right: 1px solid #666;height: 36px;line-height: 36px;">
+           银行信息
+        </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-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 slot="footer" class="card">

src/views/ecw/financial/receiptDetail.vue

@@ -261,21 +261,21 @@
           {{ form.receivableTotalAmount }}
         </el-descriptions-item> -->
         <el-descriptions-item label="已核销总金额">
-          <el-tag>{{ verificationData.usCount }}美元</el-tag>
-          <el-tag>{{ verificationData.rmbCount }}人民币</el-tag>
-          <el-tag>{{ verificationData.nairaCount }}奈拉</el-tag>
+          <el-tag>{{ verificationData.usCount.toFixed(6) }}美元</el-tag>
+          <el-tag>{{ verificationData.rmbCount.toFixed(6) }}人民币</el-tag>
+          <el-tag>{{ verificationData.nairaCount.toFixed(6) }}奈拉</el-tag>
         </el-descriptions-item>
         <el-descriptions-item>
           <template slot="label">
             已核销金额（<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="showCurrencyId" />）
           </template>
-          {{ verificationData.writtenOff }}
+          {{ verificationData.writtenOff.toFixed(6) }}
         </el-descriptions-item>
         <el-descriptions-item>
           <template slot="label">
             已核销比例（<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="showCurrencyId" />）
           </template>
-          {{ verificationData.WriteOffProportion }}%
+          {{ parseFloat(verificationData.WriteOffProportion/100).toFixed(2) }}%
         </el-descriptions-item>
       </el-descriptions>
     </el-card>

src/views/ecw/financial/receivable.vue

@@ -162,7 +162,7 @@
               clearable
             />
           </el-form-item>
-          <el-form-item label="自编号:">
+<!--          <el-form-item label="自编号:">
             <el-input
               style="max-width: 188px"
               v-model="queryParams.selfNo"
@@ -170,7 +170,7 @@
               clearable
               @keyup.enter.native="handleQuery"
             />
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item label="创建时间:">
             <!-- <dict-selector :type="DICT_TYPE.BEGINTIME_TYPE_ENDTIME" v-model="queryParams.date"></dict-selector> -->
             <el-date-picker