修改

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

@@ -66,3 +66,52 @@ export function getSupplierUnlimitedList(param) {
   });
 }
 
+// 添加挂靠风险记录
+export function addRiskRecord(data) {
+  return request({
+    url: '/laborLeaderCustomerRisk/addRiskRecord',
+    method: 'post',
+    data: data
+  })
+}
+// 查询挂靠风险列表
+export function queryRiskList(param) {
+  return request({
+    url: '/laborLeaderCustomerRisk/queryRiskList',
+    method: 'Get',
+    params: param
+  })
+}
+// 添加劳务队队长
+export function addLaborLeader(data) {
+  return request({
+    url: '/customerInfo/addLaborLeader',
+    method: 'post',
+    data: data
+  })
+}
+// 模糊查企业联想
+export function companyList(data) {
+  return request({
+    url: '/enterprise/index',
+    method: 'post',
+    data: data
+  })
+}
+// 校验劳务队长身份证号是否存在
+export function getLborLeaderId(id) {
+  return request({
+    url: `/customerInfo/checkLaborLeaderIdExist/${id}`,
+    method: 'get',
+  })
+}
+
+// 导出供应商分类列表
+export function exportCustomerList(data) {
+  return request({
+    url: '/customerInfo/exportCustomerList',
+    method: 'post',
+    data: data
+  })
+}
+

dsk-operate-ui/src/components/TableListCom/index.vue

 <template>
   <div class="table-list-com-ins" :class="{'is-empty-table' : !tableDataTotal,'no-pagination' : !hasQueryParams}">
     <div class="table-item">
-      <el-table v-if="tableDataTotal>0" class="fixed-table" v-loading="tableLoading" :data="tableData"
+      <el-table v-if="tableDataTotal>0" class="fixed-table" v-loading="tableLoading" :data="tableData" v-horizontal-scroll="'hover'"
         element-loading-text="Loading" ref="tableRef" border fit highlight-current-row :default-sort="defaultSort?defaultSort:{}"
         @sort-change="sortChange" @selection-change="selectionChange" :cell-class-name="cellClassName" :cell-style="cellStyle"
         :row-class-name="rowClassName" :row-style="rowStyle" :height="height" :maxHeight="comMaxHeight" v-sticky-header="stickyHeader">

dsk-operate-ui/src/views/consultingOrgManagement/components/EnterpriseList/detail/projectDetail.vue

@@ -61,18 +61,18 @@ export default {
   },
   data() {
     return {
-      currentList: "project",
+      currentList: "consultingAgency",
       toggleTabs: [
         {
-          value: "project",
-          name: "工程基本信息",
+          value: "consultingAgency",
+          name: "咨询机构结算信息",
           id: v4()
         },
         {
-          value: "consultingAgency",
-          name: "咨询机构结算信息",
+          value: "project",
+          name: "工程基本信息",
           id: v4()
-        }
+        },
       ],
       projectDetailInfo: {},
       projectKey: "",

dsk-operate-ui/src/views/consultingOrgManagement/components/ProjectList/index.vue

@@ -174,8 +174,9 @@ export default {
       formColum: [
         { label: '序号', prop: "staticSerialNumber", type: "index", lock: true, fixed: false, uid: v4() },
         { label: '项目列表', prop: 'projectName', width: "220px", lock: true, fixed: false, slot: true, uid: v4(), showOverflowTooltip: true },
-        { label: '项目编码', prop: 'projectCode', width: "121px", uid: v4() },
         { label: '业主单位', prop: 'ownerName', slot: true, uid: v4(), width: "185px", showOverflowTooltip: true },
+        { label: '咨询机构名称', prop: 'advisoryBodyName', width: "172px", slot: true, uid: v4(), showOverflowTooltip: true },
+        { label: '项目编码', prop: 'projectCode', width: "121px", uid: v4() },
         { label: '省市', prop: 'provinceName', width: "100px", uid: v4() },
         { label: '项目承接类型', prop: 'isinvestproject', width: "100px", uid: v4() },
         { label: '工程基础大类', prop: 'projectType1', minWidth: "100px", uid: v4() },
@@ -186,7 +187,6 @@ export default {
         { label: '合同金额（元）', prop: 'contractOrigValue', width: "110px", align: "right", uid: v4() },
         // { label: '业主单位', prop: 'ownerName', slot: true, uid: v4(), width: "185px", showOverflowTooltip: true },
         // { label: '项目承接单位', prop: 'contractOrgName', width: "196px", slot: true, uid: v4() },
-        { label: '咨询机构名称', prop: 'advisoryBodyName', width: "172px", slot: true, uid: v4(), showOverflowTooltip: true },
         { label: '创建时间', prop: 'contractSignDate', width: "172px", uid: v4() },
       ],
       fixedPropsKey: ["staticSerialNumber", "projectName"],

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

@@ -193,6 +193,11 @@ export default {
                 { title: '不良行为列表', pathName: 'badlist' },
               ]
             },
+            {
+              title: '供应商风险', pathName: '', children: [
+                { title: '供应商劳务挂靠风险', pathName: 'affiliationRisk' },
+              ]
+            },
           ]
         }
       ],

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

@@ -91,6 +91,8 @@
             <assessMent class="no-padding" v-if="currentPath.pathName=='assessMent'" :company-id="companyId" :companyInfo="companyInfo"></assessMent>
             <!-- 不良行为列表 -->
             <badlist class="no-padding" v-if="currentPath.pathName=='badlist'" :company-id="companyId" :companyInfo="companyInfo"></badlist>
+            <!-- 供应商劳务挂靠风险 -->
+            <affiliationRisk class="no-padding" v-if="currentPath.pathName=='affiliationRisk'" :company-id="companyId" :companyInfo="companyInfo"></affiliationRisk>
           </template>
           <template v-if="customerId && isCustomer">
             <!-- 商务信息 -->
@@ -168,6 +170,7 @@ import Managerial from "@/views/detail/party-a/internalCooperation/managerial";
 import equipment from "@/views/detail/party-a/internalCooperation/equipment"; //内部合作 设备信息
 import projectRecord from "@/views/detail/party-a/internalCooperation/projectRecord"; //内部合作 工程考察情况记录
 import badlist from "@/views/detail/party-a/internalCooperation/badlist"; //不良行为列表
+import affiliationRisk from "@/views/detail/party-a/internalCooperation/affiliationRisk"; //供应商劳务挂靠风险
 
 import assessMent from "@/views/supplier/supplierlist/assessment"; //年度考评
 import CooperationRecord from "@/views/detail/party-a/internalCooperation/cooperationRecord"; //内部合作 供应商合作记录
@@ -237,6 +240,7 @@ export default {
     AccessCondition,
     assessMent,
     badlist,
+    affiliationRisk,
     CooperationRecord,
     CooperativeConstructionUnit,
     CooperativeGroup,

dsk-operate-ui/src/views/detail/party-a/internalCooperation/affiliationRisk.vue

+<template>
+    <div class="supplier">
+      <div class="search-supplier">
+        <div class="title_wrap">
+          <div class="enterprise_title">
+            供应商劳务挂靠风险
+          </div>
+        </div>
+      </div>
+      <div class="table-supplier table-supplier2">
+        <!--<el-divider class="supdivider"></el-divider>
+        <div class="total-title">
+        <div class="totals">共{{total}}条</div>
+        <p class="total-dc" @click="customerExport">
+            <img src="@/assets/images/EXCEL.png" alt="">
+            <span class="excel">导出EXCEL</span>
+        </p>
+        </div> -->
+        <div class="table-item-jf table-item-jf1 empty-table" v-if="total == 0 && !isSkeleton">
+          <img class="item-jf-img" src="@/assets/images/kong.png" alt="">
+          <div class="item-jf-titel">暂无相关数据</div>
+          <div class="item-jf-text">抱歉，暂无数据，试试更换搜索条件吧</div>
+        </div>
+        <skeleton v-if="isSkeleton"></skeleton>
+
+        <div class="table-item-jf table-item" v-if="!isSkeleton&&tableData.length>0">
+          <el-table :data="tableData" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}"  class="table-item1 fixed-table" border highlight-current-row
+                    :header-row-class-name="setHeaderRow" :cell-class-name="setCellClass" :row-class-name="setRowClass" :header-cell-class-name="setCellClass"
+                    ref="theOwnerListTable" :row-key="'customerKey'">
+
+            <el-table-column type="index" label="序号" :fixed="tableColumnFixed" width="60" :resizable="false">
+              <template slot-scope="scope">
+                <span>{{(queryParams.pageNum - 1) *queryParams.pageSize + scope.$index + 1}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="劳务队长名称" :fixed="tableColumnFixed" width="120" :resizable="false">
+              <template slot-scope="scope">
+                <span v-html="scope.row.leaderName||'--'"></span>
+              </template>
+            </el-table-column>
+            <el-table-column label="身份证号" :fixed="tableColumnFixed" min-width="150" :resizable="false">
+              <template slot-scope="scope">
+                {{scope.row.laborCaptainIdCard||"--"}}
+              </template>
+            </el-table-column>
+
+            <el-table-column label="联系电话" min-width="120">
+              <template slot-scope="scope">
+                {{scope.row.laborCaptainPhone||"--"}}
+              </template>
+            </el-table-column>
+            <el-table-column label="挂靠单位" min-width="280" :resizable="false">
+              <template slot-scope="scope">
+                <router-link v-if="scope.row.customerCid" :to="`/enterprise/${encodeStr(scope.row.customerCid)}?companyName=${scope.row.customerName}`" tag="a"
+                             class="wordprimary" v-html="scope.row.customerName"></router-link>
+                <span v-else v-html="scope.row.customerName"></span>
+              </template>
+            </el-table-column>
+            <el-table-column label="不良事由" min-width="120" :resizable="false">
+              <template slot-scope="scope">
+                {{scope.row.blsy||"--"}}
+              </template>
+            </el-table-column>
+            <el-table-column label="不良行为情形" min-width="280" :resizable="false">
+              <template slot-scope="scope">
+                {{scope.row.badReason||"--"}}
+              </template>
+            </el-table-column>
+            <el-table-column label="添加人" min-width="120" :resizable="false">
+              <template slot-scope="scope">
+                {{scope.row.dataSource === 0 ?'自主添加':'系统添加'}}
+              </template>
+            </el-table-column>
+            <el-table-column label="发生日期" min-width="160" :resizable="false">
+              <template slot-scope="scope">
+                {{scope.row.createTime||"--"}}
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+        <div class="pagination clearfix" v-show="total>queryParams.pageSize">
+          <el-pagination background :page-size="queryParams.pageSize" :current-page.sync="queryParams.pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
+                         :total="total">
+          </el-pagination>
+        </div>
+      </div>
+    </div>
+
+  </template>
+
+  <script>
+    import '@/assets/styles/public.scss'
+    import '@/assets/styles/supplierlist.scss'
+    import mixin from '@/views/detail/party-a/mixins/mixin'
+    import InfoTable from '../component/infoTable';
+    import {queryRiskList} from '@/api/supplier/supplier';
+    export default {
+      name: 'ratinglist',
+      components: {InfoTable},
+      props: ['companyId', 'companyInfo'],
+      mixins: [mixin],
+      data(){
+        return{
+          detailInfo:{},
+          queryParams: {
+            customerCid: this.companyId,
+            pageNum: 1,
+            pageSize: 10,
+          },
+          total: 0,
+          isSkeleton:false,
+          tableData:[],
+          tableColumnFixed:false,
+        }
+      },
+      created() {
+        this.handleSearch()
+      },
+      methods:{
+        handleSearch(){
+          queryRiskList(this.queryParams).then(res=>{
+            this.isSkeleton = false
+            if(res.code == 200) {
+              this.total = res.total
+              this.tableData = res.rows
+              this.queryParams.pageNum = res.currentPage
+            }else{
+              this.total = 0
+              this.tableData = []
+              this.queryParams.pageNum = 1
+            }
+          })
+        },
+        handleExcel() {
+
+        },
+        customerExport(){
+
+        },
+        setHeaderRow() {
+          return "owner-table-list-header";
+        },
+        setCellClass({ row, column, rowIndex, columnIndex }) {
+          if (columnIndex == 1) {
+            return "enterprise-name-column";
+          }
+        },
+        setRowClass({ row, rowIndex }) {
+          return "enterprise-name-row";
+        },
+        handleCurrentChange(val){
+          this.queryParams.pageNum = val;
+          this.handleSearch();
+        }
+      }
+    }
+  </script>
+
+  <style lang="scss" scoped>
+  .infoTable-container{
+    margin-bottom: 16px;
+  }
+    ::v-deep .el-form-item__label{
+      min-height: 40px!important;
+    }
+    .title_wrap{
+        border: none;
+    }
+    .title_wrap1{
+      padding: 0;
+    }
+    .detail-title{
+        border-radius: 4px 4px 0px 0px;
+        opacity: 1;
+        /* 自动布局 */
+        display: flex;
+        flex-direction: column;
+        padding: 16px;
+        gap: 16px;
+        background: #FFFFFF;
+        box-sizing: border-box;
+        /* 分割线 */
+        font-size: 14px;
+        color: rgba(35, 35, 35, 0.4);
+        .el-icon-arrow-right{
+            font-size: 12px;
+            margin: 4px;
+        }
+        .tip{
+            font-size: 12px;
+            color: rgba(35, 35, 35, 1);
+        }
+        img{
+            width: 28px;
+            height: 28px;
+            border-radius: 6px;
+            margin-right: 12px;
+        }
+        strong{
+            font-size: 16px;
+            color: rgba(35, 35, 35, 1);
+            font-weight: 700;
+        }
+        .label{
+            color: rgba(35, 35, 35, 0.8);
+            margin-right: 24px;
+        }
+      }
+    .table-supplier {
+      background: #ffffff;
+      border-radius: 4px;
+      padding: 16px;
+    .supdivider{
+      width: calc(100% + 32px);
+      margin-left: -16px;
+      margin-top: 8px;
+      margin-bottom: 16px;
+    }
+      ::v-deep .head-form-new {
+        .ability-total {
+          display: none !important;
+        }
+        .from-item .normal-search-container{
+          white-space: nowrap;
+          width: 134px;
+        }
+
+      }
+      input {
+        border: 1px solid #efefef;
+      }
+
+      ::v-deep .el-form-item {
+        margin-right: 8px !important;
+      }
+
+      .query-box {
+        margin: 10px 0 20px;
+      }
+
+      .cell-span {
+        display: inline-block;
+        position: relative;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        display: -webkit-box;
+        -webkit-box-orient: vertical;
+        -webkit-line-clamp: 4;
+        cursor: pointer;
+
+        > span {
+          display: inline-block;
+          width: 37px;
+          position: absolute;
+          right: 0;
+          bottom: 0;
+          background-color: #fff;
+          z-index: 1;
+        }
+      }
+
+      @import "@/assets/styles/search-common.scss";
+    }
+    .table-supplier2{
+        padding-top: 0;
+        margin-top: 0;
+    }
+  </style>

dsk-operate-ui/src/views/detail/party-a/internalCooperation/badlist.vue

@@ -23,13 +23,12 @@
                 <div class="item-jf-text">抱歉，暂无数据，试试更换搜索条件吧</div>
                 </div>
                 <skeleton v-if="isSkeleton"></skeleton>
-        
+
                 <div class="table-item-jf table-item" v-if="!isSkeleton&&tableData.length>0">
-                    <el-table :data="tableData" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}"
-                  v-sticky-header.always="{offsetTop : '-16px',offsetBottom : '-15px'}" class="table-item1 fixed-table" border highlight-current-row
+                    <el-table :data="tableData" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}"  class="table-item1 fixed-table" border highlight-current-row
                   :header-row-class-name="setHeaderRow" :cell-class-name="setCellClass" :row-class-name="setRowClass" :header-cell-class-name="setCellClass"
                   ref="theOwnerListTable" :row-key="'customerKey'">
-            
+
                         <el-table-column type="index" label="序号" :fixed="tableColumnFixed" width="60" :resizable="false">
                         <template slot-scope="scope">
                             <span>{{(queryParams.pageNum - 1) *queryParams.pageSize + scope.$index + 1}}</span>
@@ -44,7 +43,7 @@
                         <el-table-column label="创建时间" prop="name6" :fixed="tableColumnFixed" :resizable="false"></el-table-column>
                         <el-table-column label="生效时间" prop="name6" :fixed="tableColumnFixed" :resizable="false"></el-table-column>
 
-                        <el-table-column label="操作" width="90" fixed="right">
+                        <el-table-column label="操作" width="90">
                             <template slot-scope="scope">
                                 <span style="color: #0081FF;cursor: pointer;" @click="viewDetail(scope.row)">详情</span>
                             </template>
@@ -78,18 +77,18 @@
                 </div>
                 <info-table class="info-tab"  :list="defaultList1" :obj="detailInfo" :labelWidth="140"></info-table>
             </div>
-            
+
         </template>
     </div>
-  
+
   </template>
-  
+
   <script>
     import '@/assets/styles/public.scss'
     import '@/assets/styles/supplierlist.scss'
     import mixin from '@/views/detail/party-a/mixins/mixin'
     import InfoTable from '../component/infoTable';
-  
+
     export default {
       name: 'ratinglist',
       components: {InfoTable},
@@ -139,7 +138,7 @@
           queryParams: {
             // customerId: this.companyId,
             // customerName: this.companyName,
-  
+
             pageNum: 1,
             pageSize: 10,
           },
@@ -176,10 +175,10 @@
         },
         handleSearch(){},
         handleExcel() {
-  
+
         },
         customerExport(){
-  
+
         },
         setHeaderRow() {
           return "owner-table-list-header";
@@ -198,7 +197,7 @@
       }
     }
   </script>
-  
+
   <style lang="scss" scoped>
   .infoTable-container{
     margin-bottom: 16px;
@@ -267,20 +266,20 @@
           white-space: nowrap;
           width: 134px;
         }
-  
+
       }
       input {
         border: 1px solid #efefef;
       }
-  
+
       ::v-deep .el-form-item {
         margin-right: 8px !important;
       }
-  
+
       .query-box {
         margin: 10px 0 20px;
       }
-  
+
       .cell-span {
         display: inline-block;
         position: relative;
@@ -290,7 +289,7 @@
         -webkit-box-orient: vertical;
         -webkit-line-clamp: 4;
         cursor: pointer;
-  
+
         > span {
           display: inline-block;
           width: 37px;
@@ -301,7 +300,7 @@
           z-index: 1;
         }
       }
-  
+
       @import "@/assets/styles/search-common.scss";
     }
     .table-supplier2{
@@ -309,4 +308,3 @@
         margin-top: 0;
     }
   </style>
-  
\ No newline at end of file

dsk-operate-ui/src/views/monitoring/EnterpriseMonitoring.vue

@@ -85,6 +85,7 @@
             <!--<div class="p2">建议调整关键词或筛选条件，重新搜索</div>-->
             <div class="empty-btn">
               <span class="add" @click="addEnterprise">添加企业</span>
+              <span class="add" @click="addDefault" style="width: 110px;">添加默认监控</span>
               <span class="add1" @click="handleBatch">批量监控</span>
             </div>
           </div>