修改

dsk-operate-ui/src/api/custom/custom.js

 import request from '@/utils/request'
+
+// 客户概览-客户统计
+export function statistics() {
+  return request({
+    url: '/customer/overview/statistics',
+    method: 'get',
+  })
+}
+// 客户概览-客户合作情况
+export function cooperationTop() {
+  return request({
+    url: '/customer/overview/cooperation/top',
+    method: 'get',
+  })
+}
+// 客户概览-客户信资评级
+export function creditLevel() {
+  return request({
+    url: '/customer/overview/credit/level',
+    method: 'get',
+  })
+}
+
+
+
+
+
 // 导入客户列表
 export function importData(param) {
   return request({

dsk-operate-ui/src/api/index.js

 import request from "@/utils/request";
 
+// 企业中标排行榜
+export function bidRank(data) {
+  return request({
+    url: '/index/bidRank',
+    method: 'post',
+    data: data
+  })
+}
 // 大项目最新中标
 export function bigWinningBidsPage(data) {
   return request({

dsk-operate-ui/src/assets/styles/project.scss

@@ -977,6 +977,11 @@
       font-size: 12px;
     }
   }
+  .el-form {
+    .el-form-item--small.el-form-item {
+      margin-bottom: 0;
+    }
+  }
 }
 .p10{
   padding: 0 10px;

dsk-operate-ui/src/router/index.js

@@ -127,7 +127,7 @@ export const constantRoutes = [
         path: '/enterprise/:id',
         component: () => import('@/views/detail/party-a/index'),
         name: 'PartyA',
-        meta: { title: '企业详情', icon: 'enterprise', noCache: false },
+        meta: { title: '甲方详情', icon: 'enterprise', noCache: false },
       }
     ]
   },

dsk-operate-ui/src/views/component/CustomTimeSelect.vue

@@ -61,7 +61,7 @@ export default {
     timeList: {
       type: Array,
       default: () => [],
-    }
+    },
   },
   computed: {
     isClear() {
@@ -319,6 +319,9 @@ export default {
           left: -400px;
         }
       }
+      .el-date-editor{
+        left: -400px;
+      }
     }
 
     .picker-block {

dsk-operate-ui/src/views/custom/customList/index.vue

@@ -15,10 +15,44 @@
             <div class="btn btn_primary btn_shallow h36 w88" @click="pldrs">批量导入</div>
           </div>
           <div class="table_search">
-            <div class="searchInput">
-              <el-input type="text" clearable v-model="searchParam.companyName" @change="clearname" placeholder="输入企业名称查询"></el-input>
-              <div class="btn" @click="handleCurrentChange(1)">搜索</div>
+            <div>
+              <el-form ref="queryForm" :model="searchParam" :inline="true" size="small">
+                <el-form-item prop="companyName">
+                  <div class="searchInput">
+                    <el-input type="text" clearable v-model="searchParam.companyName" @change="clearname" placeholder="输入企业名称查询"></el-input>
+                    <div class="btn" @click="handleCurrentChange(1)">搜索</div>
+                  </div>
+                </el-form-item>
+                <el-form-item>
+                  <el-cascader
+                    ref="address1"
+                    :options="addressList"
+                    :props="addressProps"
+                    v-model="address"
+                    @change="handleSearch"
+                    placeholder="地区选择"
+                    collapse-tags
+                    style="width: 200px;"
+                    clearable></el-cascader>
+                </el-form-item>
+                <el-form-item prop="companyNatures">
+                  <el-select v-model="searchParam.companyNatures" style="width: 175px;" @change="handleSearch" filterable collapse-tags multiple class="form-content-width" placeholder="客户性质">
+                    <el-option v-for="(item, index) in companyNaturelist" :key="index" :label="item.dictLabel" :value="item.dictValue" />
+                  </el-select>
+                </el-form-item>
+                <el-form-item prop="isOn">
+                  <el-select v-model="searchParam.isOn" filterable clearable style="width: 175px;" @change="handleSearch" class="form-content-width" placeholder="上市公司">
+                    <el-option v-for="(item, index) in isMajorlist" :key="index" :label="item.dictLabel" :value="item.dictValue" />
+                  </el-select>
+                </el-form-item>
+                <el-form-item prop="creditLevels">
+                  <el-select v-model="searchParam.creditLevels" style="width: 175px;" @change="handleSearch" multiple filterable collapse-tags class="form-content-width" placeholder="资信评级">
+                    <el-option v-for="(item, index) in creditLevellist" :key="index" :label="item.dictLabel" :value="item.dictValue" />
+                  </el-select>
+                </el-form-item>
+              </el-form>
             </div>
+
             <div class="dc">
               <div class="total">共{{tableData.total}}条</div>
               <div class="btn-export" @click="pldrs"><img src="@/assets/images/project/import.png">批量导入</div>
@@ -259,7 +293,6 @@
   import batchimport from '../../project/projectList/component/batchImport'
   import skeleton from '../../project/projectList/component/skeleton'
   import { encodeStr } from '@/assets/js/common'
-
   export default {
   name: 'CustomList',
   components:{batchimport,skeleton},
@@ -273,6 +306,7 @@
         pageNum:1,
         pageSize:20
       },
+      address:'',
       props:{ checkStrictly: true, expandTrigger: 'hover' },
       dialogVisible:false,
       textarea:"",
@@ -281,7 +315,23 @@
       tipsvalue:"",//标签填写内容
       tableData: [],//列表
       companData:[],//联想企业列表
-
+      addressProps: {
+        multiple: true,
+        expandTrigger: 'hover'
+      },
+      //上市公司
+      isMajorlist:[
+        {
+          dictValue: 0,
+          dictLabel:'否',
+        },
+        {
+          dictValue: 1,
+          dictLabel:'是',
+        }
+      ],
+      companyNaturelist:[],  //客户性质
+      creditLevellist:[],  //资信评级
       customerLevel:[],//客户等级
       addressList:[],//地区
       //添加客户
@@ -316,12 +366,20 @@
     }
   },
   created() {
-    this.$watch(
-      () => this.$route.params,
-      () => {
+    if(this.$route.query.type === '1'){
+      this.searchParam.companyNatures=['国有企业']
+    }
+    if(this.$route.query.type === '2'){
+      this.searchParam.companyNatures=['央企']
+    }
+    if(this.$route.query.type ==='3'){
+      this.searchParam.companyNatures=['事业单位','机关单位']
+    }
+    this.$watch(() => this.$route.params,() => {
         this.getCustomerList()
         this.getDictType()
         this.prvinceTree()
+        this.handleQuery()
         this.searchParam.companyName=''
       },
       // 组件创建完后获取数据，
@@ -330,6 +388,22 @@
     )
   },
   methods:{
+    async handleQuery() {
+      let [type1,type2] = await Promise.all([
+        getDictType('company_nature_type'),
+        getDictType('credit_level_type'),
+      ])
+      if(type1.code==200){
+        type1.data.forEach(item => {
+          this.companyNaturelist.push({dictLabel:item.dictLabel,dictValue:item.dictLabel})
+        })
+      }
+      if(type2.code==200){
+        type2.data.forEach(item => {
+          this.creditLevellist.push({dictLabel:item.dictLabel,dictValue:item.dictLabel})
+        })
+      }
+    },
     sq1(item,sq){
       this.$nextTick(()=>{
         item.sq1 = sq
@@ -367,7 +441,42 @@
     },
     //获取客户列表
     getCustomerList(){
-      getCustomerList(this.searchParam).then(result=>{
+      let params=this.searchParam
+      if(this.address.length > 0){
+        let arr = this.$refs.address1.getCheckedNodes();
+        let provinceCode = [],cityCode = [],countyCode = [];
+        for (var i in arr) {
+          if (arr[i].parent) {
+            if (!arr[i].parent.checked) {
+              arr[i].hasChildren && cityCode.push(arr[i].value);
+              !arr[i].hasChildren && countyCode.push(arr[i].value);
+            }
+          } else {
+            provinceCode.push(arr[i].value)
+          }
+        }
+        if(provinceCode.length > 0){
+          params.provinceIds=provinceCode
+        }
+        if(cityCode.length > 0){
+          params.cityIds=cityCode
+        }
+        if(countyCode.length > 0){
+          params.areaIds=countyCode
+        }
+      }else {
+        if(params.provinceIds){
+          delete params.provinceIds
+        }
+        if(params.cityIds){
+          delete params.cityIds
+        }
+        if(params.areaIds){
+          delete params.areaIds
+        }
+
+      }
+      getCustomerList(params).then(result=>{
         this.isSkeleton = false
         this.tableData = result
         this.tableData.rows.forEach(item=>{
@@ -398,6 +507,12 @@
       // }
       this.$router.push({path:'/enterprise/'+encodeStr(companyId),query:{customerId:customerId,path:path}})
     },
+    handleSearch(){
+      this.$nextTick(() => {
+        this.searchParam.pageNum = 1
+        this.getCustomerList()
+      })
+    },
     clearname(value){
       if(value == ""){
         this.handleCurrentChange(1)
@@ -650,6 +765,27 @@
         margin-top: 16px;
       }
     }
+    .table_search{
+      ::v-deep .el-cascader{
+        height: 32px;
+        line-height: 32px;
+        .el-input{
+          input{
+            height: 32px !important;
+          }
+        }
+        .el-cascader__tags{
+          flex-wrap: inherit;
+          margin-top: 1px;
+          .el-tag{
+            max-width: 120px;
+          }
+        }
+        .el-input__suffix{
+          top: 1px;
+        }
+      }
+    }
   }
   .ps1{
     display: flex;
@@ -696,8 +832,9 @@
     height: auto;
   }
   .searchInput{
+    width: 240px;
     .el-input{
-      width: 260px;
+      /*width: 260px;*/
     }
   }
 </style>