收款单打印

src/views/ecw/financial/printVoucher.vue

@@ -44,7 +44,7 @@
             <td>{{ item.discountTotal||0 }}</td>
           </tr>
           <tr v-for="(items, indexs) in receiptAccountList" :key="indexs">
-            <td><dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="items.collectionCurrencyId" />应收合计</td>
+            <td><dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="items.currencyId" />应收合计</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>
             </td>
@@ -57,14 +57,14 @@
         <div style="text-align: center;border-left:1px solid #666;border-right: 1px solid #666;height: 36px;line-height: 36px;">
            银行信息
         </div>
-        <div style="display: flex;align-items: center;border-top: 1px solid #666;border-left:1px solid #666;border-right: 1px solid #666;" v-for="(bankTiem,index) in receiptAccountList" :key="index">
+        <div style="display: flex;align-items: center;border-top: 1px solid #666;border-left:1px solid #666;border-right: 1px solid #666;" v-for="(bankTiem,index) in detailed" :key="index">
           <div style="padding:6px 0;width: 12.5%;text-align: center;border-right: 1px solid #666;" >
-            <p style="margin: 0;word-break: break-all;">户名：{{bankTiem.platformAccountName}}</p>
-            <p style="margin: 0;word-break: break-all;">银行名称：{{bankTiem.platformAccountBlankName}}</p>
-            <p style="margin: 0;word-break: break-all;">A/C NO：{{bankTiem.platformAccountNo}}</p>
+            <p style="margin: 0;word-break: break-all;">户名：{{bankTiem.accountName}}</p>
+            <p style="margin: 0;word-break: break-all;">银行名称：{{bankTiem.accountBankName||''}}</p>
+            <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;">实收<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="bankTiem.currencyId" />：{{getRecep(bankTiem.currencyId)}}¥</p>
+            <p style="margin: 0;">实收<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="bankTiem.currencyId" />：{{bankTiem.writeOffAmount}}¥</p>
             <!-- <p style="margin: 0;">未收：¥{{bankTiem.noReceipt}}</p> -->
           </div>
         </div>

src/views/ecw/financial/receiptDetail.vue

@@ -290,7 +290,7 @@
 
           </el-form-item>
           <el-form-item :label="$t('收款账户')" prop="accountNo" :rules="{ required: true, trigger: ['blur', 'change'], message: $t('收款账户不能为空') }">
-            <el-select v-if="!isView" v-model="addForm.accountNo" :placeholder="$t('请选择收款账户')" style="width: 220px" @change="accountChange">
+            <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 }}</span>
@@ -647,6 +647,8 @@ export default {
     accountChange(val){
       var data = this.bankData.find(item=>item.id==val)
       this.$set(this.addForm,'accountName',data.baAccountName)
+      this.$set(this.addForm,'accountNo',data.baAccountNum)
+      this.$set(this.addForm,'accountBankName',data.baBankName)
     },
     RMBtoUS() {
       return NP.divide(100, this.currencyList.find(v => v.titleEn === 'USD').huilv)