Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

src/views/ecw/financial/receiptDetail.vue

@@ -289,13 +289,13 @@
           <el-form-item label="收款单号">{{ form.receiptNo }}</el-form-item>
           <el-form-item label="剩余应收金额">
             <div>
-              <div>{{ remainingAmount.usAmount }}美元</div>
-              <div>{{ remainingAmount.rmbAmount }}人民币</div>
-              <div>{{ remainingAmount.nairaAmount }}奈拉</div>
+              <div>{{ remainingAmount.usAmount.toFixed(6) }}美元</div>
+              <div>{{ remainingAmount.rmbAmount.toFixed(6) }}人民币</div>
+              <div>{{ remainingAmount.nairaAmount.toFixed(6) }}奈拉</div>
             </div>
           </el-form-item>
           <el-form-item label="收款账户" prop="accountNo" :rules="{ required: true, trigger: ['blur', 'change'], message: '收款账户不能为空' }">
-            <el-select v-if="!isView" v-model="addForm.accountNo" placeholder="请选择收款账户" style="width: 220px">
+            <el-select v-if="!isView" v-model="addForm.accountNo" placeholder="请选择收款账户" 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 }}</span>
@@ -344,7 +344,7 @@
               汇率（<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="showCurrencyId" />）
             </template>
             <el-input  v-if="!isView" v-model="addForm.rate" style="width: 220px"></el-input>
-            <span v-else>{{ addForm.rate }}</span>
+            <span v-else>{{ addForm.rate}}</span>
           </el-form-item>
           <el-form-item
             v-if="showCurrencyId != addForm.currencyId"
@@ -352,7 +352,7 @@
             <template slot="label">
               金额（<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="showCurrencyId" />）
             </template>
-            <span>{{ addForm.writeOffAmount }}</span>
+            <span>{{ addForm.writeOffAmount?parseFloat(addForm.writeOffAmount).toFixed(6):'' }}</span>
           </el-form-item>
           <el-form-item
             label="水单附件"
@@ -398,7 +398,7 @@
 import { getBankAccountPage } from "@/api/ecw/bankAccount";
 import { getToken } from "@/utils/auth";
 import { getCustomer } from '@/api/ecw/customer'
-import { 
+import {
   getReceiptInfoByIds,
   getInvoicingItem,
   receiptItemCreate,
@@ -543,7 +543,7 @@ export default {
         })
       })
     }
-    
+
     this.getList()
   },
   methods: {
@@ -596,6 +596,10 @@ export default {
         }
       }
     },
+    accountChange(val){
+      var data = this.bankData.find(item=>item.id==val)
+      this.$set(this.addForm,'accountName',data.baAccountName)
+    },
     RMBtoUS() {
       return NP.divide(100, this.currencyList.find(v => v.titleEn === 'USD').huilv)
     },
@@ -635,6 +639,7 @@ export default {
           ...v,
           amountDate: this.parseTime(v.amountDate, '{y}-{m}-{d}'),
           accountNo: +v.accountNo,
+          rate:parseFloat(v.rate).toFixed(6),
           attr: v.attr ? v.attr.split(',').map(t => ({ name: t.slice(t.lastIndexOf('/') + 1), url: t })) : []
         }))
         this.calculation()
@@ -663,7 +668,7 @@ export default {
           })
         }
       })
-      
+
     },
     toEdit() {
       return this.$router.push("creatCollection?id=" + this.id);
@@ -674,6 +679,7 @@ export default {
       this.isView = true
       setTimeout(() => {
         this.addForm = { ...row }
+        this.setWriteOffAmount()
       }, 0)
     },
     editClick(row) {
@@ -683,6 +689,7 @@ export default {
       this.isView = false
       setTimeout(() => {
         this.addForm = { ...row }
+        this.setWriteOffAmount()
       }, 0)
     },
     deleteClick(row) {
@@ -773,7 +780,7 @@ export default {
         });
         this.addForm.attr = arr;
       }, 300)
-      this.loading.close(); 
+      this.loading.close();
     },
     handleBeforeUpload() {
       this.loading = this.$loading({
@@ -827,4 +834,4 @@ export default {
     width: 22%;
   }
 }
-</style>
+</style>
\ No newline at end of file