Merge branch 'zuhuduan' of 192.168.60.201:root/dsk-operate-sys into zuhuduan

dsk-admin/src/main/java/com/dsk/DskOperateSysApplication.java

@@ -3,6 +3,7 @@ package com.dsk;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.metrics.buffering.BufferingApplicationStartup;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 /**
  * 启动程序
@@ -11,6 +12,7 @@ import org.springframework.boot.context.metrics.buffering.BufferingApplicationSt
  */
 
 @SpringBootApplication
+@EnableScheduling
 public class DskOperateSysApplication {
 
     public static void main(String[] args) {

dsk-admin/src/main/java/com/dsk/web/controller/system/SysLoginController.java

@@ -3,6 +3,7 @@ package com.dsk.web.controller.system;
 import cn.dev33.satoken.annotation.SaCheckLogin;
 import cn.dev33.satoken.annotation.SaIgnore;
 import cn.dev33.satoken.stp.StpUtil;
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.lang.RegexPool;
 import cn.hutool.core.map.MapUtil;
@@ -80,6 +81,38 @@ public class SysLoginController {
 
 
 
+//    /**
+//     * 发送短信验证码
+//     *
+//     * @param phones     电话号
+//     * @param templateId 模板ID
+//     */
+//    @SaIgnore
+//    @GetMapping("/send/sms/code")
+//    public R<Object> sendAliyun(String phones, String templateId) {
+//        LinkedHashMap<String, String> map = new LinkedHashMap<>(1);
+//        map.put("code", RandomUtil.randomNumbers(4));
+//        SmsBlend smsBlend = SmsFactory.createSmsBlend(SupplierType.ALIBABA);
+//        SmsResponse smsResponse = smsBlend.sendMessage(phones, templateId, map);
+//        return R.ok(smsResponse);
+//    }
+
+    /**
+     * 短信登录
+     *
+     * @param smsLoginBody 登录信息
+     * @return 结果
+     */
+    @SaIgnore
+    @PostMapping("/smsLogin")
+    public R<LoginVo> smsLogin(@Validated @RequestBody SmsLoginBody smsLoginBody) {
+        // 生成令牌
+        LoginVo loginVo=loginService.smsLogin(smsLoginBody.getPhonenumber(), smsLoginBody.getSmsCode());
+        return R.ok(loginVo);
+    }
+
+
+
     /**
      * 动态切换租户
      *
@@ -118,6 +151,11 @@ public class SysLoginController {
             return R.ok(new ArrayList<>());
         }
         List<SysTenantVo> tenantList=loginService.tenantListByAccount(phone);
+        if(CollectionUtil.isNotEmpty(tenantList)){
+            for (SysTenantVo sysTenantVo : tenantList) {
+                sysTenantVo.setCompanyName("");
+            }
+        }
         return R.ok(tenantList);
     }
 
@@ -150,35 +188,6 @@ public class SysLoginController {
         return R.ok(MapUtil.of("tenantId",defaultTenant));
     }
 
-    /**
-     * 发送短信验证码
-     *
-     * @param phones     电话号
-     * @param templateId 模板ID
-     */
-    @SaIgnore
-    @GetMapping("/send/sms/code")
-    public R<Object> sendAliyun(String phones, String templateId) {
-        LinkedHashMap<String, String> map = new LinkedHashMap<>(1);
-        map.put("code", RandomUtil.randomNumbers(4));
-        SmsBlend smsBlend = SmsFactory.createSmsBlend(SupplierType.ALIBABA);
-        SmsResponse smsResponse = smsBlend.sendMessage(phones, templateId, map);
-        return R.ok(smsResponse);
-    }
-
-    /**
-     * 短信登录
-     *
-     * @param smsLoginBody 登录信息
-     * @return 结果
-     */
-    @SaIgnore
-    @PostMapping("/smsLogin")
-    public R<LoginVo> smsLogin(@Validated @RequestBody SmsLoginBody smsLoginBody) {
-        // 生成令牌
-        LoginVo loginVo=loginService.smsLogin(smsLoginBody.getPhonenumber(), smsLoginBody.getSmsCode());
-        return R.ok(loginVo);
-    }
     /**
      * 邮件登录
      *

dsk-admin/src/main/java/com/dsk/web/controller/system/SysTenantController.java

@@ -84,7 +84,7 @@ public class SysTenantController extends BaseController {
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody SysTenantBo bo) {
         if (!tenantService.checkCompanyNameUnique(bo)) {
-            return R.fail("新增租户'" + bo.getCompanyName() + "'失败，企业名称已存在");
+            return R.fail("新增企业'" + bo.getCompanyName() + "'失败，企业名称已存在");
         }
         return toAjax(TenantHelper.ignore(() -> tenantService.insertByBo(bo)));
     }
@@ -100,7 +100,7 @@ public class SysTenantController extends BaseController {
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysTenantBo bo) {
         tenantService.checkTenantAllowed(bo.getTenantId());
         if (!tenantService.checkCompanyNameUnique(bo)) {
-            return R.fail("修改租户'" + bo.getCompanyName() + "'失败，公司名称已存在");
+            return R.fail("修改企业'" + bo.getCompanyName() + "'失败，公司名称已存在");
         }
         return toAjax(tenantService.updateByBo(bo));
     }
@@ -162,8 +162,8 @@ public class SysTenantController extends BaseController {
     @SaCheckPermission("system:tenant:edit")
     @Log(title = "租户", businessType = BusinessType.UPDATE)
     @GetMapping("/syncTenantPackage")
-    public R<Void> syncTenantPackage(@NotBlank(message = "租户ID不能为空") String tenantId,
-                                     @NotNull(message = "套餐ID不能为空") Long packageId) {
+    public R<Void> syncTenantPackage(@NotBlank(message = "企业ID不能为空") String tenantId,
+                                     @NotNull(message = "企业方案ID不能为空") Long packageId) {
         return toAjax(TenantHelper.ignore(() -> tenantService.syncTenantPackage(tenantId, packageId)));
     }
 

dsk-admin/src/main/java/com/dsk/web/schedule/TenantTimerTask.java

+package com.dsk.web.schedule;
+
+import com.dsk.common.tenant.helper.TenantHelper;
+import com.dsk.system.service.ISysTenantService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+/**
+ * 租户相关定时任务类
+ *
+ * @author sxk
+ * @date 2023.09.06
+ */
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class TenantTimerTask {
+
+    private final ISysTenantService tenantService;
+
+    /**
+     * 每6小时扫描并禁用已过期租户账号
+     */
+    @Scheduled(cron = "0 0 0/6 * * *")
+    public void updateExpiredTenantStatus() {
+        log.info("执行定时禁用已过期租户账号(6h/次)");
+        TenantHelper.ignore(tenantService::handleExpiredTenant);
+    }
+
+}
\ No newline at end of file

dsk-admin/src/main/resources/i18n/messages_zh_CN.properties

@@ -50,5 +50,5 @@ xcx.code.not.blank=\u5C0F\u7A0B\u5E8Fcode\u4E0D\u80FD\u4E3A\u7A7A
 ##\u79DF\u6237
 company.number.not.blank=\u4F01\u4E1A\u7F16\u53F7\u4E0D\u80FD\u4E3A\u7A7A
 company.not.exists=\u5BF9\u4E0D\u8D77, \u60A8\u7684\u4F01\u4E1A\u4E0D\u5B58\u5728\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458
-company.blocked=\u5BF9\u4E0D\u8D77\uFF0C\u60A8\u7684\u4F01\u4E1A\u5DF2\u7981\u7528\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458
+company.blocked=\u5BF9\u4E0D\u8D77\uFF0C\u60A8\u7684\u4F01\u4E1A\u5DF2\u505C\u7528\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458
 company.expired=\u5BF9\u4E0D\u8D77\uFF0C\u60A8\u7684\u4F01\u4E1A\u5DF2\u8FC7\u671F\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458
\ No newline at end of file

dsk-operate-ui/package.json

@@ -40,7 +40,8 @@
     "axios": "0.24.0",
     "clipboard": "2.0.8",
     "core-js": "3.25.3",
-    "echarts": "^5.4.0",
+    "echarts": "^5.0.0",
+    "el-table-horizontal-scroll": "^1.2.5",
     "element-resize-detector": "^1.2.4",
     "element-ui": "2.15.12",
     "file-saver": "2.0.5",
@@ -60,7 +61,7 @@
     "vue-cropper": "0.5.5",
     "vue-meta": "2.4.0",
     "vue-router": "3.4.9",
-    "vuedraggable": "2.24.3",
+    "vuedraggable": "^2.24.3",
     "vuex": "3.6.0"
   },
   "devDependencies": {

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/detail/groupAccount/groupAccount.js

@@ -50,3 +50,20 @@ export function businessList(data) {
     data: data
   })
 }
+
+// 集团招标
+export function bidPage(data) {
+  return request({
+    url: '/combine/info/bidPage',
+    method: 'post',
+    data: data
+  })
+}
+// 集团招标导出
+export function exportBid(data) {
+  return request({
+    url: '/combine/info/export/bid',
+    method: 'post',
+    data: data
+  })
+}

dsk-operate-ui/src/api/detail/party-a/dealings.js

@@ -80,3 +80,35 @@ export function tenderPage(data) {
     data: data
   })
 }
+// 客户-供应商下拉框
+export function getSelect(data) {
+  return request({
+    url: '/enterpriseBussiness/select',
+    method: 'post',
+    data: data
+  })
+}
+// 中标公示来源链接
+export function bidWinMergeDetail(data) {
+  return request({
+    url: '/enterpriseBussiness/bidWinMergeDetail',
+    method: 'post',
+    data: data
+  })
+}
+// 四库业绩来源链接
+export function skyProjectDetail(data) {
+  return request({
+    url: '/enterpriseBussiness/skyProjectDetail',
+    method: 'post',
+    data: data
+  })
+}
+// 荣誉奖项来源链接
+export function awardDetail(data) {
+  return request({
+    url: '/enterpriseBussiness/awardDetail',
+    method: 'post',
+    data: data
+  })
+}

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

@@ -147,7 +147,7 @@ let centralEnterprselocalPage= function centralEnterprselocalPage(param) {
 	data: param
   })
 }
-// 民营集团
+// 其他集团
 let centralEnterprsesocial= function centralEnterprsesocial(param) {
   return request({
     url: '/combine/info/centralEnterprse/social',
@@ -155,7 +155,7 @@ let centralEnterprsesocial= function centralEnterprsesocial(param) {
 	data: param
   })
 }
-// 民营集团更多
+// 其他集团更多
 let centralEnterprsesocialPage= function centralEnterprsesocialPage(param) {
   return request({
     url: '/combine/info/centralEnterprse/social/page',

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

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

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

@@ -219,3 +219,52 @@ export function allRecord(param) {
     params:param,
   })
 }
+
+//项目状态统计
+export function getStatistics(param) {
+  return request({
+    url: '/business/overview/status/statistics',
+    method: 'get',
+    params:param,
+  })
+}
+//储备项目统计
+export function getCount(param) {
+  return request({
+    url: '/business/overview/category/analyze/'+param,
+    method: 'get',
+    params:param,
+  })
+}
+//储备项目资金
+export function getAmount(param) {
+  return request({
+    url: '/business/overview/amount/analyze',
+    method: 'get',
+    params:param,
+  })
+}
+//跟进动态
+export function getAllRecord(param) {
+  return request({
+    url: '/business/record/all/list',
+    method: 'get',
+    params:param,
+  })
+}
+//公招项目地区统计
+export function countGroupByProvince(param) {
+  return request({
+    url: '/business/overview/countGroupByProvince',
+    method: 'post',
+    data:param
+  })
+}
+//公招项目投资金额统计
+export function rangByMoney(param) {
+  return request({
+    url: '/business/overview/rangByMoney',
+    method: 'post',
+    data:param
+  })
+}

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

@@ -196,8 +196,55 @@ let getUipIdByCid = function getUipIdByCid(param) {
 		data: param
 	})
 }
+// 重点项目清单查询
+let getImportantPage = function getImportantPage(param) {
+	return request({
+		url: '/radar/importantPage',
+		method: 'post',
+		data: param
+	})
+}
+// 重点项目清单筛选
+let getImportantCondition = function getImportantCondition(param) {
+	return request({
+		url: '/radar/importantCondition',
+		method: 'post',
+		data: param
+	})
+}
+// 重点项目清单关联列表
+
+let getImportantSelect = function getImportantSelect(param) {
+	return request({
+		url: '/radar/importantSelect',
+		method: 'post',
+		data: param
+	})
+}
+//重点项目清单详情
+let getImportantDetail = function getImportantDetail(param) {
+	return request({
+		url: '/enterpriseProject/importantDetail',
+		method: 'post',
+		data: param
+	})
+}
+//项目清单导出
+
+let radarExport = function radarExport(param) {
+	return request({
+		url: '/radar/export/important',
+		method: 'post',
+		data: param
+	})
+}
 
 export default {
+	radarExport,
+	getImportantDetail,
+	getImportantSelect,
+	getImportantCondition,
+	getImportantPage,
 	importData,
 	searchDic,
 	bondProjectPage,

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

@@ -121,7 +121,7 @@ aside {
 
 //main-container全局样式
 .app-container {
-  padding: 16px;
+  //padding: 16px;
   //margin-top: 56px;
 }
 
@@ -223,6 +223,7 @@ ul, li {
 .app-container {
   margin: 12px 24px;
   background-color: #f5f5f5;
+  padding-bottom: 16px !important;
   .el-input__inner{
     border-color: #D9D9D9;
     color: #232323;
@@ -262,6 +263,19 @@ ul, li {
     }
   }
   .query-ability{
+    .total{
+      display: flex !important;
+      flex-direction: row;
+      align-items: center;
+      &:before {
+        content: "";
+        display: inline-block;
+        width: 2px;
+        height: 2px;
+        background: rgba(35, 35, 35, 0.4);
+        margin-right: 4px;
+      }
+    }
     span{
       font-size: 14px;
       color: #232323;
@@ -407,6 +421,18 @@ ul, li {
         background: #566380;
       }
     }
+    .el-scrollbar{
+      height: 16px;
+      .el-scrollbar__bar.is-horizontal{
+        height: 8px;
+      }
+      .el-scrollbar__thumb{
+        background: rgba(98,110,126,0.4);
+        &:hover{
+          background: #566380;
+        }
+      }
+    }
   }
 
 }

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;
@@ -1171,9 +1176,6 @@
 }
 
 .none{display: none}
-.el-popper[x-placement^=bottom]{
-  margin-top: 0 !important;
-}
 .el-dialog__body{
   padding-top: 14px;
   padding-bottom: 18px;

dsk-operate-ui/src/layout/components/AppMain.vue

@@ -43,7 +43,7 @@ export default {
   .app-main {
     /* 84 = navbar + tags-view = 50 + 34 */
     min-height: calc(100vh - 68px);
-	min-width:1440px;
+	min-width:1240px;
     background: #F5F5F5;
     overflow: initial;
   }

dsk-operate-ui/src/layout/components/Navbar.vue

@@ -126,7 +126,7 @@ export default {
   overflow: inherit;
   /*position: relative;*/
   background: #fff;
-  box-shadow: 0 1px 4px rgba(0,21,41,.08);
+  /*box-shadow: 0 1px 4px rgba(0,21,41,.08);*/
   position: fixed;
   top:0;
   z-index: 999;

dsk-operate-ui/src/layout/components/TagsView/index.vue

@@ -7,13 +7,7 @@
         <!--<i class="el-icon-arrow-down" v-if="!showall"></i> <i class="el-icon-arrow-up" v-if="showall"></i>-->
         </div>
       <div class="tagslist" v-if="showall">
-        <!--<div v-for="(tag, index) in visitedViews"-->
-        <!--:key="tag.path"-->
-        <!--:class="isActive(tag)?'active':''"-->
-        <!--&gt;-->
-        <!--<i class="el-icon-check"></i>-->
-
-        <!--</div>-->
+        <draggable v-model="visitedViews" :options="dragOptions" @end="end">
           <router-link
             v-for="(tag, index) in visitedViews"
             ref="tag"
@@ -30,9 +24,12 @@
             </div>
           </router-link>
           <div class="clasall"  @click="closeAllTag(selectedTag)">关闭全部标签</div>
+
+        </draggable>
       </div>
     </div>
     <scroll-pane ref="scrollPane" class="tags-view-wrapper" @scroll="handleScroll">
+      <draggable v-model="visitedViews" :options="dragOptions" @end="end">
         <router-link
           v-for="(tag, index) in visitedViews"
           ref="tag"
@@ -51,6 +48,7 @@
           <span v-if="!isAffix(tag)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
           <i :class="index!=visitedViews.length-1 && index != isActiveIndex() && index != isActiveIndex()-1?'tags-item-line':'tags-item-line item-color'" />
         </router-link>
+      </draggable>
     </scroll-pane>
     <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
       <li @click="refreshSelectedTag(selectedTag)"><i class="el-icon-refresh-right"></i> 刷新页面</li>
@@ -64,11 +62,12 @@
 </template>
 
 <script>
+  import draggable from 'vuedraggable'
 import ScrollPane from './ScrollPane'
 import path from 'path'
 
 export default {
-  components: { ScrollPane },
+  components: { ScrollPane,draggable },
   data() {
     return {
       visible: false,
@@ -77,12 +76,22 @@ export default {
       selectedTag: {},
       affixTags: [],
       showall:false,
+      dragOptions: {
+        animation: 200, // 动画时间，单位毫秒
+        group: 'items', // 分组，同一分组内的元素可以互相拖拽
+        ghostClass: 'ghost', // 拖拽过程中占位元素的class名称
+        sort: true, // 是否启用排序功能
+        draggable: '.tags-view-item', // 可拖拽元素的选择器
+      }
     }
   },
   computed: {
-    visitedViews() {
+    visitedViews:{
+      get() {
         return this.$store.state.tagsView.visitedViews
       },
+      set() {}
+    },
     iconName() {
       return function(val) {
         let svgIcon = val.meta && val.meta.icon, currentIcon = ''
@@ -124,7 +133,6 @@ export default {
   },
   methods: {
     changetags(){
-      console.log(88)
       this.showall = false
     },
     closeall(){
@@ -297,7 +305,26 @@ export default {
     },
     handleScroll() {
       this.closeMenu()
+    },
+    end (event) {
+      //调换顺序
+      let oldIndex = event.oldIndex//移动初始位置
+      let newIndex = event.newIndex//运动终止位置
+      let diff = Math.abs(newIndex - oldIndex)//插值绝对值
+      let index = this.visitedViews[oldIndex]
+      if (eval(oldIndex) > eval(newIndex)) {
+        for (let i = 0; i < diff; i++) {
+          this.visitedViews[oldIndex - i] = this.visitedViews[oldIndex - i - 1]
+        }
+        this.visitedViews[newIndex] = index
+      } else {
+        for (let i = 0; i < diff; i++) {
+          this.visitedViews[oldIndex + i] = this.visitedViews[oldIndex + i + 1]
         }
+        this.visitedViews[newIndex] = index
+      }
+      this.$forceUpdate()
+    },
   }
 }
 </script>
@@ -424,7 +451,7 @@ export default {
       /*overflow-y: auto;*/
       overflow-y: overlay;
       padding: 8px 0 0;
-      width: 325px;
+      width: 146px;
       text-align: left;
       border-radius: 4px;
       box-shadow: 0 2px 9px 2px rgba(0,0,0,.09), 0 1px 2px -2px rgba(0,0,0,.16);
@@ -434,6 +461,9 @@ export default {
         >div{
           padding: 8px 8px 8px 32px;
           line-height: 20px;
+          white-space: nowrap;
+          text-overflow: ellipsis;
+          overflow: hidden;
         }
         &:hover{
           background: rgba(0, 0, 0, 0.04);

dsk-operate-ui/src/layout/index.vue

@@ -2,7 +2,7 @@
   <div :class="classObj" class="app-wrapper" :style="{'--current-color': theme}">
     <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside"/>
     <sidebar v-if="!sidebar.hide" class="sidebar-container" @handleBar="handleSideBar" id="sidebar"/>
-    <div :class="{hasTagsView:needTagsView,sidebarHide:sidebar.hide,EnterpriseData:$route.name=='EnterpriseData'}" class="main-container">
+    <div :class="{hasTagsView:needTagsView,sidebarHide:sidebar.hide,EnterpriseData:$route.name=='Group',width1350:$route.name=='Radar',width1240:$route.name=='Overview'}" class="main-container">
       <div :class="{'fixed-header':fixedHeader}">
         <navbar :offsetWidth="offsetWidth"/>
       </div>
@@ -128,4 +128,13 @@ export default {
   .mobile .fixed-header {
     width: 100%;
   }
+  .EnterpriseData{
+    min-width: 1710px;
+  }
+  .width1350{
+    min-width: 1350px;
+  }
+  .width1240{
+    min-width: 1240px;
+  }
 </style>

dsk-operate-ui/src/main.js

@@ -13,7 +13,7 @@ import router from './router'
 import directive from './directive' // directive
 import plugins from './plugins' // plugins
 import { download } from '@/utils/request'
-
+import horizontalScroll from 'el-table-horizontal-scroll'
 
 import './assets/icons' // icon
 import './permission' // permission control
@@ -59,6 +59,7 @@ Vue.component('FileUpload', FileUpload)
 Vue.component('ImageUpload', ImageUpload)
 Vue.component('ImagePreview', ImagePreview)
 
+Vue.use(horizontalScroll)
 Vue.use(directive)
 Vue.use(plugins)
 Vue.use(VueMeta)

dsk-operate-ui/src/plugins/download.js

@@ -63,7 +63,7 @@ export default {
     saveAs(text, name, opts);
   },
 
-  exportByPost(url, params){
+  exportByPost(url, params,name){
     var url = baseURL + url
     axios({
       method: 'post',
@@ -72,8 +72,12 @@ export default {
       data: params,
       headers: { 'Authorization': 'Bearer ' + getToken() }
     }).then(res => {
-      const blob = new Blob([res.data], { type: 'application/octet-stream/pdf/doc/xlsx/xls/docx' })
+      const blob = new Blob([res.data], { type: 'application/octet-stream/pdf/doc/xlsx/xls/docx/excel' })
+      if(name){
+        this.saveAs(blob, name)
+      }else {
         this.saveAs(blob, decodeURI(res.headers['download-filename']))
+      }
     })
   },
   async printErrMsg(data) {

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

@@ -70,7 +70,7 @@ export const constantRoutes = [
         path: 'index',
         component: () => import('@/views/index'),
         name: 'Index',
-        meta: { title: '首页', icon: 'index', }
+        meta: { title: '首页', icon: 'index',noCache: false }
       }
     ]
   },
@@ -88,6 +88,34 @@ export const constantRoutes = [
       }
     ]
   },
+  // {
+  //   path: '',
+  //   component: Layout,
+  //   hidden: true,
+  //   redirect: 'economies',
+  //   children: [
+  //     {
+  //       path: '/macro/economies',
+  //       component: () => import('@/views/macro/economies'),
+  //       name: 'Economies',
+  //       meta: { title: '区域经济', icon: 'macro' }
+  //     }
+  //   ]
+  // },
+  {
+    path: '',
+    component: Layout,
+    hidden: true,
+    redirect: 'urban',
+    children: [
+      {
+        path: '/macro/urban',
+        component: () => import('@/views/macro/urban'),
+        name: 'Urban',
+        meta: { title: '城投平台', icon: 'macro' }
+      }
+    ]
+  },
   {
     path: '/user',
     component: Layout,
@@ -127,7 +155,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: 'enterpriseData', noCache: false },
       }
     ]
   },
@@ -291,6 +319,20 @@ export const constantRoutes = [
 	    }
 	  ]
 	},
+	{
+	  path: '/MajorProject',
+	  component: Layout,
+	  hidden: true,
+	  redirect: 'noredirect',
+	  children: [
+	    {
+	      path: '/radar/MajorProject/details/:id',
+	      component: () => import('@/views/radar/MajorProject/details'),
+	      name: 'MajorProjectDetails',
+	      meta: { title: '重点项目详情', icon: 'radar' }
+	    }
+	  ]
+	},
 	{
 	  path: '/Bidding',
 	  component: Layout,

dsk-operate-ui/src/utils/request.js

@@ -17,7 +17,7 @@ const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   baseURL: process.env.VUE_APP_BASE_API,
   // 超时
-  timeout: 10000
+  timeout: 20000
 })
 
 // request拦截器
@@ -37,6 +37,10 @@ service.interceptors.request.use(config => {
     config.params = {};
     config.url = url;
   }
+  cancelPending(config)
+  config.cancelToken = new CancelToken(res => {
+    pending.push({'UrlPath': config.url, 'Cancel': res})
+  })
   if (!isRepeatSubmit && (config.method === 'post' || config.method === 'put')) {
     const requestObj = {
       url: config.url,
@@ -68,6 +72,24 @@ service.interceptors.request.use(config => {
   }
 })
 
+//频繁发送请求时，返回慢的数据覆盖了返回快的数据
+let pending = []
+let CancelToken = axios.CancelToken
+let cancelPending = (config) => {
+  pending.forEach((item, index) => {
+    if (config) {
+      // if (item.UrlPath === '/combine/info/memberList' || item.UrlPath === '/combine/info/businessList' || item.UrlPath === '/combine/info/bidPage') {
+      if (item.UrlPath === config.url && ['/combine/info/memberList','/combine/info/businessList','/combine/info/bidPage'].includes(config.url)) {
+        item.Cancel() // 取消请求
+        pending.splice(index, 1) // 移除当前请求记录
+      };
+    } else {
+      item.Cancel() // 取消请求
+      pending.splice(index, 1) // 移除当前请求记录
+    }
+  })
+}
+
 // 响应拦截器
 service.interceptors.response.use(res => {
     const apiList = ['/login', '/system/user/profile/updatePwd']  //需要提示错误的接口
@@ -102,6 +124,7 @@ service.interceptors.response.use(res => {
       Notification.error({ title: msg })
       return Promise.reject('error')
     } else {
+      cancelPending(res.config)
       return res.data
     }
   },error => {
@@ -117,7 +140,7 @@ service.interceptors.response.use(res => {
     if(message=='数据正在处理，请勿重复提交'){ //重复提交，提示样式特殊处理
       Message({ message: message, type: 'warning', duration: 5 * 1000 })
     }else{
-      Message({ message: message, type: 'error', duration: 5 * 1000 })
+      // Message({ message: message, type: 'error', duration: 5 * 1000 })
     }
 
   if(error.message.indexOf('timeout')<0 ){ //超时报错不提示

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

@@ -51,6 +51,10 @@ export default {
       type: String,
       default: '请选择'
     },
+    'moneyValue': {
+      type: String,
+      default: ''
+    },
     'ref-str': {
       type: String,
       default: `timeselect${String(Math.random(0, 100)).slice(2)}`,
@@ -92,6 +96,9 @@ export default {
     if(this.moneyList&&this.moneyList.length>0){
       this.options = this.moneyList
     }
+    if(this.moneyValue){
+      this.value = this.moneyValue
+    }
   },
   destroyed() {
     const app = document.getElementById('app')
@@ -278,7 +285,7 @@ export default {
 
     .options-block {
       position: absolute;
-      margin-top: 12px;
+      margin-top: 3px;
       min-width: 120px;
       font-size: 14px;
       color: #666666;
@@ -411,20 +418,20 @@ export default {
       width: 186px;
       color: #606266;
       text-indent: 0;
-      padding: 16px;
+      padding: 14px;
       padding-top: 0px;
       border: 1px solid #e0e0e0;
       .popper_wrap {
         margin-top: 16px;
         display: inline-block;
         .popper_input {
-          width: 100px;
+          width: 90px;
           display: inline-block;
           margin: 0px 8px;
           line-height: 34px;
         }
         .el-input__inner {
-          width: 100px;
+          width: 90px;
         }
       }
       input::-webkit-outer-spin-button,

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

@@ -46,6 +46,10 @@ export default {
       type: String,
       default: '请选择',
     },
+    'timeValue': {
+      type: String,
+      default: '',
+    },
     'ref-str': {
       type: String,
       default: `timeselect${String(Math.random(0, 100)).slice(2)}`,
@@ -61,7 +65,7 @@ export default {
     timeList: {
       type: Array,
       default: () => [],
-    }
+    },
   },
   computed: {
     isClear() {
@@ -106,6 +110,9 @@ export default {
     if(this.dateTo){
       this.defaultValue = new Date(this.dateTo)
     }
+    if(this.timeValue){
+      this.value = this.timeValue
+    }
     this.handleAppClick()
     if(this.timeList&&this.timeList.length>0){
       this.options = this.timeList
@@ -319,6 +326,9 @@ export default {
           left: -400px;
         }
       }
+      .el-date-editor{
+        left: -400px;
+      }
     }
 
     .picker-block {

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

+<template>
+  <div class="no-data">
+    <div class="no-data-box">
+      <img :src="noData" alt="抱歉，没找到相关数据" />
+      <div v-if="text">抱歉，您还未添加{{text}}项目</div>
+      <div v-else>抱歉，没找到相关数据</div>
+      <span v-if="condition">建议调整关键词或筛选条件，重新搜索</span>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "NoData",
+  props: {
+    condition: {
+      type: Boolean,
+      default: false
+    },
+    text: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      noData: require("@/assets/images/detail/noData.png")
+    }
+  },
+  methods:{
+
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  .no-data {
+    font-size: 14px;
+    color: #999999;
+    width: 100%;
+    height: 100%;
+    min-height: 120px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    background: #ffffff;
+    //border: 1px solid #eeeeee;
+    .no-data-box {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      img {
+        width: 108px;
+        height: 109px;
+        margin-bottom: 22px;
+      }
+      div{
+        font-size: 16px;
+        line-height: 1;
+        color: #333333;
+      }
+      span{
+        margin-top: 4px;
+      }
+    }
+  }
+</style>

dsk-operate-ui/src/views/custom/component/addCustom.vue

+<template>
+    <div>
+      <el-dialog
+        class="popups"
+        :visible.sync="dialogVisible"
+        width="534px"
+        :close-on-click-modal="false"
+        @close="resetForm('ruleForm')"
+      >
+        <div class="poptitle">
+          <img src="@/assets/images/economies/icon.png">
+          <span>添加客户</span>
+        </div>
+        <el-form class="popform j" :model="queryParam" :rules="rules" ref="ruleForm" label-width="130px">
+          <el-form-item label="企业名称：" class="row"  prop="companyName">
+            <el-input type="text" placeholder="请输入" v-model="queryParam.companyName" @input="getCompany(1)"></el-input>
+            <div class="resultlist infinite-list" v-if="showlist" id="box" v-infinite-scroll="load" style="overflow:auto">
+              <div class="infinite-list-item" v-for="(item,index) in companData" @click="selCompany(item)"><span  v-html="item.name" :key="companypage"></span></div>
+            </div>
+          </el-form-item>
+          <el-form-item label="客户等级：" class="row">
+            <el-select  placeholder="请选择" v-model="queryParam.customerLevel">
+              <el-option v-for="(item,index) in customerLevel" :key="index" :label="item.dictLabel" :value="item.dictValue"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="法定代表人：" class="row">
+            <el-input type="text" placeholder="请输入" v-model="queryParam.legalPerson"></el-input>
+          </el-form-item>
+          <el-form-item label="注册资本（万）：" class="row">
+            <el-input type="text" placeholder="请输入" v-model="queryParam.registerCapital" @input='number'></el-input>
+          </el-form-item>
+          <el-form-item label="企业注册地：" class="row">
+            <el-cascader :props="props" @change="getAddr($event)" ref="address" v-model="queryParam.address" :options="addressList" clearable></el-cascader>
+          </el-form-item>
+          <el-form-item label="统一社会信用代码：" class="row">
+            <el-input type="text" placeholder="请输入" v-model="queryParam.creditCode"></el-input>
+          </el-form-item>
+          <div class="popbot">
+            <div class="wordprimary" @click="toct">前往城投平台寻找客户线索></div>
+            <div class="btn btn_cancel h32" @click="resetForm('ruleForm')">返回</div>
+            <div class="btn btn_primary h32" @click="submitForm('ruleForm')">添加</div>
+          </div>
+        </el-form>
+      </el-dialog>
+    </div>
+</template>
+
+<script>
+  import { getDictType, getEnterprise } from '@/api/main'
+  import { addCustomer, getCustomerList, importData } from '@/api/custom/custom'
+  import prvinceTree from '@/assets/json/provinceTree'
+  export default {
+    name: '',
+    components: {
+    },
+    props: {
+      data:{}
+    },
+    data() {
+      return {
+        props:{ checkStrictly: true, expandTrigger: 'hover' },
+        dialogVisible: this.data.open,
+        //添加客户
+        queryParam:{
+          companyId:'',//jsk企业id
+          companyName:'',//客户名称（企业名称
+          customerLevel:'',//客户等级
+          legalPerson:'',//法定代表人
+          registerCapital:'',//注册资本
+          registerAddress:'',//企业注册地址
+          creditCode:'',//社会统一信用代码
+          address:'',//选择的地址
+          provinceId:'',
+          cityId:'',
+          districtId:'',
+        },
+        rules:{
+          companyName:[{ required: true, message: '请输入非空格字符！', trigger: 'blur' },]
+        },
+        showlist:false,
+        customerLevel:[]
+      }
+    },
+    created() {
+      this.prvinceTree()
+      this.getDictType()
+      console.log(this.dialogVisible)
+      console.log('1111111111')
+    },
+    computed: {},
+    methods:{
+      async prvinceTree() {
+        this.addressList = prvinceTree;
+        this.getadd(this.addressList)
+      },
+      getDictType(){
+        //获取客户等级
+        getDictType('customer_level_type').then(result=>{
+          this.customerLevel = result.code == 200 ? result.data:[]
+        })
+      },
+      open() {
+        // this.dialogVisible = true;
+      },
+      resetForm(formName) {
+        this.queryParam = {
+          companyId:'',//jsk企业id
+          companyName:'',//客户名称（企业名称
+          customerLevel:'',//客户等级
+          legalPerson:'',//法定代表人
+          registerCapital:'',//注册资本
+          registerAddress:'',//企业注册地址
+          creditCode:'',//社会统一信用代码
+          address:'',//选择的地址
+          provinceId:'',
+          cityId:'',
+          districtId:'',
+        },
+          this.dialogVisible = false
+        this.showlist = false
+      },
+      getAddr(obj){
+        if(obj.length == 0){
+          this.queryParam.provinceId = ''
+          this.queryParam.cityId = ''
+          this.queryParam.districtId = ''
+          return false
+        }
+        let labelString = this.$refs.address.getCheckedNodes()[0].pathLabels.join("-");
+        this.queryParam.registerAddress = labelString
+        this.queryParam.provinceId = obj[0]
+        this.queryParam.cityId = obj.length>=1 ? obj[1]:''
+        this.queryParam.districtId = obj.length>=2 ? obj[2]:''
+      },
+      //获取建设库客户
+      getCompany(value){
+        this.queryParam.companyId = null
+        if(value == 1){
+          this.companData = []
+          this.companypage = 1
+        }
+        if (this.queryParam.companyName.length>=2){
+          let param = {
+            keyword:this.queryParam.companyName,
+            page:{
+              limit:20,
+              page:this.companypage
+            }
+          }
+          getEnterprise(JSON.stringify(param)).then(result=>{
+            if(result.code != 200){
+              return false
+            }
+            if(result.data.list != null && result.data.list.length>0){
+              this.isscroll = true
+              if (this.companData.length===0) {
+                this.companData = result.data.list
+              } else {
+                let arr2 = result.data.list
+                arr2.unshift(2, 0);
+                Array.prototype.splice.apply(this.companData, arr2);
+              }
+              if(this.companData.length===0) {
+                this.showlist = false
+              }else{
+                this.showlist = true
+              }
+              this.companypage += 1
+            }else{
+              this.isscroll = false
+            }
+          })
+        }
+      },
+      load(){
+        if(this.isscroll){
+          this.getCompany(2)
+        }
+      },
+      selCompany(item){
+        this.queryParam.companyId = item.jskEid
+        this.queryParam.companyName = item.name.replace(/<[^>]+>/g, '')
+        this.queryParam.legalPerson = item.legalPerson
+        let registeredCapitalStr = ""
+        if(item.registeredCapitalStr == "0" || item.registeredCapitalStr == 0){
+          registeredCapitalStr = ''
+        }else{
+          registeredCapitalStr = item.registeredCapitalStr
+        }
+        this.queryParam.registerCapital = registeredCapitalStr
+        this.queryParam.creditCode = item.creditCode
+        this.queryParam.provinceId = item.provinceId
+        this.queryParam.cityId = item.cityId
+        this.queryParam.districtId = item.cityId
+
+        let list = []
+        if(item.provinceId != null && item.provinceId != "")
+          list.push(item.provinceId)
+        if(item.cityId != null && item.cityId != "")
+          list.push(item.cityId)
+        if(item.districtId != null && item.districtId != "")
+          list.push(item.districtId)
+        this.$nextTick(()=>{
+          this.queryParam.address = list
+          let _this = this
+          setTimeout(function() {
+            if(_this.$refs.address){
+              _this.queryParam.registerAddress = _this.$refs.address.getCheckedNodes()[0].pathLabels.join("-")
+            }
+          },1000)
+        })
+        this.showlist = false
+      },
+      //添加客户
+      submitForm(formName) {
+        // if(this.queryParam.companyId=="" || this.queryParam.companyId == null){
+        //   this.$message.error({message:'请选择企业！',showClose:true})
+        //
+        //   return;
+        // }
+        this.$refs[formName].validate((valid) => {
+          if (valid) {
+            addCustomer(this.queryParam).then(result=>{
+              if(result.code == 200){
+                this.$message.success('添加成功！')
+                this.dialogVisible = false
+                this.resetForm('ruleForm')
+              }else{
+                this.$message.error(result.msg)
+              }
+            })
+          } else {
+          }
+        });
+      },
+      toct(){
+        this.$router.push({path:'/macro/urban'})
+      },
+      //输入数字
+      number(value){
+        if(value == '')
+          this.queryParam.registerCapital = value
+        else
+          this.queryParam.registerCapital = value.replace(/^\D*(\d*(?:\.\d{0,6})?).*$/g, '$1')//输入6位小数
+      },
+      //处理注册地数据
+      getadd(row) {
+        this.addrcallback(row,this.getadd)
+      },
+      addrcallback(row,callback){
+        if(row){
+          row.forEach(item => {
+            item.value = item.id
+            callback &&  callback(item.children)
+          })
+        }
+      },
+    },
+
+  }
+</script>
+
+<style scoped>
+
+</style>

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

@@ -18,7 +18,7 @@
             </div>
           </div>
           <skeleton v-if="isSkeleton"></skeleton>
-          <el-table v-if="!isSkeleton&&tableData.total > 0" class="fixed-table" max-height="640"
+          <el-table v-if="!isSkeleton&&tableData.total > 0" class="fixed-table" v-horizontal-scroll="tableData.total > 10 ? 'hover' : '1'" max-height="640"
             :data="tableData.rows"
             stripe border
             style="width: 100%">
@@ -26,7 +26,7 @@
               prop="index"
               label="序号"
               fixed="left"
-              width="47">
+              width="60">
               <template slot-scope='scope'>
                 <span>{{ (searchParam.pageNum - 1) * searchParam.pageSize + scope.$index + 1 }}</span>
               </template>
@@ -51,7 +51,7 @@
             <el-table-column
               prop="cooperationProject"
               label="合作项目"
-              width="76">
+              width="90">
               <template slot-scope="scope">
                 {{scope.row.cooperationProject || '--'}}
               </template>
@@ -59,7 +59,7 @@
             <el-table-column
               prop="followProject"
               label="跟进项目"
-              width="76">
+              width="90">
               <template slot-scope="scope">
                 {{scope.row.followProject || '--'}}
               </template>
@@ -67,7 +67,7 @@
             <el-table-column
               prop="reserveProject"
               label="储备项目"
-              width="76">
+              width="90">
               <template slot-scope="scope">
                 {{scope.row.reserveProject || '--'}}
               </template>
@@ -91,7 +91,7 @@
             <el-table-column
               prop="registerCapitalStr"
               label="注册资本金（万元）"
-              width="140">
+              width="160">
               <template slot-scope="scope">
                 <span v-if="scope.row.registerCapital && scope.row.registerCapital>0">{{scope.row.registerCapital}}</span><span v-else>--</span>
               </template>

dsk-operate-ui/src/views/detail/biddetail/index.vue

@@ -54,6 +54,13 @@
 					<label class="label">建设性质</label>
 					<span>{{info.projectNature||"--"}}</span>
 				</p>
+				<p>
+					<label class="label">招标公告</label>
+					<span class="span2">
+						<router-link :to="`/radar/Notice/details/${info.bId}`" tag="a" class="a-link" v-if="info.bId" >查看招标公告</router-link>
+						<span v-else>--</span>
+					</span>
+				</p>
 			</div>
       <div class="biddetail-title">招标信息</div>
 			<div class="main31-box">
@@ -91,7 +98,7 @@
 </template>
 
 <script>
-	import "@/assets/styles/public.css";
+	import "@/assets/styles/public.scss";
 	import {encodeStr} from "@/assets/js/common.js"
 	import {getBiddetail} from '@/api/detail/party-a/biddetail.js';
 export default {
@@ -412,6 +419,9 @@ export default {
 					.span1{
 						width: 40%;
 					}
+					.span2{
+						width: 88.9%;
+					}
 					.span-one {
 						width: 90%;
 					}

dsk-operate-ui/src/views/detail/groupAccount/component/Sidebar.vue

@@ -53,12 +53,14 @@ export default {
         {title: '集团成员', pathName: 'members'},
         {title: '集团资质', pathName: 'qualifications'},
         {title: '集团业绩', pathName: 'performance'},
+        {title: '集团招标', pathName: 'zhaobiao'},
       ],
       defaultRoute: [],
       customer:[
         'members',
         'qualifications',
         'performance',
+        'zhaobiao',
       ],
       uniqueOpened:false,
       searchIndex: ''

dsk-operate-ui/src/views/detail/groupAccount/component/members.vue

@@ -171,7 +171,7 @@
         qyType:[],
         cgblList:['100%','50%以上','20%以上','5%以上','1%-5%'],
         cgblName:'',
-        paramsData:[],  //储存组件筛选的条件
+        paramsData:{},  //储存组件筛选的条件
       }
     },
     watch:{
@@ -244,8 +244,8 @@
         }
       },
       handleQuery(params){
-        this.paramsData=params;
-        this.tableLoading=true
+        this.paramsData=params || {};
+        this.tableLoading=true;
         let data = this.getAreaList(params || this.queryParams)
         memberList(data).then(res=>{
           this.isSkeleton = false
@@ -363,8 +363,9 @@
             this.queryParams.maxStockPercent=''
           }
           if(this.paramsData){
-            this.paramsData.minStockPercent=this.queryParams.minStockPercent
-            this.paramsData.maxStockPercent=this.queryParams.maxStockPercent
+            if(!this.paramsData.combineId){
+              this.paramsData=this.queryParams
+            }
             this.paramsData.pageNum =1
             this.queryParams.pageNum =1
           }
@@ -400,16 +401,26 @@
       },
       sortChange({ column, prop, order }){
         this.queryParams.orderName = prop
+        this.paramsData.orderName = prop;
+        this.paramsData.combineId = this.customerId;
+        this.paramsData.pageNum = 1;
+        this.paramsData.pageSize = 20;
+
         if(column.order === "ascending"){
           this.queryParams.orderType = 'asc'
+          this.paramsData.orderType = 'asc'
         }else if(column.order === "descending"){
           this.queryParams.orderType = 'desc'
+          this.paramsData.orderType = 'desc'
         }else {
           this.queryParams.orderType=''
           this.queryParams.orderName=''
+          this.paramsData.orderType=''
+          this.paramsData.orderName=''
         }
-        this.pageIndex = 1;
-        this.handleQuery()
+        this.queryParams.pageNum =1
+        this.paramsData.pageNum =1
+        this.handleQuery(this.paramsData)
       },
       //分页
       handleCurrentChange(e){

dsk-operate-ui/src/views/detail/groupAccount/component/performance.vue

@@ -5,8 +5,9 @@
       :form-data="formData"
       :query-params="queryParams"
       :total="tableDataTotal"
-      :isExcel="false"
+      :isExcel="true"
       @handle-search="handleSearch"
+      @handle-excel="clickEXCEL"
     >
       <template slot="slot">
 
@@ -57,7 +58,7 @@
   import { getDictType } from '@/api/main'
   export default {
     name: 'qualifications',
-    props: ['customerId'],
+    props: ['customerId','combineName'],
     mixins: [mixin],
     components:{},
     data(){
@@ -74,17 +75,17 @@
         forData: [
           {label: '中标时间', prop: 'bidTime',slot: true,minWidth: '80'},
           {label: '中标成员', prop: 'companyName', slot: true,minWidth: '190'},
-          {label: '持股比例', prop: 'stockPercent',slot: true,minWidth: '95'},
+          {label: '持股比例', prop: 'stockPercent',slot: true,minWidth: '80'},
           {label: '项目名称', prop: 'projectName', slot: true,minWidth: '260'},
           {label: '中标金额', prop: 'bidAmount',slot: true,minWidth: '110'},
-          {label: '中标地区', prop: 'address',minWidth: '80'},
-          {label: '业绩类型', prop: 'boundType',minWidth: '100'},
-          {label: '项目类型', prop: 'projectType',minWidth: '100'},
+          {label: '中标地区', prop: 'address',minWidth: '130'},
+          {label: '业绩类型', prop: 'boundType',minWidth: '80'},
+          {label: '项目类型', prop: 'projectType',minWidth: '80'},
           {label: '业主单位', prop: 'projectUnit', slot: true,minWidth: '190'},
         ],
         formData: [
           { type: 7, fieldName: 'province', value: '',props: {multiple: true,value: 'id',expandTrigger: 'hover'}, placeholder: '项目地区', options:[]},
-          { type: 5, fieldName: 'time', value: '', placeholder: '中标时间', startTime: 'startBidTime', endTime: 'endBidTime',timeList:[] },
+          { type: 5, fieldName: 'time', value: '', placeholder: '中标时间', startTime: 'startBidTime', endTime: 'endBidTime',timeList:[],dateTo:this.formatDate(new Date()) },
           { type: 6, fieldName: 'money', value: '', placeholder: '中标金额', startMoney: 'minAmount', endMoney: 'maxAmount',moneyList:[] },
           { type: 4, fieldName: 'boundTypes', value: '', placeholder: '业绩类型', options: [],width:150},
           { type: 4, fieldName: 'projectTypes', value: '', placeholder: '项目类型', options: [],width:150},
@@ -103,6 +104,7 @@
         ],
         timeList: ['近三天', '近七天', '近半月', '自定义'],
         moneyList: ['5000万以下', '5000万-1亿', '1亿-5亿', '5亿-10亿','10亿以上', '自定义'],
+        dataEXCEL:{}
       }
     },
     created() {
@@ -162,6 +164,7 @@
           }
           delete data.cgbl
         }
+        this.dataEXCEL=JSON.parse(JSON.stringify(data));
         businessList(data).then(res=>{
           this.tableData = res.code == 200 ? res.rows:[]
           this.tableDataTotal = res.total
@@ -263,6 +266,16 @@
           // this.$children[1].$refs.tableRef.bodyWrapper.scrollTop = 0
         }, 500);
       },
+      clickEXCEL() {
+        this.dataEXCEL.combineName=this.combineName;
+        if(this.tableDataTotal > 2000){
+          this.dataEXCEL.pageSize=2000;
+        }else {
+          this.dataEXCEL.pageSize=this.tableDataTotal;
+        }
+        delete this.dataEXCEL.pageNum
+        this.$download.exportByPost('/combine/info/export/win/bid',this.dataEXCEL,'集团中标.xlsx');
+      },
     }
   }
 </script>

dsk-operate-ui/src/views/detail/groupAccount/component/qualifications.vue

@@ -8,6 +8,15 @@
       :isExcel="false"
       @handle-search="handleSearch"
     />
+    <div style="margin-bottom: 20px;">
+      <!--certificateList-->
+      <div class="item_ckquery" :style="height?'height:'+height+'':'height: 60px'">
+        <template v-for="(item,index) in certificateList">
+          <span :class="{'color_text':queryParams.qualificationType === item.qualificationType}" @click="changeType(item.qualificationType)">{{item.qualificationName}}（{{item.companyCount}}）</span>
+        </template>
+      </div>
+      <el-divider v-if="certificateList.length > 10 && !height" @click="moreClick()">更多<span></span></el-divider>
+    </div>
     <skeleton style="margin-left:16px;" v-if="isSkeleton"></skeleton>
     <tables
       v-if="!isSkeleton"
@@ -39,7 +48,7 @@
   import QualificationsDetail from './qualificationsDetail'
   export default {
     name: 'qualifications',
-    props: ['customerId','name'],
+    props: ['customerId','combineName'],
     mixins: [mixin],
     components:{
       QualificationsDetail
@@ -53,29 +62,31 @@
         queryParams: {
           combineId:this.customerId,
           pageNum: 1,
-          pageSize: 20
+          pageSize: 20,
+          qualificationType:''
         },
         forData: [
           {label: '资质名称', prop: 'qualificationName'},
           {label: '拥有该资质成员', prop: 'companyCount', slot: true},
         ],
         formData: [
-          { type: 1, fieldName: 'qualificationType', value: '', placeholder: '筛选', options:[],width:260},
+          // { type: 1, fieldName: 'qualificationType', value: '', placeholder: '筛选', options:[],width:260},
         ],
         tableData:[],
         tableDataTotal:0,
         title:'',
-        rowData:''
+        rowData:'',
+        certificateList:[],
+        height:''
       }
     },
     created() {
-      this.handleQuery()
       this.getCertificateList()
     },
     methods: {
       handleQuery(params){
         this.isSkeleton = true
-        let data = params ? params : this.queryParams
+        let data = params ? params : this.queryParams;
         certificateList(data).then(res=>{
           this.isSkeleton = false
           if(res.code === 200){
@@ -89,19 +100,32 @@
       getCertificateList(){
         certificateCount({combineId: this.queryParams.combineId}).then(res=>{
           let data = res.data
+          this.certificateList=res.data;
+          this.queryParams.qualificationType=res.data[0].qualificationType;
+          this.handleQuery()
           for(let i=0; i<data.length; i++){
-            this.formData[0].options.push({
-              name:  data[i].qualificationName+ '（' + data[i].companyCount + '）',
-              value: data[i].qualificationType,
-            })
+            // this.formData[0].options.push({
+            //   name:  data[i].qualificationName+ '（' + data[i].companyCount + '）',
+            //   value: data[i].qualificationType,
+            // })
           }
         })
       },
       handleClick(e, data) {
-        this.title=this.name+'-'+data.qualificationName+'（共'+ data.companyCount +'条）'
+        this.title=this.combineName+'-'+data.qualificationName+'（共'+ data.companyCount +'条）'
         this.rowData = data
         this.isDetails = true
       },
+      changeType(value){
+        this.queryParams.qualificationType=value;
+        this.queryParams.pageNum=1;
+        this.queryParams.pageSize=20;
+        this.handleQuery()
+      },
+      moreClick(){
+        this.height='auto'
+      },
+
     }
   }
 </script>
@@ -117,6 +141,33 @@
         margin-right: 24px;
       }
     }
+    .item_ckquery{
+      position: relative;
+      margin-bottom: 10px;
+      overflow: hidden;
+      span{
+        color: #232323;
+        padding: 3px 10px;
+        margin-bottom: 4px;
+        display: inline-block;
+        font-size: 14px;
+        cursor: pointer;
+        width: 20%;
+      }
+      span:hover{
+        background: #F3F4F5;
+        border-radius: 4px;
+        color:#0081FF;
+      }
+      .color_text{
+        background: #F3F4F5;
+        border-radius: 4px;
+        color: #0081FF;
+      }
+      .select-active{
+        color: #0081FF;
+      }
+    }
     ::v-deep .el-table{
       .has-gutter{
         tr{
@@ -132,5 +183,28 @@
         background: #F0F3FA;
       }
     }
+    ::v-deep .el-divider{
+      /*width: calc(100% - 107px);*/
+      margin-top: 12px;
+      .el-divider__text{
+        cursor: pointer;
+        span{
+          display: inline-block;
+          width: 16px;
+          height: 16px;
+          position: relative;
+          top: 2px;
+          background: url('../../../../assets/images/down.png');
+          background-size:  16px 16px;
+        }
+        &:hover{
+          color: #0081FF;
+          span{
+            background: url('../../../../assets/images/down1.png');
+            background-size:  16px 16px;
+          }
+        }
+      }
+    }
   }
 </style>

dsk-operate-ui/src/views/detail/groupAccount/component/qualificationsDetail.vue

@@ -6,11 +6,17 @@
       custom-class="client-drawer"
       :with-header="false"
       @closed="cancel">
-      <skeleton style="margin-left:16px;" v-if="isSkeleton"></skeleton>
-      <div class="head" v-if="!isSkeleton">
+      <div class="head">
         <img class="tip-img" src="@/assets/images/icon.png" />
         <span>{{title}}</span>
       </div>
+      <div style="height: 34px;margin: 12px">
+        <div class="cooperate-name" id="focus01">
+          <el-input clearable @clear="changeSelect" style="width: 300px;" @focus="clickFocus('focus01')" @blur="clickFocus('focus01')" v-model="queryParams.companyName" placeholder="成员名称查询"></el-input>
+          <span @click="changeSelect">搜索</span>
+        </div>
+      </div>
+      <skeleton style="margin-left:16px;" v-if="isSkeleton"></skeleton>
       <tables
         v-if="!isSkeleton"
         :tableLoading="tableLoading"
@@ -18,6 +24,7 @@
         :forData="forData"
         :tableDataTotal="tableDataTotal"
         :queryParams="queryParams"
+        :MaxPage=500
         @handle-current-change="handleCurrentChange"
         style="margin: 12px;"
       >
@@ -50,11 +57,9 @@ export default {
       queryParams: {
         id: this.data.id,
         pageNum: 1,
-        pageSize: 10
+        pageSize: 10,
+        companyName:''
       },
-      formData: [
-        { type: 3, fieldName: 'keys', value: '', placeholder: '输入项目/工程名称查询', options: []},
-      ],
       forData: [
         {label: '拥有该资质成员', prop: 'companyName', slot: true},
         {label: '成员共有资质（个）', prop: 'certificateCount'},
@@ -73,7 +78,8 @@ export default {
   methods: {
     async handleQuery(params) {
       this.isSkeleton = true
-      let param = params?params:this.queryParams
+      let param = params?params:this.queryParams;
+      console.log(param)
       let res = await memberCertificateList(param)
       this.isSkeleton = false
       if(res.code==200){
@@ -94,7 +100,19 @@ export default {
     },
     cancel() {
       this.$emit('cancel')
-    }
+    },
+    changeSelect(){
+      this.queryParams.pageNum = 1
+      this.handleQuery()
+    },
+    clickFocus(e){
+      document.getElementById(e).classList.toggle('span-ba')
+    },
+    //分页
+    handleCurrentChange(e){
+      this.queryParams.pageNum = e
+      this.handleQuery()
+    },
   }
 }
 </script>
@@ -114,5 +132,47 @@ export default {
       height: 17px;
       margin: 0 8px -2px 12px;
     }
+    .cooperate-name {
+      display: flex;
+      border-radius: 2px 0px 0px 2px;
+      border: 1px solid #D9D9D9;
+      line-height: 34px;
+      height: 34px;
+      width: 300px;
+      float: right;
+      span {
+        width: 80px;
+        height: 32px;
+        line-height: 32px;
+        font-size: 14px;
+        background: #F5F5F5;
+        text-align: center;
+        color: #0081FF;
+        border: 1px solid #EFEFEF;
+        border-left: 0;
+        cursor: pointer;
+      }
+      &.span-ba{
+        border: 1px solid #0081FF;
+        span{
+          color: #ffffff;
+          background: #0081FF;
+          border: 1px solid #0081FF;
+        }
+      }
+      ::v-deep .el-input{
+        flex: 1;
+      }
+      ::v-deep .el-input__inner {
+        border: 0;
+        line-height: 32px;
+        height: 32px;
+        position: absolute;
+        top: 0;
+        padding-right: 22px;
+        font-size: 12px;
+        padding-left: 8px;
+      }
+    }
   }
 </style>

dsk-operate-ui/src/views/detail/groupAccount/index.vue

@@ -12,9 +12,10 @@
       </div>
       <div class="group-right">
         <div id="groupBox" v-if="customerId">
-          <Members v-if="currentPath.pathName=='members'" :customer-id="customerId" :isSkeleton="isSkeleton" />
-          <Qualifications v-if="currentPath.pathName=='qualifications'" :customer-id="customerId" :isSkeleton="isSkeleton" :name="name"/>
-          <Performance v-if="currentPath.pathName=='performance'" :customer-id="customerId" :isSkeleton="isSkeleton"/>
+          <Members v-if="currentPath.pathName=='members'" :customer-id="customerId" :isSkeleton="isSkeleton" :combineName="name"/>
+          <Qualifications v-if="currentPath.pathName=='qualifications'" :customer-id="customerId" :isSkeleton="isSkeleton" :combineName="name"/>
+          <Performance v-if="currentPath.pathName=='performance'" :customer-id="customerId" :isSkeleton="isSkeleton"  :combineName="name"/>
+          <Zhaobiao v-if="currentPath.pathName=='zhaobiao'" :customer-id="customerId" :isSkeleton="isSkeleton"  :combineName="name"/>
         </div>
       </div>
     </div>
@@ -27,12 +28,13 @@
   import Members from "./component/members"
   import Qualifications from "./component/qualifications"
   import Performance from "./component/performance"
+  import Zhaobiao from "./component/zhaobiao"
   import { infoHeader } from '@/api/detail/party-a/index'
   import elementResizeDetectorMaker from "element-resize-detector"
   export default {
     name: 'GroupAccount',
     components:{
-      SideBar,Members,Qualifications,Performance
+      SideBar,Members,Qualifications,Performance,Zhaobiao
     },
     data(){
       return{
@@ -77,6 +79,8 @@
   }
   .group-left{
     margin-right: 16px;
+    padding-bottom: 16px;
+    background: #FFFFFF;
   }
   .group-right{
     min-width: 1088px;

dsk-operate-ui/src/views/detail/party-a/component/CustomMoneySelect.vue

@@ -272,7 +272,7 @@ export default {
 
     .options-block {
       position: absolute;
-      margin-top: 12px;
+      margin-top: 5px;
       min-width: 120px;
       font-size: 14px;
       color: #666666;

dsk-operate-ui/src/views/detail/party-a/component/HeadDetailForm.vue

 <template>
   <div class="headForm">
     <div class="flex-box query-box">
-      <div class="flex-box query-params">
+      <div class="flex-box query-params" :class="flag?'box1':''">
         <div class="flex-box headForm-text">
-          <!-- <img v-if="title" src="@/assets/images/detail/ico_title.png" /> -->
-          <!-- <span class="drawer-title" v-if="title">{{ title }}</span> -->
+          <template v-if="flag">
+            <img v-if="title" src="@/assets/images/detail/ico_title.png" />
+            <span class="drawer-title" v-if="title">{{ title }}</span>
+          </template>
           <template v-if="slots">
             <slot name="slot"></slot>
           </template>
-          <!-- <div v-else>
+          <div  v-if="flag">
             <span class="ability-total" v-if="isTotal">{{ total }}条数据</span>
             <span class="ability-total" v-if="amountTotal">，共计合作总金额：<i>{{ amountTotal }}</i>万元</span>
-          </div> -->
+          </div>
         </div>
         <div class="headForm-from">
           <div class="from-item" :key="i" v-for="(form, i) in formData">
@@ -45,7 +47,7 @@
             <!-- 输入框 -->
             <template v-if="form.type==3">
               <div class="cooperate-name" :id="'detailFocus'+i">
-                <el-input clearable @focus="clickFocus('detailFocus'+i)" @blur="clickFocus('detailFocus'+i)" v-model="form.value" :placeholder="form.placeholder" :style="form.width?'width:'+form.width+'px':'width:180px'"></el-input>
+                <el-input clearable @clear="changeSelect" @focus="clickFocus('detailFocus'+i)" @blur="clickFocus('detailFocus'+i)" v-model="form.value" :placeholder="form.placeholder" :style="form.width?'width:'+form.width+'px':'width:180px'"></el-input>
                 <span @click="changeSelect">搜索</span>
               </div>
             </template>
@@ -96,6 +98,10 @@ export default {
       type: String,
       default: ''
     },
+    flag: {
+      type: Boolean,
+      default: false
+    },
     queryParams: {
       type: Object,
       default: {}
@@ -143,11 +149,26 @@ export default {
     width: 100%;
     padding: 8px 17px 8px 0;
   }
+  .box1{
+    padding: 8px 17px 8px 13px;
+    justify-content: space-between;
+    border-bottom: 1px solid #E1E1E1;
+  }
   ::v-deep .el-input__inner{
     border: 0;
     height: 32px;
     line-height: 32px;
   }
+  ::v-deep .el-select .el-input__inner{
+    border: 1px solid #D9D9D9;
+    height: 34px;
+    line-height: 34px;
+    padding-right: 27px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    border-radius: 4px;
+  }
   ::v-deep .custom-money-select{
     .el-input__inner{
       border: 1px solid #D9D9D9;
@@ -161,6 +182,12 @@ export default {
     line-height: 32px;
   }
   .headForm-text{
+    .drawer-title{
+      font-size: 16px;
+      color: #232323;
+      font-weight: bold;
+      margin-right: 4px;
+    }
     img{
       width: 17px;
       height: 17px;

dsk-operate-ui/src/views/detail/party-a/component/HeadForm.vue

 <template>
-  <div class="headForm">
+  <div>
+    <div class="headForm" v-if="title === '集团业绩'">
+      <div class="flex-box query-box" style="margin-bottom: 12px;">
+        <div class="flex-box query-params">
+          <span class="common-title" v-if="title">{{ title }}</span>
+        </div>
+        <template v-if="slots">
+          <slot name="slot"></slot>
+        </template>
+        <div v-else class="flex-box">
+          <span class="flex-box ability-total" v-if="isTotal">共{{ total }}条</span>
+          <span class="flex-box ability-excel" v-hasPermi="['combine:info:export:win:bid']" v-if="isExcel && title ==='集团业绩'" @click="clickEXCEL"><img src="@/assets/images/ability_excel.png">导出EXCEL</span>
+          <span class="flex-box ability-excel" v-else @click="clickEXCEL"><img src="@/assets/images/ability_excel.png">导出EXCEL</span>
+        </div>
+      </div>
+      <div class="flex-box query-box">
+        <div class="flex-box query-params">
+          <div class="headForm-from">
+            <div class="from-item" :key="i" v-for="(form, i) in formData">
+              <!-- 单选 -->
+              <template v-if="form.type==1">
+                <el-select
+                  v-model="form.value"
+                  clearable
+                  class="form-content-width"
+                  :style="form.width?'width:'+form.width+'px':'max-width: 110px'"
+                  :placeholder="form.placeholder"
+                  @change="changeSelect">
+                  <el-option v-for="(item, index) in form.options" :key="index" :label="item.name" :value="item.value" :disabled="item.disabled"/>
+                </el-select>
+              </template>
+              <!-- 年月日 -->
+              <template v-if="form.type==2">
+                <el-date-picker
+                  @change="changeSelect"
+                  class="fromTime"
+                  style="width: 210px"
+                  v-model="form.value"
+                  type="daterange"
+                  prefix-icon="fromTime-icon"
+                  value-format="yyyy-MM-dd"
+                  range-separator="至"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期">
+                </el-date-picker>
+              </template>
+              <!-- 输入框 -->
+              <template v-if="form.type==3">
+                <div class="cooperate-name" :id="'focus'+i">
+                  <el-input clearable @clear="changeSelect" @focus="clickFocus('focus'+i)" @blur="clickFocus('focus'+i)" v-model="form.value" :placeholder="form.placeholder" :style="form.width?'width:'+form.width+'px':'width:180px'"></el-input>
+                  <span @click="changeSelect">搜索</span>
+                </div>
+              </template>
+              <!-- 多选 -->
+              <template  v-if="form.type==4">
+                <el-select
+                  class="form-content-width"
+                  :class="form.value.length > 1 ? 'selectTag' : ''"
+                  v-model="form.value"
+                  multiple
+                  collapse-tags
+                  clearable
+                  :style="form.width?'width:'+form.width+'px':'max-width: 170px'"
+                  :placeholder="form.placeholder"
+                  @change="changeSelect">
+                  <el-option v-for="(item, index) in form.options" :key="index" :label="item.name" :value="item.value"/>
+                </el-select>
+              </template>
+              <!-- 时间、自定义 -->
+              <template v-else-if="form.type==5">
+                <custom-time-select
+                  :timeList="form.timeList"
+                  v-model="form.value"
+                  :placeholder="form.placeholder"
+                  :dateFrom="form.dateFrom ? form.dateFrom : ''"
+                  :dateTo="form.dateTo ? form.dateTo : ''"
+                  @handle-search="changeSelect" />
+              </template>
+              <!-- 金额 -->
+              <template v-else-if="form.type==6">
+                <custom-money-select
+                  :moneyList="form.moneyList"
+                  v-model="form.value"
+                  :placeholder="form.placeholder"
+                  @handle-search="changeSelect" />
+              </template>
+              <!-- 地区选择 -->
+              <template v-else-if="form.type==7">
+                <el-cascader
+                  ref="cascader"
+                  :options="form.options"
+                  :props="form.props"
+                  v-model="form.value"
+                  @change="changeSelect"
+                  :placeholder="form.placeholder"
+                  collapse-tags
+                  clearable></el-cascader>
+              </template>
+              <!-- 自定义 -->
+              <template  v-if="form.type==0">
+                <slot name="slot"></slot>
+              </template>
+
+            </div>
+
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="headForm" v-else>
       <div class="flex-box query-box">
         <div class="flex-box query-params">
           <span class="common-title" v-if="title">{{ title }}</span>
@@ -98,10 +207,14 @@
         </template>
         <div v-else class="flex-box">
           <span class="flex-box ability-total" v-if="isTotal">共{{ total }}条</span>
-        <span class="flex-box ability-excel" v-if="isExcel" @click="clickEXCEL"><img src="@/assets/images/ability_excel.png">导出EXCEL</span>
+          <span class="flex-box ability-excel" v-hasPermi="['combine:info:export:win:bid']" v-if="isExcel && title ==='集团业绩'" @click="clickEXCEL"><img src="@/assets/images/ability_excel.png">导出EXCEL</span>
+          <span class="flex-box ability-excel" v-else @click="clickEXCEL"><img src="@/assets/images/ability_excel.png">导出EXCEL</span>
+        </div>
       </div>
     </div>
+
   </div>
+
 </template>
 
 <script>
@@ -156,10 +269,14 @@ export default {
       this.$emit('handle-search')
     },
     clickEXCEL() {
+      if(this.title==='集团业绩'){
+        this.$emit('handle-excel')
+      }else {
         this.$message({
           message: '功能正在开发中',
           type: 'warning'
         });
+      }
     },
     clickFocus(e){
       document.getElementById(e).classList.toggle('span-ba')
@@ -167,8 +284,15 @@ export default {
   }
 }
 </script>
-
+<style lang="scss">
+  .el-popper[x-placement^=bottom] {
+    margin-top: 5px !important;
+  }
+</style>
 <style lang="scss" scoped>
+  ::v-deep .el-popper[x-placement^=bottom] {
+    margin-top: 5px;
+  }
 .headForm{
   margin-bottom: 14px;
   .common-title{
@@ -219,7 +343,7 @@ export default {
       }
       .cooperate-name {
         display: flex;
-        border-radius: 2px 0px 0px 2px;
+        border-radius: 2px;
         border: 1px solid #D9D9D9;
         line-height: 34px;
         height: 34px;
@@ -236,7 +360,7 @@ export default {
           cursor: pointer;
         }
         &.span-ba{
-          border: 1px solid #0081FF;
+          /*border: 1px solid #0081FF;*/
           span{
             color: #ffffff;
             background: #0081FF;