客户查重调整，画像调整

src/HDrpManagement/customerData/index.vue

@@ -1104,12 +1104,12 @@ export default {
               geometry: 'column',
               seriesField:'key',
               isGroup: 'true',
-              color: '#5B8FF9',
+              color:['#6395fa','#62daab'],
             },
             {
               geometry: 'line',
               seriesField:'key',
-              color: '#5AD8A6',
+              color:['#657798'],
             },
           ],
           tooltip: {

src/HDrpManagement/projectData/index.vue

@@ -1831,12 +1831,12 @@ export default {
               geometry: 'column',
               seriesField:'key',
               isGroup: 'true',
-              color: '#5B8FF9',
+              color:['#6395fa','#62daab'],
             },
             {
               geometry: 'line',
               seriesField:'key',
-              color: '#5AD8A6',
+              color:['#657798'],
             },
           ],
           tooltip: {

src/components/duplicatesCheck/customerCheck.vue

@@ -38,9 +38,21 @@
         </el-pagination>
       </div>
       <span slot="footer" class="dialog-footer" v-if="creatShow">
-        <el-button @click="dialogTableVisible = false" size="small" type="primary" class="normal-btn-width">确 定</el-button>
+        <div style="display: flex;justify-content: space-between">
+          <div style="color: red" v-if="isBack">当前有重复客户归属回收站，请联系管理处理</div>
+          <el-button @click="dialogTableVisible = false" size="small" type="primary" class="normal-btn-width">确 定</el-button>
+        </div>
+
 <!--        <el-button :type="buttonTitle === '确定保存'?'warning':'primary'" @click="onCheck" size="small" class="normal-btn-width">{{buttonTitle}}</el-button>-->
       </span>
+      <span slot="footer" class="dialog-footer" v-if="isBack && !creatShow">
+        <div style="display: flex;justify-content: space-between">
+          <div style="color: red">当前有重复客户归属回收站，请联系管理处理</div>
+          <el-button  @click="dialogTableVisible = false;isBack = false" size="small" type="primary" class="normal-btn-width">确 定</el-button>
+        </div>
+
+        <!--        <el-button :type="buttonTitle === '确定保存'?'warning':'primary'" @click="onCheck" size="small" class="normal-btn-width">{{buttonTitle}}</el-button>-->
+      </span>
     </el-dialog>
   </div>
 </template>
@@ -58,6 +70,7 @@ export default {
       currentPage:0,
       duplicates:false,
       creatShow:false,
+      isBack:false,
       message:'该客户疑似重复，是否确认创建客户?',
       buttonTitle:'确定创建',
       param:{
@@ -91,6 +104,12 @@ export default {
         this.list = res.data
         this.total = res.total
         this.currentPage = res.pageNumber
+        this.list.forEach(item=>{
+          this.isBack = false
+          if (item.systemapp === '回收站'){
+            this.isBack = true
+          }
+        })
         this.dialogTableVisible = true
       }else {
         if (this.creatShow){
@@ -229,5 +248,7 @@ export default {
 </script>
 
 <style scoped>
-
+  /deep/ .el-dialog__body {
+    padding: 20px 20px 0 20px !important;
+  }
 </style>

src/components/duplicatesCheck/publicCustomerCheck.vue

@@ -39,8 +39,20 @@
         </el-pagination>
       </div>
       <span slot="footer" class="dialog-footer" v-if="creatShow">
-        <el-button @click="dialogTableVisible = false" size="small" type="primary" class="normal-btn-width">确 定</el-button>
-<!--        <el-button :type="buttonTitle === '确定保存'?'warning':'primary'" @click="onCheck" size="small" class="normal-btn-width">{{buttonTitle}}</el-button>-->
+        <div style="display: flex;justify-content: space-between">
+          <div style="color: red" v-if="isBack">当前有重复客户归属回收站，请联系管理处理</div>
+          <el-button @click="dialogTableVisible = false" size="small" type="primary" class="normal-btn-width">确 定</el-button>
+        </div>
+
+        <!--        <el-button :type="buttonTitle === '确定保存'?'warning':'primary'" @click="onCheck" size="small" class="normal-btn-width">{{buttonTitle}}</el-button>-->
+      </span>
+      <span slot="footer" class="dialog-footer" v-if="isBack && !creatShow">
+        <div style="display: flex;justify-content: space-between">
+          <div style="color: red">当前有重复客户归属回收站，请联系管理处理</div>
+          <el-button  @click="dialogTableVisible = false;isBack = false" size="small" type="primary" class="normal-btn-width">确 定</el-button>
+        </div>
+
+        <!--        <el-button :type="buttonTitle === '确定保存'?'warning':'primary'" @click="onCheck" size="small" class="normal-btn-width">{{buttonTitle}}</el-button>-->
       </span>
     </el-dialog>
   </div>
@@ -59,6 +71,7 @@ export default {
       total:0,
       currentPage:0,
       duplicates:false,
+      isBack:false,
       message:'该客户疑似重复，是否确认创建客户?',
       buttonTitle:'确定创建',
       param:{
@@ -92,6 +105,12 @@ export default {
         this.list = res.data
         this.total = res.total
         this.currentPage = res.pageNumber
+        this.list.forEach(item=>{
+          this.isBack = false
+          if (item.systemapp === '回收站'){
+            this.isBack = true
+          }
+        })
         this.dialogTableVisible = true
       }else {
         if (this.creatShow){

src/router/HManagement.js

@@ -661,7 +661,8 @@ const HManagement = [
       ast_nav: true,
       keeproute: true
     },
-    component: () => import(/* webpackChunkName: "about" */ '@/HManagement/addressList/addressBook/index')
+   /* component: () => import(/!* webpackChunkName: "about" *!/ '@/HManagement/addressList/addressBook/index')*/
+    component: () => import(/* webpackChunkName: "about" */ '@/HManagement/addressList/mycontact/index')
   },{
     path: '/phonebookGroup',
     name: 'phonebookGroup',

src/views/salesData/modules/orderTrendAnalysis.vue

@@ -113,6 +113,7 @@ export default {
             geometry: 'column',
             isGroup: true,
             seriesField: 'type',
+            color:['#62daab','#6395fa']
            /* label: {
               // 可手动配置 label 数据标签位置
               position: 'top', // 'top', 'bottom', 'middle',
@@ -122,6 +123,7 @@ export default {
           },
           {
             geometry: 'line',
+            color:['#657798'],
             lineStyle: {
               lineWidth: 2,
             },