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

dsk-admin/src/main/java/com/dsk/web/controller/customer/CustomerOverviewController.java

@@ -43,6 +43,6 @@ public class CustomerOverviewController extends BaseController {
      */
     @GetMapping("/credit/level")
     public AjaxResult creditLevel(){
-        return AjaxResult.success(baseService.cooperationTop(new CustomerSearchDto()));
+        return AjaxResult.success(baseService.creditLevel(new CustomerSearchDto()));
     }
 }

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

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

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

@@ -233,6 +233,17 @@ ul, li {
   .el-select .el-input .el-select__caret{
     color: #232323;
   }
+  .el-cascader .el-input .el-icon-arrow-down{
+    color: #232323;
+  }
+  .custom-money-select .el-input .el-icon-arrow-down{
+    color: #232323;
+    font-size: 14px;
+  }
+  .custom-time-select .el-input .el-icon-arrow-down{
+    color: #232323;
+    font-size: 14px;
+  }
   .query-box{
     justify-content: space-between;
   }

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

@@ -13,8 +13,8 @@
             <span class="search-box-t"
                   :class=" queryParams.companyType||
                              queryParams.companyTypes.length > 0 ? 'search-box-ta' : ''"
-                  @click="handleSearch1">筛选<i :class="searchState ? 'el-icon-caret-top' : 'el-icon-caret-bottom'"></i></span>
-            <div v-show="searchState" ref="showContent" class="search-main">
+                  @click="handleSearch1">筛选<i :class="searchState ? 'el-icon-arrow-up' : 'el-icon-arrow-down'"></i></span>
+            <div v-show="searchState" id="showContent" class="search-main">
               <div class="item">
                 <span class="wrap_label">科技型企业</span>
                 <div class="item_ckquery">
@@ -167,7 +167,8 @@
         moneyList: ['1000万以下', '1000万-5000万', '5000万-1亿', '1亿-10亿','10亿以上', '自定义'],
         qyType:[],
         cgblList:['100%','50%以上','20%以上','5%以上','1%-5%'],
-        cgblName:''
+        cgblName:'',
+        paramsData:[],  //储存组件筛选的条件
       }
     },
     watch:{
@@ -218,13 +219,16 @@
       // 筛选
       handleSearch1(event){
         // this.searchState=!this.searchState;
-        let dom = this.$refs.showContent;
-        if (!dom.contains(event.target)) {
-          this.searchState = !this.searchState;
-          document.removeEventListener('click', this.handleQuery);
+        let dom = document.getElementById("showContent");
+        if(dom){
+          if (!dom.contains(event.target)) {
+            this.searchState = !this.searchState;
+            document.removeEventListener('click', this.handleQuery);
+          }
         }
       },
       handleQuery(params){
+        this.paramsData=params;
         let data = this.getAreaList(params || this.queryParams)
         memberList(data).then(res=>{
           this.isSkeleton = false
@@ -292,8 +296,9 @@
         }else{
           this.queryParams[name] = []
         }
-        this.handleQuery();
-        // this.$forceUpdate();
+        this.paramsData.companyType=this.queryParams.companyType
+        this.paramsData.companyTypes=this.queryParams.companyTypes
+        this.handleQuery(this.paramsData);
       },
       handleChange(key,name) {
         if(key === '1'){
@@ -354,6 +359,9 @@
           provinceIds.length>0?params.provinceIds = provinceIds:''
           cityIds.length>0?params.cityIds = cityIds:''
           districtIds.length>0?params.districtIds = districtIds:''
+          // provinceIds.length>0?this.queryParams.provinceIds = provinceIds:''
+          // cityIds.length>0?this.queryParams.cityIds = cityIds:''
+          // districtIds.length>0?this.queryParams.districtIds = districtIds:''
         }
         return params
       },
@@ -396,7 +404,7 @@
         font-size: 14px;
         font-weight: 400;
         line-height: 32px;
-        color: #232323;
+        color: #999999;
         margin-right: 8px;
         text-align: center;
         width: 82px;
@@ -470,5 +478,24 @@
         }
       }
     }
+    ::v-deep .el-table{
+      .has-gutter{
+        tr{
+          th:nth-last-child(2){
+            border-right:0;
+          }
+          td:nth-last-child(2){
+            border-right:0;
+          }
+        }
+      }
+      .el-table__cell.gutter{
+        background: #F0F3FA;
+      }
+    }
+    ::v-deep .el-icon-arrow-down,.el-icon-arrow-up{
+      font-size: 14px;
+      color:#232323 !important;
+    }
   }
 </style>

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

@@ -253,5 +253,20 @@
         margin-right: 24px;
       }
     }
+    ::v-deep .el-table{
+      .has-gutter{
+        tr{
+          th:nth-last-child(2){
+            border-right:0;
+          }
+          td:nth-last-child(2){
+            border-right:0;
+          }
+        }
+      }
+      .el-table__cell.gutter{
+        background: #F0F3FA;
+      }
+    }
   }
 </style>

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

@@ -60,7 +60,7 @@
           {label: '拥有该资质成员', prop: 'companyCount', slot: true},
         ],
         formData: [
-          { type: 1, fieldName: 'qualificationType', value: '', placeholder: '筛选', options:[]},
+          { type: 1, fieldName: 'qualificationType', value: '', placeholder: '筛选', options:[],width:260},
         ],
         tableData:[],
         tableDataTotal:0,
@@ -117,5 +117,20 @@
         margin-right: 24px;
       }
     }
+    ::v-deep .el-table{
+      .has-gutter{
+        tr{
+          th:nth-last-child(2){
+            border-right:0;
+          }
+          td:nth-last-child(2){
+            border-right:0;
+          }
+        }
+      }
+      .el-table__cell.gutter{
+        background: #F0F3FA;
+      }
+    }
   }
 </style>

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

@@ -19,8 +19,10 @@
         style="margin: 12px;"
       >
         <template slot="companyName" slot-scope="scope">
-          <router-link :to="scope.row.uipId?`/enterprise/${encodeStr(scope.row.companyId)}`:`/company/${encodeStr(scope.row.companyId)}`" tag="a" class="a-link" v-if="scope.row.companyId&&scope.row.companyName" v-html="scope.row.companyName"></router-link>
-          <div v-else v-html="scope.row.companyName || '--'"></div>
+          <div @click="cancel">
+            <router-link :to="scope.row.uipId?`/enterprise/${encodeStr(scope.row.companyId)}`:`/company/${encodeStr(scope.row.companyId)}`" tag="a" class="a-link" v-if="scope.row.companyId&&scope.row.companyName" v-html="scope.row.companyName"></router-link>
+          </div>
+          <!--<div v-else v-html="scope.row.companyName || '&#45;&#45;'"></div>-->
         </template>
       </tables>
     </el-drawer>

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

@@ -399,7 +399,7 @@ export default {
 
     .popper_box {
       position: absolute;
-      left: 128px;
+      left: 125px;
       bottom: -15px;
       background: #ffffff;
       width: 186px;
@@ -407,7 +407,7 @@ export default {
       text-indent: 0;
       padding: 16px;
       padding-top: 0px;
-      border: 1px solid #e0e0e0;
+      border: 1px solid #E4E7ED;
       .popper_wrap {
         margin-top: 16px;
         display: inline-block;

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

@@ -179,6 +179,9 @@ export default {
     height: 34px;
     line-height: 34px;
     padding-right: 27px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
   }
   ::v-deep .el-form-item{
     margin-right: 8px !important;
@@ -213,12 +216,12 @@ export default {
         display: flex;
         border-radius: 2px 0px 0px 2px;
         border: 1px solid #D9D9D9;
-        line-height: 32px;
-        height: 32px;
+        line-height: 34px;
+        height: 34px;
         span {
           width: 60px;
-          height: 30px;
-          line-height: 28px;
+          height: 32px;
+          line-height: 32px;
           font-size: 14px;
           background: #F5F5F5;
           text-align: center;
@@ -240,11 +243,13 @@ export default {
         }
         ::v-deep .el-input__inner {
           border: 0;
-          line-height: 30px;
-          height: 30px;
+          line-height: 32px;
+          height: 32px;
           position: absolute;
           top: 0;
-          padding-right: 32px;
+          padding-right: 22px;
+          font-size: 12px;
+          padding-left: 8px;
         }
       }
       .fromTime{

dsk-system/src/main/java/com/dsk/system/mapper/CustomerMapper.java

@@ -10,6 +10,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -35,5 +36,7 @@ public interface CustomerMapper extends BaseMapper<Customer> {
 
     List<CustomerAnalyzeVo> selectCooperationTop(CustomerSearchDto dto);
 
+    List<Map<String, Object>> selectCreditLevelGroup(CustomerSearchDto dto);
+
 }
 

dsk-system/src/main/java/com/dsk/system/service/ICustomerOverviewService.java

@@ -12,8 +12,10 @@ import java.util.Map;
  */
 public interface ICustomerOverviewService {
 
-    Map<String,Object> statistics(CustomerSearchDto dto);
+    Map<String, Object> statistics(CustomerSearchDto dto);
 
     List<CustomerAnalyzeVo> cooperationTop(CustomerSearchDto dto);
 
+    List<Map<String, Object>> creditLevel(CustomerSearchDto dto);
+
 }

dsk-system/src/main/java/com/dsk/system/service/impl/CustomerOverviewServiceImpl.java

@@ -50,4 +50,10 @@ public class CustomerOverviewServiceImpl implements ICustomerOverviewService {
         return customerMapper.selectCooperationTop(dto);
     }
 
+    @Override
+    public List<Map<String, Object>> creditLevel(CustomerSearchDto dto) {
+        dto.setUserId(SecurityUtils.getUserId());
+        return customerMapper.selectCreditLevelGroup(dto);
+    }
+
 }

dsk-system/src/main/resources/mapper/system/customer/CustomerMapper.xml

@@ -26,7 +26,7 @@
         left join (
             select count(status) num,customer_id from business_info where `status` = 2 group by customer_id
         ) bi3 on bi3.customer_id = ct.customer_id
-        where ctu.user_id = #{dto.userId} and ctu.status = #{dto.status}
+        where ctu.user_id = #{userId} and ctu.status = #{status}
         <if test="companyName != null and companyName != '' "> and ct.company_name like concat('%',#{companyName},'%')</if>
         <if test="isOn != null "> and ct.is_on = #{isOn}</if>
         <if test="provinceIds != null and provinceIds.size > 0 ">
@@ -122,5 +122,15 @@
         limit 10
     </select>
 
+    <select id="selectCreditLevelGroup" resultType="java.util.Map">
+        select
+			ct.credit_level creditLevel, count(ct.credit_level) customerCount
+		from customer ct
+        join customer_user ctu on ct.customer_id = ctu.customer_id
+		where ctu.user_id = #{userId}
+		group by ct.credit_level
+        order by ct.credit_level desc
+    </select>
+
 </mapper>