71

src/views/ecw/box/query.vue

@@ -601,7 +601,7 @@ export default {
     regError,
     editForm,
     updateError,
-    //lanbm 2024-05-23 异常登记对话框
+    //异常登记对话框
     unloadingError,
   },
   created() {
@@ -615,7 +615,7 @@ export default {
       const { data } = res;
       this.allUsers = data.list ?? [];
     });
-    //lanbm 2024-05-16 add
+    //add
     /* 不用此方式
     getCurrencyList().then((res) => {
       this.currencyList = res.data ?? [];

src/views/ecw/customer/index.vue

 <template>
   <div class="app-container">
-    <!-- 搜索工作栏 -->
     <el-form
       :model="queryParams"
       ref="queryForm"
@@ -15,7 +14,8 @@
           :placeholder="$t('请输入客户编号')"
           clearable
           @keyup.enter.native="handleQuery"
-          onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')"/>
+          onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')"
+        />
       </el-form-item>
       <el-form-item :label="$t('客户名称')" prop="name">
         <el-input
@@ -28,7 +28,7 @@
       </el-form-item>
       <el-form-item :label="$t('客户等级')" prop="level">
         <el-select
-        multiple
+          multiple
           v-model="queryParams.level"
           :placeholder="$t('请选择客户等级')"
           clearable
@@ -52,7 +52,7 @@
       </el-form-item>
       <el-form-item :label="$t('客户类别')" prop="level">
         <dict-selector
-        multiple
+          multiple
           clearable
           :type="DICT_TYPE.CUSTOMER_TYPE"
           v-model="queryParams.type"
@@ -95,7 +95,7 @@
       </el-form-item>
       <el-form-item :label="$t('国家')" prop="source">
         <el-select
-        multiple
+          multiple
           clearable
           v-model="queryParams.country"
           :placeholder="$t('请选择国家')"
@@ -111,7 +111,7 @@
       </el-form-item>
       <el-form-item :label="$t('客户状态')" prop="status">
         <el-select
-         multiple
+          multiple
           clearable
           v-model="queryParams.status"
           :placeholder="$t('请选择客户状态')"
@@ -136,13 +136,11 @@
           range-separator="-"
           :start-placeholder="$t('开始日期')"
           :end-placeholder="$t('结束日期')"
-          
         />
       </el-form-item>
       <el-form-item :label="$t('信用等级')" prop="department">
         <el-select multiple clearable v-model="queryParams.creditLevel">
           <el-option
-          
             v-for="(item, index) in creditList"
             :label="isChinese ? item.nameZh : item.nameEn"
             :key="index"
@@ -268,6 +266,18 @@
           >{{ $t("新增潜在客户") }}</el-button
         >
       </el-col>
+
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleMergeCus"
+          >{{ $t("合并客户") }}</el-button
+        >
+      </el-col>
+
       <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
@@ -1220,6 +1230,9 @@ export default {
     this.getList();
   },
   methods: {
+    handleMergeCus() {
+      //合并客户
+    },
     recovery(row) {
       this.$confirm(this.$t("是否要回收当前{name}", row), "提示", {
         confirmButtonText: "确定",

src/views/ecw/customer/mergecustomer.vue

+<template>
+  <div class="app-container">
+    <el-card style="margin-bottom: 10px"> </el-card>
+    <el-card style="margin-bottom: 10px"> </el-card>
+  </div>
+</template>
\ No newline at end of file

src/views/report/customer_analysis/index.vue

@@ -574,7 +574,7 @@ export default {
     $route(to) {
       //lanbm 2024-05-06 解决重新进入参数不刷新的问题
       //this.$route.name == "客户分析" 用name做逻辑判断，有时候菜单名称会变化
-      //"/report/customer_analysis" lanbm 2024-05-07 调整为根据path做逻辑判断
+      //"/report/customer_analysis"  调整为根据path做逻辑判断
       if (this.$route.path == "/report/customer_analysis") {
         this.doLoadData();
       }