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

src/views/ecw/customer/addPotentialCustom.vue

@@ -113,6 +113,8 @@ export default {
                this.$emit('change');
                this.dialogTableVisible = false;
                this.$message(this.$t('创建成功'));
+                this.reset()
+               this.$refs.form.resetFields()
              }
            })
          }

src/views/ecw/customer/edit.vue

@@ -863,7 +863,7 @@ export default {
           const form = {...this.form, type: this.form.type?.join(','), transportType: (this.form.transportType || [])?.join(','), taxRate: Number(this.form.taxRate)}
             form.customerContacts = JSON.parse(JSON.stringify(this.form.customerContacts))
             form.customerContacts.forEach(e =>{
-              e.email = [...e.email].join(',')
+              e.email = [...e.email].filter(i => i !== '').join(',')
             })
           // 检查路线是否启用了但是没选择目的仓
           let errors = 0

src/views/ecw/customer/transferCustomer.vue

@@ -65,11 +65,19 @@ export default {
         reason:this.textarea
       }).then(r=>{
         if(r.code === 0){
-           this.$emit('update:show',false)
-           this.$emit('update:customerIds',[])
-           this. service = '';
-           this.textarea = '';
-           this.$message.success(this.$t('用户批量转移成功！'))
+          if(r.data){
+            this.$message.error(r.data)
+            this.$emit('update:show',false)
+            this.$emit('update:customerIds',[])
+            this. service = '';
+            this.textarea = '';
+          }else {
+            this.$emit('update:show',false)
+            this.$emit('update:customerIds',[])
+            this. service = '';
+            this.textarea = '';
+            this.$message.success(this.$t('用户批量转移成功！'))
+          }
         }
       })
     },

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> -->