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

src/views/ecw/financial/bankDetail.vue

@@ -13,7 +13,7 @@
               </div>
             </el-form-item>
             <el-form-item :label="$t('收款账户')" prop="accountNo">
-              <span>{{ addForm.accountNo+'('+addForm.accountName+')' }}</span>
+              <span>{{ addForm.accountNo}}{{'('+addForm.accountName+')' }}</span>
             </el-form-item>
             <el-form-item :label="$t('实收日期')" prop="amountDate">
               <span>{{ addForm.amountDate }}</span>
@@ -114,11 +114,12 @@
           this.detailed = res.data.map(v => ({
             ...v,
             amountDate: this.parseTime(v.amountDate, '{y}-{m}-{d}'),
-            accountNo: +v.accountNo,
             rate:parseFloat(v.rate).toFixed(2),
             attr: v.attr ? v.attr.split(',').map(t => ({ name: t.slice(t.lastIndexOf('/') + 1), url: t })) : []
           }))
+          console.log(this.detailed)
           this.addForm = this.detailed.find((itt) => itt.id == this.bankId);
+          console.log(this.addForm)
           this.handleAddReceiptItem()
         })
       },

src/views/ecw/financial/components/CollectionApproval.vue

@@ -10,7 +10,9 @@
         <el-descriptions-item :label="$t('业务员')">{{ form.salesmanName }}</el-descriptions-item>
         <el-descriptions-item :label="$t('期望收款金额')">
           <template>
+            <div sytle="display:flex">
               <div v-for="itemAmount in collectionAmount" :key="itemAmount.currencyNameZh">{{ itemAmount.amount}}{{$i18n.locale=='zh_CN'?itemAmount.currencyNameZh:itemAmount.currencyNameEn}}</div>
+            </div>  
           </template>
         </el-descriptions-item>
         <el-descriptions-item v-if="reason" :label="$t('申请理由')">{{reason}}</el-descriptions-item>

src/views/ecw/financial/creatCollection.vue

@@ -983,11 +983,10 @@ export default {
           // totalAmount
           res.data = [...res.data, {
             type: 'total',
-            writeOffAmount: res.data.reduce((total, currentValue) => NP.plus(total, currentValue.writeOffAmount || 0), 0),
+            writeOffAmount: res.data.reduce((total, currentValue) => NP.plus(total, currentValue.writeOffAmount || 0), 0).toFixed(2),
             collectionAmount: []
           }]
         }
-        console.log(res.data)
         this.$set(this.form, 'receiptAccountList', res.data)
 
         this.$nextTick(() => {
@@ -1010,6 +1009,7 @@ export default {
           //   this.rateChange(item, index)
 
           // });
+          console.log(111)
           if(this.form.receiptAccountList.length>0){
             this.editReceiptAccountList()
           }
@@ -1071,7 +1071,7 @@ export default {
       }
       if(row.writeOffRate){
 
-        row.writeOffAmount = Math.round(NP.times(row.writeOffRate || 0, NP.minus(row.receivableAmount, row.discountTotal||0)))
+        row.writeOffAmount = NP.times(row.writeOffRate || 0, NP.minus(row.receivableAmount, row.discountTotal||0)).toFixed(2)
       }else{
         row.writeOffAmount = ''
       }
@@ -1101,7 +1101,7 @@ export default {
         var dollarList = this.form.receiptAccountList.filter(v => v.collectionCurrencyId == item.id)
         if(dollarList.length>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})
+          amountList.push({currencyId:item.id,currencyNameEn:item.titleEn,currencyNameZh:item.titleZh,amount:dollar.toFixed(2)})
         }
       })
       this.form.receiptAccountList[this.form.receiptAccountList.length -1].collectionAmount = amountList
@@ -1228,11 +1228,11 @@ export default {
         const totalt = this.form.receiptAccountList.reduce((total, currentValue) => NP.plus(total, currentValue.writeOffAmount || 0), 0)
         this.form.receiptAccountList = [...this.form.receiptAccountList, {
           type: 'total',
-          writeOffAmount: Math.round(totalt),
-          collectionAmount: [this.form.receiptAccountList.discountNaira, 0, 0]
+          writeOffAmount:totalt.toFixed(2),
+          collectionAmount: []
         }]
 
-        this.form.receivableTotalAmount = totalt
+        this.form.receivableTotalAmount = totalt.toFixed(2)
       }
       // receiptAccountList: [
           // { currencyId: 1, receivableAmount: 0, writeOffRate: 1, writeOffAmount: 999, platformAccountId: '', currencyId: '', rate: 1, collectionAmount: 0 },
@@ -1272,7 +1272,7 @@ export default {
       const index = this.form.receiptAccountList.findIndex(v => v.currencyId == type)
       const t = this.form.receiptAccountList[index]
       if (t) {
-        t.writeOffAmount = Math.round(NP.times(t.writeOffRate || 0, usCount))
+        t.writeOffAmount = NP.times(t.writeOffRate || 0, usCount).toFixed(2)
         this.rateChange(t, index)
       }
     },

src/views/ecw/financial/receiptDetail.vue

@@ -399,7 +399,7 @@
             <el-select v-if="!isView" v-model="addForm.accountId" :placeholder="$t('请选择收款账户')" style="width: 220px" @change="accountChange">
               <el-option v-for="item in bankData" :key="item.id" :label="item.baAccountName + '(' + item.baAccountNum + ')'" :value="item.id" />
             </el-select>
-            <span v-else>{{ addForm.accountNo+'('+addForm.accountName+')' }}</span>
+            <span v-else>{{ addForm.accountNo}}{{'('+addForm.accountName+')' }}</span>
           </el-form-item>
           <el-form-item
             :label="$t('实收日期')"
@@ -664,6 +664,7 @@ export default {
           total = NP.plus(total, item.writeOffAmount)
         }
       })
+
       return total.toFixed(2)
     },
     //显示反审核反核销弹窗
@@ -741,7 +742,7 @@ export default {
           // totalAmount
           res.data = [...res.data, {
             type: 'total',
-            writeOffAmount: res.data.reduce((total, currentValue) => NP.plus(total, currentValue.writeOffAmount || 0), 0),
+            writeOffAmount: res.data.reduce((total, currentValue) => NP.plus(total, currentValue.writeOffAmount || 0), 0).toFixed(2),
             collectionAmount: []
           }]
         }
@@ -824,8 +825,8 @@ 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))
-          amountList.push({currencyId:item.id,currencyNameEn:item.titleEn,currencyNameZh:item.titleZh,amount:dollar})
+          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.toFixed(2)})
         }
       })
       this.form.receiptAccountList[this.form.receiptAccountList.length -1].collectionAmount = amountList
@@ -1118,7 +1119,6 @@ export default {
         this.detailed = res.data.map(v => ({
           ...v,
           amountDate: this.parseTime(v.amountDate, '{y}-{m}-{d}'),
-          accountNo: +v.accountNo,
           rate:parseFloat(v.rate),
           attr: v.attr ? v.attr.split(',').map(t => ({ name: t.slice(t.lastIndexOf('/') + 1), url: t })) : []
         }))