Merge branch 'release2.2new' of...

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

src/views/ecw/customer/components/customer-handover-details.vue

@@ -2,7 +2,7 @@
    <div>
     <div v-for="(item, index) in info.customerHandoverDetailDtoList">
      <router-link :to="'/customer/query/' + item.customerId"><div  style="color: blue"> 客户编号{{index + 1}}：{{item.customerNumber}} 客户名称{{index + 1}}：{{item.customerName}} </div></router-link>
-      <div>就客户经理{{index + 1}}：{{item.oldCustomerServiceName || '-'}} <span v-if="item.oldCustomerServiceDeptName">（{{item.oldCustomerServiceDeptName}}）</span></div>
+      <div>旧客户经理{{index + 1}}：{{item.oldCustomerServiceName || '-'}} <span v-if="item.oldCustomerServiceDeptName">（{{item.oldCustomerServiceDeptName}}）</span></div>
     </div>
      <div>新客户经理：{{info.newCustomerServiceName || '-'}} <span v-if="info.newCustomerServiceDeptName">（{{info.newCustomerServiceDeptName}}）</span> </div>
      <div>

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('用户批量转移成功！'))
+          }
         }
       })
     },