Merge remote-tracking branch 'origin/release2.2' into release2.2

src/views/ecw/financial/creatCollection.vue

@@ -1084,7 +1084,7 @@ export default {
         this.$modal.msgError(this.$t('汇率不能为0，请输入正确的汇率'));
       }
       if(row.collectionRate){
-        row.receivableAmount && (row.collectionAmount = Math.round(NP.times(row.collectionRate || 0, NP.minus(row.receivableAmount, row.discountTotal||0))))
+        row.receivableAmount && (row.collectionAmount = NP.times(row.collectionRate || 0, NP.minus(row.receivableAmount, row.discountTotal||0)).toFixed(2))
       }else{
         row.collectionAmount = ''
       }
@@ -1100,7 +1100,7 @@ export default {
       this.currencyList.forEach((item,index)=>{
         var dollarList = this.form.receiptAccountList.filter(v => v.collectionCurrencyId == item.id)
         if(dollarList.length>0){
-          var dollar = Math.round(dollarList.reduce((total, currentValue) => NP.plus(total, currentValue.collectionAmount), 0))
+          var dollar = dollarList.reduce((total, currentValue) => NP.plus(total, currentValue.collectionAmount), 0)
           amountList.push({currencyId:item.id,currencyNameEn:item.titleEn,currencyNameZh:item.titleZh,amount:dollar})
         }
       })

src/views/ecw/financial/printVoucher.vue

@@ -50,7 +50,7 @@
           <tr v-for="(items, indexs) in receiptAccountList" :key="indexs">
             <td>{{getCurrencyLabel(items.currencyId)}}{{$t('应收合计')}}</td>
             <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}` }}</span>
             </td>
             <td>{{$t('汇率')}}</td>
             <td>{{ items.collectionRate}}</td>
@@ -68,7 +68,7 @@
             <p style="margin: 0;word-break: break-all;">A/C NO：{{bankTiem.accountNo}}</p>
           </div>
           <div style="padding:6px 0;width: 87.5%;text-align: center;">
-            <p style="margin: 0;">{{$t('实收')}}{{getCurrencyLabel(bankTiem.currencyId)}}：{{bankTiem.amount}}¥</p>
+            <p style="margin: 0;">{{$t('实收')}}{{getCurrencyLabel(bankTiem.currencyId)}}：{{bankTiem.amount}}{{getCurrencyFuhao(bankTiem.currencyId)}}</p>
             <!-- <p style="margin: 0;">未收：¥{{bankTiem.noReceipt}}</p> -->
           </div>
         </div>
@@ -216,6 +216,11 @@
 		  if(label.length>0) return this.$i18n.locale=='zh_CN'?label[0].titleZh:label[0].titleEn
 		  return ''
 		},
+    getCurrencyFuhao(id){
+      var label = this.currencyList.filter(item=>item.id == id)
+      if(label.length>0) return label[0].fuhao
+      return ''
+    },
       getList() {
         getReceivableItem({ id: this.id }).then(res => {
           this.detailed = res.data