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

src/views/ecw/financial/printVoucher.vue

@@ -12,7 +12,7 @@
               <td style="font-weight: bold;width:12.5%">{{$t('部门')}}</td>
               <td style="width:12.5%">{{form?form.departmentName:$t('无')}}</td>
               <td style="font-weight: bold;width:12.5%">{{$t('客户名称')}}</td>
-              <td colspan="2" style="width: 25%;">{{form?form.customerName:$t('无')}}</td>
+              <td colspan="2" style="width: 25%;">{{form.payerName?form.payerName:(form.customerName||$t('无'))}}</td>
               <td style="font-weight: bold;width:12.5%">{{$t('收款日期')}}</td>
               <td colspan="2" style="width: 25%;">{{form&&form.payedAt?parseTime(form.payedAt):$t('无')}}</td>
             </tr>
@@ -141,9 +141,9 @@
 
             that.deptArr.push(item)
 
-          }else{
-            that.deptData.push(item)
           }
+          that.deptData.push(item)
+          
         })
 
         that.deptData.forEach((value)=>{

src/views/ecw/financial/receiptDetail.vue

@@ -7,7 +7,7 @@
         <el-descriptions-item :label="$t('状态')">
           <dict-tag :type="DICT_TYPE.ECW_RECEIPT_STATE" :value="form.state"/>
         </el-descriptions-item>
-        <el-descriptions-item :label="$t('客户')">{{ form.customerName }}</el-descriptions-item>
+        <el-descriptions-item :label="$t('客户')">{{form.payerName?form.payerName:form.customerName }}</el-descriptions-item>
         <el-descriptions-item :label="$t('部门')">{{ form.departmentName }}</el-descriptions-item>
         <el-descriptions-item :label="$t('业务员')">{{ form.salesmanName }}</el-descriptions-item>
         <!-- <el-descriptions-item :label="$t('手续费（RMB）')">{{ form.feeRate }}</el-descriptions-item> -->