Merge remote-tracking branch 'origin/dev' into dev

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

 <template>
    <div>
     <div v-for="(item, index) in info.customerHandoverDetailDtoList">
-      <div> 客户编号{{index + 1}}：{{item.customerNumber}} 客户名称{{index + 1}}：{{item.customerName}} </div>
-      <div>就客户经理{{index + 1}}：{{item.oldCustomerServiceName || '-'}}</div>
+      <div  style="color: blue"> 客户编号{{index + 1}}：{{item.customerNumber}} 客户名称{{index + 1}}：{{item.customerName}} </div>
+      <div>就客户经理{{index + 1}}：{{item.oldCustomerServiceName || '-'}} <span v-if="item.oldCustomerServiceDeptName">（{{item.oldCustomerServiceDeptName}}）</span></div>
     </div>
+     <div style="color: blue">新客户经理：{{info.newCustomerServiceName || '-'}} <span v-if="info.customerServiceDeptName">（{{info.customerServiceDeptName}}）</span> </div>
      <div>
         申请理由：{{info.reason}}
      </div>

src/views/ecw/customer/transferCustomer.vue

@@ -6,7 +6,7 @@
     width="30%">
     <div style="width: 100%;min-height: 200px;text-align: center">
       <el-select filterable v-model="service">
-        <el-option v-for="(item,index) in customerServiceList" :key="index" :label="item.nickname" :value="item.id"></el-option>
+        <el-option v-for="(item,index) in customerServiceList" :key="index" :label="item.deptName ? item.nickname + `（${item.deptName}）`  : item.nickname  " :value="item.id"></el-option>
       </el-select>
       <div style="display: flex;margin-top: 20px;">
         <label style="width:100px;" >申请理由</label>