收款单打印

src/i18n/languages/en_US.json

@@ -1142,7 +1142,7 @@
     "手续费（RMB）": "Handling fee (RMB)",
     "需要": "need",
     "不需要": "unnecessary",
-    "元": "RMB",
+    "元": "Yuan",
     "银行收款明细": "Bank Receipt Details",
     "批量核销": "Batch write-off",
     "添加收款明细": "Add Receipt Details",
@@ -1181,7 +1181,7 @@
     "待收款": "Payment Unreceived",
     "请输入唛头": "Please enter shipping mark",
     "收款": "Receipt",
-    "收款单": "receipt",
+    "收款单": "Collection Note",
     "商品名称": "product name",
     "请输入商品名称": "Please enter a product name",
     "收款类型": "Receipt Type",
@@ -1396,7 +1396,6 @@
     "商品链接": "Product link",
     "编辑商品链接": "Edit product link",
     "添加商品链接": "Add product link",
-    "元": "Yuan",
     "通用": "General",
     "价格有效时间": "Price valid time",
     "交货地址": "Delivery Address",
@@ -3896,5 +3895,151 @@
     "入仓方数": "",
     "收费方数": "",
     "可放入重量": "",
-    "可放入收费重量": ""
+    "可放入收费重量": "",
+    "请选择提单制作状态": "",
+    "提单状态": "",
+    "部分完成": "",
+    "数量(个)": "",
+    "品名可拆数据": "",
+    "剩余货值": "",
+    "可拆入仓记录": "",
+    "已拆完": "",
+    "已放入入仓记录": "",
+    "放入货值": "",
+    "{num}箱": "",
+    "长{boxGauge1}cm": "",
+    "宽{boxGauge2}cm": "",
+    "高{boxGauge3}cm": "",
+    "方数{volume}m³": "",
+    "重量{weight}kg": "",
+    "数量{n}": "",
+    "快递{expressNo}": "",
+    "储位{location}": "",
+    "请选择入仓记录": "",
+    "暂无入仓记录": "",
+    "请至少放入一条数据": "",
+    "确定要清空放入数据么?": "",
+    "是否需要一起移出?": "",
+    "币种1": "",
+    "请选择币种": "",
+    "币种2": "",
+    "币种1 金额": "",
+    "币种1金额兑换币种2汇率": "",
+    "币种2金额": "",
+    "最后修改人": "",
+    "日志": "",
+    "例子：": "",
+    "例子：1RMB = 0.138611USD": "",
+    "最后更新人": "",
+    "修改前内容": "",
+    "币种1：": "",
+    "币种2：": "",
+    "汇率：": "",
+    "币种1不能为空": "",
+    "原币种代码不能为空": "",
+    "币种2不能为空": "",
+    "目标种代码不能为空": "",
+    "汇率不能为空": "",
+    "是否确认删除汇率管理编号为": "",
+    "是否确认导出所有汇率管理数据项?": "",
+    "汇率不能为0，请输入正确的汇率": "",
+    "核销基准币种汇率不能为0，请输入正确的汇率": "",
+    "期望收款汇率不能为0，请输入正确的汇率": "",
+    "广州市捷道国际货运代理有限公司": "E&C LOGISTICS LIMITED",
+    "美元": "",
+    "目的国": "",
+    "自编号状态": "",
+    "结算时间": "",
+    "是否结算": "",
+    "No.柜号": "",
+    "应收款(Accounts receivable)": "",
+    "received in + 目的国国家(目的地实收)": "",
+    "received in China(中国实收)": "",
+    "Discounts 折扣": "",
+    "是否重泡货": "",
+    "收费数据": "",
+    "订单优惠金额": "",
+    "实收总金额": "",
+    "已收总金额": "",
+    "应收运费": "",
+    "运费优惠金额": "",
+    "实收运费": "",
+    "已收运费": "",
+    "应收清关费": "",
+    "实收清关费": "",
+    "清关费优惠金额": "",
+    "已收清关费": "",
+    "应收额外费用": "",
+    "实收额外费用": "",
+    "额外费用优惠金额": "",
+    "已收额外费用": "",
+    "是否全部核销": "",
+    "订单入仓时间": "",
+    "订单装柜时间": "",
+    "上传新附件": "",
+    "您最多上传10个附件": "",
+    "附件仅限doc/xls/ppt/txt/pdf/jpg/png/jpeg/docx/xlsx格式": "",
+    "上传成功": "",
+    "确定删除附件吗?": "",
+    "实收总额": "",
+    "已核销总金额": "",
+    "是否重货": "",
+    "原收费数据": "",
+    "优惠重货标准": "",
+    "实际收费数据": "",
+    "入仓实测": "",
+    "是否重货/泡货": "",
+    "应收数据": "",
+    "实收数据": "",
+    "应收单价": "",
+    "优惠单价金额": "",
+    "应收运费&清关费": "",
+    "收款单优惠金额": "",
+    "总优惠金额": "",
+    "实收运费&清关费": "",
+    "特需类型": "",
+    "收款优惠金额": "",
+    "实收美元金额": "",
+    "优惠活动": "",
+    "优惠ID": "",
+    "优惠名称": "",
+    "运费优惠": "",
+    "清关费优惠": "",
+    "特价折扣": "",
+    "请求备注": "",
+    "请求内容": "",
+    "查看报关资料": "",
+    "费用汇总": "",
+    "费用来源": "",
+    "请再次确认运费由您支付还是收货人支付?": "",
+    "测量方数汇总": "",
+    "收费方数汇总": "",
+    "重量汇总": "",
+    "多个异常": "",
+    "提货方式": "",
+    "入仓记录放入确认": "",
+    "可拆出入仓记录": "",
+    "可拆": "",
+    "m³": "",
+    "kg": "",
+    "新入仓记录": "",
+    "确定要删除该行入仓记录吗？": "",
+    "请填写收费方数": "",
+    "请填写收费重量": "",
+    "请放入品名": "",
+    "放入箱数不能大于可拆箱数": "",
+    "{field}最少为0.01": "",
+    "暂无货物入库信息": "",
+    "多了": "",
+    "阶梯和价格设置不能留空": "",
+    "目的港码头": "",
+    "TIN NO./RC NO.": "",
+    "请输入TIN NO./RC NO.": "",
+    "CTN证书": "",
+    "COC证书": "",
+    "SONCAP证书": "",
+    "码头": "",
+    "保费币种": "",
+    "是否支持控货": "",
+    "默认送货上门": ""
 }
\ No newline at end of file

src/utils/dict.js

@@ -120,6 +120,7 @@ export const DICT_TYPE = {
   ECW_CUSTOMER_TRANSPORT_TYPE: 'customer_transport_type', // 客户出货渠道（跟运输方式相同，但是显示全部）
   ECW_ORDER_APPROVAL_TYPE: 'order_approval_type', // 订单相关审批类型
   ECW_FEE_SOURCE: 'fee_source', // 费用来源
+  RECEIPT_FEE_TYPE:'receipt_fee_type',
   //--------ecw---------
   CUSTOMER_STATUS: 'customer_status',
   CUSTOMER_SOURCE: 'customer_source',

src/views/ecw/financial/printVoucher.vue

@@ -2,7 +2,11 @@
   <div class="app-container" >
       <div id="print" style="font-size: 18px;">
 
-        <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;">{{$t('捷道货运收款单')}}</div>
+        <div style="position:relative;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 style="position:absolute;left:4px;top:4px">{{$t('广州市捷道国际货运代理有限公司')}}
+          </div>
+          <span>{{$t('收款单')}}</span>
+        </div>
           <table border="1" style="width: 100%;text-align: center;border-collapse: collapse; ">
             <tr>
               <td style="font-weight: bold;width:12.5%">{{$t('部门')}}</td>
@@ -27,20 +31,20 @@
             <th style="width: 12.5%;">{{$t('序号')}}</th>
             <th style="width: 12.5%;">{{$t('提单号')}}</th>
             <th style="width: 12.5%;">{{$t('订单号')}}</th>
-            <th style="width: 12.5%;">{{$t('品名')}}</th>
+            <!-- <th style="width: 12.5%;">{{$t('品名')}}</th> -->
             <th style="width: 12.5%;">{{$t('收入类型')}}</th>
-            <th style="width: 12.5%;">{{$t('金额')}}</th>
             <th style="width: 12.5%;">{{$t('币种')}}</th>
+            <th style="width: 12.5%;">{{$t('金额')}}</th>
             <th style="width: 12.5%;">{{$t('优惠金额')}}</th>
           </tr>
-          <tr v-for="(item, index) in list" :key="index">
+          <tr v-for="(item, index) in list" :key="item.id">
             <td>{{ index + 1 }}</td>
             <td>{{ orderData.tidanNo||''}}</td>
             <td>{{ item.orderNo }}</td>
-            <td>{{ $i18n.locale=='zh_CN'?item.titleZh:item.titleEn }}</td>
-            <td><dict-tag :value="item.feeType" :type="DICT_TYPE.FEE_TYPE"></dict-tag></td>
-            <td> {{item.totalAmount}}</td>
+            <!-- <td>{{ $i18n.locale=='zh_CN'?item.titleZh:item.titleEn }}</td> -->
+            <td><dict-tag :value="item.feeType" :type="DICT_TYPE.RECEIPT_FEE_TYPE"></dict-tag></td>
             <td>{{getCurrencyLabel(item.currencyId)}}</td>
+            <td> {{item.totalAmount}}</td>
             <td>{{ item.discountTotal||0 }}</td>
           </tr>
           <tr v-for="(items, indexs) in receiptAccountList" :key="indexs">