Merge branch 'V20231129-中建一局二公司' of 192.168.60.201:root/dsk-operate-sys into V20231129-中建一局二公司

df5ffc13 · liuChang · 209136ed · 0aedb9ac · df5ffc13 · df5ffc13
Commit df5ffc13 authored Jan 10, 2024 by liuChang
58 changed files
--- a/dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/controller/AdvisoryBodyManageController.java
+++ b/dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/controller/AdvisoryBodyManageController.java
@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import java.util.List;
 /**
 * 咨询机构管理控制层
@@ -30,7 +30,7 @@ import javax.validation.constraints.NotNull;
 @RequestMapping("advisory/body")
 public class AdvisoryBodyManageController extends BaseController {
    @Resource
-    private IDProjectService baseService;
+    private IDProjectService projectService;
    @Resource
    private AdvisoryBodyService advisoryBodyService;
    @Resource
@@ -43,7 +43,7 @@ public class AdvisoryBodyManageController extends BaseController {
     */
    @GetMapping("/getProjectList")
    public TableDataInfo<ProjectSearchVo> getProjectList(ProjectSearchBo projectSearchBo, PageQuery pageQuery) {
-        return baseService.queryProjectList(projectSearchBo, pageQuery);
+        return projectService.queryProjectList(projectSearchBo, pageQuery);
    }
    /**
@@ -54,12 +54,20 @@ public class AdvisoryBodyManageController extends BaseController {
        return advisoryBodyService.queryAdvisoryBodyList(advisoryBodySearchBo, pageQuery);
    }
+    /**
+     * 获取项目承接类型下拉列表
+     */
+    @GetMapping("/getIsInvestProject")
+    public R<List<String>> getIsInvestProject() {
+        return R.ok(projectService.queryIsInvestProject());
+    }
    /**
     * 获取合作项目明细
     */
    @GetMapping("/getCooperateProjectDetailList")
    public TableDataInfo<CooperateProjectDetailSearchVo> getCooperateProjectDetailList(@Validated CooperateProjectDetailSearchBo cooperateProjectDetailSearchBo, PageQuery pageQuery) {
-        return baseService.queryCooperateProjectDetailList(cooperateProjectDetailSearchBo, pageQuery);
+        return projectService.queryCooperateProjectDetailList(cooperateProjectDetailSearchBo, pageQuery);
    }
    /**
@@ -67,7 +75,7 @@ public class AdvisoryBodyManageController extends BaseController {
     */
    @GetMapping("/getProjectDetail")
    public R<ProjectDetailVo> getProjectDetail(@Validated ProjectDetailBo projectDetailBo) {
-        return R.ok(baseService.queryProjectDetail(projectDetailBo));
+        return R.ok(projectService.queryProjectDetail(projectDetailBo));
    }
    /**
@@ -78,8 +86,6 @@ public class AdvisoryBodyManageController extends BaseController {
        return R.ok(advisoryBodyService.checkAdvisoryBodyExist(advisoryBodyName));
    }
-    //todo:咨询机构合作明细,项目承接类型下拉列表接口
    /**
     * 编辑咨询机构结算信息
     * 包含:
@@ -88,19 +94,17 @@ public class AdvisoryBodyManageController extends BaseController {
     */
    @PostMapping("/editAdvisoryBody")
    public R<Void> editAdvisoryBody(@Validated EditAdvisoryBodyInfoBo editInfoBo) {
-        System.out.println("👉🏻editInfoBo:"+editInfoBo);
        return toAjax(advisoryBodyService.editAdvisoryBody(editInfoBo));
    }
    /**
     * 获取咨询机构自定义表单
     */
-    @GetMapping("/getAdvisoryBodyCustomForm/{projectKey}")
+    @GetMapping("/getAdvisoryBodyCustomForm")
-    public R<AdvisoryBodyCustomForm> getAdvisoryBodyCustomForm(@Validated @NotNull(message = "项目主键不能为空") @PathVariable Long projectKey) {
+    public R<List<AdvisoryBodyCustomForm>> getAdvisoryBodyCustomForm() {
-        return R.ok(advisoryBodyCustomFormService.getById(projectKey));
+        return R.ok(advisoryBodyCustomFormService.list());
    }
-    //todo:自定义表单表格只存一条json数据改造
    /**
     * 新增咨询机构自定义表单
     */
@@ -115,7 +119,7 @@ public class AdvisoryBodyManageController extends BaseController {
     */
    @PutMapping("/updateAdvisoryBodyCustomForm")
    @Transactional(rollbackFor = Exception.class)
-    public R<Void> updateAdvisoryBodyCustomForm(@Validated AdvisoryBodyCustomForm advisoryBodyCustomForm) {
+    public R<Void> updateAdvisoryBodyCustomForm(@Validated EditAdvisoryBodyCustomFormBo editBo) {
-        return toAjax(advisoryBodyCustomFormService.updateById(advisoryBodyCustomForm));
+        return toAjax(advisoryBodyCustomFormService.updateById(editBo));
    }
 }
\ No newline at end of file
--- a/dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/controller/FSupplierLimitedController.java
+++ b/dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/controller/FSupplierLimitedController.java
@@ -21,19 +21,19 @@ import javax.annotation.Resource;
 */
 @RestController
 @RequestMapping("fSupplierLimited")
-public class FSupplierLimitedController {
+public class SupplierLimitedController {
    /**
     * 服务对象
     */
    @Resource
-    private FSupplierLimitedService fSupplierLimitedService;
+    private FSupplierLimitedService supplierLimitedService;
    /**
     * 获取涉诉限用禁用名单
     */
    @GetMapping("/getSupplierLimitedList")
    public TableDataInfo<SupplierLimitedSearchVo> getSupplierLimitedList(SupplierLimitedSearchBo searchBo, PageQuery pageQuery) {
-        return fSupplierLimitedService.querySupplierLimitedList(searchBo, pageQuery);
+        return supplierLimitedService.querySupplierLimitedList(searchBo, pageQuery);
    }
    /**
@@ -41,7 +41,7 @@ public class FSupplierLimitedController {
     */
    @GetMapping("/getSupplierUnlimitedList")
    public TableDataInfo<SupplierUnlimitedSearchVo> getSupplierUnlimitedList(SupplierUnlimitedSearchBo searchBo, PageQuery pageQuery) {
-        return fSupplierLimitedService.querySupplierUnlimitedList(searchBo, pageQuery);
+        return supplierLimitedService.querySupplierUnlimitedList(searchBo, pageQuery);
    }
 }
--- a/dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/AdvisoryBodyCustomForm.java
+++ b/dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/AdvisoryBodyCustomForm.java
@@ -6,7 +6,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 /**
@@ -22,14 +21,8 @@ public class AdvisoryBodyCustomForm extends BaseEntity implements Serializable {
    /**
     * 项目主键
     */
-    @TableId(value = "project_key")
+    @TableId(value = "ab_custom_form_id")
-    @NotNull(message = "项目主键不能为空")
+    private Long abCustomFormId;
-    private Long projectKey;
-    /**
-     * 咨询机构ID
-     */
-    @NotNull(message = "咨询机构ID不能为空")
-    private Long advisoryBodyId;
    /**
     * json数据
     */

--- a/dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/bo/EditAdvisoryBodyCustomFormBo.java
+++ b/dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/bo/EditAdvisoryBodyCustomFormBo.java
+package com.dsk.cscec.domain.bo;
+import com.dsk.cscec.domain.AdvisoryBodyCustomForm;
+import lombok.Data;
+import javax.validation.constraints.NotNull;
+/**
+ * @author sxk
+ * @date 2024.01.09
+ * @time 11:24
+ */
+@Data
+public class EditAdvisoryBodyCustomFormBo extends AdvisoryBodyCustomForm {
+    /**
+     * 项目主键
+     */
+    @NotNull(message = "自定义表单ID不能为空")
+    private Long abCustomFormId;
+}
--- a/dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/bo/ProjectDetailBo.java
+++ b/dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/bo/ProjectDetailBo.java
@@ -19,6 +19,5 @@ public class ProjectDetailBo {
    /**
     * 咨询机构Cid
     */
-    @NotNull(message = "咨询机构Cid不能为空")
    private Long advisoryBodyCid;
 }
--- a/dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/vo/AdvisoryBodyExistVo.java
+++ b/dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/vo/AdvisoryBodyExistVo.java
@@ -16,4 +16,12 @@ public class AdvisoryBodyExistVo extends AdvisoryBody {
     * 是否为新资讯机构
     */
    private Boolean isNewAdvisoryBody;
+    /**
+     * 法定代表人
+     */
+    private String corporatePerson;
+    /**
+     * 注册地址
+     */
+    private String regAddress;
 }
--- a/dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/mapper/DProjectMapper.java
+++ b/dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/mapper/DProjectMapper.java
@@ -9,6 +9,8 @@ import com.dsk.cscec.domain.vo.CooperateProjectDetailSearchVo;
 import com.dsk.cscec.domain.vo.ProjectSearchVo;
 import org.apache.ibatis.annotations.Param;
+import java.util.List;
 /**
 * 项目维表(DProject)表数据库访问层
 *
@@ -21,9 +23,13 @@ public interface DProjectMapper extends BaseMapper<DProject> {
     */
    Page<ProjectSearchVo> selectPageProjectList(@Param("page") Page<ProjectSearchVo> page, @Param(Constants.WRAPPER) Wrapper<DProject> queryWrapper);
+    /**
+     * 获取项目承接类型下拉列表
+     */
+    List<String> queryIsInvestProject();
    /**
     * 获取合作项目明细
     */
    Page<CooperateProjectDetailSearchVo> selectPageCooperateProjectDetailList(@Param("page") Page<CooperateProjectDetailSearchVo> page, @Param(Constants.WRAPPER) Wrapper<DProject> Wrapper);
 }
\ No newline at end of file
--- a/dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/IDProjectService.java
+++ b/dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/IDProjectService.java
@@ -11,6 +11,8 @@ import com.dsk.cscec.domain.vo.CooperateProjectDetailSearchVo;
 import com.dsk.cscec.domain.vo.ProjectDetailVo;
 import com.dsk.cscec.domain.vo.ProjectSearchVo;
+import java.util.List;
 /**
 * 项目维表(DProject)表服务接口
 *
@@ -27,6 +29,13 @@ public interface IDProjectService extends IService<DProject> {
     */
    TableDataInfo<ProjectSearchVo> queryProjectList(ProjectSearchBo projectSearchBo, PageQuery pageQuery);
+    /**
+     * 获取项目承接类型下拉列表
+     *
+     * @return 去重后的项目承接类型
+     */
+    List<String> queryIsInvestProject();
    /**
     * 获取合作项目明细
     *

--- a/dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/AdvisoryBodyServiceImpl.java
+++ b/dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/AdvisoryBodyServiceImpl.java
@@ -140,6 +140,15 @@ public class AdvisoryBodyServiceImpl extends ServiceImpl<AdvisoryBodyMapper, Adv
        if (ObjectUtil.isNotNull(advisoryBody)) {
            //咨询机构表中有记录,则设置为非新咨询机构
            AdvisoryBodyExistVo advisoryBodyExistVo = BeanUtil.toBean(advisoryBody, AdvisoryBodyExistVo.class);
+            EnterpriseInfoHeaderBody infoHeaderBody = new EnterpriseInfoHeaderBody();
+            infoHeaderBody.setCompanyId(advisoryBodyExistVo.getAdvisoryBodyCid());
+            Map<String, Object> companyMap = dskOpenApiUtil.requestBody("/api/jsk/enterprise/infoHeader", BeanUtil.beanToMap(infoHeaderBody, false, false));
+            Map companyData = MapUtils.getMap(companyMap, "data", null);
+            //法人信息
+            advisoryBodyExistVo.setCorporatePerson(MapUtils.getString(companyData,"corporatePerson"));
+            //注册地址
+            advisoryBodyExistVo.setRegAddress(MapUtils.getString(companyData, "addressDetail", ""));
+            //是否为新资讯机构
            advisoryBodyExistVo.setIsNewAdvisoryBody(false);
            return advisoryBodyExistVo;
        } else {
@@ -154,9 +163,23 @@ public class AdvisoryBodyServiceImpl extends ServiceImpl<AdvisoryBodyMapper, Adv
                    String companyName = StringUtils.removeRed(MapUtils.getString(companyData, "name", "NotExist"));
                    if (advisoryBodyName.equals(companyName)) {
                        AdvisoryBodyExistVo advisoryBodyExistVo = new AdvisoryBodyExistVo();
-                        advisoryBodyExistVo.setAdvisoryBodyCid(Math.toIntExact(MapUtils.getLong(companyData, "jskEid")));
+                        //jskEid就是cid
+                        Long jskEid = MapUtils.getLong(companyData, "jskEid");
+                        advisoryBodyExistVo.setAdvisoryBodyCid(Math.toIntExact(jskEid));
+                        //企业名称
                        advisoryBodyExistVo.setAdvisoryBodyName(companyName);
+                        //经营范围
                        advisoryBodyExistVo.setBusinessScope(MapUtils.getString(companyData, "businessScope"));
+                        //法人信息
+                        advisoryBodyExistVo.setCorporatePerson(MapUtils.getString(companyData,"legalPerson"));
+                        EnterpriseInfoHeaderBody infoHeaderBody = new EnterpriseInfoHeaderBody();
+                        infoHeaderBody.setCompanyId(Math.toIntExact(jskEid));
+                        Map<String, Object> companyMap = dskOpenApiUtil.requestBody("/api/jsk/enterprise/infoHeader", BeanUtil.beanToMap(infoHeaderBody, false, false));
+                        Map companyData1 = MapUtils.getMap(companyMap, "data", null);
+                        //注册地址
+                        advisoryBodyExistVo.setRegAddress(MapUtils.getString(companyData1, "addressDetail", ""));
+                        //是否为新资讯机构
                        advisoryBodyExistVo.setIsNewAdvisoryBody(true);
                        return advisoryBodyExistVo;
                    }
@@ -164,8 +187,8 @@ public class AdvisoryBodyServiceImpl extends ServiceImpl<AdvisoryBodyMapper, Adv
                //查不到则抛异常
                throw new ServiceException("咨询机构不存在或结果不唯一,请输入完整咨询机构企业名称");
            }
+            throw new ServiceException("咨询机构不存在");
        }
-        return null;
    }
    /**

--- a/dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/FSupplierLimitedServiceImpl.java
+++ b/dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/FSupplierLimitedServiceImpl.java
@@ -83,6 +83,10 @@ public class FSupplierLimitedServiceImpl extends ServiceImpl<FSupplierLimitedMap
                //查不到则抛异常
                //throw new ServiceException("未查询到该供应商Cid");
            }
+            //关键字标红
+            if (StringUtils.isNotBlank(searchBo.getSupplierName())) {
+                searchVo.setFsuppliername(StringUtils.markInRed(searchVo.getFsuppliername(), searchBo.getSupplierName()));
+            }
        }
        return TableDataInfo.build(page);
    }

--- a/dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/IDProjectServiceImpl.java
+++ b/dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/IDProjectServiceImpl.java
@@ -130,6 +130,16 @@ public class IDProjectServiceImpl extends ServiceImpl<DProjectMapper, DProject>
        return wrapper;
    }
+    /**
+     * 获取项目承接类型下拉列表
+     *
+     * @return 去重后的项目承接类型
+     */
+    @Override
+    public List<String> queryIsInvestProject() {
+        return baseMapper.queryIsInvestProject();
+    }
    /**
     * 根据项目主键查询咨询机构
     *
@@ -204,24 +214,27 @@ public class IDProjectServiceImpl extends ServiceImpl<DProjectMapper, DProject>
     */
    @Override
    public ProjectDetailVo queryProjectDetail(ProjectDetailBo projectDetailBo) {
+        Long advisoryBodyCid = projectDetailBo.getAdvisoryBodyCid();
        //查询项目明细
        DProject dProject = baseMapper.selectOne(new LambdaQueryWrapper<DProject>()
                .eq(DProject::getProjectKey, projectDetailBo.getProjectKey()));
        ProjectDetailVo projectDetailVo = BeanUtil.toBean(dProject, ProjectDetailVo.class);
        //查询咨询机构信息并填充
        projectDetailVo.setAdvisoryBody(advisoryBodyMapper.queryAdvisoryBodyByProjectKey(projectDetailBo.getProjectKey()));
-        EnterpriseInfoHeaderBody infoHeaderBody = new EnterpriseInfoHeaderBody();
-        infoHeaderBody.setCompanyId(Math.toIntExact(projectDetailBo.getAdvisoryBodyCid()));
-        Map<String, Object> companyMap = dskOpenApiUtil.requestBody("/api/jsk/enterprise/infoHeader", BeanUtil.beanToMap(infoHeaderBody, false, false));
-        Map companyData = MapUtils.getMap(companyMap, "data", null);
-        //法人
-        projectDetailVo.setCorporatePerson(MapUtils.getString(companyData, "corporatePerson", ""));
-        //注册地址
-        projectDetailVo.setRegAddress(MapUtils.getString(companyData, "addressDetail", ""));
        //查询项目信息并填充
        projectDetailVo.setAdvisoryBodyProject(advisoryBodyProjectMapper.selectById(projectDetailBo.getProjectKey()));
+        if (ObjectUtil.isNotNull(advisoryBodyCid)) {
+            EnterpriseInfoHeaderBody infoHeaderBody = new EnterpriseInfoHeaderBody();
+            infoHeaderBody.setCompanyId(Math.toIntExact(advisoryBodyCid));
+            Map<String, Object> companyMap = dskOpenApiUtil.requestBody("/api/jsk/enterprise/infoHeader", BeanUtil.beanToMap(infoHeaderBody, false, false));
+            Map companyData = MapUtils.getMap(companyMap, "data", null);
+            //法人
+            projectDetailVo.setCorporatePerson(MapUtils.getString(companyData, "corporatePerson", ""));
+            //注册地址
+            projectDetailVo.setRegAddress(MapUtils.getString(companyData, "addressDetail", ""));
+        }
        return projectDetailVo;
    }
 }

--- a/dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/JskCompanyRelationTableV1DetailPageDto.java
+++ b/dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/JskCompanyRelationTableV1DetailPageDto.java
@@ -77,4 +77,17 @@ public class JskCompanyRelationTableV1DetailPageDto extends BasePage {
     * 成员Id（常合作集团成员详情）
     */
    private Integer memberId;
+    /**
+     * 集团名称（集团查看详情需传）
+     */
+    private String combineName;
+    /**
+     * 成员名称（常合作集团成员详情传
+     */
+    private String memberName;
 }
--- a/dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/JskCompanyRelationTableV1Dto.java
+++ b/dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/JskCompanyRelationTableV1Dto.java
@@ -72,5 +72,10 @@ public class JskCompanyRelationTableV1Dto extends BasePage {
     */
    private String combineId;
+    /**
+     * 集团名称（集团查看详情需传）
+     */
+    private String combineName;
 }
--- a/dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/service/EnterpriseService.java
+++ b/dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/service/EnterpriseService.java
@@ -71,12 +71,19 @@ public class EnterpriseService {
    }
    public R infoHeader(EnterpriseInfoHeaderBody body) throws Exception {
-        if (body.isVaildCid()) return R.ok();
+        if (body.isVaildCid()) {
+            return R.ok();
+        }
        Map<String, Object> companyMap = dskOpenApiUtil.requestBody("/api/jsk/enterprise/infoHeader", BeanUtil.beanToMap(body, false, false));
        Integer companyCode = MapUtils.getInteger(companyMap, "code", 300);
-        if (200 != companyCode) return R.ok();
+        if (200 != companyCode) {
+            return R.ok();
+        }
        Map companyData = MapUtils.getMap(companyMap, "data", null);
+        if (ObjectUtil.isEmpty(companyData)) {
+            return R.ok();
+        }
        companyData.put("uipId", null);
        companyData.put("claimStatus", 0);
        companyData.put("bratingSubjectLevel", null);
@@ -102,14 +109,20 @@ public class EnterpriseService {
    }
    public R statistic(EnterpriseStatisticBody body) throws Exception {
-        if (body.isVaildCid()) return R.ok();
+        if (body.isVaildCid()) {
+            return R.ok();
+        }
        Map<String, Object> statisticMap = dskOpenApiUtil.requestBody("/api/jsk/enterprise/statistic", BeanUtil.beanToMap(body, false, false));
        Integer statisticMapCode = MapUtils.getInteger(statisticMap, "code", 300);
-        if (200 != statisticMapCode) throw new RuntimeException();
+        if (200 != statisticMapCode) {
+            return R.ok();
+        }
        Map statisticMapData = MapUtils.getMap(statisticMap, "data", null);
-        if (MapUtils.isEmpty(statisticMapData)) return R.ok();
+        if (MapUtils.isEmpty(statisticMapData)) {
+            return R.ok();
+        }
        //内部合作
        Map<String,Object> cooperation = iCustomerInfoService.cooperationStatistic(body.getCompanyName());
@@ -122,7 +135,9 @@ public class EnterpriseService {
        paramMap.put("cid", body.getCompanyId());
        Map<String, Object> projectStatisticMap = dskOpenApiUtil.requestBody("/operate/enterpriseProject/statistic", paramMap);
        Integer projectStatisticMapCode = MapUtils.getInteger(projectStatisticMap, "code", 300);
-        if (200 != projectStatisticMapCode) return R.ok(statisticMapData);
+        if (200 != projectStatisticMapCode) {
+            return R.ok(statisticMapData);
+        }
        Map projectStatisticMapData = MapUtils.getMap(projectStatisticMap, "data", null);

--- a/dsk-module/dsk-biz-api/src/main/resources/mapper/cscec/DProjectMapper.xml
+++ b/dsk-module/dsk-biz-api/src/main/resources/mapper/cscec/DProjectMapper.xml
@@ -21,6 +21,12 @@
            ${ew.getCustomSqlSegment}
    </select>
+    <select id="queryIsInvestProject" resultType="java.lang.String">
+        SELECT DISTINCT isinvestproject
+        FROM d_project
+        WHERE (isinvestproject <![CDATA[ <> ]]> '')
+    </select>
    <select id="selectPageCooperateProjectDetailList"
            resultType="com.dsk.cscec.domain.vo.CooperateProjectDetailSearchVo">
        select p.project_key,

--- a/dsk-operate-ui/.env.development
+++ b/dsk-operate-ui/.env.development
 # 页面标题
-VUE_APP_TITLE = 数字化经营履约全生命链路管理系统
+VUE_APP_TITLE = 中建一局集团第二建筑有限公司
 # 开发环境配置
 ENV = 'development'
@@ -16,4 +16,4 @@ VUE_CLI_BABEL_TRANSPILE_MODULES = true
 VUE_APP_SUB_SYSTEM_ADDRESS = "http://192.168.60.210:3400"
 # Bi大屏系统地址
 VUE_APP_BI_SYSTEM_ADDRESS = "https://192.168.60.104:8001"
\ No newline at end of file
--- a/dsk-operate-ui/.env.production
+++ b/dsk-operate-ui/.env.production
 # 页面标题
-VUE_APP_TITLE = 数字化经营履约全生命链路管理系统
+VUE_APP_TITLE = 中建一局集团第二建筑有限公司
 # 生产环境配置
 ENV = 'production'

--- a/dsk-operate-ui/.env.staging
+++ b/dsk-operate-ui/.env.staging
 # 页面标题
-VUE_APP_TITLE = 数字化经营履约全生命链路管理系统
+VUE_APP_TITLE = 中建一局集团第二建筑有限公司
 NODE_ENV = production

--- a/dsk-operate-ui/.env.test
+++ b/dsk-operate-ui/.env.test
 # 页面标题
-VUE_APP_TITLE = 数字化经营履约全生命链路管理系统
+VUE_APP_TITLE = 中建一局集团第二建筑有限公司
 NODE_ENV = "production"
@@ -15,4 +15,4 @@ VUE_APP_BASE_API = '/prod-api'
 VUE_APP_SUB_SYSTEM_ADDRESS = "https://pre-plug.jiansheku.com"
 # Bi大屏系统地址
 VUE_APP_BI_SYSTEM_ADDRESS = "https://192.168.60.104:8001"
\ No newline at end of file
--- a/dsk-operate-ui/public/favicon.ico
+++ b/dsk-operate-ui/public/favicon.ico
--- a/dsk-operate-ui/src/api/consultingOrgManagement/index.js
+++ b/dsk-operate-ui/src/api/consultingOrgManagement/index.js
@@ -38,8 +38,32 @@ export const getConsultingOrgEenterpriseDetailWithSearchApi = (params) => reques
 * @param {*} params 
 * @returns 
 */
-export const getgetConsultingOrgProjectDetailApi = (params) => request({
+export const getConsultingOrgProjectDetailApi = (params) => request({
  url: "/advisory/body/getProjectDetail",
  method: "get",
  params
+});
+/**
+ * 查询咨询机构 
+ * @param {*} advisoryBodyName 
+ * @returns 
+ */
+export const searchConsultingApi = (advisoryBodyName) => request({
+  url: "/advisory/body/checkAdvisoryBodyExist",
+  method: "get",
+  params: {
+    advisoryBodyName
+  }
+});
+/**
+ * 更新咨询机构结算信息
+ * @param {*} data 
+ * @returns 
+ */
+export const updateConsultingDetailApi = (data) => request({
+  url: "/advisory/body/editAdvisoryBody",
+  method: "post",
+  data
 });
\ No newline at end of file
--- a/dsk-operate-ui/src/api/supplier/supplier.js
+++ b/dsk-operate-ui/src/api/supplier/supplier.js
@@ -48,3 +48,21 @@ export function custmerInfo(param) {
    method: 'get',
  });
 }
+//涉诉限用禁用名单名单
+export function getSupplierLimitedList(param) {
+  return request({
+    url: '/fSupplierLimited/getSupplierLimitedList',
+    params: param,
+    method: 'get',
+  });
+}
+//解除限用禁用名单名单
+export function getSupplierUnlimitedList(param) {
+  return request({
+    url: '/fSupplierLimited/getSupplierUnlimitedList',
+    params: param,
+    method: 'get',
+  });
+}
--- a/dsk-operate-ui/src/assets/icons/svg/indexs.svg
+++ b/dsk-operate-ui/src/assets/icons/svg/indexs.svg
--- a/dsk-operate-ui/src/assets/icons/svg/managelog.svg
+++ b/dsk-operate-ui/src/assets/icons/svg/managelog.svg
+<svg xmlns="http://www.w3.org/2000/svg" fill="white" version="1.1" width="14" height="14" viewBox="0 0 14 14">
+  <defs>
+    <clipPath id="master_svg0_634_008390">
+      <rect x="0" y="0" width="14" height="14" rx="0"/>
+    </clipPath>
+  </defs>
+  <g clip-path="url(#master_svg0_634_008390)">
+    <g>
+      <path
+        d="M1.0104570234375,2.9374589765625L1.0104570234375,11.9582959765625Q1.0104570234375,12.3854259765625,1.3125050234375,12.6875259765625Q1.6145490234375,12.9895259765625,2.0417070234375,12.9895259765625L11.9583740234375,12.9895259765625Q12.3855740234375,12.9895259765625,12.6875740234375,12.6875259765625Q12.9895740234375,12.3854259765625,12.9895740234375,11.9582859765625L12.9895740234375,2.9374539765625Q12.9895740234375,2.3808559765625,12.5959740234375,1.9872829765625Q12.2024740234375,1.5937089765625,11.6458740234375,1.5937089765625L2.3542070234375,1.5937089765625Q1.7976080234375,1.5937089765625,1.4040326234375,1.9872845765625Q1.0104570234375,2.3808599765625,1.0104570234375,2.9374589765625ZM2.0417070234375,12.0937259765625Q1.9062910234375,12.0937259765625,1.9062910234375,11.9582959765625L1.9062910234375,2.9374589765625Q1.9062910234375,2.7519259765625,2.0374820234374997,2.6207339765624997Q2.1686740234375,2.4895429765625,2.3542070234375,2.4895429765625L11.6458740234375,2.4895429765625Q11.8313740234375,2.4895429765625,11.9625740234375,2.6207339765624997Q12.0937740234375,2.7519249765625,12.0937740234375,2.9374579765625L12.0937740234375,11.9582959765625Q12.0937740234375,12.0937259765625,11.9583740234375,12.0937259765625L2.0417070234375,12.0937259765625Z"
+        fill-rule="evenodd" fill="#ffffff" fill-opacity="1"/>
+    </g>
+    <g>
+      <path
+        d="M4.822917,1.3557511Q4.825,1.3341757,4.825,1.3125Q4.825,1.2681789,4.816353,1.2247094Q4.807707,1.18124,4.790746,1.140292Q4.773785,1.099345,4.749161,1.062493Q4.724538,1.025642,4.693198,0.994302Q4.661858,0.962962,4.625007,0.938339Q4.588155,0.913715,4.547208,0.896754Q4.50626,0.879793,4.4627906,0.871147Q4.4193211,0.8625,4.375,0.8625Q4.3306789,0.8625,4.2872094,0.871147Q4.24374,0.879793,4.202792,0.896754Q4.161845,0.913715,4.124993,0.938339Q4.088142,0.962962,4.056802,0.994302Q4.025462,1.025642,4.000839,1.062493Q3.976215,1.099345,3.959254,1.140292Q3.942293,1.18124,3.933647,1.2247094Q3.925,1.2681789,3.925,1.3125Q3.925,1.3341757,3.927083,1.3557511L3.927083,3.45675Q3.925,3.47832,3.925,3.5Q3.925,3.54432,3.933647,3.58779Q3.942293,3.63126,3.959254,3.67221Q3.976215,3.71315,4.000839,3.75001Q4.025462,3.78686,4.056802,3.8182Q4.088142,3.84954,4.124993,3.87416Q4.161845,3.89878,4.202792,3.91575Q4.24374,3.93271,4.2872094,3.94135Q4.3306789,3.95,4.375,3.95Q4.4193211,3.95,4.4627906,3.94135Q4.50626,3.93271,4.547208,3.91575Q4.588155,3.89878,4.625007,3.87416Q4.661858,3.84954,4.693198,3.8182Q4.724538,3.78686,4.749161,3.75001Q4.773785,3.71315,4.790746,3.67221Q4.807707,3.63126,4.816353,3.58779Q4.825,3.54432,4.825,3.5Q4.825,3.47832,4.822917,3.45675L4.822917,1.3557511Z"
+        fill-rule="evenodd" fill="#ffffff" fill-opacity="1"/>
+    </g>
+    <g>
+      <path
+        d="M10.072917,1.3557511Q10.075,1.3341757,10.075,1.3125Q10.075,1.2681789,10.066353,1.2247094Q10.057707,1.18124,10.040746,1.140292Q10.023785,1.099345,9.999161,1.062493Q9.974538,1.025642,9.943198,0.994302Q9.911858,0.962962,9.875007,0.938339Q9.838155,0.913715,9.797208,0.896754Q9.75626,0.879793,9.7127906,0.871147Q9.6693211,0.8625,9.625,0.8625Q9.5806789,0.8625,9.5372094,0.871147Q9.49374,0.879793,9.452792,0.896754Q9.411845,0.913715,9.374993,0.938339Q9.338142,0.962962,9.306802,0.994302Q9.275462,1.025642,9.250839,1.062493Q9.226215,1.099345,9.209254,1.140292Q9.192293,1.18124,9.183647,1.2247094Q9.175,1.2681789,9.175,1.3125Q9.175,1.3341757,9.177083,1.3557511L9.177083,3.45675Q9.175,3.47832,9.175,3.5Q9.175,3.54432,9.183647,3.58779Q9.192293,3.63126,9.209254,3.67221Q9.226215,3.71315,9.250839,3.75001Q9.275462,3.78686,9.306802,3.8182Q9.338142,3.84954,9.374993,3.87416Q9.411845,3.89878,9.452792,3.91575Q9.49374,3.93271,9.5372094,3.94135Q9.5806789,3.95,9.625,3.95Q9.6693211,3.95,9.7127906,3.94135Q9.75626,3.93271,9.797208,3.91575Q9.838155,3.89878,9.875007,3.87416Q9.911858,3.84954,9.943198,3.8182Q9.974538,3.78686,9.999161,3.75001Q10.023785,3.71315,10.040746,3.67221Q10.057707,3.63126,10.066353,3.58779Q10.075,3.54432,10.075,3.5Q10.075,3.47832,10.072917,3.45675L10.072917,1.3557511Z"
+        fill-rule="evenodd" fill="#ffffff" fill-opacity="1"/>
+    </g>
+    <g>
+      <ellipse cx="7" cy="7.875" rx="0.875" ry="0.875" fill="#ffffff" fill-opacity="1"/>
+    </g>
+    <g transform="matrix(0,1,-1,0,14.875,-4.375)">
+      <path
+        d="M12.47396,4.862093L14.74727,6.174593Q14.79834,6.204078,14.84004,6.245775Q14.88174,6.28747,14.91122,6.33854Q14.94071,6.38961,14.95597,6.4465699999999995Q14.97123,6.50353,14.97123,6.5625L14.97123,9.1875Q14.97123,9.24647,14.95597,9.303429999999999Q14.94071,9.360389999999999,14.91122,9.41146Q14.88174,9.462530000000001,14.84004,9.50422Q14.79834,9.545919999999999,14.74727,9.57541L12.47396,10.88791Q12.42289,10.917390000000001,12.36593,10.932649999999999Q12.30897,10.94792,12.25,10.94792Q12.19103,10.94792,12.13407,10.932649999999999Q12.07711,10.917390000000001,12.02604,10.88791L9.752725,9.57541Q9.701656,9.545919999999999,9.6599584,9.50422Q9.61826079,9.462530000000001,9.5887761,9.41146Q9.5592914,9.360389999999999,9.544029,9.303429999999999Q9.5287667,9.24647,9.5287667,9.1875L9.5287666,6.5625Q9.5287666,6.50353,9.544029,6.4465699999999995Q9.5592914,6.38961,9.5887761,6.33854Q9.61826075,6.28747,9.6599584,6.245775Q9.701656,6.204077,9.752725,6.174593L12.02604,4.862093Q12.07711,4.8326080000000005,12.13407,4.817346Q12.19103,4.802083,12.25,4.802083Q12.30897,4.802083,12.36593,4.817346Q12.42289,4.8326080000000005,12.47396,4.862093L12.47396,4.862093ZM12.02604,5.637907L12.25,5.25L12.47396,5.637907L10.200642,6.95041L9.976683,6.5625L10.4246,6.5625L10.4246,9.1875L9.976683,9.1875L10.200642,8.79959L12.47396,10.11209L12.25,10.5L12.02604,10.11209L14.29936,8.79959L14.52332,9.1875L14.0754,9.1875L14.0754,6.5625L14.52332,6.5625L14.29936,6.95041L12.02604,5.637907Z"
+        fill="#ffffff" fill-opacity="1"/>
+    </g>
+  </g>
+</svg>
--- a/dsk-operate-ui/src/assets/icons/svg/managelogs.svg
+++ b/dsk-operate-ui/src/assets/icons/svg/managelogs.svg
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" version="1.1" width="14" height="14" viewBox="0 0 14 14">
+  <defs>
+    <clipPath id="master_svg0_634_008390">
+      <rect x="0" y="0" width="14" height="14" rx="0"/>
+    </clipPath>
+  </defs>
+  <g clip-path="url(#master_svg0_634_008390)">
+    <g>
+      <path
+        d="M1.0104570234375,2.9374589765625L1.0104570234375,11.9582959765625Q1.0104570234375,12.3854259765625,1.3125050234375,12.6875259765625Q1.6145490234375,12.9895259765625,2.0417070234375,12.9895259765625L11.9583740234375,12.9895259765625Q12.3855740234375,12.9895259765625,12.6875740234375,12.6875259765625Q12.9895740234375,12.3854259765625,12.9895740234375,11.9582859765625L12.9895740234375,2.9374539765625Q12.9895740234375,2.3808559765625,12.5959740234375,1.9872829765625Q12.2024740234375,1.5937089765625,11.6458740234375,1.5937089765625L2.3542070234375,1.5937089765625Q1.7976080234375,1.5937089765625,1.4040326234375,1.9872845765625Q1.0104570234375,2.3808599765625,1.0104570234375,2.9374589765625ZM2.0417070234375,12.0937259765625Q1.9062910234375,12.0937259765625,1.9062910234375,11.9582959765625L1.9062910234375,2.9374589765625Q1.9062910234375,2.7519259765625,2.0374820234374997,2.6207339765624997Q2.1686740234375,2.4895429765625,2.3542070234375,2.4895429765625L11.6458740234375,2.4895429765625Q11.8313740234375,2.4895429765625,11.9625740234375,2.6207339765624997Q12.0937740234375,2.7519249765625,12.0937740234375,2.9374579765625L12.0937740234375,11.9582959765625Q12.0937740234375,12.0937259765625,11.9583740234375,12.0937259765625L2.0417070234375,12.0937259765625Z"
+        fill-rule="evenodd" fill="#ffffff" fill-opacity="1"/>
+    </g>
+    <g>
+      <path
+        d="M4.822917,1.3557511Q4.825,1.3341757,4.825,1.3125Q4.825,1.2681789,4.816353,1.2247094Q4.807707,1.18124,4.790746,1.140292Q4.773785,1.099345,4.749161,1.062493Q4.724538,1.025642,4.693198,0.994302Q4.661858,0.962962,4.625007,0.938339Q4.588155,0.913715,4.547208,0.896754Q4.50626,0.879793,4.4627906,0.871147Q4.4193211,0.8625,4.375,0.8625Q4.3306789,0.8625,4.2872094,0.871147Q4.24374,0.879793,4.202792,0.896754Q4.161845,0.913715,4.124993,0.938339Q4.088142,0.962962,4.056802,0.994302Q4.025462,1.025642,4.000839,1.062493Q3.976215,1.099345,3.959254,1.140292Q3.942293,1.18124,3.933647,1.2247094Q3.925,1.2681789,3.925,1.3125Q3.925,1.3341757,3.927083,1.3557511L3.927083,3.45675Q3.925,3.47832,3.925,3.5Q3.925,3.54432,3.933647,3.58779Q3.942293,3.63126,3.959254,3.67221Q3.976215,3.71315,4.000839,3.75001Q4.025462,3.78686,4.056802,3.8182Q4.088142,3.84954,4.124993,3.87416Q4.161845,3.89878,4.202792,3.91575Q4.24374,3.93271,4.2872094,3.94135Q4.3306789,3.95,4.375,3.95Q4.4193211,3.95,4.4627906,3.94135Q4.50626,3.93271,4.547208,3.91575Q4.588155,3.89878,4.625007,3.87416Q4.661858,3.84954,4.693198,3.8182Q4.724538,3.78686,4.749161,3.75001Q4.773785,3.71315,4.790746,3.67221Q4.807707,3.63126,4.816353,3.58779Q4.825,3.54432,4.825,3.5Q4.825,3.47832,4.822917,3.45675L4.822917,1.3557511Z"
+        fill-rule="evenodd" fill="#ffffff" fill-opacity="1"/>
+    </g>
+    <g>
+      <path
+        d="M10.072917,1.3557511Q10.075,1.3341757,10.075,1.3125Q10.075,1.2681789,10.066353,1.2247094Q10.057707,1.18124,10.040746,1.140292Q10.023785,1.099345,9.999161,1.062493Q9.974538,1.025642,9.943198,0.994302Q9.911858,0.962962,9.875007,0.938339Q9.838155,0.913715,9.797208,0.896754Q9.75626,0.879793,9.7127906,0.871147Q9.6693211,0.8625,9.625,0.8625Q9.5806789,0.8625,9.5372094,0.871147Q9.49374,0.879793,9.452792,0.896754Q9.411845,0.913715,9.374993,0.938339Q9.338142,0.962962,9.306802,0.994302Q9.275462,1.025642,9.250839,1.062493Q9.226215,1.099345,9.209254,1.140292Q9.192293,1.18124,9.183647,1.2247094Q9.175,1.2681789,9.175,1.3125Q9.175,1.3341757,9.177083,1.3557511L9.177083,3.45675Q9.175,3.47832,9.175,3.5Q9.175,3.54432,9.183647,3.58779Q9.192293,3.63126,9.209254,3.67221Q9.226215,3.71315,9.250839,3.75001Q9.275462,3.78686,9.306802,3.8182Q9.338142,3.84954,9.374993,3.87416Q9.411845,3.89878,9.452792,3.91575Q9.49374,3.93271,9.5372094,3.94135Q9.5806789,3.95,9.625,3.95Q9.6693211,3.95,9.7127906,3.94135Q9.75626,3.93271,9.797208,3.91575Q9.838155,3.89878,9.875007,3.87416Q9.911858,3.84954,9.943198,3.8182Q9.974538,3.78686,9.999161,3.75001Q10.023785,3.71315,10.040746,3.67221Q10.057707,3.63126,10.066353,3.58779Q10.075,3.54432,10.075,3.5Q10.075,3.47832,10.072917,3.45675L10.072917,1.3557511Z"
+        fill-rule="evenodd" fill="#ffffff" fill-opacity="1"/>
+    </g>
+    <g>
+      <ellipse cx="7" cy="7.875" rx="0.875" ry="0.875" fill="#ffffff" fill-opacity="1"/>
+    </g>
+    <g transform="matrix(0,1,-1,0,14.875,-4.375)">
+      <path
+        d="M12.47396,4.862093L14.74727,6.174593Q14.79834,6.204078,14.84004,6.245775Q14.88174,6.28747,14.91122,6.33854Q14.94071,6.38961,14.95597,6.4465699999999995Q14.97123,6.50353,14.97123,6.5625L14.97123,9.1875Q14.97123,9.24647,14.95597,9.303429999999999Q14.94071,9.360389999999999,14.91122,9.41146Q14.88174,9.462530000000001,14.84004,9.50422Q14.79834,9.545919999999999,14.74727,9.57541L12.47396,10.88791Q12.42289,10.917390000000001,12.36593,10.932649999999999Q12.30897,10.94792,12.25,10.94792Q12.19103,10.94792,12.13407,10.932649999999999Q12.07711,10.917390000000001,12.02604,10.88791L9.752725,9.57541Q9.701656,9.545919999999999,9.6599584,9.50422Q9.61826079,9.462530000000001,9.5887761,9.41146Q9.5592914,9.360389999999999,9.544029,9.303429999999999Q9.5287667,9.24647,9.5287667,9.1875L9.5287666,6.5625Q9.5287666,6.50353,9.544029,6.4465699999999995Q9.5592914,6.38961,9.5887761,6.33854Q9.61826075,6.28747,9.6599584,6.245775Q9.701656,6.204077,9.752725,6.174593L12.02604,4.862093Q12.07711,4.8326080000000005,12.13407,4.817346Q12.19103,4.802083,12.25,4.802083Q12.30897,4.802083,12.36593,4.817346Q12.42289,4.8326080000000005,12.47396,4.862093L12.47396,4.862093ZM12.02604,5.637907L12.25,5.25L12.47396,5.637907L10.200642,6.95041L9.976683,6.5625L10.4246,6.5625L10.4246,9.1875L9.976683,9.1875L10.200642,8.79959L12.47396,10.11209L12.25,10.5L12.02604,10.11209L14.29936,8.79959L14.52332,9.1875L14.0754,9.1875L14.0754,6.5625L14.52332,6.5625L14.29936,6.95041L12.02604,5.637907Z"
+        fill="#ffffff" fill-opacity="1"/>
+    </g>
+  </g>
+</svg>
--- a/dsk-operate-ui/src/assets/icons/svg/systemmonitor.svg
+++ b/dsk-operate-ui/src/assets/icons/svg/systemmonitor.svg
--- a/dsk-operate-ui/src/assets/icons/svg/systemmonitors.svg
+++ b/dsk-operate-ui/src/assets/icons/svg/systemmonitors.svg
--- a/dsk-operate-ui/src/assets/icons/svg/systems.svg
+++ b/dsk-operate-ui/src/assets/icons/svg/systems.svg
--- a/dsk-operate-ui/src/assets/styles/common.css
+++ b/dsk-operate-ui/src/assets/styles/common.css
@@ -26,6 +26,16 @@
  opacity: 0;
 }
+.edit-fade-enter-active,
+.edit-fade-leave-active {
+  transition: opacity 0.3s ease-in-out;
+}
+.edit-fade-leave-to,
+.edit-fade-leave-to /* .fade-leave-active below version 2.1.8 */ {
+  opacity: 0;
+}
 .list-enter-active,
 .list-leave-active {
  transition: all 0.5s ease;

--- a/dsk-operate-ui/src/assets/styles/index.scss
+++ b/dsk-operate-ui/src/assets/styles/index.scss
@@ -330,7 +330,7 @@ li {
      padding-right: 12px;
      padding-left: 12px;
      line-height: 21px;
-      font-size: 12px;
+      font-size: 14px;
      font-weight: 400;
    }
    thead {

--- a/dsk-operate-ui/src/assets/styles/supplierlist.scss
+++ b/dsk-operate-ui/src/assets/styles/supplierlist.scss
@@ -233,3 +233,18 @@
 .table-supplier .fixed-table .el-table__fixed-header-wrapper{
  top: -16px !important;
 }
+.renling{
+  width: 280px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.ellipsis{
+  width: 500px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.el-range-editor--medium{
+  text-align: left;
+}
--- a/dsk-operate-ui/src/components/DskTableHeaderSetting/components/SettingBar/index.vue
+++ b/dsk-operate-ui/src/components/DskTableHeaderSetting/components/SettingBar/index.vue
@@ -18,7 +18,7 @@
            <transition-group name="fade" tag="div">
              <div class="use-header-item" v-for="(item,index) of useColumn" :key="item.uid">
                <el-checkbox v-model="item.use" class="use-header-item-label"
-                  @change="flag => checkedChange(index,flag,item)">{{item.label}}</el-checkbox>
+                  @change="flag => checkedChange(index,flag,item,false)">{{item.label}}</el-checkbox>
                <img src="@/assets/images/consultingAgencyManagement/use-header-btn.png" alt="" class="use-header-item-drag-icon">
              </div>
            </transition-group>
@@ -30,7 +30,7 @@
          <div class="not-use-header-title">未选字段</div>
          <div class="not-use-header-item" v-for="(item,index) of notUseColumn" :key="item.uid">
            <el-checkbox v-model="item.use" class="not-use-header-item-label"
-              @change="flag => checkedChange(index,flag,item)">{{item.label}}</el-checkbox>
+              @change="flag => checkedChange(index,flag,item,true)">{{item.label}}</el-checkbox>
          </div>
        </div>
@@ -129,10 +129,10 @@ export default {
        // console.log(this.notUseColumn);
      }
    },
-    checkedChange(index, flag, item) {
+    checkedChange(index, flag, item, isUse) {
      // 至少保证一个自适应列存在
-      const hasOnly = this.checkeOnlySelfAdaptation();
+      const { status, onlyColumn } = this.checkeOnlySelfAdaptation();
-      if (!hasOnly) {
+      if (status && onlyColumn.uid == item.uid && !isUse) {
        elementMessageSingleton("warning", "列表至少保证一个自适应列存在");
        this.useColumn.splice(index, 1, {
          ...item,
@@ -158,7 +158,14 @@ export default {
      const len = _array.length;
      //  len等于1时仅剩一个自适应列
-      return len == 1 ? false : true;
+      let status = false;
+      // 仅剩1个自适应列是用于判断当前取消的列是否是自适应列
+      let onlyColumn = null;
+      if (len == 1) {
+        onlyColumn = _array[0];
+        status = true;
+      }
+      return { status, onlyColumn };
    },
    cancel() {
      this.$emit("settingClose");

--- a/dsk-operate-ui/src/layout/components/Sidebar/Logo.vue
+++ b/dsk-operate-ui/src/layout/components/Sidebar/Logo.vue
@@ -45,7 +45,7 @@ export default {
  },
  data() {
    return {
-      title: '中建一局二公司',
+      title: '中建一局集团第二建筑有限公司',
      logo: logoImg
    }
  }

--- a/dsk-operate-ui/src/layout/components/TagsView/index.vue
+++ b/dsk-operate-ui/src/layout/components/TagsView/index.vue
@@ -26,9 +26,9 @@
          <router-link v-for="(tag, index) in visitedViews" ref="tag" :key="tag.fullPath" :class="isActive(tag)?'active':''"
            :to="{ path: tag.fullPath, query: tag.query, fullPath: tag.fullPath }" tag="span" class="tags-view-item"
            @click.middle.native="!isAffix(tag)?closeSelectedTag(tag):''" @contextmenu.prevent.native="openMenu(tag,$event)">
-            <svg :class="isActive(tag)?'tags-icon tags-icon-active':'tags-icon'" aria-hidden="true">
+            <!--<svg :class="isActive(tag)?'tags-icon tags-icon-active':'tags-icon'" aria-hidden="true">-->
-              <use :xlink:href="iconName(tag)" />
+              <!--<use :xlink:href="iconName(tag)" />-->
-            </svg>
+            <!--</svg>-->
            <span :id="isActive(tag)?'tagTitle':''">{{ tag.title.replace(/<[^>]+>/g, '') }}</span>
            <span v-if="!isAffix(tag)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
            <i

--- a/dsk-operate-ui/src/utils/index.js
+++ b/dsk-operate-ui/src/utils/index.js
 import { Message } from "element-ui";
 import { parseTime } from './ruoyi';
+import { router } from "@/router";
 /**
 * 表格时间格式化
@@ -924,5 +925,10 @@ export const detailSideBar = new Map([
  ["cooperationList", "cooperationRecord"],
  // 内部合作 准入情况
  ["approveInfo", "accessCondition"],
-])
+]);
+export const tableContainerFixed = (scrollBarContainer = "",) => {
+}
--- a/dsk-operate-ui/src/views/consultingOrgManagement/components/EnterpriseList/detail/consultingAgency.vue
+++ b/dsk-operate-ui/src/views/consultingOrgManagement/components/EnterpriseList/detail/consultingAgency.vue
--- a/dsk-operate-ui/src/views/consultingOrgManagement/components/EnterpriseList/detail/detailsOfCooperation.vue
+++ b/dsk-operate-ui/src/views/consultingOrgManagement/components/EnterpriseList/detail/detailsOfCooperation.vue
@@ -56,7 +56,7 @@
          v-else-if="!tableLoading" :maxHeight="true" @handle-current-change="handleCurrentChange">
          <!-- 项目列表 -->
          <template slot="projectName" slot-scope="{data,row}">
-            <div v-if="row.projectName" class="no-line-feed">{{row.projectName}}</div>
+            <div v-if="row.projectName" class="no-line-feed" v-html="row.projectName"></div>
            <span v-else>-</span>
          </template>
          <template slot="projectLeader" slot-scope="{data,row}">

--- a/dsk-operate-ui/src/views/consultingOrgManagement/components/EnterpriseList/detail/projectDetail.vue
+++ b/dsk-operate-ui/src/views/consultingOrgManagement/components/EnterpriseList/detail/projectDetail.vue
@@ -25,7 +25,7 @@
              <el-button type="primary" @click="editProjectDetail">编辑信息</el-button>
            </div>
            <div class="save-project-detail-container" v-if="currentList === 'consultingAgency' && isModify" :key="'save-project'">
-              <el-button type="primary" @click="editProjectDetail">保存</el-button>
+              <el-button type="primary" @click="saveProjectDetail">保存</el-button>
              <el-button @click="cancelSave">取消</el-button>
            </div>
          </transition>
@@ -36,8 +36,8 @@
          <!-- 工程基本信息 -->
          <basic-engineering-information v-if="currentList === 'project'" :projectDetailInfo="projectDetailInfo"></basic-engineering-information>
          <!-- 咨询机构结算信息 -->
-          <consulting-agency v-if="currentList === 'consultingAgency'" :projectDetailInfo="projectDetailInfo"
+          <consulting-agency v-if="currentList === 'consultingAgency'" :projectDetailInfo="projectDetailInfo" :isModify="isModify"
-            :isModify="isModify"></consulting-agency>
+            ref="consultingAgency" @editComProjectDetailSuccess="editComProjectDetailSuccess"></consulting-agency>
        </div>
      </div>
@@ -47,7 +47,7 @@
 </template>
 <script>
 import DskTabToggle from "@/components/DskTabToggle";
-import { getgetConsultingOrgProjectDetailApi } from "@/api/consultingOrgManagement/index";
+import { getConsultingOrgProjectDetailApi, updateConsultingDetailApi } from "@/api/consultingOrgManagement";
 import { v4 } from 'uuid';
 import BasicEngineeringInformation from "@/views/consultingOrgManagement/components/EnterpriseList/detail/basicEngineeringInformation";
 import consultingAgency from "@/views/consultingOrgManagement/components/EnterpriseList/detail/consultingAgency";
@@ -92,29 +92,42 @@ export default {
  methods: {
    async init() {
      try {
-        const advisoryBodyCid = this.$route.params?.advisoryBodyCid;
+        const advisoryBodyCid = this.$route.query?.advisoryBodyCid;
        const projectKey = this.$route.query?.projectKey;
-        if (!advisoryBodyCid) return this.$message.error("缺少咨询机构ID");
+        // if (!advisoryBodyCid) return this.$message.error("缺少咨询机构ID");
        if (!projectKey) return this.$message.error("缺少项目主键");
-        const detail = await getgetConsultingOrgProjectDetailApi({
+        const detail = await getConsultingOrgProjectDetailApi({
          advisoryBodyCid,
          projectKey
        });
        if (detail.code == 200 && detail.data) {
-          this.projectDetailInfo = { ...this.pprojectDetailInfo, ...detail.data };
+          this.projectDetailInfo = { ...this.projectDetailInfo, ...detail.data };
        }
      } catch (error) {
+        console.log(error);
      }
    },
    editProjectDetail() {
      this.isModify = true;
    },
    saveProjectDetail() {
+      this.$refs["consultingAgency"].updateConsultingDetail();
+    },
+    // 编辑成功提交信息
+    async editComProjectDetailSuccess(data) {
+      try {
+        const result = await updateConsultingDetailApi(data);
+        if (result.code) {
+          this.$message.success("更新咨询机构结算信息成功");
+          this.isModify = false;
+        }
+      } catch (error) {
+      }
    },
    cancelSave() {
      this.isModify = false;
+      this.$refs["consultingAgency"].cancelModify();
    },
  },
 }

--- a/dsk-operate-ui/src/views/consultingOrgManagement/components/ProjectList/index.vue
+++ b/dsk-operate-ui/src/views/consultingOrgManagement/components/ProjectList/index.vue
@@ -337,8 +337,8 @@ export default {
    },
    // 查看项目详情
    viewProjectDetail(row) {
-      if (!row?.advisoryBody?.advisoryBodyCid) return this.$message.warning("缺少咨询机构id");
+      // if (!row?.advisoryBody?.advisoryBodyCid) return this.$message.warning("缺少咨询机构id");
-      this.$tab.openPage(row.projectName, `/consultingOrgManagement/projectDetail/${row.advisoryBody?.advisoryBodyCid}?projectKey=${row.projectKey}`);
+      this.$tab.openPage(row.projectName, `/consultingOrgManagement/projectDetail?advisoryBodyCid=${row.advisoryBody?.advisoryBodyCid ? row.advisoryBody?.advisoryBodyCid : ""}&projectKey=${row.projectKey}`);
    },
    // 跳转到企业详情
    viewEnterprise(row) {

--- a/dsk-operate-ui/src/views/detail/party-a/component/Tables.vue
+++ b/dsk-operate-ui/src/views/detail/party-a/component/Tables.vue
@@ -130,7 +130,7 @@ export default {
    async maxHeightInit() {
      try {
        await this.$nextTick();
-        /** 
+        /**
         * @type {HTMLDivElement}
        */
        const container = this.$el.querySelector(".table-item");
@@ -224,7 +224,7 @@ export default {
    }
    .el-table {
      .cell {
-        font-size: 12px;
+        font-size: 14px;
      }
      .el-table__header-wrapper {
        min-height: 40px;

--- a/dsk-operate-ui/src/views/monitoring/EnterpriseMonitoring.vue
+++ b/dsk-operate-ui/src/views/monitoring/EnterpriseMonitoring.vue
@@ -24,7 +24,7 @@
        </div>
      </div>
      <div class="content">
-        <div class="table-search">
+        <div class="table-search"  v-if="tableDataTotal > 0  && !isSkeleton">
          <div class="total">共 {{tableDataTotal}} 条</div>
          <div class="right">
            <span class="add" @click="addEnterprise">添加企业</span>
@@ -68,8 +68,12 @@
          <skeleton v-if="isSkeleton" style="padding: 16px"></skeleton>
          <div class="empty" v-if="tableDataTotal === 0 && !isSkeleton">
            <img class="img" src="@/assets/images/project/empty.png">
-            <div class="p1">抱歉，没找到相关数据</div>
+            <div class="p1">您还未添加监控企业</div>
-            <div class="p2">建议调整关键词或筛选条件，重新搜索</div>
+            <!--<div class="p2">建议调整关键词或筛选条件，重新搜索</div>-->
+            <div class="empty-btn">
+              <span class="add" @click="addEnterprise">添加企业</span>
+              <span class="add1" @click="handleBatch">批量监控</span>
+            </div>
          </div>
        </div>
        <div class="pagination-box" v-if="tableDataTotal>queryParams.pageSize">
@@ -218,7 +222,6 @@
    methods: {
      async querySubmit() {
        companyPage(this.queryParams).then(res => {
-          console.log(res)
          this.isSkeleton = false;
          this.tableData=res.rows
          this.tableDataTotal=res.total
@@ -501,7 +504,6 @@
        margin: 0 auto;
        height: 550px;
        text-align: center;
-        border-top: 1px solid #EFEFEF;
        .img{
          width: 108px;
          height: 108px;
@@ -517,6 +519,29 @@
          font-size: 14px;
          margin-top: 8px;
        }
+        .empty-btn{
+          margin-top: 24px;
+          span{
+            width: 88px;
+            height: 32px;
+            border-radius: 4px 4px 4px 4px;
+            line-height: 32px;
+            text-align: center;
+            display: inline-block;
+            font-size: 14px;
+            cursor: pointer;
+          }
+          .add{
+            color: #0081FF;
+            border: 1px solid #0081FF;
+            margin-right: 16px;
+          }
+          .add1{
+            color: #FFFFFF;
+            background: #0081FF;
+            border: 1px solid #0081FF;
+          }
+        }
      }
    }
    ::v-deep .dialogAdd{

--- a/dsk-operate-ui/src/views/monitoring/MonitorSettings.vue
+++ b/dsk-operate-ui/src/views/monitoring/MonitorSettings.vue
 <template>
  <!--监控维度设置-->
    <div class="app-container MonitorSettings">
-      <div class="content">
+      <div class="content" style="height: 100%;">
        <div class="m-title">监控维度设置</div>
        <div class="m-main">
          <div class="main-item">
@@ -127,7 +127,7 @@
        rulesDetail({}).then(res => {
          console.log(res)
          if(res.data){
-            let dimension=res.data.dimension.split(',');
            this.queryParams={
              pushFrequency:res.data.pushFrequency.toString(),
              receiveMode:res.data.receiveMode.toString(),
@@ -135,11 +135,15 @@
            }
            this.startTime =res.data.timePeriodStart
            this.endTime = res.data.timePeriodEnd
-            for(let item in dimension){
+            if(res.data.dimension){
-              if (this.arr.indexOf(dimension[item]) == -1) {
+              let dimension=res.data.dimension.split(',');
-                this.gsfx.push(dimension[item])
+              for(let item in dimension){
-              } else {
+                if (this.arr.indexOf(dimension[item]) == -1) {
-                this.sffx.push(dimension[item])
+                  console.log(dimension[item])
+                  this.gsfx.push(dimension[item])
+                } else {
+                  this.sffx.push(dimension[item])
+                }
              }
            }
          }

--- a/dsk-operate-ui/src/views/monitoring/MonitoringDynamics.vue
+++ b/dsk-operate-ui/src/views/monitoring/MonitoringDynamics.vue
@@ -65,7 +65,7 @@
      </div>
      <div class="content">
-        <div class="total">共 {{tableDataTotal}} 条</div>
+        <div class="total" v-if="tableDataTotal > 0  && !isSkeleton">共 {{tableDataTotal}} 条</div>
        <div class="table-item">
          <div v-if="tableDataTotal > 0  && !isSkeleton">
            <el-table
@@ -106,8 +106,8 @@
          <skeleton v-if="isSkeleton" style="padding: 16px"></skeleton>
          <div class="empty" v-if="tableDataTotal === 0 && !isSkeleton">
            <img class="img" src="@/assets/images/project/empty.png">
-            <div class="p1">抱歉，没找到相关数据</div>
+            <div class="p1">暂未发现企业风险动态信息</div>
-            <div class="p2">建议调整关键词或筛选条件，重新搜索</div>
+            <!--<div class="p2">建议调整关键词或筛选条件，重新搜索</div>-->
          </div>
        </div>
        <div class="pagination-box" v-if="tableDataTotal>queryParams.pageSize">
@@ -374,7 +374,6 @@
              el.Array.push({key:i,value:j})
            }
          })
-          console.log(this.tableData)
        })
      },
      getDetail(name,id) {
@@ -802,7 +801,6 @@
        margin: 0 auto;
        height: 550px;
        text-align: center;
-        border-top: 1px solid #EFEFEF;
        .img{
          width: 108px;
          height: 108px;

--- a/dsk-operate-ui/src/views/monitoring/MonitoringReport.vue
+++ b/dsk-operate-ui/src/views/monitoring/MonitoringReport.vue
@@ -48,8 +48,8 @@
        <skeleton v-if="isSkeleton" style="padding: 16px"></skeleton>
        <div class="empty" v-if="tableDataTotal === 0 && !isSkeleton">
          <img class="img" src="@/assets/images/project/empty.png">
-          <div class="p1">抱歉，没找到相关数据</div>
+          <div class="p1">当前暂无监控报告</div>
-          <div class="p2">建议调整关键词或筛选条件，重新搜索</div>
+          <!--<div class="p2">建议调整关键词或筛选条件，重新搜索</div>-->
        </div>
        <div class="pagination-box" v-if="tableDataTotal>queryParams.pageSize" style="background: #ffffff;margin-top: 16px;padding-right: 16px;">
          <el-pagination background :current-page="queryParams.pageNum" :page-size="queryParams.pageSize" :total="tableDataTotal" layout="prev, pager, next, jumper" @current-change="handleCurrentChange" @size-change="handleSizeChange" />
@@ -251,7 +251,6 @@
        margin: 0 auto;
        height: 550px;
        text-align: center;
-        border-top: 1px solid #EFEFEF;
        background: #ffffff;
        .img{
          width: 108px;

--- a/dsk-operate-ui/src/views/supplier/components/AptitudeStandard.vue
+++ b/dsk-operate-ui/src/views/supplier/components/AptitudeStandard.vue
@@ -13,15 +13,15 @@
                    :value="item">
                    </el-option>
                </el-select>
-                <el-select v-model="value1" value-key="id" @change="selectChange1" v-if="options.length>0" placeholder="请选择">
+                <el-select v-model="value1" value-key="id" @change="selectChange1" v-if="options1&&options1.length>0" placeholder="请选择">
                    <el-option
-                    v-for="item in options"
+                    v-for="item in options1"
                    :key="item.name"
                    :label="item.name"
                    :value="item">
                    </el-option>
                </el-select>
-                <el-select v-model="value2" value-key="id" @change="selectChange2" v-if="options2.length>0" placeholder="请选择">
+                <el-select v-model="value2" value-key="id" @change="selectChange2" v-if="options2&&options2.length>0" placeholder="请选择">
                    <el-option
                    v-for="item in options2"
                    :key="item.name"
@@ -29,6 +29,14 @@
                    :value="item">
                    </el-option>
                </el-select>
+                <el-select v-model="value3" value-key="id" @change="selectChange3" v-if="options3&&options3.length>0" placeholder="请选择">
+                    <el-option
+                    v-for="item in options3"
+                    :key="item.name"
+                    :label="item.name"
+                    :value="item">
+                    </el-option>
+                </el-select>
            </div>
            <div style="padding:16px;">
                <el-table :data="info.list" :span-method="objectSpanMethod" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}" v-horizontal-scroll="'hover'"
@@ -46,7 +54,7 @@
                        </template>
                    </el-table-column>
-                    <el-table-column :resizable="false" label="经营范围" >
+                    <el-table-column :resizable="false" label="可承包工程范围" >
                        <template slot-scope="scope">
                            {{scope.row.contractScope||"--"}}
                        </template>
@@ -68,86 +76,135 @@ export default {
        return{
            list,
            activeIndex:0,
-            options: [],
+            options1: [],
            options2: [],
+            options3: [],
            value: '',
            value1: '',
            value2: '',
+            value3: '',
            info:"",
        }
    },
-   methods:{
+    mounted(){
-    flitterData(arr) {
+        this.choose()
-      let spanOneArr = [];
-      let concatOne = 0;
-      arr.forEach((item, index) => {
-        if (index === 0) {
-          spanOneArr.push(1);
-        } else {
-          if (item.name === arr[index - 1].name) {
-            spanOneArr[concatOne] += 1;
-            spanOneArr.push(0);
-          } else {
-            spanOneArr.push(1);
-            concatOne = index;
-          }
-        }
-      });
-      return {
-        one: spanOneArr,
-      };
    },
-    objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+    methods:{
-      if (columnIndex === 0) {
+        choose(){
-        const _row = this.flitterData(this.info.list).one[rowIndex];
+            this.value = this.list[this.activeIndex].list[0];
-        const _col = _row > 0 ? 1 : 0;
+            this.options1 = this.list[this.activeIndex].list[0].list
+            if(this.options1){
+                this.value1 = this.list[this.activeIndex].list[0].list[0];
+                this.options2 = this.list[this.activeIndex].list[0].list[0].list
+                if(this.options2){
+                    this.value2 = this.list[this.activeIndex].list[0].list[0].list[0];
+                    this.options3 = this.list[this.activeIndex].list[0].list[0].list[0].list
+                    if(this.options3){
+                        this.value3 = this.list[this.activeIndex].list[0].list[0].list[0].list[0];
+                        standard({id:this.value3.id}).then(res=>{
+                            this.info = res.data
+                        })
+                    }else{
+                        standard({id:this.value2.id}).then(res=>{
+                            this.info = res.data
+                        })
+                    }
+                }else{
+                    standard({id:this.value1.id}).then(res=>{
+                        this.info = res.data
+                    })
+                }
+            }else{
+                standard({id:this.value.id}).then(res=>{
+                    this.info = res.data
+                })
+            }
+        },
+        flitterData(arr) {
+        let spanOneArr = [];
+        let concatOne = 0;
+        arr.forEach((item, index) => {
+            if (index === 0) {
+            spanOneArr.push(1);
+            } else {
+            if (item.name === arr[index - 1].name) {
+                spanOneArr[concatOne] += 1;
+                spanOneArr.push(0);
+            } else {
+                spanOneArr.push(1);
+                concatOne = index;
+            }
+            }
+        });
        return {
-          rowspan: _row,
+            one: spanOneArr,
-          colspan: _col,
        };
-      }
+        },
-    },
+        objectSpanMethod({ row, column, rowIndex, columnIndex }) {
-    selectChange(){
+        if (columnIndex === 0) {
-        this.info = "";
+            const _row = this.flitterData(this.info.list).one[rowIndex];
-        if(this.value.list&&this.value.list.length>0){
+            const _col = _row > 0 ? 1 : 0;
-            this.options = this.value.list;
+            return {
-            this.value1 = ""
+            rowspan: _row,
-        }else{
+            colspan: _col,
-            this.options = []
+            };
-            standard({id:this.value.id}).then(res=>{
-                this.info = res.data
-            })
        }
-        this.value2 = "";
+        },
-        this.options2 = []
+        selectChange(){
-    },
+            if(this.value.list&&this.value.list.length>0){
-    selectChange1(){
+                this.options1 = this.value.list;
-        this.info = "";
+                this.value1 = ""
-        if(this.value1.list&&this.value1.list.length>0){
+            }else{
-            this.options2 = this.value1.list;
+                this.options1 = []
-            this.value2 = ""
+                    standard({id:this.value.id}).then(res=>{
-        }else{
+                        this.info = res.data
+                    })
+            }
+            this.value2 = "";
            this.options2 = []
-            standard({id:this.value1.id}).then(res=>{
+        },
+        selectChange1(){
+            this.info = "";
+            if(this.value1.list&&this.value1.list.length>0){
+                this.options2 = this.value1.list;
+                this.value2 = ""
+            }else{
+                this.options2 = []
+                standard({id:this.value1.id}).then(res=>{
+                    this.info = res.data
+                })
+            }
+        },
+        selectChange2(){
+            this.info = "";
+            if(this.value2.list&&this.value2.list.length>0){
+                this.options3 = this.value2.list;
+                this.value3 = ""
+            }else{
+                this.options3 = []
+                standard({id:this.value2.id}).then(res=>{
+                    this.info = res.data
+                })
+            }
+        },
+        selectChange3(){
+            this.info = "";
+            standard({id:this.value3.id}).then(res=>{
                this.info = res.data
            })
-        }
+        },
-    },
+        changeActiveIndex(index){
-    selectChange2(){
+            this.info = "";
-        this.info = "";
+            this.activeIndex=index;
-        standard({id:this.value2.id}).then(res=>{
+            this.value = '';
-            this.info = res.data
+            this.options1 = [];
-        })
+            this.value2 = "";
-    },
+            this.options2 = [];
-    changeActiveIndex(index){
+            this.value3 = "";
-        this.info = "";
+            this.options3 = [];
-        this.activeIndex=index;
+            this.choose()
-        this.value = '';
+        },
-        this.options = [];
+    }
-        this.value2 = "";
-        this.options2 = []
-    },
-   }
 }
 </script>
@@ -179,7 +236,6 @@ export default {
        border-radius: 4px 4px 0px 0px;
        .apt_stan_content_header{
            padding: 16px;
            border-width: 0px 0px 1px 0px;
            border-style: solid;
            border-color: #EEEEEE;

--- a/dsk-operate-ui/src/views/supplier/components/BatchImport.vue
+++ b/dsk-operate-ui/src/views/supplier/components/BatchImport.vue
@@ -25,7 +25,7 @@
            <div class="up_text">点击选择文件或将文件拖拽至此导入企业名录</div>
            <div class="up_tip">· 导入的文件内容必须依照下载模板的要求填写）；</div>
            <div class="up_tip">· 上传文件最大为2M，仅支持Excel表格文件（xls，xlsx）；</div>
-            <div class="up_tip">· 单次查询企业数量限时免费 5000 家。</div>
+            <div class="up_tip">· 单次查询企业数量限时免费 500 家。</div>
          </el-upload>
        </div>
        <div class="bd"></div>

--- a/dsk-operate-ui/src/views/supplier/components/SearchAptitude.vue
+++ b/dsk-operate-ui/src/views/supplier/components/SearchAptitude.vue
@@ -92,7 +92,7 @@
                                </template>
                            </el-table-column>
-                            <el-table-column :resizable="false" label="承包工程范围" width="415">
+                            <el-table-column :resizable="false" label="承包工程范围" width="315">
                                <template slot-scope="scope">
                                    {{scope.row.contractScope||"--"}}
                                </template>
@@ -114,7 +114,7 @@
                                    {{scope.row.organ||"--"}}
                                </template>
                            </el-table-column>
-                            <el-table-column :resizable="false" label="经营范围" width="415">
+                            <el-table-column :resizable="false" label="经营范围" >
                                <template slot-scope="scope">
                                    <el-tooltip class="item" effect="light" :content="scope.row.businessScope" placement="bottom">
                                        <span class="line_2"> {{scope.row.businessScope||"--"}}</span>
@@ -602,6 +602,9 @@ export default {
                width: 405px;
                height: 32px;
                line-height: 32px;
+                .el-input__inner{
+                    width: 405px;
+                }
            }
            .ckquery_list_right {
                width: 670px;
@@ -783,6 +786,9 @@ export default {
                    font-weight: 700;
                    color: #232323;
                    margin-bottom: 12px;
+                    &:hover{
+                        color:#0081FF;
+                    }
                }
                img{
                    width: 28px;
@@ -860,6 +866,9 @@ export default {
                font-size: 16px;
                color: #232323;
                margin-bottom: 12px;
+                &:hover{
+                    color:#0081FF;
+                }
            }
            img{
                width: 28px;

--- a/dsk-operate-ui/src/views/supplier/disableManagement/Unlist.vue
+++ b/dsk-operate-ui/src/views/supplier/disableManagement/Unlist.vue
--- a/dsk-operate-ui/src/views/supplier/disableManagement/disableList.vue
+++ b/dsk-operate-ui/src/views/supplier/disableManagement/disableList.vue
--- a/dsk-operate-ui/src/views/supplier/supplierlist/access.vue
+++ b/dsk-operate-ui/src/views/supplier/supplierlist/access.vue
@@ -70,7 +70,7 @@
              </p>
              <p>
                <label class="label">公司性质</label>
-                <span></span>
+                <span>{{custmerInfo.customerProperty || '--'}}</span>
                <label class="label">资质等级</label>
                <span>{{custmerInfo.credential || '--'}}</span>
              </p>
@@ -351,7 +351,7 @@
              </el-table>
            </div>
-            <div class="pagination clearfix" v-show="total>0">
+            <div class="pagination clearfix" v-show="total>formdata.pageSize">
              <el-pagination background :page-size="pageSize" :current-page.sync="pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
                             :total="total">
              </el-pagination>
@@ -426,7 +426,7 @@
                </el-table-column>
              </el-table>
            </div>
-            <div class="pagination clearfix" v-show="total>0">
+            <div class="pagination clearfix" v-show="total>formdata.pageSize">
              <el-pagination background :page-size="pageSize" :current-page.sync="pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
                             :total="total">
              </el-pagination>

--- a/dsk-operate-ui/src/views/supplier/supplierlist/assessment.vue
+++ b/dsk-operate-ui/src/views/supplier/supplierlist/assessment.vue
@@ -56,7 +56,7 @@
          </el-table-column>
        </el-table>
      </div>
-      <div class="pagination clearfix" v-show="total>0">
+      <div class="pagination clearfix" v-show="total>pageSize">
        <el-pagination background :page-size="pageSize" :current-page.sync="pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
                       :total="total">
        </el-pagination>

--- a/dsk-operate-ui/src/views/supplier/supplierlist/disposal.vue
+++ b/dsk-operate-ui/src/views/supplier/supplierlist/disposal.vue
@@ -81,7 +81,7 @@
          </el-table-column>
        </el-table>
      </div>
-      <div class="pagination clearfix" v-show="total>0">
+      <div class="pagination clearfix" v-show="total>pageSize">
        <el-pagination background :page-size="pageSize" :current-page.sync="pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
                       :total="total">
        </el-pagination>

--- a/dsk-operate-ui/src/views/supplier/supplierlist/laborSubcontracting.vue
+++ b/dsk-operate-ui/src/views/supplier/supplierlist/laborSubcontracting.vue
@@ -94,11 +94,6 @@
              <span>{{(formdata.pageNum - 1) *formdata.pageSize + scope.$index + 1}}</span>
            </template>
          </el-table-column>
-          <el-table-column label="二级市场编码" :fixed="tableColumnFixed" width="120" :resizable="false">
-            <template slot-scope="scope">
-              {{scope.row.secondaryCode||"--"}}
-            </template>
-          </el-table-column>
          <el-table-column label="供应商编号" prop="customerCode" :fixed="tableColumnFixed" width="120" :resizable="false">
          </el-table-column>
@@ -106,16 +101,30 @@
            <template slot-scope="scope">
              <div class="renling">
                <div style="display:flex;align-items:center">
-                  <router-link v-if="scope.row.companyId" :to="`/enterprise/${encodeStr(scope.row.companyId)}?path=cooperationRecord&companyName=${scope.row.customerName}`" tag="a"
+                  <el-tooltip placement="top" v-if="scope.row.customerText.length>20">
-                               class="wordprimary" v-html="scope.row.customerName"></router-link>
+                    <div slot="content">{{scope.row.customerText}}</div>
-                  <span v-else v-html="scope.row.customerName"></span>
+                    <div class="renling">
+                      <router-link v-if="scope.row.companyId" :to="`/enterprise/${encodeStr(scope.row.companyId)}?path=cooperationRecord&companyName=${scope.row.customerName}`" tag="a"
+                                   class="wordprimary" v-html="scope.row.customerName"></router-link>
+                      <span v-else v-html="scope.row.customerName"></span>
+                    </div>
+                  </el-tooltip>
+                  <div class="renling" v-else>
+                    <router-link v-if="scope.row.companyId" :to="`/enterprise/${encodeStr(scope.row.companyId)}?path=cooperationRecord&companyName=${scope.row.customerName}`" tag="a"
+                                 class="wordprimary" v-html="scope.row.customerName"></router-link>
+                    <span v-else v-html="scope.row.customerName"></span>
+                  </div>
                </div>
              </div>
            </template>
          </el-table-column>
+          <el-table-column label="二级市场编码" width="120" :resizable="false">
+            <template slot-scope="scope">
+              {{scope.row.secondaryCode||"--"}}
+            </template>
+          </el-table-column>
          <el-table-column label="推荐单位" min-width="280">
            <template slot-scope="scope">
              {{scope.row.recommendOrg||"--"}}
@@ -138,7 +147,15 @@
          </el-table-column>
          <el-table-column label="专业类别" min-width="85" :resizable="false">
            <template slot-scope="scope">
-              {{scope.row.groupSpecialty||"--"}}
+              <el-tooltip placement="top" v-if="scope.row.groupSpecialty&&scope.row.groupSpecialty.length>35">
+                <div slot="content">{{scope.row.groupSpecialty}}</div>
+                <span class="ellipsis">
+                  {{scope.row.groupSpecialty||"--"}}
+                </span>
+              </el-tooltip>
+              <span class="ellipsis" v-else>
+                {{scope.row.groupSpecialty||"--"}}
+              </span>
            </template>
          </el-table-column>
          <el-table-column label="法人代表" min-width="85" :resizable="false">
@@ -158,7 +175,15 @@
          </el-table-column>
          <el-table-column label="施工承包范围" min-width="120" :resizable="false">
            <template slot-scope="scope">
-              {{scope.row.constructJobScope||"--"}}
+              <el-tooltip placement="top-start" v-if="scope.row.constructJobScope&&scope.row.constructJobScope.length>35">
+                <div slot="content">{{scope.row.constructJobScope}}</div>
+                <div class="ellipsis">
+                  <span>{{scope.row.constructJobScope||"--"}}</span>
+                </div>
+              </el-tooltip>
+              <div class="ellipsis" v-else>
+                <span>{{scope.row.constructJobScope||"--"}}</span>
+              </div>
            </template>
          </el-table-column>
          <el-table-column label="资质等级" min-width="85" :resizable="false">
@@ -181,7 +206,7 @@
              {{scope.row.contactPhone||"--"}}
            </template>
          </el-table-column>
-          <el-table-column label="准入时间" min-width="120" :resizable="false">
+          <el-table-column label="准入时间" min-width="180" :resizable="false">
            <template slot-scope="scope">
              {{scope.row.approveDate2||"--"}}
            </template>
@@ -215,7 +240,7 @@
        </el-table>
      </div>
-      <div class="pagination clearfix" v-show="total>0">
+      <div class="pagination clearfix" v-show="total>formdata.pageSize">
        <el-pagination background :page-size="formdata.pageSize" :current-page.sync="formdata.pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
                       :total="total">
        </el-pagination>
@@ -419,6 +444,9 @@
          this.isSkeleton = false
          this.tableData = res.rows
          this.total = res.total
+          this.tableData.forEach(item=>{
+            item.customerText = item.customerName.replace(/<\/?[^>]+(style=('|")[^'"]*)?>/gi, '')
+          })
        })
      },
      handleCurrentChange(val){

--- a/dsk-operate-ui/src/views/supplier/supplierlist/laborSubcontractingTeam.vue
+++ b/dsk-operate-ui/src/views/supplier/supplierlist/laborSubcontractingTeam.vue
@@ -99,11 +99,6 @@
              <span>{{(formdata.pageNum - 1) *formdata.pageSize + scope.$index + 1}}</span>
            </template>
          </el-table-column>
-          <el-table-column label="二级市场编码" :fixed="tableColumnFixed" width="120" :resizable="false">
-            <template slot-scope="scope">
-              {{scope.row.secondaryCode||"--"}}
-            </template>
-          </el-table-column>
          <el-table-column label="供应商编号" prop="customerCode" :fixed="tableColumnFixed" width="120" :resizable="false">
          </el-table-column>
@@ -111,16 +106,30 @@
            <template slot-scope="scope">
              <div class="renling">
                <div style="display:flex;align-items:center">
-                  <router-link v-if="scope.row.companyId" :to="`/enterprise/${encodeStr(scope.row.companyId)}?path=cooperationRecord&companyName=${scope.row.customerName}`" tag="a"
+                  <el-tooltip placement="top" v-if="scope.row.customerText.length>20">
-                               class="wordprimary" v-html="scope.row.customerName"></router-link>
+                    <div slot="content">{{scope.row.customerText}}</div>
-                  <span v-else v-html="scope.row.customerName"></span>
+                    <div class="renling">
+                      <router-link v-if="scope.row.companyId" :to="`/enterprise/${encodeStr(scope.row.companyId)}?path=cooperationRecord&companyName=${scope.row.customerName}`" tag="a"
+                                   class="wordprimary" v-html="scope.row.customerName"></router-link>
+                      <span v-else v-html="scope.row.customerName"></span>
+                    </div>
+                  </el-tooltip>
+                  <div class="renling" v-else>
+                    <router-link v-if="scope.row.companyId" :to="`/enterprise/${encodeStr(scope.row.companyId)}?path=cooperationRecord&companyName=${scope.row.customerName}`" tag="a"
+                                 class="wordprimary" v-html="scope.row.customerName"></router-link>
+                    <span v-else v-html="scope.row.customerName"></span>
+                  </div>
                </div>
              </div>
            </template>
          </el-table-column>
+          <el-table-column label="二级市场编码" width="120" :resizable="false">
+            <template slot-scope="scope">
+              {{scope.row.secondaryCode||"--"}}
+            </template>
+          </el-table-column>
          <el-table-column label="营业执照号码" min-width="180">
            <template slot-scope="scope">
              {{scope.row.unifySocialCode||"--"}}
@@ -216,7 +225,7 @@
              {{scope.row.serviceTeamSpeciality||"--"}}
            </template>
          </el-table-column>
-          <el-table-column label="准入时间" min-width="120" :resizable="false">
+          <el-table-column label="准入时间" min-width="180" :resizable="false">
            <template slot-scope="scope">
              {{scope.row.approveDate2||"--"}}
            </template>
@@ -250,7 +259,7 @@
        </el-table>
      </div>
-      <div class="pagination clearfix" v-show="total>0">
+      <div class="pagination clearfix" v-show="total>formdata.pageSize">
        <el-pagination background :page-size="formdata.pageSize" :current-page.sync="formdata.pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
                       :total="total">
        </el-pagination>
@@ -456,6 +465,9 @@
          this.isSkeleton = false
          this.tableData = res.rows
          this.total = res.total
+          this.tableData.forEach(item=>{
+            item.customerText = item.customerName.replace(/<\/?[^>]+(style=('|")[^'"]*)?>/gi, '')
+          })
        })
      },
      handleCurrentChange(val){

--- a/dsk-operate-ui/src/views/supplier/supplierlist/ledger.vue
+++ b/dsk-operate-ui/src/views/supplier/supplierlist/ledger.vue
@@ -86,7 +86,7 @@
        <el-table :data="tableData" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}"
                  v-sticky-header.always="{offsetTop : '-16px',offsetBottom : '10px'}" 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">
+                  ref="theOwnerListTable" :row-key="'customerKey'">
          <el-table-column type="index" label="序号" :fixed="tableColumnFixed" width="60" :resizable="false">
            <template slot-scope="scope">
@@ -96,10 +96,18 @@
          <el-table-column label="供应商编号" prop="customerCode" :fixed="tableColumnFixed" width="120" :resizable="false">
          </el-table-column>
-          <el-table-column label="供应商名称" :fixed="tableColumnFixed" width="380" :resizable="false">
+          <el-table-column label="供应商名称" :fixed="tableColumnFixed" width="305" :resizable="false">
            <template slot-scope="scope">
-              <div class="renling">
+              <div style="display:flex;align-items:center">
-                <div style="display:flex;align-items:center">
+                <el-tooltip placement="top" v-if="scope.row.customerText.length>20">
+                  <div slot="content">{{scope.row.customerText}}</div>
+                  <div class="renling">
+                    <router-link v-if="scope.row.companyId" :to="`/enterprise/${encodeStr(scope.row.companyId)}?path=cooperationRecord&companyName=${scope.row.customerName}`" tag="a"
+                                 class="wordprimary" v-html="scope.row.customerName"></router-link>
+                    <span v-else v-html="scope.row.customerName"></span>
+                  </div>
+                </el-tooltip>
+                <div class="renling" v-else>
                  <router-link v-if="scope.row.companyId" :to="`/enterprise/${encodeStr(scope.row.companyId)}?path=cooperationRecord&companyName=${scope.row.customerName}`" tag="a"
                               class="wordprimary" v-html="scope.row.customerName"></router-link>
                  <span v-else v-html="scope.row.customerName"></span>
@@ -135,9 +143,17 @@
              {{scope.row.customerClass||"--"}}
            </template>
          </el-table-column>
-          <el-table-column label="专业类别" min-width="185" :resizable="false">
+          <el-table-column label="专业类别" min-width="520" :resizable="false">
            <template slot-scope="scope">
-              {{scope.row.groupSpecialty||"--"}}
+              <el-tooltip placement="top" v-if="scope.row.groupSpecialty&&scope.row.groupSpecialty.length>35">
+                <div slot="content">{{scope.row.groupSpecialty}}</div>
+                <span class="ellipsis">
+                  {{scope.row.groupSpecialty||"--"}}
+                </span>
+              </el-tooltip>
+              <span class="ellipsis" v-else>
+                {{scope.row.groupSpecialty||"--"}}
+              </span>
            </template>
          </el-table-column>
          <el-table-column label="纳税人身份" min-width="120" :resizable="false">
@@ -168,7 +184,7 @@
              {{scope.row.laborCaptainPhone||"--"}}
            </template>
          </el-table-column>
-          <el-table-column label="队长身份证" min-width="120" :resizable="false">
+          <el-table-column label="队长身份证" min-width="180" :resizable="false">
            <template slot-scope="scope">
              {{scope.row.laborCaptainIdcard||"--"}}
            </template>
@@ -183,9 +199,17 @@
              {{scope.row.serviceTeamSpeciality||"--"}}
            </template>
          </el-table-column>
-          <el-table-column label="施工承包范围" min-width="200" :resizable="false">
+          <el-table-column label="施工承包范围" min-width="520" :resizable="false">
            <template slot-scope="scope">
-              {{scope.row.constructJobScope||"--"}}
+              <el-tooltip placement="top-start" v-if="scope.row.constructJobScope&&scope.row.constructJobScope.length>35">
+                <div slot="content">{{scope.row.constructJobScope}}</div>
+                <div class="ellipsis">
+                  <span>{{scope.row.constructJobScope||"--"}}</span>
+                </div>
+              </el-tooltip>
+              <div class="ellipsis" v-else>
+                  <span>{{scope.row.constructJobScope||"--"}}</span>
+              </div>
            </template>
          </el-table-column>
          <el-table-column label="资质等级" min-width="120" :resizable="false">
@@ -208,7 +232,7 @@
              {{scope.row.contactPhone||"--"}}
            </template>
          </el-table-column>
-          <el-table-column label="准入时间" min-width="120" :resizable="false">
+          <el-table-column label="准入时间" min-width="180" :resizable="false">
            <template slot-scope="scope">
              {{scope.row.approveDate2||"--"}}
            </template>
@@ -241,7 +265,7 @@
        </el-table>
      </div>
-      <div class="pagination clearfix" v-show="total>0">
+      <div class="pagination clearfix" v-show="total>formdata.pageSize">
        <el-pagination background :page-size="formdata.pageSize" :current-page.sync="formdata.pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
                       :total="total">
        </el-pagination>
@@ -454,6 +478,9 @@
          this.tableData = res.rows
          this.total = res.total
          this.isSkeleton = false
+          this.tableData.forEach(item=>{
+            item.customerText = item.customerName.replace(/<\/?[^>]+(style=('|")[^'"]*)?>/gi, '')
+          })
        })
      },
      handleCurrentChange(val){

--- a/dsk-operate-ui/src/views/supplier/supplierlist/professionalSubcontracting.vue
+++ b/dsk-operate-ui/src/views/supplier/supplierlist/professionalSubcontracting.vue
@@ -100,7 +100,15 @@
          <el-table-column label="供应商名称" :fixed="tableColumnFixed" width="380" :resizable="false">
            <template slot-scope="scope">
              <div class="renling">
-                <div style="display:flex;align-items:center">
+                <el-tooltip placement="top" v-if="scope.row.customerText.length>20">
+                  <div slot="content">{{scope.row.customerText}}</div>
+                  <div class="renling">
+                    <router-link v-if="scope.row.companyId" :to="`/enterprise/${encodeStr(scope.row.companyId)}?path=cooperationRecord&companyName=${scope.row.customerName}`" tag="a"
+                                 class="wordprimary" v-html="scope.row.customerName"></router-link>
+                    <span v-else v-html="scope.row.customerName"></span>
+                  </div>
+                </el-tooltip>
+                <div class="renling" v-else>
                  <router-link v-if="scope.row.companyId" :to="`/enterprise/${encodeStr(scope.row.companyId)}?path=cooperationRecord&companyName=${scope.row.customerName}`" tag="a"
                               class="wordprimary" v-html="scope.row.customerName"></router-link>
                  <span v-else v-html="scope.row.customerName"></span>
@@ -133,7 +141,15 @@
          </el-table-column>
          <el-table-column label="专业类别" min-width="85" :resizable="false">
            <template slot-scope="scope">
-              {{scope.row.groupSpecialty||"--"}}
+              <el-tooltip placement="top" v-if="scope.row.groupSpecialty&&scope.row.groupSpecialty.length>35">
+                <div slot="content">{{scope.row.groupSpecialty}}</div>
+                <span class="ellipsis">
+                  {{scope.row.groupSpecialty||"--"}}
+                </span>
+              </el-tooltip>
+              <span class="ellipsis" v-else>
+                {{scope.row.groupSpecialty||"--"}}
+              </span>
            </template>
          </el-table-column>
          <el-table-column label="法人代表" min-width="85" :resizable="false">
@@ -153,7 +169,15 @@
          </el-table-column>
          <el-table-column label="施工承包范围" min-width="120" :resizable="false">
            <template slot-scope="scope">
-              {{scope.row.constructJobScope||"--"}}
+              <el-tooltip placement="top-start" v-if="scope.row.constructJobScope&&scope.row.constructJobScope.length>35">
+                <div slot="content">{{scope.row.constructJobScope}}</div>
+                <div class="ellipsis">
+                  <span>{{scope.row.constructJobScope||"--"}}</span>
+                </div>
+              </el-tooltip>
+              <div class="ellipsis" v-else>
+                <span>{{scope.row.constructJobScope||"--"}}</span>
+              </div>
            </template>
          </el-table-column>
          <el-table-column label="资质等级" min-width="85" :resizable="false">
@@ -176,7 +200,7 @@
              {{scope.row.contactPhone||"--"}}
            </template>
          </el-table-column>
-          <el-table-column label="准入时间" min-width="120" :resizable="false">
+          <el-table-column label="准入时间" min-width="180" :resizable="false">
            <template slot-scope="scope">
              {{scope.row.approveDate2||"--"}}
            </template>
@@ -210,7 +234,7 @@
        </el-table>
      </div>
-      <div class="pagination clearfix" v-show="total>0">
+      <div class="pagination clearfix" v-show="total>formdata.pageSize">
        <el-pagination background :page-size="formdata.pageSize" :current-page.sync="formdata.pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
                       :total="total">
        </el-pagination>
@@ -415,6 +439,9 @@
          this.isSkeleton = false
          this.tableData = res.rows
          this.total = res.total
+          this.tableData.forEach(item=>{
+            item.customerText = item.customerName.replace(/<\/?[^>]+(style=('|")[^'"]*)?>/gi, '')
+          })
        })
      },
      handleCurrentChange(val){

--- a/dsk-operate-ui/src/views/supplier/supplierlist/rentalServices.vue
+++ b/dsk-operate-ui/src/views/supplier/supplierlist/rentalServices.vue
@@ -101,9 +101,19 @@
            <template slot-scope="scope">
              <div class="renling">
                <div style="display:flex;align-items:center">
-                  <router-link v-if="scope.row.companyId" :to="`/enterprise/${encodeStr(scope.row.companyId)}?path=cooperationRecord&companyName=${scope.row.customerName}`" tag="a"
+                  <el-tooltip placement="top" v-if="scope.row.customerText.length>20">
-                               class="wordprimary" v-html="scope.row.customerName"></router-link>
+                    <div slot="content">{{scope.row.customerText}}</div>
-                  <span v-else v-html="scope.row.customerName"></span>
+                    <div class="renling">
+                      <router-link v-if="scope.row.companyId" :to="`/enterprise/${encodeStr(scope.row.companyId)}?path=cooperationRecord&companyName=${scope.row.customerName}`" tag="a"
+                                   class="wordprimary" v-html="scope.row.customerName"></router-link>
+                      <span v-else v-html="scope.row.customerName"></span>
+                    </div>
+                  </el-tooltip>
+                  <div class="renling" v-else>
+                    <router-link v-if="scope.row.companyId" :to="`/enterprise/${encodeStr(scope.row.companyId)}?path=cooperationRecord&companyName=${scope.row.customerName}`" tag="a"
+                                 class="wordprimary" v-html="scope.row.customerName"></router-link>
+                    <span v-else v-html="scope.row.customerName"></span>
+                  </div>
                </div>
              </div>
@@ -133,7 +143,15 @@
          </el-table-column>
          <el-table-column label="专业类别" min-width="85" :resizable="false">
            <template slot-scope="scope">
-              {{scope.row.groupSpecialty||"--"}}
+              <el-tooltip placement="top" v-if="scope.row.groupSpecialty&&scope.row.groupSpecialty.length>35">
+                <div slot="content">{{scope.row.groupSpecialty}}</div>
+                <span class="ellipsis">
+                  {{scope.row.groupSpecialty||"--"}}
+                </span>
+              </el-tooltip>
+              <span class="ellipsis" v-else>
+                {{scope.row.groupSpecialty||"--"}}
+              </span>
            </template>
          </el-table-column>
          <el-table-column label="法人代表" min-width="85" :resizable="false">
@@ -171,7 +189,7 @@
              {{scope.row.contactPhone||"--"}}
            </template>
          </el-table-column>
-          <el-table-column label="准入时间" min-width="120" :resizable="false">
+          <el-table-column label="准入时间" min-width="180" :resizable="false">
            <template slot-scope="scope">
              {{scope.row.approveDate2||"--"}}
            </template>
@@ -205,7 +223,7 @@
        </el-table>
      </div>
-      <div class="pagination clearfix" v-show="total>0">
+      <div class="pagination clearfix" v-show="total>formdata.pageSize">
        <el-pagination background :page-size="formdata.pageSize" :current-page.sync="formdata.pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
                       :total="total">
        </el-pagination>
@@ -409,6 +427,9 @@
          this.isSkeleton = false
          this.tableData = res.rows
          this.total = res.total
+          this.tableData.forEach(item=>{
+            item.customerText = item.customerName.replace(/<\/?[^>]+(style=('|")[^'"]*)?>/gi, '')
+          })
        })
      },
      handleCurrentChange(val){

--- a/dsk-operate-ui/src/views/supplier/supplierlist/supplySubcontracting.vue
+++ b/dsk-operate-ui/src/views/supplier/supplierlist/supplySubcontracting.vue
@@ -101,9 +101,19 @@
            <template slot-scope="scope">
              <div class="renling">
                <div style="display:flex;align-items:center">
-                  <router-link v-if="scope.row.companyId" :to="`/enterprise/${encodeStr(scope.row.companyId)}?path=cooperationRecord&companyName=${scope.row.customerName}`" tag="a"
+                  <el-tooltip placement="top" v-if="scope.row.customerText.length>20">
-                               class="wordprimary" v-html="scope.row.customerName"></router-link>
+                    <div slot="content">{{scope.row.customerText}}</div>
-                  <span v-else v-html="scope.row.customerName"></span>
+                    <div class="renling">
+                      <router-link v-if="scope.row.companyId" :to="`/enterprise/${encodeStr(scope.row.companyId)}?path=cooperationRecord&companyName=${scope.row.customerName}`" tag="a"
+                                   class="wordprimary" v-html="scope.row.customerName"></router-link>
+                      <span v-else v-html="scope.row.customerName"></span>
+                    </div>
+                  </el-tooltip>
+                  <div class="renling" v-else>
+                    <router-link v-if="scope.row.companyId" :to="`/enterprise/${encodeStr(scope.row.companyId)}?path=cooperationRecord&companyName=${scope.row.customerName}`" tag="a"
+                                 class="wordprimary" v-html="scope.row.customerName"></router-link>
+                    <span v-else v-html="scope.row.customerName"></span>
+                  </div>
                </div>
              </div>
@@ -171,7 +181,7 @@
              {{scope.row.contactPhone||"--"}}
            </template>
          </el-table-column>
-          <el-table-column label="准入时间" min-width="120" :resizable="false">
+          <el-table-column label="准入时间" min-width="180" :resizable="false">
            <template slot-scope="scope">
              {{scope.row.approveDate2||"--"}}
            </template>
@@ -205,7 +215,7 @@
        </el-table>
      </div>
-      <div class="pagination clearfix" v-show="total>0">
+      <div class="pagination clearfix" v-show="total>formdata.pageSize">
        <el-pagination background :page-size="formdata.pageSize" :current-page.sync="formdata.pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
                       :total="total">
        </el-pagination>
@@ -409,6 +419,9 @@
          this.isSkeleton = false
          this.tableData = res.rows
          this.total = res.total
+          this.tableData.forEach(item=>{
+            item.customerText = item.customerName.replace(/<\/?[^>]+(style=('|")[^'"]*)?>/gi, '')
+          })
        })
      },
      handleCurrentChange(val){