收款单币种修复

src/views/ecw/financial/creatCollection.vue

@@ -372,6 +372,7 @@
                 <div v-if="scope.row.collectionAmount[0]">{{ $t('美元') }}: {{ scope.row.collectionAmount[0].toFixed(6) }}</div>
                 <div v-if="scope.row.collectionAmount[1]">{{ $t('人民币') }}: {{ scope.row.collectionAmount[1].toFixed(6) }}</div>
                 <div v-if="scope.row.collectionAmount[2]">{{ $t('奈拉') }}: {{ scope.row.collectionAmount[2].toFixed(6) }}</div>
+                <div v-if="scope.row.collectionAmount[3]">{{ $t('西非法郎') }}: {{ scope.row.collectionAmount[3].toFixed(6) }}</div>
               </div>
               <!-- <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" /> -->
             </template>
@@ -857,12 +858,13 @@ export default {
       row.collectionCurrencyId = val
       if (val == row.currencyId) row.collectionRate = 1
       else {
-        if (row.currencyId == 1 && val == 3) row.collectionRate = this.UStoRMB()
-        if (row.currencyId == 1 && val == 2) row.collectionRate = this.UStoNAN()
-        if (row.currencyId == 3 && val == 1) row.collectionRate = this.RMBtoUS()
-        if (row.currencyId == 3 && val == 2) row.collectionRate = this.RMBtoNAN()
-        if (row.currencyId == 2 && val == 1) row.collectionRate = this.NANtoUS()
-        if (row.currencyId == 2 && val == 3) row.collectionRate = this.NANtoRMB()
+        // if (row.currencyId == 1 && val == 3) row.collectionRate = this.UStoRMB()
+        // if (row.currencyId == 1 && val == 2) row.collectionRate = this.UStoNAN()
+        // if (row.currencyId == 3 && val == 1) row.collectionRate = this.RMBtoUS()
+        // if (row.currencyId == 3 && val == 2) row.collectionRate = this.RMBtoNAN()
+        // if (row.currencyId == 2 && val == 1) row.collectionRate = this.NANtoUS()
+        // if (row.currencyId == 2 && val == 3) row.collectionRate = this.NANtoRMB()
+         row.collectionRate = NP.divide(this.currencyList.find(v => v.id === row.currencyId).huilv, this.currencyList.find(v => v.id === val).huilv).toFixed(6)
       }
 
       this.rateChange(row, index)
@@ -887,8 +889,9 @@ export default {
 
         const nairaList = this.form.receiptAccountList.filter(v => v.collectionCurrencyId == 2)
         const naira = nairaList.reduce((total, currentValue) => NP.plus(total, currentValue.collectionAmount), 0)
-
-        this.form.receiptAccountList[this.form.receiptAccountList.length -1].collectionAmount = [dollar, rmb, naira]
+        const faList = this.form.receiptAccountList.filter(v => v.collectionCurrencyId == 6)
+        const fa = faList.reduce((total, currentValue) => NP.plus(total, currentValue.collectionAmount), 0)
+        this.form.receiptAccountList[this.form.receiptAccountList.length -1].collectionAmount = [dollar, rmb, naira,fa]
         this.$set(this.form, 'receiptAccountList', [...this.form.receiptAccountList])
       }, 100)
     },
@@ -1091,16 +1094,25 @@ export default {
         } else {
           this.$modal.msgSuccess(this.$t('新增成功'));
         }
-        // getReceivableInfoByIds({ id: this.selectListRow.id }).then(res => {
-        //   this.$set(this.list, this.selectListIndex, {...res.data})
-        //   this.cancelDiscount()
-        //   this.calculation()
-        // })
-         getInvoicingItem({ id: this.id }).then(res => {
-          this.list = [...res.data]
-          this.cancelDiscount()
-          this.calculation()
-        })
+        // if(this.id>0){
+        //    getInvoicingItem({ id: this.id }).then(res => {
+        //     this.list = [...res.data]
+        //     this.cancelDiscount()
+        //     this.calculation()
+        //   })
+        // }else{
+          setTimeout(()=>{
+            getReceivableInfoByIds({ id: this.selectListRow.id }).then(res => {
+              this.$set(this.list, this.selectListIndex, {...res.data})
+              this.cancelDiscount()
+              this.calculation()
+            })
+          },1000)
+
+
+        // }
+
+
       })
     },
     getList() {

src/views/ecw/financial/receiptDetail.vue

@@ -41,13 +41,13 @@
         <el-table-column :label="$t('单价金额')" align="center" prop="unitPrice">
           <template slot-scope="scope">
             <span>{{ scope.row.unitPrice }}</span>
-            <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" />
+            {{getCurrencyLabel(scope.row.currencyId)}}
           </template>
         </el-table-column>
         <el-table-column :label="$t('总金额')" align="center" prop="totalAmount">
           <template slot-scope="scope">
             <span>{{ scope.row.totalAmount }}</span>
-            <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" />
+            < {{getCurrencyLabel(scope.row.currencyId)}}
           </template>
         </el-table-column>
         <el-table-column :label="$t('优惠金额')" align="center">
@@ -75,7 +75,7 @@
           </el-select> -->
         </el-descriptions-item>
         <el-descriptions-item :label="$t('核销基准币种')">
-          <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="showCurrencyId" />
+          {{getCurrencyLabel(showCurrencyId)}}
         </el-descriptions-item>
       </el-descriptions>
     </el-card>
@@ -118,7 +118,7 @@
       <el-table :data="form.receiptAccountList" border>
         <el-table-column :label="$t('应收币种')" align="center">
           <template slot-scope="scope">
-            <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" />
+             {{getCurrencyLabel(scope.row.currencyId)}}
           </template>
         </el-table-column>
         <!-- <el-table-column label="应收金额" align="center" prop="receivableAmount" /> -->
@@ -130,20 +130,20 @@
         </el-table-column>
         <el-table-column align="center" width="220">
           <template #header>
-            {{ $t('核销基准币种') }}（<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="showCurrencyId" />）{{ $t('汇率') }}
+            {{ $t('核销基准币种') }}（{{getCurrencyLabel(showCurrencyId)}}）{{ $t('汇率') }}
           </template>
           <template slot-scope="scope">
             <template v-if="scope.row.type !== 'total'">
               <span>{{ scope.row.writeOffRate }}</span>
             </template>
             <template v-else>
-              {{ $t('应收总金额') }}（<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="showCurrencyId" />）
+              {{ $t('应收总金额') }}（{{getCurrencyLabel(showCurrencyId)}}）
             </template>
           </template>
         </el-table-column>
         <el-table-column align="center" prop="writeOffAmount">
           <template #header>
-            {{ $t('核销基准金额') }}（<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="showCurrencyId" />）
+            {{ $t('核销基准金额') }}（{{getCurrencyLabel(showCurrencyId)}}）
           </template>
         </el-table-column>
         <el-table-column :label="$t('期望收款账户')" align="center">
@@ -205,7 +205,7 @@
     <el-card class="card">
       <div slot="header" class="card-title">{{ $t('银行收款明细') }}</div>
       <div>
-        <el-button type="primary" plain size="mini" @click="batchVerification" style="padding: 10px; margin-bottom: 10px">{{ $t('批量核销') }}</el-button>
+        <el-button type="primary" plain size="mini" @click="batchVerification" v-hasPermi="['ecw:verification:update']" style="padding: 10px; margin-bottom: 10px">{{ $t('批量核销') }}</el-button>
         <el-button type="primary" plain size="mini" @click="handleAddReceiptItem" style="padding: 10px; margin-bottom: 10px">{{ $t('添加收款明细') }}</el-button>
       </div>
       <el-table ref="multipleTable" :data="detailed" border row-key="id" @selection-change="handleSelectionChange">
@@ -215,7 +215,7 @@
         <el-table-column :label="$t('实收金额')" align="center" prop="amount" />
         <el-table-column :label="$t('实收币种')" align="center" prop="marks">
           <template slot-scope="scope">
-            <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" />
+            {{getCurrencyLabel(scope.row.currencyId)}}
           </template>
         </el-table-column>
         <el-table-column :label="$t('汇率')" align="center" prop="rate" />
@@ -240,8 +240,8 @@
           <template slot-scope="scope">
             <el-button v-if="scope.row.status == 0" type="text" @click="deleteClick(scope.row)">{{ $t('删除') }}</el-button>
             <el-button type="text" @click="detailClick(scope.row)">{{ $t('详情') }}</el-button>
-            <el-button v-if="scope.row.status == 0" type="text" @click="verificationClick(scope.row)">{{ $t('核销') }}</el-button>
-            <el-button v-if="scope.row.status == 1" type="text" @click="verificationCancelClick(scope.row)">{{ $t('反核销') }}</el-button>
+            <el-button v-if="scope.row.status == 0" type="text" @click="verificationClick(scope.row)" v-hasPermi="['ecw:verification:update']">{{ $t('核销') }}</el-button>
+            <el-button v-if="scope.row.status == 1" type="text" @click="verificationCancelClick(scope.row)" v-hasPermi="['ecw:verification:update']">{{ $t('反核销') }}</el-button>
             <el-button v-if="scope.row.status == 0" type="text" @click="editClick(scope.row)">{{ $t('编辑') }}</el-button>
           </template>
         </el-table-column>
@@ -258,19 +258,19 @@
           </template>
           <div v-else>
             <div v-for="(amount, currency) in writeOffTotal" :key="currency">
-              {{amount}}<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="currency" />
+              {{amount}}{{getCurrencyLabel(currency)}}
             </div>
           </div>
         </el-descriptions-item>
         <el-descriptions-item>
           <template slot="label">
-            {{ $t('核销基准金额') }}（<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="showCurrencyId" />）
+            {{ $t('核销基准金额') }}（{{getCurrencyLabel(showCurrencyId)}}）
           </template>
           {{ writeOffAmount}}
         </el-descriptions-item>
         <el-descriptions-item>
           <template slot="label">
-            {{ $t('已核销比例') }}（<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="showCurrencyId" />）
+            {{ $t('已核销比例') }}（{{getCurrencyLabel(showCurrencyId)}}）
           </template>
           {{ WriteOffProportion }}%
         </el-descriptions-item>
@@ -278,7 +278,7 @@
     </el-card>
     <div slot="footer" style="margin: 20px 0">
       <el-button type="primary" @click="toEdit">{{ $t('编辑') }}</el-button>
-      <el-button type="primary" @click="verificationAll">{{ $t('全部核销') }}</el-button>
+      <el-button type="primary" @click="verificationAll" v-hasPermi="['ecw:verification:update']">{{ $t('全部核销') }}</el-button>
     </div>
     <el-dialog v-if="openAddDialog" :visible.sync="openAddDialog" :title="dialogTitle" width="40%" append-to-body>
       <div style="padding: 0 24px">
@@ -290,7 +290,7 @@
             </template>
             <div v-else>
               <div v-for="(amount, currency) in surplusData" :key="currency">
-                 <span v-if="amount"> {{amount}}<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="currency" /></span>
+                 <span v-if="amount"> {{amount}}{{getCurrencyLabel(currency)}}</span>
               </div>
             </div>
 
@@ -355,7 +355,7 @@
             :rules="{ required: true, trigger: ['blur', 'change'], message: $t('汇率不能为空') }"
           >
             <template slot="label">
-              {{ $t('汇率') }}（<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="showCurrencyId" />）
+              {{ $t('汇率') }}（{{getCurrencyLabel(showCurrencyId)}}）
             </template>
             <el-input  v-if="!isView" v-model="addForm.rate" style="width: 220px"></el-input>
             <span v-else>{{ addForm.rate}}</span>
@@ -364,7 +364,7 @@
             v-if="showCurrencyId != addForm.currencyId"
           >
             <template slot="label">
-              {{ $t('金额') }}（<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="showCurrencyId" />）
+              {{ $t('金额') }}（{{getCurrencyLabel(showCurrencyId)}}）
             </template>
             <span>{{ addForm.writeOffAmount?parseFloat(addForm.writeOffAmount).toFixed(6):'' }}</span>
           </el-form-item>