合并客户2，客户信息显示

src/api/ecw/customer.js

@@ -549,4 +549,12 @@ export function competitorListAll(){
     url:'customer/competitor/listAll',
     method:'get'
   })
+}
+
+export function customerMergeCus(params){
+  return request({
+    url:'ecw/customer/mergeCus',
+    method:'get',
+    params
+  })
 }
\ No newline at end of file

src/views/ecw/customer/components/customerFollowSelectOffer.vue

@@ -76,7 +76,7 @@
     <pagination v-show="offerTotal > 0" :total="offerTotal" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
         @pagination="getOfferList"/>
     <div slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="confirm">{{$t('确定')}}</el-button>
+      <el-button type="primary" @click="confirm">{{$t('确 定')}}</el-button>
     </div>
   </el-dialog>
 </template>

src/views/ecw/customer/index.vue

@@ -1364,6 +1364,10 @@
     <customer-merge
       ref="customerMerge"
       @refresh="getList"
+      :countryList="countryList"
+      :getNodeLists="getNodeLists"
+      :productTypeList="getNodeLists"
+      :customerSelectFn="customerSelectFn"
       v-if="customerMergeVisible"
     ></customer-merge>
     <!--业绩类型   -->
@@ -1725,6 +1729,7 @@ export default {
     handleMergeCus() {
       this.customerMergeVisible = true
       this.$nextTick(_ => {
+        this.$refs['customerMerge'].init()
         this.$refs['customerMerge'].dialogVisible = true
       })
     },

src/views/ecw/customer/query.vue

@@ -283,7 +283,7 @@
                     {{row.pickNum | deliveryRate(row.sumNum)}}
                   </template>
                 </el-table-column>
-                <el-table-column :label="$t('客户经理')" align="center" prop="customerName" />
+                <el-table-column :label="$t('客户经理')" align="center" prop="customerServiceName" />
                 <el-table-column :label="$t('业绩归属客户方')" align="center" prop="customerName" />
               </el-table>
               <pagination @pagination="getorderList" :page.sync="queryParams.page" :limit.sync="queryParams.rows"  :total="orderTotal" ></pagination>
@@ -735,11 +735,13 @@
           <el-tab-pane name="special" :label="$t('特殊设置')">
             <el-descriptions :column="2">
               <el-descriptions-item :label="$t('是否显示提单价格')">
-                <el-switch v-model="customer.isShowTidanPrice" disabled></el-switch>
+                <el-switch v-model="customer.isShowTidanPrice" disabled />
               </el-descriptions-item>
-              <el-descriptions-item :label="$t('到仓确认')">{{ customer.arrivalConfirm }}</el-descriptions-item>
-              <el-descriptions-item :label="$t('重货标准')">{{ customer.weightUnit }}</el-descriptions-item>
-              <el-descriptions-item :label="$t('泡货标准')">{{ customer.lightUnit }}</el-descriptions-item>
+              <el-descriptions-item :label="$t('到仓确认')">
+                <el-switch v-model="customer.arrivalConfirm" :active-value="1" :inactive-value="0" />
+              </el-descriptions-item>
+              <el-descriptions-item :label="$t('重货标准')">{{ customer.weightUnit ? `${customer.weightUnit}kg/cbm` : '' }}</el-descriptions-item>
+              <el-descriptions-item :label="$t('泡货标准')">{{ customer.lightUnit ?  `${customer.lightUnit}kg/cbm` : ''}}</el-descriptions-item>
               <el-descriptions-item :label="$t('控制无收货人')">
                 <el-switch v-model="customer.noConsignee" disabled />
               </el-descriptions-item>