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

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

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/controller/AdvisoryBodyProjectController.java

+package com.dsk.cscec.controller;
+
+
+import com.dsk.common.core.controller.BaseController;
+import com.dsk.cscec.service.AdvisoryBodyProjectService;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * 咨询机构和项目关联表(AdvisoryBodyProject)表控制层
+ *
+ * @author makejava
+ * @since 2023-12-15 15:57:54
+ */
+@RestController
+@RequestMapping("advisoryBodyProject")
+public class AdvisoryBodyProjectController extends BaseController {
+    /**
+     * 服务对象
+     */
+    @Resource
+    private AdvisoryBodyProjectService advisoryBodyProjectService;
+
+    ///**
+    // * 分页查询所有数据
+    // *
+    // * @param page 分页对象
+    // * @param advisoryBodyProject 查询实体
+    // * @return 所有数据
+    // */
+    //@GetMapping
+    //public R selectAll(Page<AdvisoryBodyProject> page, AdvisoryBodyProject advisoryBodyProject) {
+    //    return success(this.advisoryBodyProjectService.page(page, new QueryWrapper<>(advisoryBodyProject)));
+    //}
+    //
+    ///**
+    // * 通过主键查询单条数据
+    // *
+    // * @param id 主键
+    // * @return 单条数据
+    // */
+    //@GetMapping("{id}")
+    //public R selectOne(@PathVariable Serializable id) {
+    //    return success(this.advisoryBodyProjectService.getById(id));
+    //}
+    //
+    ///**
+    // * 新增数据
+    // *
+    // * @param advisoryBodyProject 实体对象
+    // * @return 新增结果
+    // */
+    //@PostMapping
+    //public R insert(@RequestBody AdvisoryBodyProject advisoryBodyProject) {
+    //    return success(this.advisoryBodyProjectService.save(advisoryBodyProject));
+    //}
+    //
+    ///**
+    // * 修改数据
+    // *
+    // * @param advisoryBodyProject 实体对象
+    // * @return 修改结果
+    // */
+    //@PutMapping
+    //public R update(@RequestBody AdvisoryBodyProject advisoryBodyProject) {
+    //    return success(this.advisoryBodyProjectService.updateById(advisoryBodyProject));
+    //}
+    //
+    ///**
+    // * 删除数据
+    // *
+    // * @param idList 主键结合
+    // * @return 删除结果
+    // */
+    //@DeleteMapping
+    //public R delete(@RequestParam("idList") List<Long> idList) {
+    //    return success(this.advisoryBodyProjectService.removeByIds(idList));
+    //}
+}
+

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/controller/CustomerInfoController.java

@@ -6,10 +6,10 @@ import com.dsk.common.core.domain.PageQuery;
 import com.dsk.common.core.domain.R;
 import com.dsk.common.core.page.TableDataInfo;
 import com.dsk.common.utils.poi.ExcelUtil;
-import com.dsk.cscec.domain.DCustomer;
 import com.dsk.cscec.domain.bo.AdvisoryBodyBo;
 import com.dsk.cscec.domain.bo.CustomerInfoBo;
 import com.dsk.cscec.domain.vo.AdvisoryBodyVo;
+import com.dsk.cscec.domain.vo.CustomerApproveVo;
 import com.dsk.cscec.domain.vo.CustomerInfoVo;
 import com.dsk.cscec.service.ICustomerInfoService;
 import lombok.RequiredArgsConstructor;
@@ -17,7 +17,6 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
-import javax.validation.constraints.NotEmpty;
 import java.util.List;
 
 /**
@@ -64,9 +63,9 @@ public class CustomerInfoController extends BaseController {
     /**
      * 合作记录-供应商准入情况
      */
-    @GetMapping("/getByName/{name}")
-    public R<DCustomer> list(@NotEmpty(message = "企业名称不能为空") @PathVariable String name) {
-        return R.ok(iCustomerInfoService.queryByName(name));
+    @GetMapping("/getApproveInfo")
+    public R<CustomerApproveVo> getApproveInfo(CustomerInfoBo bo) {
+        return R.ok(iCustomerInfoService.queryApproveByBo(bo));
     }
 
 }

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/controller/DimAreaController.java

@@ -4,6 +4,7 @@ package com.dsk.cscec.controller;
 import com.dsk.common.core.controller.BaseController;
 import com.dsk.common.core.domain.R;
 import com.dsk.cscec.domain.vo.RegionVo;
+import com.dsk.cscec.domain.vo.RegionWithLevelVo;
 import com.dsk.cscec.service.IDimAreaService;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -39,7 +40,7 @@ public class DimAreaController extends BaseController {
      * 获取地区树(不含区域)
      */
     @GetMapping("/all/withoutRegion")
-    public R<List<RegionVo>> allAreaWithoutRegion(){
+    public R<List<RegionWithLevelVo>> allAreaWithoutRegion(){
         return R.ok(baseService.allAreaWithoutRegion());
     }
 }

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/AdvisoryBodyProject.java

+package com.dsk.cscec.domain;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author sxk
+ * @date 2023.12.15
+ * @time 15:58
+ */
+@Data
+public class AdvisoryBodyProject implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 项目主键
+     */
+    private Long projectKey;
+    /**
+     * 咨询机构ID
+     */
+    private Long advisoryBodyId;
+    /**
+     * 咨询机构cid(用于查询建设库数据)
+     */
+    private Integer advisoryBodyCid;
+    /**
+     * 合作时间
+     */
+    private Date cooperateTime;
+    /**
+     * 项目负责人
+     */
+    private String projectLeader;
+    /**
+     * 项目负责人专业
+     */
+    private String projectLeaderMajor;
+    /**
+     * 项目负责人联系电话
+     */
+    private String projectLeaderPhone;
+    /**
+     * 结算金额(万元)
+     */
+    private Double settleAmount;
+    /**
+     * 结算开始时间
+     */
+    private Date settleStartTime;
+    /**
+     * 结算完成时间
+     */
+    private Date settleFinishTime;
+    /**
+     * 是否为终审单位（0代表是 1代表否）
+     */
+    private String isFinalJudgeUnit;
+    /**
+     * 创建者
+     */
+    private String createBy;
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+    /**
+     * 更新者
+     */
+    private String updateBy;
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+}

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/DimArea.java

@@ -13,29 +13,29 @@ import lombok.Data;
 public class DimArea implements Serializable {
 
     private static final long serialVersionUID = 1L;
-    
-        private Integer areaKey;
-        private String areaCode;
-        private String areaName;
-        /**
+
+    private Integer areaKey;
+    private String areaCode;
+    private String areaName;
+    /**
      * 地区
      */
-        private String areaName1;
-        /**
+    private String areaName1;
+    /**
      * 省
      */
-        private String areaName2;
-        /**
+    private String areaName2;
+    /**
      * 省简写
      */
-        private String areaAbbrName2;
-        private String areaName3;
-        private Integer levelNo;
-        private String isleaf;
-        private String isvalid;
-        private String remark;
-        private String areaId;
-        private String parentId;
-        private String loadTime;
+    private String areaAbbrName2;
+    private String areaName3;
+    private Integer levelNo;
+    private String isleaf;
+    private String isvalid;
+    private String remark;
+    private String areaId;
+    private String parentId;
+    private String loadTime;
 }
 

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/bo/CustomerInfoBo.java

@@ -17,6 +17,14 @@ import java.util.List;
  */
 @Data
 public class CustomerInfoBo extends BaseEntity {
+    /**
+     * 客商主键
+     */
+    private Long customerKey;
+    /**
+     * 统一社会信用代码
+     */
+    private String unifySocialCode;
     /**
      * 供应商类别(分供,劳务分包,专业分包,租赁,劳务分包队伍)
      */

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/vo/CustomerApproveVo.java

+package com.dsk.cscec.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 供应商准入情况
+ *
+ * @author
+ * @since 2023-12-15
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class CustomerApproveVo {
+
+    /**
+     * 客商主键
+     */
+    private Long customerKey;
+    /**
+     * 供应商编号
+     */
+    private String customerCode;
+    /**
+     * 供应商名称
+     */
+    private String customerName;
+    /**
+     * 注册资金
+     */
+    private Double registerCapital;
+    /**
+     * 统一社会信用代码
+     */
+    private String unifySocialCode;
+    /**
+     * 工商注册号
+     */
+    private String registerNo;
+    /**
+     * 组织机构代码号
+     */
+    private String orgnizationCode;
+    /**
+     * 税务登记号
+     */
+    private String businessLicense;
+    /**
+     * 身份信息选择
+     */
+    private String cardType;
+    /**
+     * 身份证号
+     */
+    private String idCard;
+    /**
+     * 纳税人身份
+     */
+    private String paytaxType;
+    /**
+     * 纳税人税率
+     */
+    private String taxRate;
+    /**
+     * 法人代表
+     */
+    private String representative;
+    /**
+     * 联系人
+     */
+    private String contactPerson;
+    /**
+     * 联系电话
+     */
+    private String contactPhone;
+    /**
+     * 业主性质
+     */
+    private String ownerKind;
+    /**
+     * 资质等级
+     */
+    private String credential;
+    /**
+     * 施工承包范围
+     */
+    private String constructJobScope;
+    /**
+     * 专业类别id
+     */
+    private String groupSpecialtyId;
+    /**
+     * 集团专业类别
+     */
+    private String groupSpecialty;
+    /**
+     * 城市id
+     */
+    private String registerCityId;
+    /**
+     * 注册地区域
+     */
+    private String registerRegion;
+    /**
+     * 省份
+     */
+    private String registerProvince;
+    /**
+     * 城市
+     */
+    private String registerCity;
+    /**
+     * 企业注册地
+     */
+    private String registerAddress;
+    /**
+     * 开户行
+     */
+    private String openBank;
+    /**
+     * 银行账号
+     */
+    private String bankAccount;
+
+    /**
+     * 主营业务
+     */
+    private String primaryBusiness;
+    /**
+     * 税号
+     */
+    private String taxNumber;
+    /**
+     * 企业性质
+     */
+    private String customerProperty;
+
+    //证书信息
+    /**
+     * 营业执照到期时间1
+     */
+    private Date expireDate1;
+    /**
+     * 组织机构代码证到期时间2
+     */
+    private Date expireDate2;
+    /**
+     * 税务登记证到期时间3
+     */
+    private Date expireDate3;
+    /**
+     * 资质证书到期时间4
+     */
+    private Date expireDate4;
+    /**
+     * 安全生产许可证到期时间5
+     */
+    private Date expireDate5;
+    /**
+     * 施工队长资格证到期时间6
+     */
+    private String expireDate6;
+    /**
+     * 授权委托书到期时间7
+     */
+    private String expireDate7;
+    //审批意见
+    /**
+     * 经办人
+     */
+    private String responsiblePerson;
+    /**
+     * 经办人签字时间
+     */
+    private Date approveDate1;
+    /**
+     * 商务经理
+     */
+    private String businessManager;
+    /**
+     * 商务经理签字时间
+     */
+    private Date approveDate3;
+    /**
+     * 项目经理
+     */
+    private String projectManager;
+    /**
+     * 项目经理签字时间
+     */
+    private Date approveDate4;
+    /**
+     * 采购部门负责人/公司意见
+     */
+    private String purchasePrincipal;
+    /**
+     * 准入时间
+     */
+    private Date approveDate2;
+}
+

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/vo/RegionWithLevelVo.java

+package com.dsk.cscec.domain.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author sxk
+ * @Data 2023/12/13 14:14
+ */
+@Data
+public class RegionWithLevelVo {
+    String level;
+    String value;
+    List<RegionWithLevelVo> children;
+}

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/mapper/AdvisoryBodyProjectMapper.java

+package com.dsk.cscec.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dsk.cscec.domain.AdvisoryBodyProject;
+
+/**
+ * 咨询机构和项目关联表(AdvisoryBodyProject)表数据库访问层
+ *
+ * @author makejava
+ * @since 2023-12-15 15:57:54
+ */
+public interface AdvisoryBodyProjectMapper extends BaseMapper<AdvisoryBodyProject> {
+
+}
+

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/AdvisoryBodyProjectService.java

+package com.dsk.cscec.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.dsk.cscec.domain.AdvisoryBodyProject;
+
+/**
+ * 咨询机构和项目关联表(AdvisoryBodyProject)表服务接口
+ *
+ * @author makejava
+ * @since 2023-12-15 15:57:57
+ */
+public interface AdvisoryBodyProjectService extends IService<AdvisoryBodyProject> {
+
+}
+

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/ICustomerInfoService.java

@@ -7,6 +7,7 @@ import com.dsk.cscec.domain.DCustomer;
 import com.dsk.cscec.domain.bo.AdvisoryBodyBo;
 import com.dsk.cscec.domain.bo.CustomerInfoBo;
 import com.dsk.cscec.domain.vo.AdvisoryBodyVo;
+import com.dsk.cscec.domain.vo.CustomerApproveVo;
 import com.dsk.cscec.domain.vo.CustomerInfoVo;
 
 /**
@@ -19,7 +20,7 @@ public interface ICustomerInfoService extends IService<DCustomer> {
 
     TableDataInfo<CustomerInfoVo> queryPageList(CustomerInfoBo bo, PageQuery query);
 
-    DCustomer queryByName(String name);
+    CustomerApproveVo queryApproveByBo(CustomerInfoBo bo);
 
     TableDataInfo<AdvisoryBodyVo> queryAdvisoryList(AdvisoryBodyBo bo, PageQuery query);
 }

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/IDimAreaService.java

@@ -3,6 +3,7 @@ package com.dsk.cscec.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.dsk.cscec.domain.DimArea;
 import com.dsk.cscec.domain.vo.RegionVo;
+import com.dsk.cscec.domain.vo.RegionWithLevelVo;
 
 import java.util.List;
 
@@ -17,7 +18,7 @@ public interface IDimAreaService extends IService<DimArea> {
 
     List<RegionVo> allArea();
 
-    List<RegionVo> allAreaWithoutRegion();
+    List<RegionWithLevelVo> allAreaWithoutRegion();
 
 }
 

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/AdvisoryBodyProjectServiceImpl.java

+package com.dsk.cscec.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dsk.cscec.mapper.AdvisoryBodyProjectMapper;
+import com.dsk.cscec.domain.AdvisoryBodyProject;
+import com.dsk.cscec.service.AdvisoryBodyProjectService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 咨询机构和项目关联表(AdvisoryBodyProject)表服务实现类
+ *
+ * @author makejava
+ * @since 2023-12-15 15:57:57
+ */
+@Service("advisoryBodyProjectService")
+public class AdvisoryBodyProjectServiceImpl extends ServiceImpl<AdvisoryBodyProjectMapper, AdvisoryBodyProject> implements AdvisoryBodyProjectService {
+
+}
+

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/CustomerInfoServiceImpl.java

 package com.dsk.cscec.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.lang.Assert;
 import cn.hutool.core.map.MapUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -14,12 +16,14 @@ import com.dsk.cscec.domain.DCustomer;
 import com.dsk.cscec.domain.bo.AdvisoryBodyBo;
 import com.dsk.cscec.domain.bo.CustomerInfoBo;
 import com.dsk.cscec.domain.vo.AdvisoryBodyVo;
+import com.dsk.cscec.domain.vo.CustomerApproveVo;
 import com.dsk.cscec.domain.vo.CustomerInfoVo;
 import com.dsk.cscec.mapper.AdvisoryBodyMapper;
 import com.dsk.cscec.mapper.DCustomerMapper;
 import com.dsk.cscec.mapper.DSubcontractMapper;
 import com.dsk.cscec.service.ICustomerInfoService;
 import com.dsk.search.service.BusinessOpportunityRadarService;
+import jodd.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
@@ -76,12 +80,19 @@ public class CustomerInfoServiceImpl extends ServiceImpl<DCustomerMapper, DCusto
     }
 
     @Override
-    public DCustomer queryByName(String name) {
+    public CustomerApproveVo queryApproveByBo(CustomerInfoBo bo) {
+        if(ObjectUtil.isNull(bo.getCustomerKey()) && StringUtil.isBlank(bo.getCustomerName()) && StringUtil.isBlank(bo.getUnifySocialCode())){
+            Assert.isTrue(false,"参数不能为空");
+        }
         LambdaQueryWrapper<DCustomer> lqw = Wrappers.lambdaQuery();
-        lqw.eq(DCustomer::getCustomerName,name);
+        lqw.eq(ObjectUtil.isNotNull(bo.getCustomerKey()),DCustomer::getCustomerKey,bo.getCustomerKey());
+        lqw.eq(StringUtil.isNotBlank(bo.getUnifySocialCode()),DCustomer::getUnifySocialCode,bo.getUnifySocialCode());
+        lqw.eq(StringUtil.isNotBlank(bo.getCustomerName()),DCustomer::getCustomerName,bo.getCustomerName());
         lqw.orderByDesc(DCustomer::getApproveDate2);
         lqw.last("limit 1");
-        return baseMapper.selectOne(lqw);
+        DCustomer dCustomer = baseMapper.selectOne(lqw);
+        CustomerApproveVo vo = BeanUtil.toBean(dCustomer, CustomerApproveVo.class);
+        return vo;
     }
 
     @Override

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/DimAreaServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dsk.common.core.domain.entity.SysDictData;
 import com.dsk.cscec.domain.DimArea;
 import com.dsk.cscec.domain.vo.RegionVo;
+import com.dsk.cscec.domain.vo.RegionWithLevelVo;
 import com.dsk.cscec.mapper.DimAreaMapper;
 import com.dsk.cscec.service.IDimAreaService;
 import com.dsk.system.service.ISysDictTypeService;
@@ -77,8 +78,8 @@ public class DimAreaServiceImpl extends ServiceImpl<DimAreaMapper, DimArea> impl
     }
 
     @Override
-    public List<RegionVo> allAreaWithoutRegion() {
-        List<RegionVo> vos = new ArrayList<>();
+    public List<RegionWithLevelVo> allAreaWithoutRegion() {
+        List<RegionWithLevelVo> vos = new ArrayList<>();
         //区域
         List<SysDictData> sysDictData = sysDictTypeService.selectDictDataByType(AREA_TYPE);
         if(CollectionUtils.isNotEmpty(sysDictData)){
@@ -92,9 +93,10 @@ public class DimAreaServiceImpl extends ServiceImpl<DimAreaMapper, DimArea> impl
 
                 if(CollectionUtils.isNotEmpty(provinces)){
                     for (Object province : provinces) {
-                        RegionVo provinceVo = new RegionVo();
+                        RegionWithLevelVo provinceVo = new RegionWithLevelVo();
                         provinceVo.setValue(String.valueOf(province));
-                        List<RegionVo> cityVos = new ArrayList<>();
+                        provinceVo.setLevel("1");
+                        List<RegionWithLevelVo> cityVos = new ArrayList<>();
                         //市
                         List<Object> citys = baseMapper.selectObjs(Wrappers.<DimArea>lambdaQuery()
                                 .select(DimArea::getAreaName3)
@@ -103,8 +105,9 @@ public class DimAreaServiceImpl extends ServiceImpl<DimAreaMapper, DimArea> impl
                                 .groupBy(DimArea::getAreaName3));
                         if(CollectionUtils.isNotEmpty(citys)){
                             for (Object city : citys) {
-                                RegionVo cityVo = new RegionVo();
+                                RegionWithLevelVo cityVo = new RegionWithLevelVo();
                                 cityVo.setValue(String.valueOf(city));
+                                cityVo.setLevel("2");
                                 cityVos.add(cityVo);
                             }
                         }

dsk-module/dsk-biz-api/src/main/resources/mapper/cscec/AdvisoryBodyProjectMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dsk.cscec.mapper.AdvisoryBodyProjectMapper">
+
+</mapper>
\ No newline at end of file

dsk-operate-ui/.env.production

@@ -5,10 +5,10 @@ VUE_APP_TITLE = 数字化经营履约全生命链路管理系统
 ENV = 'production'
 
 # 数字化经营履约全生命链路管理系统/生产环境
-VUE_APP_BASE_API = 'https://szhapi.jiansheku.com'
+VUE_APP_BASE_API = 'http://111.204.34.146:9099/prod-api'
 
 # 子系统地址
-VUE_APP_SUB_SYSTEM_ADDRESS = "https://plug.jiansheku.com"
+#VUE_APP_SUB_SYSTEM_ADDRESS = "https://plug.jiansheku.com"
 
 # Bi大屏系统地址
-VUE_APP_BI_SYSTEM_ADDRESS = "https://192.168.60.104:8001"
+#VUE_APP_BI_SYSTEM_ADDRESS = "https://192.168.60.104:8001"

dsk-operate-ui/.env.staging

@@ -7,4 +7,4 @@ NODE_ENV = production
 ENV = 'staging'
 
 # 数字化经营履约全生命链路管理系统/测试环境
-VUE_APP_BASE_API = '/stage-api'
+VUE_APP_BASE_API = '/prod-api'

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

+import request from '@/utils/request';
+
+//获取地区树
+export function areaAll() {
+  return request({
+    url: '/area/all',
+    method: 'get',
+  });
+}
+//供应商总台账
+export function customerAll(param) {
+  return request({
+    url: '/customer/all/searchList',
+    data:param,
+    method: 'POSt',
+  });
+}
+//专业类别选项列表
+export function bizDictData() {
+  return request({
+    url: '/bizDictData/tree?type=0',
+    method: 'get',
+  });
+}
+//供应商管理分类列表
+export function custmerInfolist(param) {
+  return request({
+    url: '/customerInfo/list',
+    method: 'POST',
+    data: param
+  });
+}
+
+//供应商准入信息
+export function custmerInfo(param) {
+  return request({
+    url: '/customer/info/'+param,
+    method: 'get',
+  });
+}

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

@@ -148,6 +148,9 @@
       border-right: 1px solid #E6E9F0;
       border-bottom: 1px solid #E6E9F0;
       background: #fff;
+      &.bg{
+        background: #F9FCFF;
+      }
       .label {
         width: 10%;
         height: auto;
@@ -177,6 +180,24 @@
 
       }
 
+      .tab{
+        border-right: 1px solid #E6E9F0;
+      }
+      .tab:nth-child(1){
+        width: 20%;
+      }
+      .tab:nth-child(2){
+        width: 15%;
+      }
+      .tab:nth-child(3){
+        width: 10%;
+      }
+      .tab:nth-child(4){
+        width: 35%;
+      }
+      .tab:nth-child(5){
+        width: 20%;
+      }
     }
 
   }

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

@@ -115,13 +115,13 @@ service.interceptors.response.use(res => {
       });
     }
       return Promise.reject('无效的会话，或者会话已过期，请重新登录。')
-    } else if (code === 500 && apiList.includes(res.config.url)) {
+    } else if (code === 500) {
       Message({ message: msg, type: 'error' })
       return Promise.reject(new Error(msg))
-    } else if (code === 601 && apiList.includes(res.config.url)) {
+    } else if (code === 601) {
       Message({ message: msg, type: 'warning' })
       return Promise.reject('error')
-    } else if (code !== 200 && apiList.includes(res.config.url)) {
+    } else if (code !== 200) {
       Notification.error({ title: msg })
       return Promise.reject('error')
     } else {

dsk-operate-ui/src/views/login.vue

 <template>
   <div class="login">
-    <div class="content">
-      <div class="left">
-        <img class="logo" src="../assets/images/logo1.png" />
-        <img class="img" src="../assets/images/login/img.png" />
+    <div class="left">
+      <div class="bgimg">
+        <div class="p1">欢迎使用</div>
+        <div class="p2">大数据经营管理支撑服务平台</div>
       </div>
-      <!--快捷登录-->
-      <el-form v-if="!islog && !islang && isDXlogin" ref="dxform" :model="dxform" :rules="dxRules" class="login-form">
-        <div class="logintitle">
-          <div @click="isDXlogin = false">密码登录</div>
-          <div class="on" @click="isDXlogin = true">快捷登录</div>
-        </div>
-        <el-form-item prop="phonenumber">
-          <el-input
-            v-model="dxform.phonenumber"
-            type="text"
-            auto-complete="off"
-            placeholder="请输入手机号码"
-          >
-            <img class="img" slot="prefix" src="../assets/images/phone.png"/>
-          </el-input>
-        </el-form-item>
-        <el-form-item prop="captchaCode" v-if="captchaEnabled">
-          <el-input
-            v-model="dxform.captchaCode"
-            auto-complete="off"
-            placeholder="请输入图形验证码"
-            style="width: 196px;float: left;"
-          >
-            <img class="img" slot="prefix" src="../assets/images/txyzm.png"/>
-          </el-input>
-          <div class="login-code">
-            <img :src="codeUrl" @click="getCode" class="login-code-img"/>
-          </div>
-        </el-form-item>
-        <el-form-item prop="smsCode">
-          <el-input
-            v-model="dxform.smsCode"
-            auto-complete="off"
-            placeholder="请输入验证码"
-            style="width: 196px;float: left;"
-            @keyup.enter.native="dxLogin"
-          >
-            <img class="img" slot="prefix" src="../assets/images/validCode.png"/>
-          </el-input>
-          <div class="login-code">
-            <div class="hqyzm" @click="getsms" :class="{'disableds':smstitle!='获取验证码'&&smstitle!='重新获取'}">{{smstitle}}</div>
-          </div>
-        </el-form-item>
-        <el-form-item style="width:100%;margin-top: 42px">
-          <el-button
-            size="medium"
-            type="primary"
-            style="width:100%;height: 48px;border-radius: 4px;font-size: 16px;"
-            @click.native.prevent="dxLogin"
-          >
-            <span v-if="!loading">确认</span>
-            <span v-else>登 录 中...</span>
-          </el-button>
-        </el-form-item>
-      </el-form>
-      <!--密码登录-->
-      <el-form v-if="!islog && !islang && !isDXlogin" ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-        <div class="logintitle">
-          <div class="on" @click="isDXlogin = false">密码登录</div>
-          <div @click="isDXlogin = true">快捷登录</div>
-        </div>
+    </div>
+    <!--快捷登录-->
+    <!--<el-form v-if="!islog && !islang && isDXlogin" ref="dxform" :model="dxform" :rules="dxRules" class="login-form">-->
+      <!--<div class="logintitle">-->
+        <!--<div @click="isDXlogin = false">密码登录</div>-->
+        <!--<div class="on" @click="isDXlogin = true">快捷登录</div>-->
+      <!--</div>-->
+      <!--<el-form-item prop="phonenumber">-->
+        <!--<el-input-->
+          <!--v-model="dxform.phonenumber"-->
+          <!--type="text"-->
+          <!--auto-complete="off"-->
+          <!--placeholder="请输入手机号码"-->
+        <!--&gt;-->
+          <!--<img class="img" slot="prefix" src="../assets/images/phone.png"/>-->
+        <!--</el-input>-->
+      <!--</el-form-item>-->
+      <!--<el-form-item prop="captchaCode" v-if="captchaEnabled">-->
+        <!--<el-input-->
+          <!--v-model="dxform.captchaCode"-->
+          <!--auto-complete="off"-->
+          <!--placeholder="请输入图形验证码"-->
+          <!--style="width: 290px;float: left;"-->
+        <!--&gt;-->
+          <!--<img class="img" slot="prefix" src="../assets/images/txyzm.png"/>-->
+        <!--</el-input>-->
+        <!--<div class="login-code">-->
+          <!--<img :src="codeUrl" @click="getCode" class="login-code-img"/>-->
+        <!--</div>-->
+      <!--</el-form-item>-->
+      <!--<el-form-item prop="smsCode">-->
+        <!--<el-input-->
+          <!--v-model="dxform.smsCode"-->
+          <!--auto-complete="off"-->
+          <!--placeholder="请输入验证码"-->
+          <!--style="width: 290px;float: left;"-->
+          <!--@keyup.enter.native="dxLogin"-->
+        <!--&gt;-->
+          <!--<img class="img" slot="prefix" src="../assets/images/validCode.png"/>-->
+        <!--</el-input>-->
+        <!--<div class="login-code">-->
+          <!--<div class="hqyzm" @click="getsms" :class="{'disableds':smstitle!='获取验证码'&&smstitle!='重新获取'}">{{smstitle}}-->
+          <!--</div>-->
+        <!--</div>-->
+      <!--</el-form-item>-->
+      <!--<el-form-item style="width:100%;margin-top: 42px">-->
+        <!--<el-button-->
+          <!--size="medium"-->
+          <!--type="primary"-->
+          <!--style="width:100%;height: 48px;border-radius: 4px;font-size: 16px;"-->
+          <!--@click.native.prevent="dxLogin"-->
+        <!--&gt;-->
+          <!--<span v-if="!loading">确认</span>-->
+          <!--<span v-else>登 录 中...</span>-->
+        <!--</el-button>-->
+      <!--</el-form-item>-->
+    <!--</el-form>-->
+    <!--密码登录-->
+    <div class="rightlogtin">
+      <el-form v-if="!islog && !islang && !isDXlogin" ref="loginForm" :model="loginForm" :rules="loginRules"
+               class="login-form ">
+        <!--<div class="logintitle">-->
+          <!--<div class="on" @click="isDXlogin = false">密码登录</div>-->
+          <!--<div @click="isDXlogin = true">快捷登录</div>-->
+        <!--</div>-->
+        <div class="loginname"><img src="../assets/images/login/ztlogo.png">中建一局集团第二建筑有限公司</div>
         <el-form-item prop="username">
           <el-input
             v-model="loginForm.username"
@@ -92,7 +97,7 @@
             v-model="loginForm.code"
             auto-complete="off"
             placeholder="请输入图形验证码"
-            style="width: 196px;float: left;"
+            style="width: 290px;float: left;"
             @keyup.enter.native="handleLogin"
           >
             <img class="img" slot="prefix" src="../assets/images/txyzm.png"/>
@@ -113,6 +118,7 @@
             <span v-else>登 录 中...</span>
           </el-button>
         </el-form-item>
+        <div class="changepwd" @click="$message.warning('请联系企业管理员修改密码')">忘记密码</div>
       </el-form>
       <!--安全验证-->
       <el-form v-if="!islog && islang" ref="dxform" :model="dxform" :rules="dxRules" class="login-form">
@@ -133,7 +139,7 @@
             @focus="getCode"
             auto-complete="off"
             placeholder="请输入验证码"
-            style="width: 196px;float: left;"
+            style="width: 290px;float: left;"
           >
             <img class="img" slot="prefix" src="../assets/images/txyzm.png"/>
           </el-input>
@@ -146,13 +152,14 @@
             v-model="dxform.smsCode"
             auto-complete="off"
             placeholder="请输入验证码"
-            style="width: 196px;float: left;"
+            style="width: 290px;float: left;"
             @keyup.enter.native="dxLogin"
           >
             <img class="img" slot="prefix" src="../assets/images/validCode.png"/>
           </el-input>
           <div class="login-code">
-            <div class="hqyzm" @click="getsms" :class="{'disableds':smstitle!='获取验证码'&&smstitle!='重新获取'}">{{smstitle}}</div>
+            <div class="hqyzm" @click="getsms" :class="{'disableds':smstitle!='获取验证码'&&smstitle!='重新获取'}">{{smstitle}}
+            </div>
           </div>
         </el-form-item>
         <el-form-item style="width:100%;margin-top: 42px">
@@ -170,7 +177,9 @@
       <div v-if="islog" class="login-form choose-form">
         <h3 class="title i"><img src="../assets/images/login/title_choose.png"/>请选择你想要登录的企业</h3>
         <div class="enterpriselist">
-          <div class="entername" v-for="(item,index) of tenanlist"> <el-radio v-model="tenantId" :label="item.tenantId">{{item.companyName}}</el-radio></div>
+          <div class="entername" v-for="(item,index) of tenanlist">
+            <el-radio v-model="tenantId" :label="item.tenantId">{{item.companyName}}</el-radio>
+          </div>
         </div>
         <el-button class="goin" type="primary" :disabled="tenantId == -1" @click="tochose">立即进入</el-button>
       </div>
@@ -180,10 +189,18 @@
 
 <script>
   import store from '@/store'
-  import { changeTenants, defaultTenantid, getCodeImg, getTenants,userTenantList,logincaptchaSms,smsLogin} from '@/api/login'
+  import {
+    changeTenants,
+    defaultTenantid,
+    getCodeImg,
+    getTenants,
+    logincaptchaSms,
+    smsLogin,
+    userTenantList
+  } from '@/api/login'
   import { decrypt, encrypt } from '@/utils/jsencrypt'
-  import {Base64} from 'js-base64'
-  import { getTenantid, setTenantid,setToken } from '@/utils/auth'
+  import { Base64 } from 'js-base64'
+  import { getTenantid, setTenantid, setToken } from '@/utils/auth'
 
   export default {
   name: "Login",
@@ -392,30 +409,40 @@
 .login {
   align-items: center;
   height: 100%;
-  background-image: url("../assets/images/login_bg.png");
+  background-color: #fff;
   background-size: cover;
   overflow-y: hidden;
-  display: flex;
-  justify-content: center;
-  .content{
-    width: 1320px;
-    margin: 0 auto;
-    /*padding-top: 180px;*/
-  }
+  width: 100%;
+  min-width: 1200px;
   .left{
     float: left;
-    width: 730px;
+    width: 60%;
     /*margin-right: 170px;*/
+    height: 100%;
   }
-  .logo{
-    width: 253px;
-    height: 55px;
-    margin-bottom: 53px;
-    margin-left: 127px;
-  }
-  .img{
-    width: 662px;
-    height: 566px;
+  .bgimg{
+    width: 100%;
+    height: 100%;
+    background: url("../assets/images/login/img.png") no-repeat center;
+    background-size: cover;
+    padding-top: 10%;
+    padding-left: 14%;
+    .p1{
+      height: 36px;
+      font-size: 32px;
+      font-weight: 400;
+      color: #0081FF;
+      line-height: 36px;
+      margin-bottom: 24px;
+    }
+    .p2{
+      height: 48px;
+      font-size: 40px;
+      font-weight: 700;
+      color: #FFFFFF;
+      line-height: 48px;
+      letter-spacing: 3px;
+    }
   }
 }
 .title {
@@ -446,21 +473,45 @@
     }
   }
 }
-
+.rightlogtin{
+  width: 40%;
+  float: right;
+  height: 100%;
+  position: relative;
+  min-width: 420px;
+  .loginname{
+    line-height: 30px;
+    font-size: 22px;
+    font-weight: 900;
+    color: #232323;
+    height: 30px;
+    margin-bottom: 50px;
+    padding-left: 10px;
+    img{
+      width: 22px;
+      margin-right: 8px;
+      margin-top: 4px;
+      float: left;
+    }
+  }
+}
 .login-form {
   border-radius: 10px;
   background: #ffffff;
   width: 420px;
-  float: right;
-  margin-top: 70px;
-  padding-bottom: 72px;
+  margin: auto;
+  position: absolute;
+  margin-top: -200px;
+  top: 50%;
+  left: 50%;
+  margin-left: -210px;
   /*padding: 25px 25px 5px 25px;*/
   .el-form-item{
-    padding: 0 48px;
+    /*padding: 0 48px;*/
     margin-bottom:24px;
   }
   .el-input {
-    width: 324px;
+    width: 420px;
     height: 48px;
     background: #F2F4F9;
     border-radius: 4px;
@@ -513,13 +564,23 @@
     }
   }
 }
+.changepwd{
+  height: 12px;
+  font-size: 14px;
+  font-weight: 400;
+  color: rgba(35,35,35,0.4);
+  line-height: 12px;
+  margin-top: -4px;
+  text-align: center;
+  cursor: pointer;
+}
 .login-tip {
   font-size: 13px;
   text-align: center;
   color: #bfbfbf;
 }
 .login-code {
-  width: 33%;
+  width: 116px;
   height: 38px;
   float: left;
   margin-left: 14px;

dsk-operate-ui/src/views/supplier/supplierlist/access.vue

@@ -13,156 +13,198 @@
             <div class="main3-box">
               <p>
                 <label class="label">资源平台分类</label>
-                <span class="span-one">-</span>
+                <span></span>
+                <!--<span class="span-one">{{custmerInfo. || '&#45;&#45;'}}</span>-->
               </p>
               <p>
                 <label class="label">公司名称</label>
-                <span>555</span>
+                <span>{{custmerInfo.cusomerName || '--'}}</span>
                 <label class="label">注册资本（万元）</label>
-                <span>555</span>
+                <span>{{custmerInfo.registerCapital || '--'}}</span>
               </p>
               <p>
                 <label class="label">证件选择</label>
-                <span>555</span>
+                <span></span>
                 <label class="label">统一社会信用代码</label>
-                <span>555</span>
+                <span>{{custmerInfo.unifySocialCode || '--'}}</span>
               </p>
               <p>
                 <label class="label">工商注册号</label>
-                <span>555</span>
+                <span>{{custmerInfo.registerNo || '--'}}</span>
                 <label class="label">组织机构代码证号</label>
-                <span>555</span>
+                <span>{{custmerInfo.orgnizationCode || '--'}}</span>
               </p>
               <p>
                 <label class="label">税务登记号</label>
-                <span class="span-one">-</span>
+                <span>{{custmerInfo.businessLicense || '--'}}</span>
               </p>
               <p>
                 <label class="label">身份选择</label>
-                <span>555</span>
+                <span>{{custmerInfo.cardType || '--'}}</span>
                 <label class="label">法人身份证号/护照/其他</label>
-                <span>555</span>
+                <span>{{custmerInfo.idCard || '--'}}</span>
               </p>
               <p>
                 <label class="label">纳税人身份</label>
-                <span>555</span>
+                <span>{{custmerInfo.paytaxType || '--'}}</span>
                 <label class="label">纳税人税率</label>
-                <span>555</span>
+                <span>{{custmerInfo.taxRate || '--'}}</span>
               </p>
               <p>
                 <label class="label">享受优惠政策说明</label>
-                <span class="span-one" style="height: 64px">-</span>
+                <span class="span-one" style="height: 64px"></span>
               </p>
             </div>
             <div class="main3-box">
               <p>
                 <label class="label">法人代表</label>
-                <span>555</span>
+                <span>{{custmerInfo.representative || '--'}}</span>
                 <label class="label">公司联系人</label>
-                <span>555</span>
+                <span>{{custmerInfo.contactPerson || '--'}}</span>
               </p>
               <p>
                 <label class="label">公司联系人电话</label>
-                <span>555</span>
+                <span>{{custmerInfo.contactPhone || '--'}}</span>
                 <label class="label">主项资质</label>
-                <span>555</span>
+                <span></span>
               </p>
               <p>
                 <label class="label">公司性质</label>
-                <span>555</span>
+                <span></span>
                 <label class="label">资质等级</label>
-                <span>555</span>
+                <span>{{custmerInfo.credential || '--'}}</span>
               </p>
               <p>
                 <label class="label">施工承包范围</label>
-                <span>555</span>
+                <span>{{custmerInfo.constructJobScope || '--'}}</span>
                 <label class="label">专业类别</label>
-                <span>555</span>
+                <span>{{custmerInfo.groupSpecialty || '--'}}</span>
               </p>
               <p>
                 <label class="label">公司注册地所属区域</label>
-                <span>555</span>
+                <span>{{custmerInfo.registerRegion || '--'}}</span>
                 <label class="label">公司注册地所属省</label>
-                <span>555</span>
+                <span>{{custmerInfo.registerProvince || '--'}}</span>
               </p>
               <p>
                 <label class="label">公司注册地所属城市</label>
-                <span>555</span>
+                <span>{{custmerInfo.registerCity || '--'}}</span>
                 <label class="label">注册地址</label>
-                <span>555</span>
+                <span>{{custmerInfo.address || '--'}}</span>
               </p>
               <p>
                 <label class="label">开户行</label>
-                <span>555</span>
+                <span>{{custmerInfo.openBank || '--'}}</span>
                 <label class="label">银行账号</label>
-                <span>555</span>
+                <span>{{custmerInfo.bankAccount || '--'}}</span>
               </p>
             </div>
             <div class="acc-title i">上传证书及其他信息</div>
             <skeleton v-if="fbsisSkeleton"></skeleton>
-
-            <div class="table-item-jf table-item" style="margin-top: 16px" v-if="!fbsisSkeleton&&tableData.length>0">
-              <el-table :data="tableData" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}"
-                        v-sticky-header.always="{offsetTop : '-16px',offsetBottom : '10px'}" class="table-item1 fixed-table" border highlight-current-row>
-                <el-table-column label="证书类型" :resizable="false">
-                  <template slot-scope="scope">
-                    <span>{{scope.row.legalPerson||'--'}}</span>
-                  </template>
-                </el-table-column>
-                <el-table-column label="到期时间" width="120" :resizable="false">
-                  <template slot-scope="scope">
-                    <span>2020-12-30</span>
-                  </template>
-                </el-table-column>
-                <el-table-column label="状态" width="180" :resizable="false">
-                  <template slot-scope="scope">
-                    <span>{{scope.row.legalPerson||'--'}}</span>
-                  </template>
-                </el-table-column>
-                <el-table-column label="查看" :resizable="false">
-                  <template slot-scope="scope">
-                    <span class="wordprimary">{{scope.row.legalPerson||'--'}}</span>
-                  </template>
-                </el-table-column>
-                <el-table-column label="操作" width="180" :resizable="false">
-                  <template slot-scope="scope">
-                    <span class="wordprimary">下载</span>
-                  </template>
-                </el-table-column>
-              </el-table>
+            <div class="main3-box">
+              <p>
+                <label class="label tab">证书类型</label>
+                <label class="label tab">到期时间</label>
+                <label class="label tab">状态</label>
+                <label class="label tab">查看</label>
+                <label class="label tab">操作</label>
+              </p>
+              <p>
+                <span class="tab">营业执照</span>
+                <span class="tab">{{custmerInfo.expireDate1 || '--'}}</span>
+                <span class="tab">{{custmerInfo.status1}}</span>
+                <span class="tab blue"></span>
+                <span class="tab blue">下载</span>
+              </p>
+              <p class="bg">
+                <span class="tab">组织机构代码</span>
+                <span class="tab">{{custmerInfo.expireDate2 || '--'}}</span>
+                <span class="tab">{{custmerInfo.status2}}</span>
+                <span class="tab blue"></span>
+                <span class="tab blue">下载</span>
+              </p>
+              <p>
+                <span class="tab">税务登记证</span>
+                <span class="tab">{{custmerInfo.expireDate3 || '--'}}</span>
+                <span class="tab">{{custmerInfo.status3}}</span>
+                <span class="tab blue"></span>
+                <span class="tab blue">下载</span>
+              </p>
+              <p class="bg">
+                <span class="tab">资质证书</span>
+                <span class="tab">{{custmerInfo.expireDate4 || '--'}}</span>
+                <span class="tab">{{custmerInfo.status4}}</span>
+                <span class="tab blue"></span>
+                <span class="tab blue">下载</span>
+              </p>
+              <p>
+                <span class="tab">安全生产</span>
+                <span class="tab">{{custmerInfo.expireDate5 || '--'}}</span>
+                <span class="tab">{{custmerInfo.status5}}</span>
+                <span class="tab blue"></span>
+                <span class="tab blue">下载</span>
+              </p>
+              <p class="bg">
+                <span class="tab">增值税一般纳税人资格证明</span>
+                <span class="tab">--</span>
+                <span class="tab">--</span>
+                <span class="tab">--</span>
+                <span class="tab">--</span>
+              </p>
+              <p>
+                <span class="tab">业绩报告</span>
+                <span class="tab">--</span>
+                <span class="tab">--</span>
+                <span class="tab">--</span>
+                <span class="tab">--</span>
+              </p>
+              <p class="bg">
+                <span class="tab">考察报告</span>
+                <span class="tab">--</span>
+                <span class="tab">--</span>
+                <span class="tab">--</span>
+                <span class="tab">--</span>
+              </p>
+              <p>
+                <span class="tab">其他</span>
+                <span class="tab">--</span>
+                <span class="tab">--</span>
+                <span class="tab">--</span>
+                <span class="tab">--</span>
+              </p>
             </div>
             <div class="acc-title i">项目部意见</div>
             <div class="main3-box">
               <p>
                 <label class="label">准入情况</label>
-                <span class="span-one">-</span>
+                <span>{{custmerInfo.isagree || '--'}}</span>
               </p>
               <p>
                 <label class="label">经办人</label>
-                <span>555</span>
+                <span>{{custmerInfo.responsiblePerson || '--'}}</span>
                 <label class="label">准入时间</label>
-                <span>555</span>
+                <span>{{custmerInfo.approveDate1 || '--'}}</span>
               </p>
               <p>
                 <label class="label">商务经理</label>
-                <span>555</span>
+                <span>{{custmerInfo.businessManager || '--'}}</span>
                 <label class="label">准入时间</label>
-                <span>555</span>
+                <span>{{custmerInfo.approveDate3 || '--'}}</span>
               </p>
               <p>
                 <label class="label">项目经理</label>
-                <span>555</span>
+                <span>{{custmerInfo.projectManager || '--'}}</span>
                 <label class="label">准入时间</label>
-                <span>555</span>
+                <span>{{custmerInfo.approveDate4 || '--'}}</span>
               </p>
             </div>
             <div class="acc-title i">公司意见</div>
             <div class="main3-box">
               <p>
                 <label class="label">公司意见</label>
-                <span>555</span>
+                <span>{{custmerInfo.purchasePrincipal || '--'}}</span>
                 <label class="label">准入时间</label>
-                <span>555</span>
+                <span>{{custmerInfo.approveDate2||'--'}}</span>
               </p>
             </div>
           </el-tab-pane>
@@ -324,10 +366,11 @@
 </template>
 
 <script>
-  import { encodeStr } from "@/assets/js/common.js";
+  import { encodeStr } from '@/assets/js/common.js'
   import '@/assets/styles/public.scss'
   import '@/assets/styles/supplierlist.scss'
-  import skeleton from '@/views/project/projectList/component/skeleton';
+  import skeleton from '@/views/project/projectList/component/skeleton'
+  import { custmerInfo } from '@/api/supplier/supplier'
 
   export default {
     name: 'access',
@@ -344,9 +387,30 @@
         pageNum:1,
         // table列是否悬浮
         tableColumnFixed: true,
+        custmerInfo:{},
       }
     },
     created() {
+      custmerInfo(this.$route.query.customerKey).then(res=>{
+        console.log(res)
+        this.custmerInfo = res.data
+        let date = new Date().getTime()
+        let d1 =  new Date(this.custmerInfo.expireDate1).getTime()
+        let d2 =  new Date(this.custmerInfo.expireDate2).getTime()
+        let d3 =  new Date(this.custmerInfo.expireDate3).getTime()
+        let d4 =  new Date(this.custmerInfo.expireDate4).getTime()
+        let d5 =  new Date(this.custmerInfo.expireDate5).getTime()
+        this.custmerInfo.status1 = '--'
+        this.custmerInfo.status2 = '--'
+        this.custmerInfo.status3 = '--'
+        this.custmerInfo.status4 = '--'
+        this.custmerInfo.status5 = '--'
+        if (d1) this.custmerInfo.status1 = d1 > date ? '有效' : '过期'
+        if (d2) this.custmerInfo.status2 = d2 > date ? '有效' : '过期'
+        if (d3) this.custmerInfo.status3 = d3 > date ? '有效' : '过期'
+        if (d4) this.custmerInfo.status4 = d4 > date ? '有效' : '过期'
+        if (d5) this.custmerInfo.status5 = d5>date?'有效':'过期'
+      })
     },
     methods:{
       handleClick(){},

dsk-operate-ui/src/views/supplier/supplierlist/laborSubcontracting.vue

@@ -9,60 +9,53 @@
       <div class="content-supplier">
         <el-form :model="formdata" label-width="82px" label-position="right"  :inline="true" >
           <el-row>
-            <el-form-item label="供应商名称">
-              <el-input v-model="formdata.user" placeholder="请输入分供方名称"></el-input>
-            </el-form-item>
-            <el-form-item label="注册地区">
-              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
-                <el-option v-for="(item,index) in arealist" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
-              </el-select>
+            <el-form-item label="分供方名称">
+              <el-input v-model="formdata.customerName" placeholder="请输入分供方名称"></el-input>
             </el-form-item>
             <el-form-item label="注册城市">
               <el-cascader
-                v-model="formdata.user"
-                :options="addressList" :collapse-tags="true"
+                v-model="formdata.areas"
+                :options="addressList" :collapse-tags="true" :show-all-levels="false" clearable
                 :props="provienceprops"></el-cascader>
             </el-form-item>
-          </el-row>
-          <el-row>
             <el-form-item label="供应商状态">
-              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+              <el-select v-model="formdata.customerState" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in customstate" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
+          </el-row>
+          <el-row>
             <el-form-item label="资质等级">
-              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+              <el-select v-model="formdata.credential" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in credential" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="专业类别">
-              <el-select v-model="formdata.user" placeholder="请选择">
-                <el-option label="区域一" value="shanghai"></el-option>
-                <el-option label="区域二" value="beijing"></el-option>
-              </el-select>
+              <el-cascader clearable
+                           v-model="formdata.groupSpecialtys"
+                           :options="groupSpecialty" :collapse-tags="true"
+                           :props="groupprops"></el-cascader>
             </el-form-item>
-          </el-row>
-          <el-row>
             <el-form-item label="评价等级">
-              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+              <el-select v-model="formdata.creditLevel" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in creditlevel" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
+          </el-row>
+          <el-row>
             <el-form-item label="纳税人身份">
-              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+              <el-select v-model="formdata.paytaxType" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in paytaxtype" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="纳税人税率">
-              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+              <el-select v-model="formdata.taxRate" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in taxrate" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
-          </el-row>
-          <el-row>
             <el-form-item label="准入时间">
               <el-date-picker
-                v-model="formdata.time"
+                v-model="formdata.times"
                 type="daterange"
                 value-format="yyyy-MM-dd"
                 range-separator="至"
@@ -73,8 +66,8 @@
           </el-row>
           <el-divider></el-divider>
           <el-form-item label="  ">
-            <el-button type="primary" size="small">查询</el-button>
-            <el-button size="small">重置</el-button>
+            <el-button type="primary" size="small" @click="handleCurrentChange(1)">查询</el-button>
+            <el-button size="small" @click="clears">重置</el-button>
           </el-form-item>
         </el-form>
       </div>
@@ -83,6 +76,11 @@
       <div class="total-title">
         <div class="totals">共{{total}}条</div>
       </div>
+      <div class="table-item-jf table-item-jf1 empty-table" v-if="total == 0 && !isSkeleton">
+        <img class="item-jf-img" src="@/assets/images/kong.png" alt="">
+        <div class="item-jf-titel">暂无相关数据</div>
+        <div class="item-jf-text">抱歉，暂无数据，试试更换搜索条件吧</div>
+      </div>
       <skeleton v-if="isSkeleton"></skeleton>
 
       <div class="table-item-jf table-item" v-if="!isSkeleton&&tableData.length>0">
@@ -93,18 +91,23 @@
 
           <el-table-column type="index" label="序号" :fixed="tableColumnFixed" width="60" :resizable="false">
             <template slot-scope="scope">
-              <span>{{(pageNum - 1) *pageSize + scope.$index + 1}}</span>
+              <span>{{(formdata.pageNum - 1) *formdata.pageSize + scope.$index + 1}}</span>
             </template>
           </el-table-column>
-          <el-table-column label="供应商编号" :fixed="tableColumnFixed" width="120" :resizable="false">
+          <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>
 
           <el-table-column label="供应商名称" :fixed="tableColumnFixed" width="380" :resizable="false">
             <template slot-scope="scope">
               <div class="renling">
                 <div style="display:flex;align-items:center">
-                  <router-link :to="`/enterprise/${encodeStr(scope.row.id)}`" tag="a"
-                               class="wordprimary" v-html="scope.row.name"></router-link>
+                  <router-link :to="`/enterprise/${encodeStr(scope.row.companyId)}`" tag="a"
+                               class="wordprimary" v-html="scope.row.customerName"></router-link>
                 </div>
               </div>
 
@@ -114,87 +117,87 @@
 
           <el-table-column label="推荐单位" min-width="280">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.recommendOrg||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="公司注册区域" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.registerRegion||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="公司注册省" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.registerProvince||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="公司注册城市" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.registerCity||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="专业类别" min-width="85" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.groupSpecialty||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="法人代表" min-width="85" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.representative||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="纳税人身份" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.paytaxType||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="纳税人税率" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.taxRate||"--"}}
             </template>
           </el-table-column>
-          <el-table-column label="施工承包范围" min-width="200" :resizable="false">
+          <el-table-column label="施工承包范围" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.constructJobScope||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="资质等级" min-width="85" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.credential||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="注册资本(万元)" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.registerCapital||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="公司联系人" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.contactPerson||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="联系人电话" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.contactPhone||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="准入时间" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.approveDate2||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="公司合作数量" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.enterpriseCooperationCount||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="合作项目数量" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              <span>{{scope.row.legalPerson||"--"}}</span>
+              <span>{{scope.row.projectCooperationCount||"--"}}</span>
             </template>
           </el-table-column>
           <el-table-column label="分包商等级" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              <span class="wordprimary" @click="getFBS(scope.row)">{{scope.row.legalPerson||"--"}}</span>
+              <span class="wordprimary" @click="getFBS(scope.row)">{{scope.row.creditLevel||"--"}}</span>
             </template>
           </el-table-column>
           <el-table-column label="链接" min-width="160" :resizable="false">
@@ -205,14 +208,14 @@
           </el-table-column>
           <el-table-column label="资源平台分类" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              --
             </template>
           </el-table-column>
 
         </el-table>
       </div>
       <div class="pagination clearfix" v-show="total>0">
-        <el-pagination background :page-size="pageSize" :current-page.sync="pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
+        <el-pagination background :page-size="formdata.pageSize" :current-page.sync="formdata.pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
                        :total="total">
         </el-pagination>
       </div>
@@ -260,20 +263,19 @@
 </template>
 
 <script>
-  import { encodeStr } from "@/assets/js/common.js";
-  import "@/assets/styles/public.scss";
-  import "@/assets/styles/supplierlist.scss";
-  import skeleton from '@/views/project/projectList/component/skeleton';
-  import api from '@/api/enterpriseData/enterpriseData.js';
-  import dataRegion from '@/assets/json/provinceTree'
-  import { getDicts } from "@/api/system/dict/data";
+  import { encodeStr } from '@/assets/js/common.js'
+  import '@/assets/styles/public.scss'
+  import '@/assets/styles/supplierlist.scss'
+  import skeleton from '@/views/project/projectList/component/skeleton'
+  import { areaAll, bizDictData, custmerInfolist } from '@/api/supplier/supplier'
+  import { getDicts } from '@/api/system/dict/data'
+  import {queryConditionFiltering} from '@/utils/index'
   export default {
     name: 'laborSubcontracting',
     components:{skeleton},
     data(){
       return{
         encodeStr,
-        formdata:{},
         addressList:[],
         arealist:[],
         creditlevel:[],
@@ -281,215 +283,39 @@
         credential:[],
         paytaxtype:[],
         taxrate:[],
+        groupSpecialty:[],
         provienceprops:{
-          checkStrictly:true,
+          checkStrictly:false,
+          multiple:true,
+          label:'value',
+        },
+        groupprops:{
+          checkStrictly:false,
           multiple:true,
           value:'id',
         },
-        options: [
-          {
-            value: 'zhinan',
-            label: '指南',
-            children: [{
-              value: 'shejiyuanze',
-              label: '设计原则',
-              children: [{
-                value: 'yizhi',
-                label: '一致'
-              }, {
-                value: 'fankui',
-                label: '反馈'
-              }, {
-                value: 'xiaolv',
-                label: '效率'
-              }, {
-                value: 'kekong',
-                label: '可控'
-              }]
-            }, {
-              value: 'daohang',
-              label: '导航',
-              children: [{
-                value: 'cexiangdaohang',
-                label: '侧向导航'
-              }, {
-                value: 'dingbudaohang',
-                label: '顶部导航'
-              }]
-            }]
-          }, {
-            value: 'zujian',
-            label: '组件',
-            children: [{
-              value: 'basic',
-              label: 'Basic',
-              children: [{
-                value: 'layout',
-                label: 'Layout 布局'
-              }, {
-                value: 'color',
-                label: 'Color 色彩'
-              }, {
-                value: 'typography',
-                label: 'Typography 字体'
-              }, {
-                value: 'icon',
-                label: 'Icon 图标'
-              }, {
-                value: 'button',
-                label: 'Button 按钮'
-              }]
-            }, {
-              value: 'form',
-              label: 'Form',
-              children: [{
-                value: 'radio',
-                label: 'Radio 单选框'
-              }, {
-                value: 'checkbox',
-                label: 'Checkbox 多选框'
-              }, {
-                value: 'input',
-                label: 'Input 输入框'
-              }, {
-                value: 'input-number',
-                label: 'InputNumber 计数器'
-              }, {
-                value: 'select',
-                label: 'Select 选择器'
-              }, {
-                value: 'cascader',
-                label: 'Cascader 级联选择器'
-              }, {
-                value: 'switch',
-                label: 'Switch 开关'
-              }, {
-                value: 'slider',
-                label: 'Slider 滑块'
-              }, {
-                value: 'time-picker',
-                label: 'TimePicker 时间选择器'
-              }, {
-                value: 'date-picker',
-                label: 'DatePicker 日期选择器'
-              }, {
-                value: 'datetime-picker',
-                label: 'DateTimePicker 日期时间选择器'
-              }, {
-                value: 'upload',
-                label: 'Upload 上传'
-              }, {
-                value: 'rate',
-                label: 'Rate 评分'
-              }, {
-                value: 'form',
-                label: 'Form 表单'
-              }]
-            }, {
-              value: 'data',
-              label: 'Data',
-              children: [{
-                value: 'table',
-                label: 'Table 表格'
-              }, {
-                value: 'tag',
-                label: 'Tag 标签'
-              }, {
-                value: 'progress',
-                label: 'Progress 进度条'
-              }, {
-                value: 'tree',
-                label: 'Tree 树形控件'
-              }, {
-                value: 'pagination',
-                label: 'Pagination 分页'
-              }, {
-                value: 'badge',
-                label: 'Badge 标记'
-              }]
-            }, {
-              value: 'notice',
-              label: 'Notice',
-              children: [{
-                value: 'alert',
-                label: 'Alert 警告'
-              }, {
-                value: 'loading',
-                label: 'Loading 加载'
-              }, {
-                value: 'message',
-                label: 'Message 消息提示'
-              }, {
-                value: 'message-box',
-                label: 'MessageBox 弹框'
-              }, {
-                value: 'notification',
-                label: 'Notification 通知'
-              }]
-            }, {
-              value: 'navigation',
-              label: 'Navigation',
-              children: [{
-                value: 'menu',
-                label: 'NavMenu 导航菜单'
-              }, {
-                value: 'tabs',
-                label: 'Tabs 标签页'
-              }, {
-                value: 'breadcrumb',
-                label: 'Breadcrumb 面包屑'
-              }, {
-                value: 'dropdown',
-                label: 'Dropdown 下拉菜单'
-              }, {
-                value: 'steps',
-                label: 'Steps 步骤条'
-              }]
-            }, {
-              value: 'others',
-              label: 'Others',
-              children: [{
-                value: 'dialog',
-                label: 'Dialog 对话框'
-              }, {
-                value: 'tooltip',
-                label: 'Tooltip 文字提示'
-              }, {
-                value: 'popover',
-                label: 'Popover 弹出框'
-              }, {
-                value: 'card',
-                label: 'Card 卡片'
-              }, {
-                value: 'carousel',
-                label: 'Carousel 走马灯'
-              }, {
-                value: 'collapse',
-                label: 'Collapse 折叠面板'
-              }]
-            }]
-          }, {
-            value: 'ziyuan',
-            label: '资源',
-            children: [{
-              value: 'axure',
-              label: 'Axure Components'
-            }, {
-              value: 'sketch',
-              label: 'Sketch Templates'
-            }, {
-              value: 'jiaohu',
-              label: '组件交互文档'
-            }]
-          }
-        ],
-        tableData:[
-          {name:'测试',legalPerson:'AAAA'}
-        ],
+        formdata:{
+          customerClass:'劳务分包',
+          pageNum:1,
+          pageSize:50,
+          times:[],
+          customerName:"",
+          areas:[],
+          customerState:[],
+          credential:[],
+          groupSpecialtys:[],
+          groupSpecialtyId:[],
+          creditLevel:[],
+          paytaxType:[],
+          taxRate:[],
+          registerProvince:[],
+          registerCity:[],
+          approveDate2Start:null,
+          approveDate2End:null,
+        },
+        tableData:[],
         isSkeleton:false,
-        total:100,
-        pageSize:50,
-        pageNum:1,
+        total:0,
         // table列是否悬浮
         tableColumnFixed: true,
         fbsvisib:false,
@@ -498,13 +324,10 @@
     },
     created() {
       this.init()
+      this.cusoomerInfolist()
     },
     methods:{
       init(){
-        //地区
-        getDicts('arealist').then(res=>{
-          this.arealist = res.data
-        })
         //评价等级
         getDicts('credit_level').then(res=>{
           this.creditlevel = res.data
@@ -525,24 +348,81 @@
         getDicts('credential').then(res=>{
           this.credential = res.data
         })
-        this.dataRegion()
+        // this.dataRegion()
+        //专业类别
+        bizDictData().then(res=>{
+          this.groupSpecialty = res.data
+        })
+        // 地区树
+        areaAll().then(res=>{
+          this.addressList = res.data
+        })
       },
-      handleCurrentChange(){
-
+      clears(){
+        this.formdata = {
+          customerClass: '劳务分包',
+          pageNum: 1,
+          pageSize: 50,
+          times: [],
+          customerName: '',
+          areas: [],
+          customerState: [],
+          credential: [],
+          groupSpecialtys: [],
+          groupSpecialtyId: [],
+          creditLevel: [],
+          paytaxType: [],
+          taxRate: [],
+          registerProvince: [],
+          registerCity: [],
+          approveDate2Start: null,
+          approveDate2End: null
+        }
+        this.cusoomerInfolist()
       },
-      //地区
-      async dataRegion() {
-        let addrs = JSON.parse(JSON.stringify(dataRegion))
-        addrs.forEach(item=>{
-          if (item.children) {
-            (item.children).forEach(i => {
-              if (i.children) {
-                delete i.children
+      cusoomerInfolist(){
+        this.isSkeleton = true
+        let param = this.formdata
+        if(param.times){
+          param.approveDate2Start = param.times[0]
+          param.approveDate2End = param.times[1]
+        }else{
+          param.approveDate2Start = ''
+          param.approveDate2End = ''
+        }
+        param.groupSpecialtyId = []
+        if(param.groupSpecialtys){
+          param.groupSpecialtys.forEach(item=>{
+            param.groupSpecialtyId.push(item[item.length-1])
+          })
+        }
+        if(param.areas){
+          let province = []
+          let city = []
+          param.areas.forEach(item=>{
+            if(item.length == 3){//到市
+              if(item[1].indexOf('重庆')>-1||item[1].indexOf('北京')>-1||item[1].indexOf('天津')>-1||item[1].indexOf('上海')>-1){
+                province.push(item[1])
+              }else{
+                city.push(item[2])
               }
-            })
-          }
+            }
+          })
+          param.registerProvince = province
+          param.registerCity = city
+        }else{
+          param.registerProvince = []
+          param.registerCity = []
+        }
+        custmerInfolist(queryConditionFiltering(this.formdata)).then(res=>{
+          this.isSkeleton = false
+          this.tableData = res.rows
+          this.total = res.total
         })
-        this.addressList = addrs;
+      },
+      handleCurrentChange(val){
+        this.formdata.pageNum = val
+        this.cusoomerInfolist()
       },
       setHeaderRow() {
         return "owner-table-list-header";
@@ -562,7 +442,7 @@
       },
       //点击准入
       goAccess(row){
-        this.$tab.openPage('测试一下-准入情况', '/supplier/supplierlist/access')
+        this.$tab.openPage(row.customerName+'-准入情况', '/supplier/supplierlist/access',{customerKey:row.customerKey})
       },
       //点击考评
       goAssessment(row){
@@ -575,5 +455,3 @@
 <style scoped lang="scss">
 </style>
 
-
-

dsk-operate-ui/src/views/supplier/supplierlist/laborSubcontractingTeam.vue

@@ -10,62 +10,57 @@
         <el-form :model="formdata" label-width="82px" label-position="right"  :inline="true" >
           <el-row>
             <el-form-item label="供应商名称">
-              <el-input v-model="formdata.user" placeholder="请输入分供方名称"></el-input>
+              <el-input v-model="formdata.customerName" placeholder="请输入供应商名称"></el-input>
             </el-form-item>
             <el-form-item label="劳务队长">
-              <el-input v-model="formdata.user" placeholder="请输入劳务队长"></el-input>
+              <el-input v-model="formdata.leaderName" placeholder="请输入劳务队长"></el-input>
             </el-form-item>
-            <el-form-item label="注册地区">
-              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
-                <el-option v-for="(item,index) in arealist" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-row>
-          <el-row>
             <el-form-item label="注册城市">
               <el-cascader
-                v-model="formdata.user"
-                :options="addressList" :collapse-tags="true"
+                v-model="formdata.areas"
+                :options="addressList" :collapse-tags="true" :show-all-levels="false" clearable
                 :props="provienceprops"></el-cascader>
             </el-form-item>
+          </el-row>
+          <el-row>
             <el-form-item label="供应商状态">
-              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+              <el-select v-model="formdata.customerState" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in customstate" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="资质等级">
-              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+              <el-select v-model="formdata.credential" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in credential" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
-          </el-row>
-          <el-row>
             <el-form-item label="专业类别">
-              <el-select v-model="formdata.user" placeholder="请选择">
-                <el-option label="区域一" value="shanghai"></el-option>
-                <el-option label="区域二" value="beijing"></el-option>
-              </el-select>
+              <el-cascader clearable
+                           v-model="formdata.groupSpecialtys"
+                           :options="groupSpecialty" :collapse-tags="true"
+                           :props="groupprops"></el-cascader>
             </el-form-item>
+          </el-row>
+          <el-row>
             <el-form-item label="评价等级">
-              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+              <el-select v-model="formdata.creditLevel" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in creditlevel" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="纳税人身份">
-              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+              <el-select v-model="formdata.paytaxType" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in paytaxtype" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
-          </el-row>
-          <el-row>
             <el-form-item label="纳税人税率">
-              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+              <el-select v-model="formdata.taxRate" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in taxrate" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
+          </el-row>
+          <el-row>
             <el-form-item label="准入时间">
               <el-date-picker
-                v-model="formdata.time"
+                v-model="formdata.times"
                 type="daterange"
                 value-format="yyyy-MM-dd"
                 range-separator="至"
@@ -76,8 +71,8 @@
           </el-row>
           <el-divider></el-divider>
           <el-form-item label="  ">
-            <el-button type="primary" size="small">查询</el-button>
-            <el-button size="small">重置</el-button>
+            <el-button type="primary" size="small" @click="handleCurrentChange(1)">查询</el-button>
+            <el-button size="small" @click="clears">重置</el-button>
           </el-form-item>
         </el-form>
       </div>
@@ -86,6 +81,11 @@
       <div class="total-title">
         <div class="totals">共{{total}}条</div>
       </div>
+      <div class="table-item-jf table-item-jf1 empty-table" v-if="total == 0 && !isSkeleton">
+        <img class="item-jf-img" src="@/assets/images/kong.png" alt="">
+        <div class="item-jf-titel">暂无相关数据</div>
+        <div class="item-jf-text">抱歉，暂无数据，试试更换搜索条件吧</div>
+      </div>
       <skeleton v-if="isSkeleton"></skeleton>
 
       <div class="table-item-jf table-item" v-if="!isSkeleton&&tableData.length>0">
@@ -96,20 +96,23 @@
 
           <el-table-column type="index" label="序号" :fixed="tableColumnFixed" width="60" :resizable="false">
             <template slot-scope="scope">
-              <span>{{(pageNum - 1) *pageSize + scope.$index + 1}}</span>
+              <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="供应商编号" :fixed="tableColumnFixed" width="120" :resizable="false">
+          <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">
             <template slot-scope="scope">
               <div class="renling">
                 <div style="display:flex;align-items:center">
-                  <router-link :to="`/enterprise/${encodeStr(scope.row.id)}`" tag="a"
-                               class="wordprimary" v-html="scope.row.name"></router-link>
+                  <router-link :to="`/enterprise/${encodeStr(scope.row.companyId)}`" tag="a"
+                               class="wordprimary" v-html="scope.row.customerName"></router-link>
                 </div>
               </div>
 
@@ -117,121 +120,89 @@
 
           </el-table-column>
 
-          <el-table-column label="营业执照号码" min-width="280">
-            <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
-            </template>
-          </el-table-column>
           <el-table-column label="推荐单位" min-width="280">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.recommendOrg||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="公司注册区域" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.registerRegion||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="公司注册省" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.registerProvince||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="公司注册城市" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
-            </template>
-          </el-table-column>
-          <el-table-column label="法人代表" min-width="85" :resizable="false">
-            <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
-            </template>
-          </el-table-column>
-          <el-table-column label="公司联系人" min-width="120" :resizable="false">
-            <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.registerCity||"--"}}
             </template>
           </el-table-column>
-          <el-table-column label="联系人电话" min-width="120" :resizable="false">
+          <el-table-column label="专业类别" min-width="85" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.groupSpecialty||"--"}}
             </template>
           </el-table-column>
-          <el-table-column label="注册资本(万元)" min-width="120" :resizable="false">
+          <el-table-column label="法人代表" min-width="85" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.representative||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="纳税人身份" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.paytaxType||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="纳税人税率" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.taxRate||"--"}}
             </template>
           </el-table-column>
-          <el-table-column label="资质等级" min-width="85" :resizable="false">
-            <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
-            </template>
-          </el-table-column>
-          <el-table-column label="主项资质" min-width="85" :resizable="false">
-            <template slot-scope="scope">
-              <!--没有值直接展示空-->
-              --
-            </template>
-          </el-table-column>
-          <el-table-column label="劳务资质" min-width="85" :resizable="false">
+          <el-table-column label="施工承包范围" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              <!--没有值直接展示空-->
-              --
-            </template>
-          </el-table-column>
-          <el-table-column label="施工队长" min-width="85" :resizable="false">
-            <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.constructJobScope||"--"}}
             </template>
           </el-table-column>
-          <el-table-column label="联系电话" min-width="85" :resizable="false">
+          <el-table-column label="资质等级" min-width="85" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.credential||"--"}}
             </template>
           </el-table-column>
-          <el-table-column label="身份证号" min-width="85" :resizable="false">
+          <el-table-column label="注册资本(万元)" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.registerCapital||"--"}}
             </template>
           </el-table-column>
-          <el-table-column label="队伍规模" min-width="85" :resizable="false">
+          <el-table-column label="公司联系人" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.contactPerson||"--"}}
             </template>
           </el-table-column>
-          <el-table-column label="专业特长" min-width="85" :resizable="false">
+          <el-table-column label="联系人电话" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.contactPhone||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="准入时间" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.approveDate2||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="公司合作数量" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.enterpriseCooperationCount||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="合作项目数量" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              <span>{{scope.row.legalPerson||"--"}}</span>
+              <span>{{scope.row.projectCooperationCount||"--"}}</span>
             </template>
           </el-table-column>
           <el-table-column label="分包商等级" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              <span class="wordprimary" @click="getFBS(scope.row)">{{scope.row.legalPerson||"--"}}</span>
+              <span class="wordprimary" @click="getFBS(scope.row)">{{scope.row.creditLevel||"--"}}</span>
             </template>
           </el-table-column>
           <el-table-column label="链接" min-width="160" :resizable="false">
@@ -242,14 +213,14 @@
           </el-table-column>
           <el-table-column label="资源平台分类" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              --
             </template>
           </el-table-column>
 
         </el-table>
       </div>
       <div class="pagination clearfix" v-show="total>0">
-        <el-pagination background :page-size="pageSize" :current-page.sync="pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
+        <el-pagination background :page-size="formdata.pageSize" :current-page.sync="formdata.pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
                        :total="total">
         </el-pagination>
       </div>
@@ -297,13 +268,13 @@
 </template>
 
 <script>
-  import { encodeStr } from "@/assets/js/common.js";
-  import "@/assets/styles/public.scss";
-  import "@/assets/styles/supplierlist.scss";
-  import skeleton from '@/views/project/projectList/component/skeleton';
-  import api from '@/api/enterpriseData/enterpriseData.js';
-  import dataRegion from '@/assets/json/provinceTree'
-  import { getDicts } from "@/api/system/dict/data";
+  import { encodeStr } from '@/assets/js/common.js'
+  import '@/assets/styles/public.scss'
+  import '@/assets/styles/supplierlist.scss'
+  import skeleton from '@/views/project/projectList/component/skeleton'
+  import { areaAll, bizDictData, custmerInfolist } from '@/api/supplier/supplier'
+  import { getDicts } from '@/api/system/dict/data'
+  import {queryConditionFiltering} from '@/utils/index'
   export default {
     name: 'laborSubcontractingTeam',
     components:{skeleton},
@@ -317,216 +288,40 @@
         credential:[],
         paytaxtype:[],
         taxrate:[],
+        groupSpecialty:[],
         provienceprops:{
-          checkStrictly:true,
+          checkStrictly:false,
+          multiple:true,
+          label:'value',
+        },
+        groupprops:{
+          checkStrictly:false,
           multiple:true,
           value:'id',
         },
-        formdata:{},
-        options: [
-          {
-            value: 'zhinan',
-            label: '指南',
-            children: [{
-              value: 'shejiyuanze',
-              label: '设计原则',
-              children: [{
-                value: 'yizhi',
-                label: '一致'
-              }, {
-                value: 'fankui',
-                label: '反馈'
-              }, {
-                value: 'xiaolv',
-                label: '效率'
-              }, {
-                value: 'kekong',
-                label: '可控'
-              }]
-            }, {
-              value: 'daohang',
-              label: '导航',
-              children: [{
-                value: 'cexiangdaohang',
-                label: '侧向导航'
-              }, {
-                value: 'dingbudaohang',
-                label: '顶部导航'
-              }]
-            }]
-          }, {
-            value: 'zujian',
-            label: '组件',
-            children: [{
-              value: 'basic',
-              label: 'Basic',
-              children: [{
-                value: 'layout',
-                label: 'Layout 布局'
-              }, {
-                value: 'color',
-                label: 'Color 色彩'
-              }, {
-                value: 'typography',
-                label: 'Typography 字体'
-              }, {
-                value: 'icon',
-                label: 'Icon 图标'
-              }, {
-                value: 'button',
-                label: 'Button 按钮'
-              }]
-            }, {
-              value: 'form',
-              label: 'Form',
-              children: [{
-                value: 'radio',
-                label: 'Radio 单选框'
-              }, {
-                value: 'checkbox',
-                label: 'Checkbox 多选框'
-              }, {
-                value: 'input',
-                label: 'Input 输入框'
-              }, {
-                value: 'input-number',
-                label: 'InputNumber 计数器'
-              }, {
-                value: 'select',
-                label: 'Select 选择器'
-              }, {
-                value: 'cascader',
-                label: 'Cascader 级联选择器'
-              }, {
-                value: 'switch',
-                label: 'Switch 开关'
-              }, {
-                value: 'slider',
-                label: 'Slider 滑块'
-              }, {
-                value: 'time-picker',
-                label: 'TimePicker 时间选择器'
-              }, {
-                value: 'date-picker',
-                label: 'DatePicker 日期选择器'
-              }, {
-                value: 'datetime-picker',
-                label: 'DateTimePicker 日期时间选择器'
-              }, {
-                value: 'upload',
-                label: 'Upload 上传'
-              }, {
-                value: 'rate',
-                label: 'Rate 评分'
-              }, {
-                value: 'form',
-                label: 'Form 表单'
-              }]
-            }, {
-              value: 'data',
-              label: 'Data',
-              children: [{
-                value: 'table',
-                label: 'Table 表格'
-              }, {
-                value: 'tag',
-                label: 'Tag 标签'
-              }, {
-                value: 'progress',
-                label: 'Progress 进度条'
-              }, {
-                value: 'tree',
-                label: 'Tree 树形控件'
-              }, {
-                value: 'pagination',
-                label: 'Pagination 分页'
-              }, {
-                value: 'badge',
-                label: 'Badge 标记'
-              }]
-            }, {
-              value: 'notice',
-              label: 'Notice',
-              children: [{
-                value: 'alert',
-                label: 'Alert 警告'
-              }, {
-                value: 'loading',
-                label: 'Loading 加载'
-              }, {
-                value: 'message',
-                label: 'Message 消息提示'
-              }, {
-                value: 'message-box',
-                label: 'MessageBox 弹框'
-              }, {
-                value: 'notification',
-                label: 'Notification 通知'
-              }]
-            }, {
-              value: 'navigation',
-              label: 'Navigation',
-              children: [{
-                value: 'menu',
-                label: 'NavMenu 导航菜单'
-              }, {
-                value: 'tabs',
-                label: 'Tabs 标签页'
-              }, {
-                value: 'breadcrumb',
-                label: 'Breadcrumb 面包屑'
-              }, {
-                value: 'dropdown',
-                label: 'Dropdown 下拉菜单'
-              }, {
-                value: 'steps',
-                label: 'Steps 步骤条'
-              }]
-            }, {
-              value: 'others',
-              label: 'Others',
-              children: [{
-                value: 'dialog',
-                label: 'Dialog 对话框'
-              }, {
-                value: 'tooltip',
-                label: 'Tooltip 文字提示'
-              }, {
-                value: 'popover',
-                label: 'Popover 弹出框'
-              }, {
-                value: 'card',
-                label: 'Card 卡片'
-              }, {
-                value: 'carousel',
-                label: 'Carousel 走马灯'
-              }, {
-                value: 'collapse',
-                label: 'Collapse 折叠面板'
-              }]
-            }]
-          }, {
-            value: 'ziyuan',
-            label: '资源',
-            children: [{
-              value: 'axure',
-              label: 'Axure Components'
-            }, {
-              value: 'sketch',
-              label: 'Sketch Templates'
-            }, {
-              value: 'jiaohu',
-              label: '组件交互文档'
-            }]
-          }
-        ],
-        tableData:[
-          {name:'测试',legalPerson:'AAAA'}
-        ],
+        formdata:{
+          customerClass:'劳务分包队伍',
+          pageNum:1,
+          pageSize:50,
+          times:[],
+          customerName:"",
+          leaderName:"",
+          areas:[],
+          customerState:[],
+          credential:[],
+          groupSpecialtys:[],
+          groupSpecialtyId:[],
+          creditLevel:[],
+          paytaxType:[],
+          taxRate:[],
+          registerProvince:[],
+          registerCity:[],
+          approveDate2Start:null,
+          approveDate2End:null,
+        },
+        tableData:[],
         isSkeleton:false,
-        total:100,
-        pageSize:50,
-        pageNum:1,
+        total:0,
         // table列是否悬浮
         tableColumnFixed: true,
         fbsvisib:false,
@@ -535,13 +330,10 @@
     },
     created() {
       this.init()
+      this.cusoomerInfolist()
     },
     methods:{
       init(){
-        //地区
-        getDicts('arealist').then(res=>{
-          this.arealist = res.data
-        })
         //评价等级
         getDicts('credit_level').then(res=>{
           this.creditlevel = res.data
@@ -562,24 +354,82 @@
         getDicts('credential').then(res=>{
           this.credential = res.data
         })
-        this.dataRegion()
+        // this.dataRegion()
+        //专业类别
+        bizDictData().then(res=>{
+          this.groupSpecialty = res.data
+        })
+        // 地区树
+        areaAll().then(res=>{
+          this.addressList = res.data
+        })
       },
-      //地区
-      async dataRegion() {
-        let addrs = JSON.parse(JSON.stringify(dataRegion))
-        addrs.forEach(item=>{
-          if (item.children) {
-            (item.children).forEach(i => {
-              if (i.children) {
-                delete i.children
+      clears(){
+        this.formdata = {
+          customerClass: '劳务分包队伍',
+          pageNum: 1,
+          pageSize: 50,
+          times: [],
+          customerName: '',
+          leaderName: '',
+          areas: [],
+          customerState: [],
+          credential: [],
+          groupSpecialtys: [],
+          groupSpecialtyId: [],
+          creditLevel: [],
+          paytaxType: [],
+          taxRate: [],
+          registerProvince: [],
+          registerCity: [],
+          approveDate2Start: null,
+          approveDate2End: null
+        }
+        this.cusoomerInfolist()
+      },
+      cusoomerInfolist(){
+        this.isSkeleton = true
+        let param = this.formdata
+        if(param.times){
+          param.approveDate2Start = param.times[0]
+          param.approveDate2End = param.times[1]
+        }else{
+          param.approveDate2Start = ''
+          param.approveDate2End = ''
+        }
+        param.groupSpecialtyId = []
+        if(param.groupSpecialtys){
+          param.groupSpecialtys.forEach(item=>{
+            param.groupSpecialtyId.push(item[item.length-1])
+          })
+        }
+        if(param.areas){
+          let province = []
+          let city = []
+          param.areas.forEach(item=>{
+            if(item.length == 3){//到市
+              if(item[1].indexOf('重庆')>-1||item[1].indexOf('北京')>-1||item[1].indexOf('天津')>-1||item[1].indexOf('上海')>-1){
+                province.push(item[1])
+              }else{
+                city.push(item[2])
               }
-            })
-          }
+            }
+          })
+          param.registerProvince = province
+          param.registerCity = city
+        }else{
+          param.registerProvince = []
+          param.registerCity = []
+        }
+        custmerInfolist(queryConditionFiltering(this.formdata)).then(res=>{
+          this.isSkeleton = false
+          this.tableData = res.rows
+          this.total = res.total
         })
-        this.addressList = addrs;
       },
-      handleCurrentChange(){
-
+      handleCurrentChange(val){
+        this.formdata.pageNum = val
+        this.cusoomerInfolist()
       },
       setHeaderRow() {
         return "owner-table-list-header";
@@ -599,7 +449,7 @@
       },
       //点击准入
       goAccess(row){
-        this.$tab.openPage('测试一下-准入情况', '/supplier/supplierlist/access')
+        this.$tab.openPage(row.customerName+'-准入情况', '/supplier/supplierlist/access',{customerKey:row.customerKey})
       },
       //点击考评
       goAssessment(row){
@@ -612,5 +462,3 @@
 <style scoped lang="scss">
 </style>
 
-
-

dsk-operate-ui/src/views/supplier/supplierlist/ledger.vue

@@ -10,34 +10,42 @@
         <el-form :model="formdata" label-width="82px" label-position="right"  :inline="true" >
           <el-row>
             <el-form-item label="分供方名称">
-              <el-input v-model="formdata.user" placeholder="请输入分供方名称" clearable></el-input>
-            </el-form-item>
-            <el-form-item label="注册地区">
-              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
-                <el-option v-for="(item,index) in arealist" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
-              </el-select>
+              <el-input v-model="formdata.customerName" placeholder="请输入分供方名称" clearable></el-input>
             </el-form-item>
             <el-form-item label="注册城市">
               <el-cascader
-                v-model="formdata.user"
+                v-model="formdata.areas"
                 :options="addressList" :collapse-tags="true" :show-all-levels="false" clearable
                 :props="provienceprops"></el-cascader>
             </el-form-item>
+            <el-form-item label="供应商类别">
+              <el-select v-model="formdata.customerClass" multiple placeholder="请选择" :collapse-tags="true" clearable>
+                <el-option v-for="(item,index) in suppliertype" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
+              </el-select>
+            </el-form-item>
           </el-row>
           <el-row>
             <el-form-item label="供应商状态">
-              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+              <el-select v-model="formdata.customerState" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in customstate" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="评价等级">
-              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+              <el-select v-model="formdata.creditLevel" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in creditlevel" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
+            <el-form-item label="资质等级">
+              <el-select v-model="formdata.credential" multiple placeholder="请选择" :collapse-tags="true" clearable>
+                <el-option v-for="(item,index) in credential" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-row>
+          <el-divider></el-divider>
+          <el-row>
             <el-form-item label="准入时间">
               <el-date-picker
-                v-model="formdata.time"
+                v-model="formdata.times"
                 type="daterange"
                 value-format="yyyy-MM-dd"
                 range-separator="至"
@@ -45,24 +53,16 @@
                 end-placeholder="年/月/日">
               </el-date-picker>
             </el-form-item>
-          </el-row>
-          <el-divider></el-divider>
-          <el-row>
-            <el-form-item label="纳税人身份">
-              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
-                <el-option v-for="(item,index) in paytaxtype" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="纳税人税率">
-              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
-                <el-option v-for="(item,index) in taxrate" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
-              </el-select>
+            <el-form-item label="涉诉状态">
+              <!--<el-select multiple placeholder="请选择" :collapse-tags="true" clearable>-->
+                <!--<el-option v-for="(item,index) in litigationstatus" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>-->
+              <!--</el-select>-->
             </el-form-item>
           </el-row>
           <el-divider></el-divider>
           <el-form-item label="  ">
-            <el-button type="primary" size="small">查询</el-button>
-            <el-button size="small">重置</el-button>
+            <el-button type="primary" size="small" @click="getSearch">查询</el-button>
+            <el-button size="small" @click="clears">重置</el-button>
           </el-form-item>
         </el-form>
       </div>
@@ -75,14 +75,14 @@
           <span class="excel" @click="$message({message: '功能正在开发中',type: 'warning'})">导出EXCEL</span>
         </p>
       </div>
-      <div class="table-item-jf table-item-jf1 empty-table" v-if="!tableData.length && !isSkeleton">
+      <div class="table-item-jf table-item-jf1 empty-table" v-if="total == 0 && !isSkeleton">
         <img class="item-jf-img" src="@/assets/images/kong.png" alt="">
         <div class="item-jf-titel">暂无相关数据</div>
         <div class="item-jf-text">抱歉，暂无数据，试试更换搜索条件吧</div>
       </div>
       <skeleton v-if="isSkeleton"></skeleton>
 
-      <div class="table-item-jf table-item" v-if="!isSkeleton&&tableData.length>0">
+      <div class="table-item-jf table-item" v-if="!isSkeleton&&total>0">
         <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"
@@ -90,18 +90,18 @@
 
           <el-table-column type="index" label="序号" :fixed="tableColumnFixed" width="60" :resizable="false">
             <template slot-scope="scope">
-              <span>{{(pageNum - 1) *pageSize + scope.$index + 1}}</span>
+              <span>{{(formdata.pageNum - 1) *formdata.pageSize + scope.$index + 1}}</span>
             </template>
           </el-table-column>
-          <el-table-column label="供应商编号" :fixed="tableColumnFixed" width="120" :resizable="false">
+          <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">
             <template slot-scope="scope">
               <div class="renling">
                 <div style="display:flex;align-items:center">
-                  <router-link :to="`/enterprise/${encodeStr(scope.row.id)}`" tag="a"
-                               class="wordprimary" v-html="scope.row.name"></router-link>
+                  <router-link :to="`/enterprise/${encodeStr(scope.row.companyId)}`" tag="a"
+                               class="wordprimary" v-html="scope.row.customerName"></router-link>
                 </div>
               </div>
 
@@ -111,67 +111,65 @@
 
           <el-table-column label="推荐单位" min-width="280">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.recommendOrg||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="公司注册区域" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.registerRegion||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="公司注册省" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.registerProvince||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="公司注册城市" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.registerCity||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="供应商类别" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.customerClass||"--"}}
             </template>
           </el-table-column>
-          <el-table-column label="专业类别" min-width="85" :resizable="false">
+          <el-table-column label="专业类别" min-width="185" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.groupSpecialty||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="纳税人身份" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.paytaxType||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="纳税人税率" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.taxRate||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="状态" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.customerState||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="限用/禁用状态" min-width="120" :resizable="false">
-            <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
-            </template>
+            <template slot-scope="scope">--</template>
           </el-table-column>
           <el-table-column label="劳务队长" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.leaderName||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="队长联系电话" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.laborCaptainPhone||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="队长身份证" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.laborCaptainIdcard||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="队伍规模" min-width="120" :resizable="false">
@@ -181,27 +179,27 @@
           </el-table-column>
           <el-table-column label="专业特长" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.serviceTeamSpeciality||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="施工承包范围" min-width="200" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.constructJobScope||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="资质等级" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.credential||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="注册资本(万元)" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.registerCapital||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="公司联系人" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.contactPerson||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="联系人电话" min-width="120" :resizable="false">
@@ -211,22 +209,22 @@
           </el-table-column>
           <el-table-column label="准入时间" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.contactPhone||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="公司合作数量" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.enterpriseCooperationCount||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="合作项目数量" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              <span class="wordprimary">{{scope.row.legalPerson||"--"}}</span>
+              <span class="projectCooperationCount">{{scope.row.legalPerson||"--"}}</span>
             </template>
           </el-table-column>
           <el-table-column label="分包商等级" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              <span class="wordprimary" @click="getFBS(scope.row)">{{scope.row.legalPerson||"--"}}</span>
+              <span class="creditLevel" @click="getFBS(scope.row)">{{scope.row.creditLevel||"--"}}</span>
             </template>
           </el-table-column>
           <el-table-column label="链接" min-width="160" :resizable="false">
@@ -237,15 +235,13 @@
             </template>
           </el-table-column>
           <el-table-column label="资源平台分类" min-width="120" :resizable="false">
-            <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
-            </template>
+            <template slot-scope="scope">--</template>
           </el-table-column>
 
         </el-table>
       </div>
       <div class="pagination clearfix" v-show="total>0">
-        <el-pagination background :page-size="pageSize" :current-page.sync="pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
+        <el-pagination background :page-size="formdata.pageSize" :current-page.sync="formdata.pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
                        :total="total">
         </el-pagination>
       </div>
@@ -297,8 +293,7 @@
   import "@/assets/styles/public.scss";
   import "@/assets/styles/supplierlist.scss";
   import skeleton from '@/views/project/projectList/component/skeleton';
-  import api from '@/api/enterpriseData/enterpriseData.js';
-  import dataRegion from '@/assets/json/provinceTree'
+  import {customerAll,areaAll} from '@/api/supplier/supplier';
   import { getDicts } from "@/api/system/dict/data";
   export default {
     name: 'ledger',
@@ -307,242 +302,34 @@
       return{
         encodeStr,
         addressList:[],
-        arealist:[],
         creditlevel:[],
         customstate:[],
-        paytaxtype:[],
-        taxrate:[],
+        credential:[],
+        litigationstatus:[],
+        suppliertype:[],
         provienceprops:{
-          checkStrictly:true,
+          checkStrictly:false,
           multiple:true,
-          value:'id',
+          label:'value',
         },
-        formdata:{},
-        options: [
-          {
-          value: 'zhinan',
-          label: '指南',
-          children: [{
-            value: 'shejiyuanze',
-            label: '设计原则',
-            children: [{
-              value: 'yizhi',
-              label: '一致'
-            }, {
-              value: 'fankui',
-              label: '反馈'
-            }, {
-              value: 'xiaolv',
-              label: '效率'
-            }, {
-              value: 'kekong',
-              label: '可控'
-            }]
-          }, {
-            value: 'daohang',
-            label: '导航',
-            children: [{
-              value: 'cexiangdaohang',
-              label: '侧向导航'
-            }, {
-              value: 'dingbudaohang',
-              label: '顶部导航'
-            }]
-          }]
-        }, {
-          value: 'zujian',
-          label: '组件',
-          children: [{
-            value: 'basic',
-            label: 'Basic',
-            children: [{
-              value: 'layout',
-              label: 'Layout 布局'
-            }, {
-              value: 'color',
-              label: 'Color 色彩'
-            }, {
-              value: 'typography',
-              label: 'Typography 字体'
-            }, {
-              value: 'icon',
-              label: 'Icon 图标'
-            }, {
-              value: 'button',
-              label: 'Button 按钮'
-            }]
-          }, {
-            value: 'form',
-            label: 'Form',
-            children: [{
-              value: 'radio',
-              label: 'Radio 单选框'
-            }, {
-              value: 'checkbox',
-              label: 'Checkbox 多选框'
-            }, {
-              value: 'input',
-              label: 'Input 输入框'
-            }, {
-              value: 'input-number',
-              label: 'InputNumber 计数器'
-            }, {
-              value: 'select',
-              label: 'Select 选择器'
-            }, {
-              value: 'cascader',
-              label: 'Cascader 级联选择器'
-            }, {
-              value: 'switch',
-              label: 'Switch 开关'
-            }, {
-              value: 'slider',
-              label: 'Slider 滑块'
-            }, {
-              value: 'time-picker',
-              label: 'TimePicker 时间选择器'
-            }, {
-              value: 'date-picker',
-              label: 'DatePicker 日期选择器'
-            }, {
-              value: 'datetime-picker',
-              label: 'DateTimePicker 日期时间选择器'
-            }, {
-              value: 'upload',
-              label: 'Upload 上传'
-            }, {
-              value: 'rate',
-              label: 'Rate 评分'
-            }, {
-              value: 'form',
-              label: 'Form 表单'
-            }]
-          }, {
-            value: 'data',
-            label: 'Data',
-            children: [{
-              value: 'table',
-              label: 'Table 表格'
-            }, {
-              value: 'tag',
-              label: 'Tag 标签'
-            }, {
-              value: 'progress',
-              label: 'Progress 进度条'
-            }, {
-              value: 'tree',
-              label: 'Tree 树形控件'
-            }, {
-              value: 'pagination',
-              label: 'Pagination 分页'
-            }, {
-              value: 'badge',
-              label: 'Badge 标记'
-            }]
-          }, {
-            value: 'notice',
-            label: 'Notice',
-            children: [{
-              value: 'alert',
-              label: 'Alert 警告'
-            }, {
-              value: 'loading',
-              label: 'Loading 加载'
-            }, {
-              value: 'message',
-              label: 'Message 消息提示'
-            }, {
-              value: 'message-box',
-              label: 'MessageBox 弹框'
-            }, {
-              value: 'notification',
-              label: 'Notification 通知'
-            }]
-          }, {
-            value: 'navigation',
-            label: 'Navigation',
-            children: [{
-              value: 'menu',
-              label: 'NavMenu 导航菜单'
-            }, {
-              value: 'tabs',
-              label: 'Tabs 标签页'
-            }, {
-              value: 'breadcrumb',
-              label: 'Breadcrumb 面包屑'
-            }, {
-              value: 'dropdown',
-              label: 'Dropdown 下拉菜单'
-            }, {
-              value: 'steps',
-              label: 'Steps 步骤条'
-            }]
-          }, {
-            value: 'others',
-            label: 'Others',
-            children: [{
-              value: 'dialog',
-              label: 'Dialog 对话框'
-            }, {
-              value: 'tooltip',
-              label: 'Tooltip 文字提示'
-            }, {
-              value: 'popover',
-              label: 'Popover 弹出框'
-            }, {
-              value: 'card',
-              label: 'Card 卡片'
-            }, {
-              value: 'carousel',
-              label: 'Carousel 走马灯'
-            }, {
-              value: 'collapse',
-              label: 'Collapse 折叠面板'
-            }]
-          }]
-        }, {
-          value: 'ziyuan',
-          label: '资源',
-          children: [{
-            value: 'axure',
-            label: 'Axure Components'
-          }, {
-            value: 'sketch',
-            label: 'Sketch Templates'
-          }, {
-            value: 'jiaohu',
-            label: '组件交互文档'
-          }]
-        }
-        ],
-        tableData:[
-          {name:'测试',legalPerson:'AAAA'},
-          {name:'测试',legalPerson:'AAAA'},
-          {name:'测试',legalPerson:'AAAA'},
-          {name:'测试',legalPerson:'AAAA'},
-          {name:'测试',legalPerson:'AAAA'},
-          {name:'测试',legalPerson:'AAAA'},
-          {name:'测试',legalPerson:'AAAA'},
-          {name:'测试',legalPerson:'AAAA'},
-          {name:'测试',legalPerson:'AAAA'},
-          {name:'测试',legalPerson:'AAAA'},
-          {name:'测试',legalPerson:'AAAA'},
-          {name:'测试',legalPerson:'AAAA'},
-          {name:'测试',legalPerson:'AAAA'},
-          {name:'测试',legalPerson:'AAAA'},
-          {name:'测试',legalPerson:'AAAA'},
-          {name:'测试',legalPerson:'AAAA'},
-          {name:'测试',legalPerson:'AAAA'},
-          {name:'测试',legalPerson:'AAAA'},
-          {name:'测试',legalPerson:'AAAA'},
-          {name:'测试',legalPerson:'AAAA'},
-          {name:'测试',legalPerson:'AAAA'},
-          {name:'测试',legalPerson:'AAAA'},
-        ],
+        formdata:{
+          customerName: '',
+          customerClass:[],
+          areas:[],
+          province:[],
+          city:[],
+          customerState:[],
+          creditLevel:[],
+          credential:[],
+          approveDateBegion:null,
+          approveDateEnd:null,
+          times:[],
+          pageSize:50,
+          pageNum:1,
+        },
+        tableData:[],
         isSkeleton:false,
-        total:100,
-        pageSize:50,
-        pageNum:1,
+        total:0,
         // table列是否悬浮
         tableColumnFixed: true,
         fbsvisib:false,
@@ -551,47 +338,94 @@
     },
     created() {
       this.init()
+      this.customerAll()
     },
     methods:{
       init(){
         //地区
-        getDicts('arealist').then(res=>{
-          this.arealist = res.data
+        areaAll().then(res=>{
+          this.addressList = res.data
         })
         //评价等级
         getDicts('credit_level').then(res=>{
           this.creditlevel = res.data
         })
+        //资质等级
+        getDicts('credential').then(res=>{
+          this.credential = res.data
+        })
+        //供应商类别
+        getDicts('suppliertype').then(res=>{
+          this.suppliertype = res.data
+        })
         //供应商状态
         getDicts('custom_state').then(res=>{
           this.customstate = res.data
         })
-        //纳税人身份
-        getDicts('paytaxtype').then(res=>{
-          this.paytaxtype = res.data
-        })
-        //纳税人税率
-        getDicts('taxrate').then(res=>{
-          this.taxrate = res.data
+        //涉诉状态
+        getDicts('litigation_status').then(res=>{
+          this.litigationstatus = res.data
         })
-        this.dataRegion()
       },
-      //地区
-      async dataRegion() {
-        let addrs = JSON.parse(JSON.stringify(dataRegion))
-        addrs.forEach(item=>{
-          if (item.children) {
-            (item.children).forEach(i => {
-              if (i.children) {
-                delete i.children
+      getSearch(){
+        this.formdata.pageNum = 1
+        this.customerAll()
+      },
+      clears(){
+        this.formdata={
+          customerName: '',
+          customerClass:[],
+          areas:[],
+          province:[],
+          city:[],
+          customerState:[],
+          creditLevel:[],
+          credential:[],
+          approveDateBegion:null,
+          approveDateEnd:null,
+          times:[],
+          pageSize:50,
+          pageNum:1,
+        }
+        this.customerAll()
+      },
+      customerAll(){
+        this.isSkeleton = true
+        let param = this.formdata
+        if(param.times){
+          param.approveDateBegion = param.times[0]
+          param.approveDateEnd = param.times[1]
+        }else{
+          param.approveDateBegion = ''
+          param.approveDateEnd = ''
+        }
+        if(param.areas){
+          let province = []
+          let city = []
+          param.areas.forEach(item=>{
+            if(item.length == 3){//到市
+              if(item[1].indexOf('重庆')>-1||item[1].indexOf('北京')>-1||item[1].indexOf('天津')>-1||item[1].indexOf('上海')>-1){
+                province.push(item[1])
+              }else{
+                city.push(item[2])
               }
-            })
-          }
+            }
+          })
+          param.province = province
+          param.city = city
+        }else{
+          param.province = []
+          param.city = []
+        }
+        customerAll(JSON.stringify(param)).then(res=>{
+          this.tableData = res.rows
+          this.total = res.total
+          this.isSkeleton = false
         })
-        this.addressList = addrs;
       },
-      handleCurrentChange(){
-
+      handleCurrentChange(val){
+        this.formdata.pageNum = val
+        this.customerAll()
       },
       setHeaderRow() {
         return "owner-table-list-header";
@@ -611,7 +445,7 @@
       },
       //点击准入
       goAccess(row){
-        this.$tab.openPage('测试一下-准入情况', '/supplier/supplierlist/access')
+        this.$tab.openPage(row.customerName+'-准入情况', '/supplier/supplierlist/access',{customerKey:row.customerKey})
       },
       //点击考评
       goAssessment(row){

dsk-operate-ui/src/views/supplier/supplierlist/professionalSubcontracting.vue

@@ -10,59 +10,52 @@
         <el-form :model="formdata" label-width="82px" label-position="right"  :inline="true" >
           <el-row>
             <el-form-item label="分供方名称">
-              <el-input v-model="formdata.user" placeholder="请输入分供方名称"></el-input>
-            </el-form-item>
-            <el-form-item label="注册地区">
-              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
-                <el-option v-for="(item,index) in arealist" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
-              </el-select>
+              <el-input v-model="formdata.customerName" placeholder="请输入分供方名称"></el-input>
             </el-form-item>
             <el-form-item label="注册城市">
               <el-cascader
-                v-model="formdata.user"
-                :options="addressList" :collapse-tags="true"
+                v-model="formdata.areas"
+                :options="addressList" :collapse-tags="true" :show-all-levels="false" clearable
                 :props="provienceprops"></el-cascader>
             </el-form-item>
-          </el-row>
-          <el-row>
             <el-form-item label="供应商状态">
-              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+              <el-select v-model="formdata.customerState" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in customstate" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
+          </el-row>
+          <el-row>
             <el-form-item label="资质等级">
-              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+              <el-select v-model="formdata.credential" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in credential" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="专业类别">
-              <el-select v-model="formdata.user" placeholder="请选择">
-                <el-option label="区域一" value="shanghai"></el-option>
-                <el-option label="区域二" value="beijing"></el-option>
-              </el-select>
+              <el-cascader clearable
+                v-model="formdata.groupSpecialtys"
+                :options="groupSpecialty" :collapse-tags="true"
+                :props="groupprops"></el-cascader>
             </el-form-item>
-          </el-row>
-          <el-row>
             <el-form-item label="评价等级">
-              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+              <el-select v-model="formdata.creditLevel" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in creditlevel" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
+          </el-row>
+          <el-row>
             <el-form-item label="纳税人身份">
-              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+              <el-select v-model="formdata.paytaxType" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in paytaxtype" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="纳税人税率">
-              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+              <el-select v-model="formdata.taxRate" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in taxrate" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
-          </el-row>
-          <el-row>
             <el-form-item label="准入时间">
               <el-date-picker
-                v-model="formdata.time"
+                v-model="formdata.times"
                 type="daterange"
                 value-format="yyyy-MM-dd"
                 range-separator="至"
@@ -73,8 +66,8 @@
           </el-row>
           <el-divider></el-divider>
           <el-form-item label="  ">
-            <el-button type="primary" size="small">查询</el-button>
-            <el-button size="small">重置</el-button>
+            <el-button type="primary" size="small" @click="handleCurrentChange(1)">查询</el-button>
+            <el-button size="small" @click="clears">重置</el-button>
           </el-form-item>
         </el-form>
       </div>
@@ -83,6 +76,11 @@
       <div class="total-title">
         <div class="totals">共{{total}}条</div>
       </div>
+      <div class="table-item-jf table-item-jf1 empty-table" v-if="total == 0 && !isSkeleton">
+        <img class="item-jf-img" src="@/assets/images/kong.png" alt="">
+        <div class="item-jf-titel">暂无相关数据</div>
+        <div class="item-jf-text">抱歉，暂无数据，试试更换搜索条件吧</div>
+      </div>
       <skeleton v-if="isSkeleton"></skeleton>
 
       <div class="table-item-jf table-item" v-if="!isSkeleton&&tableData.length>0">
@@ -93,18 +91,18 @@
 
           <el-table-column type="index" label="序号" :fixed="tableColumnFixed" width="60" :resizable="false">
             <template slot-scope="scope">
-              <span>{{(pageNum - 1) *pageSize + scope.$index + 1}}</span>
+              <span>{{(formdata.pageNum - 1) *formdata.pageSize + scope.$index + 1}}</span>
             </template>
           </el-table-column>
-          <el-table-column label="供应商编号" :fixed="tableColumnFixed" width="120" :resizable="false">
+          <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">
             <template slot-scope="scope">
               <div class="renling">
                 <div style="display:flex;align-items:center">
-                  <router-link :to="`/enterprise/${encodeStr(scope.row.id)}`" tag="a"
-                               class="wordprimary" v-html="scope.row.name"></router-link>
+                  <router-link :to="`/enterprise/${encodeStr(scope.row.companyId)}`" tag="a"
+                               class="wordprimary" v-html="scope.row.customerName"></router-link>
                 </div>
               </div>
 
@@ -114,87 +112,87 @@
 
           <el-table-column label="推荐单位" min-width="280">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.recommendOrg||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="公司注册区域" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.registerRegion||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="公司注册省" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.registerProvince||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="公司注册城市" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.registerCity||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="专业类别" min-width="85" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.groupSpecialty||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="法人代表" min-width="85" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.representative||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="纳税人身份" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.paytaxType||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="纳税人税率" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.taxRate||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="施工承包范围" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.constructJobScope||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="资质等级" min-width="85" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.credential||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="注册资本(万元)" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.registerCapital||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="公司联系人" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.contactPerson||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="联系人电话" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.contactPhone||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="准入时间" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.approveDate2||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="公司合作数量" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.enterpriseCooperationCount||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="合作项目数量" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              <span>{{scope.row.legalPerson||"--"}}</span>
+              <span>{{scope.row.projectCooperationCount||"--"}}</span>
             </template>
           </el-table-column>
           <el-table-column label="分包商等级" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              <span class="wordprimary" @click="getFBS(scope.row)">{{scope.row.legalPerson||"--"}}</span>
+              <span class="wordprimary" @click="getFBS(scope.row)">{{scope.row.creditLevel||"--"}}</span>
             </template>
           </el-table-column>
           <el-table-column label="链接" min-width="160" :resizable="false">
@@ -205,14 +203,14 @@
           </el-table-column>
           <el-table-column label="资源平台分类" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              --
             </template>
           </el-table-column>
 
         </el-table>
       </div>
       <div class="pagination clearfix" v-show="total>0">
-        <el-pagination background :page-size="pageSize" :current-page.sync="pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
+        <el-pagination background :page-size="formdata.pageSize" :current-page.sync="formdata.pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
                        :total="total">
         </el-pagination>
       </div>
@@ -260,13 +258,14 @@
 </template>
 
 <script>
-  import { encodeStr } from "@/assets/js/common.js";
-  import "@/assets/styles/public.scss";
-  import "@/assets/styles/supplierlist.scss";
-  import skeleton from '@/views/project/projectList/component/skeleton';
-  import api from '@/api/enterpriseData/enterpriseData.js';
-  import dataRegion from '@/assets/json/provinceTree'
-  import { getDicts } from "@/api/system/dict/data";
+  import { encodeStr } from '@/assets/js/common.js'
+  import '@/assets/styles/public.scss'
+  import '@/assets/styles/supplierlist.scss'
+  import skeleton from '@/views/project/projectList/component/skeleton'
+  import { areaAll, bizDictData, custmerInfolist } from '@/api/supplier/supplier'
+  import { getDicts } from '@/api/system/dict/data'
+  import {queryConditionFiltering} from '@/utils/index'
+
   export default {
     name: 'professionalSubcontracting',
     components:{skeleton},
@@ -280,216 +279,39 @@
         credential:[],
         paytaxtype:[],
         taxrate:[],
+        groupSpecialty:[],
         provienceprops:{
-          checkStrictly:true,
+          checkStrictly:false,
+          multiple:true,
+          label:'value',
+        },
+        groupprops:{
+          checkStrictly:false,
           multiple:true,
           value:'id',
         },
-        formdata:{},
-        options: [
-          {
-            value: 'zhinan',
-            label: '指南',
-            children: [{
-              value: 'shejiyuanze',
-              label: '设计原则',
-              children: [{
-                value: 'yizhi',
-                label: '一致'
-              }, {
-                value: 'fankui',
-                label: '反馈'
-              }, {
-                value: 'xiaolv',
-                label: '效率'
-              }, {
-                value: 'kekong',
-                label: '可控'
-              }]
-            }, {
-              value: 'daohang',
-              label: '导航',
-              children: [{
-                value: 'cexiangdaohang',
-                label: '侧向导航'
-              }, {
-                value: 'dingbudaohang',
-                label: '顶部导航'
-              }]
-            }]
-          }, {
-            value: 'zujian',
-            label: '组件',
-            children: [{
-              value: 'basic',
-              label: 'Basic',
-              children: [{
-                value: 'layout',
-                label: 'Layout 布局'
-              }, {
-                value: 'color',
-                label: 'Color 色彩'
-              }, {
-                value: 'typography',
-                label: 'Typography 字体'
-              }, {
-                value: 'icon',
-                label: 'Icon 图标'
-              }, {
-                value: 'button',
-                label: 'Button 按钮'
-              }]
-            }, {
-              value: 'form',
-              label: 'Form',
-              children: [{
-                value: 'radio',
-                label: 'Radio 单选框'
-              }, {
-                value: 'checkbox',
-                label: 'Checkbox 多选框'
-              }, {
-                value: 'input',
-                label: 'Input 输入框'
-              }, {
-                value: 'input-number',
-                label: 'InputNumber 计数器'
-              }, {
-                value: 'select',
-                label: 'Select 选择器'
-              }, {
-                value: 'cascader',
-                label: 'Cascader 级联选择器'
-              }, {
-                value: 'switch',
-                label: 'Switch 开关'
-              }, {
-                value: 'slider',
-                label: 'Slider 滑块'
-              }, {
-                value: 'time-picker',
-                label: 'TimePicker 时间选择器'
-              }, {
-                value: 'date-picker',
-                label: 'DatePicker 日期选择器'
-              }, {
-                value: 'datetime-picker',
-                label: 'DateTimePicker 日期时间选择器'
-              }, {
-                value: 'upload',
-                label: 'Upload 上传'
-              }, {
-                value: 'rate',
-                label: 'Rate 评分'
-              }, {
-                value: 'form',
-                label: 'Form 表单'
-              }]
-            }, {
-              value: 'data',
-              label: 'Data',
-              children: [{
-                value: 'table',
-                label: 'Table 表格'
-              }, {
-                value: 'tag',
-                label: 'Tag 标签'
-              }, {
-                value: 'progress',
-                label: 'Progress 进度条'
-              }, {
-                value: 'tree',
-                label: 'Tree 树形控件'
-              }, {
-                value: 'pagination',
-                label: 'Pagination 分页'
-              }, {
-                value: 'badge',
-                label: 'Badge 标记'
-              }]
-            }, {
-              value: 'notice',
-              label: 'Notice',
-              children: [{
-                value: 'alert',
-                label: 'Alert 警告'
-              }, {
-                value: 'loading',
-                label: 'Loading 加载'
-              }, {
-                value: 'message',
-                label: 'Message 消息提示'
-              }, {
-                value: 'message-box',
-                label: 'MessageBox 弹框'
-              }, {
-                value: 'notification',
-                label: 'Notification 通知'
-              }]
-            }, {
-              value: 'navigation',
-              label: 'Navigation',
-              children: [{
-                value: 'menu',
-                label: 'NavMenu 导航菜单'
-              }, {
-                value: 'tabs',
-                label: 'Tabs 标签页'
-              }, {
-                value: 'breadcrumb',
-                label: 'Breadcrumb 面包屑'
-              }, {
-                value: 'dropdown',
-                label: 'Dropdown 下拉菜单'
-              }, {
-                value: 'steps',
-                label: 'Steps 步骤条'
-              }]
-            }, {
-              value: 'others',
-              label: 'Others',
-              children: [{
-                value: 'dialog',
-                label: 'Dialog 对话框'
-              }, {
-                value: 'tooltip',
-                label: 'Tooltip 文字提示'
-              }, {
-                value: 'popover',
-                label: 'Popover 弹出框'
-              }, {
-                value: 'card',
-                label: 'Card 卡片'
-              }, {
-                value: 'carousel',
-                label: 'Carousel 走马灯'
-              }, {
-                value: 'collapse',
-                label: 'Collapse 折叠面板'
-              }]
-            }]
-          }, {
-            value: 'ziyuan',
-            label: '资源',
-            children: [{
-              value: 'axure',
-              label: 'Axure Components'
-            }, {
-              value: 'sketch',
-              label: 'Sketch Templates'
-            }, {
-              value: 'jiaohu',
-              label: '组件交互文档'
-            }]
-          }
-        ],
-        tableData:[
-          {name:'测试',legalPerson:'AAAA'}
-        ],
+        formdata:{
+          customerClass:'专业分包',
+          pageNum:1,
+          pageSize:50,
+          times:[],
+          customerName:"",
+          areas:[],
+          customerState:[],
+          credential:[],
+          groupSpecialtys:[],
+          groupSpecialtyId:[],
+          creditLevel:[],
+          paytaxType:[],
+          taxRate:[],
+          registerProvince:[],
+          registerCity:[],
+          approveDate2Start:null,
+          approveDate2End:null,
+        },
+        tableData:[],
         isSkeleton:false,
-        total:100,
-        pageSize:50,
-        pageNum:1,
+        total:0,
         // table列是否悬浮
         tableColumnFixed: true,
         fbsvisib:false,
@@ -498,13 +320,10 @@
     },
     created() {
       this.init()
+      this.cusoomerInfolist()
     },
     methods:{
       init(){
-        //地区
-        getDicts('arealist').then(res=>{
-          this.arealist = res.data
-        })
         //评价等级
         getDicts('credit_level').then(res=>{
           this.creditlevel = res.data
@@ -525,24 +344,81 @@
         getDicts('credential').then(res=>{
           this.credential = res.data
         })
-        this.dataRegion()
+        // this.dataRegion()
+        //专业类别
+        bizDictData().then(res=>{
+          this.groupSpecialty = res.data
+        })
+        // 地区树
+        areaAll().then(res=>{
+          this.addressList = res.data
+        })
       },
-      //地区
-      async dataRegion() {
-        let addrs = JSON.parse(JSON.stringify(dataRegion))
-        addrs.forEach(item=>{
-          if (item.children) {
-            (item.children).forEach(i => {
-              if (i.children) {
-                delete i.children
+      clears(){
+        this.formdata = {
+          customerClass: '专业分包',
+          pageNum: 1,
+          pageSize: 50,
+          times: [],
+          customerName: '',
+          areas: [],
+          customerState: [],
+          credential: [],
+          groupSpecialtys: [],
+          groupSpecialtyId: [],
+          creditLevel: [],
+          paytaxType: [],
+          taxRate: [],
+          registerProvince: [],
+          registerCity: [],
+          approveDate2Start: null,
+          approveDate2End: null
+        }
+        this.cusoomerInfolist()
+      },
+      cusoomerInfolist(){
+        this.isSkeleton = true
+        let param = this.formdata
+        if(param.times){
+          param.approveDate2Start = param.times[0]
+          param.approveDate2End = param.times[1]
+        }else{
+          param.approveDate2Start = ''
+          param.approveDate2End = ''
+        }
+        param.groupSpecialtyId = []
+        if(param.groupSpecialtys){
+          param.groupSpecialtys.forEach(item=>{
+            param.groupSpecialtyId.push(item[item.length-1])
+          })
+        }
+        if(param.areas){
+          let province = []
+          let city = []
+          param.areas.forEach(item=>{
+            if(item.length == 3){//到市
+              if(item[1].indexOf('重庆')>-1||item[1].indexOf('北京')>-1||item[1].indexOf('天津')>-1||item[1].indexOf('上海')>-1){
+                province.push(item[1])
+              }else{
+                city.push(item[2])
               }
-            })
-          }
+            }
+          })
+          param.registerProvince = province
+          param.registerCity = city
+        }else{
+          param.registerProvince = []
+          param.registerCity = []
+        }
+        custmerInfolist(queryConditionFiltering(this.formdata)).then(res=>{
+          this.isSkeleton = false
+          this.tableData = res.rows
+          this.total = res.total
         })
-        this.addressList = addrs;
       },
-      handleCurrentChange(){
-
+      handleCurrentChange(val){
+        this.formdata.pageNum = val
+        this.cusoomerInfolist()
       },
       setHeaderRow() {
         return "owner-table-list-header";
@@ -562,7 +438,7 @@
       },
       //点击准入
       goAccess(row){
-        this.$tab.openPage('测试一下-准入情况', '/supplier/supplierlist/access')
+        this.$tab.openPage(row.customerName+'-准入情况', '/supplier/supplierlist/access',{customerKey:row.customerKey})
       },
       //点击考评
       goAssessment(row){

dsk-operate-ui/src/views/supplier/supplierlist/rentalServices.vue

-
 <template>
   <div class="supplier">
     <div class="search-supplier">
       <div class="title_wrap">
         <div class="enterprise_title">
-          租赁服务类
+          机械施工类
         </div>
       </div>
       <div class="content-supplier">
         <el-form :model="formdata" label-width="82px" label-position="right"  :inline="true" >
           <el-row>
             <el-form-item label="供应商名称">
-              <el-input v-model="formdata.user" placeholder="请输入分供方名称"></el-input>
-            </el-form-item>
-            <el-form-item label="注册地区">
-              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
-                <el-option v-for="(item,index) in arealist" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
-              </el-select>
+              <el-input v-model="formdata.customerName" placeholder="请输入供应商名称"></el-input>
             </el-form-item>
             <el-form-item label="注册城市">
               <el-cascader
-                v-model="formdata.user"
-                :options="addressList" :collapse-tags="true"
+                v-model="formdata.areas"
+                :options="addressList" :collapse-tags="true" :show-all-levels="false" clearable
                 :props="provienceprops"></el-cascader>
             </el-form-item>
-          </el-row>
-          <el-row>
             <el-form-item label="供应商状态">
-              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+              <el-select v-model="formdata.customerState" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in customstate" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
+          </el-row>
+          <el-row>
             <el-form-item label="资质等级">
-              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+              <el-select v-model="formdata.credential" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in credential" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="物资类别">
-              <el-select v-model="formdata.user" placeholder="请选择">
-                <el-option label="区域一" value="shanghai"></el-option>
-                <el-option label="区域二" value="beijing"></el-option>
-              </el-select>
+              <el-cascader clearable
+                           v-model="formdata.groupSpecialtys"
+                           :options="groupSpecialty" :collapse-tags="true"
+                           :props="groupprops"></el-cascader>
             </el-form-item>
-          </el-row>
-          <el-row>
             <el-form-item label="评价等级">
-              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+              <el-select v-model="formdata.creditLevel" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in creditlevel" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
+          </el-row>
+          <el-row>
             <el-form-item label="纳税人身份">
-              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+              <el-select v-model="formdata.paytaxType" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in paytaxtype" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="纳税人税率">
-              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+              <el-select v-model="formdata.taxRate" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in taxrate" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
-          </el-row>
-          <el-row>
             <el-form-item label="准入时间">
               <el-date-picker
-                v-model="formdata.time"
+                v-model="formdata.times"
                 type="daterange"
                 value-format="yyyy-MM-dd"
                 range-separator="至"
@@ -74,8 +66,8 @@
           </el-row>
           <el-divider></el-divider>
           <el-form-item label="  ">
-            <el-button type="primary" size="small">查询</el-button>
-            <el-button size="small">重置</el-button>
+            <el-button type="primary" size="small" @click="handleCurrentChange(1)">查询</el-button>
+            <el-button size="small" @click="clears">重置</el-button>
           </el-form-item>
         </el-form>
       </div>
@@ -84,6 +76,11 @@
       <div class="total-title">
         <div class="totals">共{{total}}条</div>
       </div>
+      <div class="table-item-jf table-item-jf1 empty-table" v-if="total == 0 && !isSkeleton">
+        <img class="item-jf-img" src="@/assets/images/kong.png" alt="">
+        <div class="item-jf-titel">暂无相关数据</div>
+        <div class="item-jf-text">抱歉，暂无数据，试试更换搜索条件吧</div>
+      </div>
       <skeleton v-if="isSkeleton"></skeleton>
 
       <div class="table-item-jf table-item" v-if="!isSkeleton&&tableData.length>0">
@@ -94,18 +91,18 @@
 
           <el-table-column type="index" label="序号" :fixed="tableColumnFixed" width="60" :resizable="false">
             <template slot-scope="scope">
-              <span>{{(pageNum - 1) *pageSize + scope.$index + 1}}</span>
+              <span>{{(formdata.pageNum - 1) *formdata.pageSize + scope.$index + 1}}</span>
             </template>
           </el-table-column>
-          <el-table-column label="供应商编号" :fixed="tableColumnFixed" width="120" :resizable="false">
+          <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">
             <template slot-scope="scope">
               <div class="renling">
                 <div style="display:flex;align-items:center">
-                  <router-link :to="`/enterprise/${encodeStr(scope.row.id)}`" tag="a"
-                               class="wordprimary" v-html="scope.row.name"></router-link>
+                  <router-link :to="`/enterprise/${encodeStr(scope.row.companyId)}`" tag="a"
+                               class="wordprimary" v-html="scope.row.customerName"></router-link>
                 </div>
               </div>
 
@@ -115,82 +112,82 @@
 
           <el-table-column label="推荐单位" min-width="280">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.recommendOrg||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="公司注册区域" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.registerRegion||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="公司注册省" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.registerProvince||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="公司注册城市" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.registerCity||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="专业类别" min-width="85" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.groupSpecialty||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="法人代表" min-width="85" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.representative||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="纳税人身份" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.paytaxType||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="纳税人税率" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.taxRate||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="资质等级" min-width="85" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.credential||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="注册资本(万元)" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.registerCapital||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="公司联系人" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.contactPerson||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="联系人电话" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.contactPhone||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="准入时间" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.approveDate2||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="公司合作数量" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.enterpriseCooperationCount||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="合作项目数量" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              <span>{{scope.row.legalPerson||"--"}}</span>
+              <span>{{scope.row.projectCooperationCount||"--"}}</span>
             </template>
           </el-table-column>
           <el-table-column label="分包商等级" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              <span class="wordprimary" @click="getFBS(scope.row)">{{scope.row.legalPerson||"--"}}</span>
+              <span class="wordprimary" @click="getFBS(scope.row)">{{scope.row.creditLevel||"--"}}</span>
             </template>
           </el-table-column>
           <el-table-column label="链接" min-width="160" :resizable="false">
@@ -201,14 +198,14 @@
           </el-table-column>
           <el-table-column label="资源平台分类" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              --
             </template>
           </el-table-column>
 
         </el-table>
       </div>
       <div class="pagination clearfix" v-show="total>0">
-        <el-pagination background :page-size="pageSize" :current-page.sync="pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
+        <el-pagination background :page-size="formdata.pageSize" :current-page.sync="formdata.pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
                        :total="total">
         </el-pagination>
       </div>
@@ -256,13 +253,13 @@
 </template>
 
 <script>
-  import { encodeStr } from "@/assets/js/common.js";
-  import "@/assets/styles/public.scss";
-  import "@/assets/styles/supplierlist.scss";
-  import skeleton from '@/views/project/projectList/component/skeleton';
-  import api from '@/api/enterpriseData/enterpriseData.js';
-  import dataRegion from '@/assets/json/provinceTree'
-  import { getDicts } from "@/api/system/dict/data";
+  import { encodeStr } from '@/assets/js/common.js'
+  import '@/assets/styles/public.scss'
+  import '@/assets/styles/supplierlist.scss'
+  import skeleton from '@/views/project/projectList/component/skeleton'
+  import { areaAll, bizDictData, custmerInfolist } from '@/api/supplier/supplier'
+  import { getDicts } from '@/api/system/dict/data'
+  import {queryConditionFiltering} from '@/utils/index'
   export default {
     name: 'rentalServices',
     components:{skeleton},
@@ -276,216 +273,39 @@
         credential:[],
         paytaxtype:[],
         taxrate:[],
+        groupSpecialty:[],
         provienceprops:{
-          checkStrictly:true,
+          checkStrictly:false,
+          multiple:true,
+          label:'value',
+        },
+        groupprops:{
+          checkStrictly:false,
           multiple:true,
           value:'id',
         },
-        formdata:{},
-        options: [
-          {
-            value: 'zhinan',
-            label: '指南',
-            children: [{
-              value: 'shejiyuanze',
-              label: '设计原则',
-              children: [{
-                value: 'yizhi',
-                label: '一致'
-              }, {
-                value: 'fankui',
-                label: '反馈'
-              }, {
-                value: 'xiaolv',
-                label: '效率'
-              }, {
-                value: 'kekong',
-                label: '可控'
-              }]
-            }, {
-              value: 'daohang',
-              label: '导航',
-              children: [{
-                value: 'cexiangdaohang',
-                label: '侧向导航'
-              }, {
-                value: 'dingbudaohang',
-                label: '顶部导航'
-              }]
-            }]
-          }, {
-            value: 'zujian',
-            label: '组件',
-            children: [{
-              value: 'basic',
-              label: 'Basic',
-              children: [{
-                value: 'layout',
-                label: 'Layout 布局'
-              }, {
-                value: 'color',
-                label: 'Color 色彩'
-              }, {
-                value: 'typography',
-                label: 'Typography 字体'
-              }, {
-                value: 'icon',
-                label: 'Icon 图标'
-              }, {
-                value: 'button',
-                label: 'Button 按钮'
-              }]
-            }, {
-              value: 'form',
-              label: 'Form',
-              children: [{
-                value: 'radio',
-                label: 'Radio 单选框'
-              }, {
-                value: 'checkbox',
-                label: 'Checkbox 多选框'
-              }, {
-                value: 'input',
-                label: 'Input 输入框'
-              }, {
-                value: 'input-number',
-                label: 'InputNumber 计数器'
-              }, {
-                value: 'select',
-                label: 'Select 选择器'
-              }, {
-                value: 'cascader',
-                label: 'Cascader 级联选择器'
-              }, {
-                value: 'switch',
-                label: 'Switch 开关'
-              }, {
-                value: 'slider',
-                label: 'Slider 滑块'
-              }, {
-                value: 'time-picker',
-                label: 'TimePicker 时间选择器'
-              }, {
-                value: 'date-picker',
-                label: 'DatePicker 日期选择器'
-              }, {
-                value: 'datetime-picker',
-                label: 'DateTimePicker 日期时间选择器'
-              }, {
-                value: 'upload',
-                label: 'Upload 上传'
-              }, {
-                value: 'rate',
-                label: 'Rate 评分'
-              }, {
-                value: 'form',
-                label: 'Form 表单'
-              }]
-            }, {
-              value: 'data',
-              label: 'Data',
-              children: [{
-                value: 'table',
-                label: 'Table 表格'
-              }, {
-                value: 'tag',
-                label: 'Tag 标签'
-              }, {
-                value: 'progress',
-                label: 'Progress 进度条'
-              }, {
-                value: 'tree',
-                label: 'Tree 树形控件'
-              }, {
-                value: 'pagination',
-                label: 'Pagination 分页'
-              }, {
-                value: 'badge',
-                label: 'Badge 标记'
-              }]
-            }, {
-              value: 'notice',
-              label: 'Notice',
-              children: [{
-                value: 'alert',
-                label: 'Alert 警告'
-              }, {
-                value: 'loading',
-                label: 'Loading 加载'
-              }, {
-                value: 'message',
-                label: 'Message 消息提示'
-              }, {
-                value: 'message-box',
-                label: 'MessageBox 弹框'
-              }, {
-                value: 'notification',
-                label: 'Notification 通知'
-              }]
-            }, {
-              value: 'navigation',
-              label: 'Navigation',
-              children: [{
-                value: 'menu',
-                label: 'NavMenu 导航菜单'
-              }, {
-                value: 'tabs',
-                label: 'Tabs 标签页'
-              }, {
-                value: 'breadcrumb',
-                label: 'Breadcrumb 面包屑'
-              }, {
-                value: 'dropdown',
-                label: 'Dropdown 下拉菜单'
-              }, {
-                value: 'steps',
-                label: 'Steps 步骤条'
-              }]
-            }, {
-              value: 'others',
-              label: 'Others',
-              children: [{
-                value: 'dialog',
-                label: 'Dialog 对话框'
-              }, {
-                value: 'tooltip',
-                label: 'Tooltip 文字提示'
-              }, {
-                value: 'popover',
-                label: 'Popover 弹出框'
-              }, {
-                value: 'card',
-                label: 'Card 卡片'
-              }, {
-                value: 'carousel',
-                label: 'Carousel 走马灯'
-              }, {
-                value: 'collapse',
-                label: 'Collapse 折叠面板'
-              }]
-            }]
-          }, {
-            value: 'ziyuan',
-            label: '资源',
-            children: [{
-              value: 'axure',
-              label: 'Axure Components'
-            }, {
-              value: 'sketch',
-              label: 'Sketch Templates'
-            }, {
-              value: 'jiaohu',
-              label: '组件交互文档'
-            }]
-          }
-        ],
-        tableData:[
-          {name:'测试',legalPerson:'AAAA'}
-        ],
+        formdata:{
+          customerClass:'租赁',
+          pageNum:1,
+          pageSize:50,
+          times:[],
+          customerName:"",
+          areas:[],
+          customerState:[],
+          credential:[],
+          groupSpecialtys:[],
+          groupSpecialtyId:[],
+          creditLevel:[],
+          paytaxType:[],
+          taxRate:[],
+          registerProvince:[],
+          registerCity:[],
+          approveDate2Start:null,
+          approveDate2End:null,
+        },
+        tableData:[],
         isSkeleton:false,
-        total:100,
-        pageSize:50,
-        pageNum:1,
+        total:0,
         // table列是否悬浮
         tableColumnFixed: true,
         fbsvisib:false,
@@ -494,13 +314,10 @@
     },
     created() {
       this.init()
+      this.cusoomerInfolist()
     },
     methods:{
       init(){
-        //地区
-        getDicts('arealist').then(res=>{
-          this.arealist = res.data
-        })
         //评价等级
         getDicts('credit_level').then(res=>{
           this.creditlevel = res.data
@@ -521,24 +338,81 @@
         getDicts('credential').then(res=>{
           this.credential = res.data
         })
-        this.dataRegion()
+        // this.dataRegion()
+        //专业类别
+        bizDictData().then(res=>{
+          this.groupSpecialty = res.data
+        })
+        // 地区树
+        areaAll().then(res=>{
+          this.addressList = res.data
+        })
       },
-      //地区
-      async dataRegion() {
-        let addrs = JSON.parse(JSON.stringify(dataRegion))
-        addrs.forEach(item=>{
-          if (item.children) {
-            (item.children).forEach(i => {
-              if (i.children) {
-                delete i.children
+      clears(){
+        this.formdata = {
+          customerClass: '租赁',
+          pageNum: 1,
+          pageSize: 50,
+          times: [],
+          customerName: '',
+          areas: [],
+          customerState: [],
+          credential: [],
+          groupSpecialtys: [],
+          groupSpecialtyId: [],
+          creditLevel: [],
+          paytaxType: [],
+          taxRate: [],
+          registerProvince: [],
+          registerCity: [],
+          approveDate2Start: null,
+          approveDate2End: null
+        }
+        this.cusoomerInfolist()
+      },
+      cusoomerInfolist(){
+        this.isSkeleton = true
+        let param = this.formdata
+        if(param.times){
+          param.approveDate2Start = param.times[0]
+          param.approveDate2End = param.times[1]
+        }else{
+          param.approveDate2Start = ''
+          param.approveDate2End = ''
+        }
+        param.groupSpecialtyId = []
+        if(param.groupSpecialtys){
+          param.groupSpecialtys.forEach(item=>{
+            param.groupSpecialtyId.push(item[item.length-1])
+          })
+        }
+        if(param.areas){
+          let province = []
+          let city = []
+          param.areas.forEach(item=>{
+            if(item.length == 3){//到市
+              if(item[1].indexOf('重庆')>-1||item[1].indexOf('北京')>-1||item[1].indexOf('天津')>-1||item[1].indexOf('上海')>-1){
+                province.push(item[1])
+              }else{
+                city.push(item[2])
               }
-            })
-          }
+            }
+          })
+          param.registerProvince = province
+          param.registerCity = city
+        }else{
+          param.registerProvince = []
+          param.registerCity = []
+        }
+        custmerInfolist(queryConditionFiltering(this.formdata)).then(res=>{
+          this.isSkeleton = false
+          this.tableData = res.rows
+          this.total = res.total
         })
-        this.addressList = addrs;
       },
-      handleCurrentChange(){
-
+      handleCurrentChange(val){
+        this.formdata.pageNum = val
+        this.cusoomerInfolist()
       },
       setHeaderRow() {
         return "owner-table-list-header";
@@ -558,7 +432,7 @@
       },
       //点击准入
       goAccess(row){
-        this.$tab.openPage('测试一下-准入情况', '/supplier/supplierlist/access')
+        this.$tab.openPage(row.customerName+'-准入情况', '/supplier/supplierlist/access',{customerKey:row.customerKey})
       },
       //点击考评
       goAssessment(row){
@@ -571,4 +445,3 @@
 <style scoped lang="scss">
 </style>
 
-

dsk-operate-ui/src/views/supplier/supplierlist/supplySubcontracting.vue

@@ -3,66 +3,59 @@
     <div class="search-supplier">
       <div class="title_wrap">
         <div class="enterprise_title">
-          分供分包类
+          物资设备
         </div>
       </div>
       <div class="content-supplier">
         <el-form :model="formdata" label-width="82px" label-position="right"  :inline="true" >
           <el-row>
             <el-form-item label="供应商名称">
-              <el-input v-model="formdata.user" placeholder="请输入分供方名称"></el-input>
-            </el-form-item>
-            <el-form-item label="注册地区">
-              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
-                <el-option v-for="(item,index) in arealist" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
-              </el-select>
+              <el-input v-model="formdata.customerName" placeholder="请输入供应商名称"></el-input>
             </el-form-item>
             <el-form-item label="注册城市">
               <el-cascader
-                v-model="formdata.user"
-                :options="addressList" :collapse-tags="true"
+                v-model="formdata.areas"
+                :options="addressList" :collapse-tags="true" :show-all-levels="false" clearable
                 :props="provienceprops"></el-cascader>
             </el-form-item>
-          </el-row>
-          <el-row>
             <el-form-item label="供应商状态">
-              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+              <el-select v-model="formdata.customerState" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in customstate" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
+          </el-row>
+          <el-row>
             <el-form-item label="资质等级">
-              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+              <el-select v-model="formdata.credential" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in credential" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="物资类别">
-              <el-select v-model="formdata.user" placeholder="请选择">
-                <el-option label="区域一" value="shanghai"></el-option>
-                <el-option label="区域二" value="beijing"></el-option>
-              </el-select>
+              <el-cascader clearable
+                           v-model="formdata.groupSpecialtys"
+                           :options="groupSpecialty" :collapse-tags="true"
+                           :props="groupprops"></el-cascader>
             </el-form-item>
-          </el-row>
-          <el-row>
             <el-form-item label="评价等级">
-              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+              <el-select v-model="formdata.creditLevel" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in creditlevel" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
+          </el-row>
+          <el-row>
             <el-form-item label="纳税人身份">
-              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+              <el-select v-model="formdata.paytaxType" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in paytaxtype" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="纳税人税率">
-              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+              <el-select v-model="formdata.taxRate" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in taxrate" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
-          </el-row>
-          <el-row>
             <el-form-item label="准入时间">
               <el-date-picker
-                v-model="formdata.time"
+                v-model="formdata.times"
                 type="daterange"
                 value-format="yyyy-MM-dd"
                 range-separator="至"
@@ -73,8 +66,8 @@
           </el-row>
           <el-divider></el-divider>
           <el-form-item label="  ">
-            <el-button type="primary" size="small">查询</el-button>
-            <el-button size="small">重置</el-button>
+            <el-button type="primary" size="small" @click="handleCurrentChange(1)">查询</el-button>
+            <el-button size="small" @click="clears">重置</el-button>
           </el-form-item>
         </el-form>
       </div>
@@ -83,6 +76,11 @@
       <div class="total-title">
         <div class="totals">共{{total}}条</div>
       </div>
+      <div class="table-item-jf table-item-jf1 empty-table" v-if="total == 0 && !isSkeleton">
+        <img class="item-jf-img" src="@/assets/images/kong.png" alt="">
+        <div class="item-jf-titel">暂无相关数据</div>
+        <div class="item-jf-text">抱歉，暂无数据，试试更换搜索条件吧</div>
+      </div>
       <skeleton v-if="isSkeleton"></skeleton>
 
       <div class="table-item-jf table-item" v-if="!isSkeleton&&tableData.length>0">
@@ -93,18 +91,18 @@
 
           <el-table-column type="index" label="序号" :fixed="tableColumnFixed" width="60" :resizable="false">
             <template slot-scope="scope">
-              <span>{{(pageNum - 1) *pageSize + scope.$index + 1}}</span>
+              <span>{{(formdata.pageNum - 1) *formdata.pageSize + scope.$index + 1}}</span>
             </template>
           </el-table-column>
-          <el-table-column label="供应商编号" :fixed="tableColumnFixed" width="120" :resizable="false">
+          <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">
             <template slot-scope="scope">
               <div class="renling">
                 <div style="display:flex;align-items:center">
-                  <router-link :to="`/enterprise/${encodeStr(scope.row.id)}`" tag="a"
-                               class="wordprimary" v-html="scope.row.name"></router-link>
+                  <router-link :to="`/enterprise/${encodeStr(scope.row.companyId)}`" tag="a"
+                               class="wordprimary" v-html="scope.row.customerName"></router-link>
                 </div>
               </div>
 
@@ -114,82 +112,82 @@
 
           <el-table-column label="推荐单位" min-width="280">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.recommendOrg||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="公司注册区域" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.registerRegion||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="公司注册省" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.registerProvince||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="公司注册城市" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.registerCity||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="供应类别" min-width="85" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.groupSpecialty||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="法人代表" min-width="85" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.representative||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="纳税人身份" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.paytaxType||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="纳税人税率" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.taxRate||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="资质等级" min-width="85" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.credential||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="注册资本(万元)" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.registerCapital||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="公司联系人" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.contactPerson||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="联系人电话" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.contactPhone||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="准入时间" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.approveDate2||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="公司合作数量" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.enterpriseCooperationCount||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="合作项目数量" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              <span>{{scope.row.legalPerson||"--"}}</span>
+              <span>{{scope.row.projectCooperationCount||"--"}}</span>
             </template>
           </el-table-column>
           <el-table-column label="分包商等级" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              <span class="wordprimary" @click="getFBS(scope.row)">{{scope.row.legalPerson||"--"}}</span>
+              <span class="wordprimary" @click="getFBS(scope.row)">{{scope.row.creditLevel||"--"}}</span>
             </template>
           </el-table-column>
           <el-table-column label="链接" min-width="160" :resizable="false">
@@ -200,14 +198,14 @@
           </el-table-column>
           <el-table-column label="资源平台分类" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              --
             </template>
           </el-table-column>
 
         </el-table>
       </div>
       <div class="pagination clearfix" v-show="total>0">
-        <el-pagination background :page-size="pageSize" :current-page.sync="pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
+        <el-pagination background :page-size="formdata.pageSize" :current-page.sync="formdata.pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
                        :total="total">
         </el-pagination>
       </div>
@@ -255,13 +253,13 @@
 </template>
 
 <script>
-  import { encodeStr } from "@/assets/js/common.js";
-  import "@/assets/styles/public.scss";
-  import "@/assets/styles/supplierlist.scss";
-  import skeleton from '@/views/project/projectList/component/skeleton';
-  import api from '@/api/enterpriseData/enterpriseData.js';
-  import dataRegion from '@/assets/json/provinceTree'
-  import { getDicts } from "@/api/system/dict/data";
+  import { encodeStr } from '@/assets/js/common.js'
+  import '@/assets/styles/public.scss'
+  import '@/assets/styles/supplierlist.scss'
+  import skeleton from '@/views/project/projectList/component/skeleton'
+  import { areaAll, bizDictData, custmerInfolist } from '@/api/supplier/supplier'
+  import { getDicts } from '@/api/system/dict/data'
+  import {queryConditionFiltering} from '@/utils/index'
   export default {
     name: 'supplySubcontracting',
     components:{skeleton},
@@ -275,216 +273,39 @@
         credential:[],
         paytaxtype:[],
         taxrate:[],
+        groupSpecialty:[],
         provienceprops:{
-          checkStrictly:true,
+          checkStrictly:false,
+          multiple:true,
+          label:'value',
+        },
+        groupprops:{
+          checkStrictly:false,
           multiple:true,
           value:'id',
         },
-        formdata:{},
-        options: [
-          {
-            value: 'zhinan',
-            label: '指南',
-            children: [{
-              value: 'shejiyuanze',
-              label: '设计原则',
-              children: [{
-                value: 'yizhi',
-                label: '一致'
-              }, {
-                value: 'fankui',
-                label: '反馈'
-              }, {
-                value: 'xiaolv',
-                label: '效率'
-              }, {
-                value: 'kekong',
-                label: '可控'
-              }]
-            }, {
-              value: 'daohang',
-              label: '导航',
-              children: [{
-                value: 'cexiangdaohang',
-                label: '侧向导航'
-              }, {
-                value: 'dingbudaohang',
-                label: '顶部导航'
-              }]
-            }]
-          }, {
-            value: 'zujian',
-            label: '组件',
-            children: [{
-              value: 'basic',
-              label: 'Basic',
-              children: [{
-                value: 'layout',
-                label: 'Layout 布局'
-              }, {
-                value: 'color',
-                label: 'Color 色彩'
-              }, {
-                value: 'typography',
-                label: 'Typography 字体'
-              }, {
-                value: 'icon',
-                label: 'Icon 图标'
-              }, {
-                value: 'button',
-                label: 'Button 按钮'
-              }]
-            }, {
-              value: 'form',
-              label: 'Form',
-              children: [{
-                value: 'radio',
-                label: 'Radio 单选框'
-              }, {
-                value: 'checkbox',
-                label: 'Checkbox 多选框'
-              }, {
-                value: 'input',
-                label: 'Input 输入框'
-              }, {
-                value: 'input-number',
-                label: 'InputNumber 计数器'
-              }, {
-                value: 'select',
-                label: 'Select 选择器'
-              }, {
-                value: 'cascader',
-                label: 'Cascader 级联选择器'
-              }, {
-                value: 'switch',
-                label: 'Switch 开关'
-              }, {
-                value: 'slider',
-                label: 'Slider 滑块'
-              }, {
-                value: 'time-picker',
-                label: 'TimePicker 时间选择器'
-              }, {
-                value: 'date-picker',
-                label: 'DatePicker 日期选择器'
-              }, {
-                value: 'datetime-picker',
-                label: 'DateTimePicker 日期时间选择器'
-              }, {
-                value: 'upload',
-                label: 'Upload 上传'
-              }, {
-                value: 'rate',
-                label: 'Rate 评分'
-              }, {
-                value: 'form',
-                label: 'Form 表单'
-              }]
-            }, {
-              value: 'data',
-              label: 'Data',
-              children: [{
-                value: 'table',
-                label: 'Table 表格'
-              }, {
-                value: 'tag',
-                label: 'Tag 标签'
-              }, {
-                value: 'progress',
-                label: 'Progress 进度条'
-              }, {
-                value: 'tree',
-                label: 'Tree 树形控件'
-              }, {
-                value: 'pagination',
-                label: 'Pagination 分页'
-              }, {
-                value: 'badge',
-                label: 'Badge 标记'
-              }]
-            }, {
-              value: 'notice',
-              label: 'Notice',
-              children: [{
-                value: 'alert',
-                label: 'Alert 警告'
-              }, {
-                value: 'loading',
-                label: 'Loading 加载'
-              }, {
-                value: 'message',
-                label: 'Message 消息提示'
-              }, {
-                value: 'message-box',
-                label: 'MessageBox 弹框'
-              }, {
-                value: 'notification',
-                label: 'Notification 通知'
-              }]
-            }, {
-              value: 'navigation',
-              label: 'Navigation',
-              children: [{
-                value: 'menu',
-                label: 'NavMenu 导航菜单'
-              }, {
-                value: 'tabs',
-                label: 'Tabs 标签页'
-              }, {
-                value: 'breadcrumb',
-                label: 'Breadcrumb 面包屑'
-              }, {
-                value: 'dropdown',
-                label: 'Dropdown 下拉菜单'
-              }, {
-                value: 'steps',
-                label: 'Steps 步骤条'
-              }]
-            }, {
-              value: 'others',
-              label: 'Others',
-              children: [{
-                value: 'dialog',
-                label: 'Dialog 对话框'
-              }, {
-                value: 'tooltip',
-                label: 'Tooltip 文字提示'
-              }, {
-                value: 'popover',
-                label: 'Popover 弹出框'
-              }, {
-                value: 'card',
-                label: 'Card 卡片'
-              }, {
-                value: 'carousel',
-                label: 'Carousel 走马灯'
-              }, {
-                value: 'collapse',
-                label: 'Collapse 折叠面板'
-              }]
-            }]
-          }, {
-            value: 'ziyuan',
-            label: '资源',
-            children: [{
-              value: 'axure',
-              label: 'Axure Components'
-            }, {
-              value: 'sketch',
-              label: 'Sketch Templates'
-            }, {
-              value: 'jiaohu',
-              label: '组件交互文档'
-            }]
-          }
-        ],
-        tableData:[
-          {name:'测试',legalPerson:'AAAA'}
-        ],
+        formdata:{
+          customerClass:'分供',
+          pageNum:1,
+          pageSize:50,
+          times:[],
+          customerName:"",
+          areas:[],
+          customerState:[],
+          credential:[],
+          groupSpecialtys:[],
+          groupSpecialtyId:[],
+          creditLevel:[],
+          paytaxType:[],
+          taxRate:[],
+          registerProvince:[],
+          registerCity:[],
+          approveDate2Start:null,
+          approveDate2End:null,
+        },
+        tableData:[],
         isSkeleton:false,
-        total:100,
-        pageSize:50,
-        pageNum:1,
+        total:0,
         // table列是否悬浮
         tableColumnFixed: true,
         fbsvisib:false,
@@ -493,13 +314,10 @@
     },
     created() {
       this.init()
+      this.cusoomerInfolist()
     },
     methods:{
       init(){
-        //地区
-        getDicts('arealist').then(res=>{
-          this.arealist = res.data
-        })
         //评价等级
         getDicts('credit_level').then(res=>{
           this.creditlevel = res.data
@@ -520,24 +338,81 @@
         getDicts('credential').then(res=>{
           this.credential = res.data
         })
-        this.dataRegion()
+        // this.dataRegion()
+        //专业类别
+        bizDictData().then(res=>{
+          this.groupSpecialty = res.data
+        })
+        // 地区树
+        areaAll().then(res=>{
+          this.addressList = res.data
+        })
       },
-      //地区
-      async dataRegion() {
-        let addrs = JSON.parse(JSON.stringify(dataRegion))
-        addrs.forEach(item=>{
-          if (item.children) {
-            (item.children).forEach(i => {
-              if (i.children) {
-                delete i.children
+      clears(){
+        this.formdata = {
+          customerClass: '分供',
+          pageNum: 1,
+          pageSize: 50,
+          times: [],
+          customerName: '',
+          areas: [],
+          customerState: [],
+          credential: [],
+          groupSpecialtys: [],
+          groupSpecialtyId: [],
+          creditLevel: [],
+          paytaxType: [],
+          taxRate: [],
+          registerProvince: [],
+          registerCity: [],
+          approveDate2Start: null,
+          approveDate2End: null
+        }
+        this.cusoomerInfolist()
+      },
+      cusoomerInfolist(){
+        this.isSkeleton = true
+        let param = this.formdata
+        if(param.times){
+          param.approveDate2Start = param.times[0]
+          param.approveDate2End = param.times[1]
+        }else{
+          param.approveDate2Start = ''
+          param.approveDate2End = ''
+        }
+        param.groupSpecialtyId = []
+        if(param.groupSpecialtys){
+          param.groupSpecialtys.forEach(item=>{
+            param.groupSpecialtyId.push(item[item.length-1])
+          })
+        }
+        if(param.areas){
+          let province = []
+          let city = []
+          param.areas.forEach(item=>{
+            if(item.length == 3){//到市
+              if(item[1].indexOf('重庆')>-1||item[1].indexOf('北京')>-1||item[1].indexOf('天津')>-1||item[1].indexOf('上海')>-1){
+                province.push(item[1])
+              }else{
+                city.push(item[2])
               }
-            })
-          }
+            }
+          })
+          param.registerProvince = province
+          param.registerCity = city
+        }else{
+          param.registerProvince = []
+          param.registerCity = []
+        }
+        custmerInfolist(queryConditionFiltering(this.formdata)).then(res=>{
+          this.isSkeleton = false
+          this.tableData = res.rows
+          this.total = res.total
         })
-        this.addressList = addrs;
       },
-      handleCurrentChange(){
-
+      handleCurrentChange(val){
+        this.formdata.pageNum = val
+        this.cusoomerInfolist()
       },
       setHeaderRow() {
         return "owner-table-list-header";
@@ -557,7 +432,7 @@
       },
       //点击准入
       goAccess(row){
-        this.$tab.openPage('测试一下-准入情况', '/supplier/supplierlist/access')
+        this.$tab.openPage(row.customerName+'-准入情况', '/supplier/supplierlist/access',{customerKey:row.customerKey})
       },
       //点击考评
       goAssessment(row){

dsk-operate-ui/vue.config.js

@@ -35,9 +35,10 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        // target: `http://47.104.91.229:9099/prod-api`,//测试
+        // target: `http://47.104.91.229:9099/prod-api`,//测试-旧
         target: `http://111.204.34.146:9099/prod-api`,//测试
-        // target: `https://szhapi.jiansheku.com`,//线上
+        // target: `http://192.168.60.5:9098`,//陈跃方
+
         // target: `http://122.9.160.122:9011`,  //线上
         // target: `http://192.168.0.165:9098`,//施-无线
         // target: `http://192.168.60.46:9098`,//施-有线