Merge branch 'master' of http://192.168.60.201/root/dsk-operate-sys

dsk-admin/src/main/java/com/dsk/web/controller/business/BusinessBacklogController.java

@@ -46,7 +46,7 @@ public class BusinessBacklogController extends BaseController
      */
 //    @PreAuthorize("@ss.hasPermi('system:backlog:list')")
     @GetMapping("/list")
-    public TableDataInfo list(@RequestBody BusinessBacklog businessBacklog)
+    public TableDataInfo list(@RequestBody(required=false) BusinessBacklog businessBacklog)
     {
         startPage();
         List<BusinessBacklog> list = businessBacklogService.selectBusinessBacklogList(businessBacklog);

dsk-admin/src/main/java/com/dsk/web/controller/business/BusinessContactsController.java

@@ -40,7 +40,7 @@ public class BusinessContactsController extends BaseController
      */
 //    @PreAuthorize("@ss.hasPermi('system:contacts:list')")
     @GetMapping("/list")
-    public TableDataInfo list(@RequestBody BusinessContacts businessContacts)
+    public TableDataInfo list(@RequestBody(required=false) BusinessContacts businessContacts)
     {
         startPage();
         List<BusinessContacts> list = businessContactsService.selectBusinessContactsList(businessContacts);

dsk-admin/src/main/java/com/dsk/web/controller/business/BusinessInfoController.java

@@ -17,6 +17,10 @@ import com.dsk.common.core.controller.BaseController;
 import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.enums.BusinessType;
 import com.dsk.common.core.page.TableDataInfo;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 /**
  * 项目详情Controller
@@ -31,11 +35,18 @@ public class BusinessInfoController extends BaseController
     @Autowired
     private IBusinessInfoService businessInfoService;
 
+    /**
+     * 项目批量导入
+     */
+    @PostMapping("/upload")
+//    public AjaxResult batchUpload(@RequestPart("file") MultipartFile file, HttpServletRequest request, HttpServletResponse response){
+    public AjaxResult batchUpload(@RequestPart("file") MultipartFile file){
+         return businessInfoService.batchUpload(file);
+    }
 
     /**
      * 查询所有项目名称(支持模糊查询)
      */
-//    @PreAuthorize("@ss.hasPermi('system:info:list')")
     @PostMapping("/query/project")
     public AjaxResult queryprojectName(@RequestBody BusinessListDto dto){
         return AjaxResult.success(businessInfoService.selectProjectName(dto));
@@ -44,9 +55,9 @@ public class BusinessInfoController extends BaseController
     /**
      * 查询项目列表
      */
-//    @PreAuthorize("@ss.hasPermi('system:info:list')")
+//    @PreAuthorize("@ss.hasPermi('system:business:list')")
     @GetMapping("/list")
-    public TableDataInfo list(@RequestBody BusinessListDto dto)
+    public TableDataInfo list(@RequestBody(required=false) BusinessListDto dto)
     {
         startPage();
         List<BusinessListVo> list = businessInfoService.selectBusinessInfoList(dto);
@@ -56,7 +67,7 @@ public class BusinessInfoController extends BaseController
     /**
      * 查询项目速览
      */
-//    @PreAuthorize("@ss.hasPermi('system:info:list')")
+//    @PreAuthorize("@ss.hasPermi('system:business:query')")
     @GetMapping("/browse/{businessId}")
     public AjaxResult browse(@PathVariable Integer id)
     {
@@ -66,7 +77,7 @@ public class BusinessInfoController extends BaseController
     /**
      * 获取项目建设内容
      */
-//    @PreAuthorize("@ss.hasPermi('system:info:query')")
+//    @PreAuthorize("@ss.hasPermi('system:business:query')")
     @GetMapping(value = "/construction/{id}")
     public AjaxResult getConstruction(@PathVariable("id") Integer id)
     {
@@ -76,8 +87,8 @@ public class BusinessInfoController extends BaseController
     /**
      * 删除项目列表
      */
-//    @PreAuthorize("@ss.hasPermi('system:info:remove')")
-//    @Log(title = "项目详情", businessType = BusinessType.DELETE)
+//    @PreAuthorize("@ss.hasPermi('system:business:remove')")
+    @Log(title = "项目管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/remove/{ids}")
     public AjaxResult remove(@PathVariable(value = "ids",required=false) Long[] ids)
     {
@@ -87,8 +98,8 @@ public class BusinessInfoController extends BaseController
     /**
      * 新增项目详情
      */
-//    @PreAuthorize("@ss.hasPermi('system:info:add')")
-//    @Log(title = "项目详情", businessType = BusinessType.INSERT)
+//    @PreAuthorize("@ss.hasPermi('system:business:add')")
+    @Log(title = "项目管理", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     public AjaxResult add(@RequestBody BusinessAddDto dto)
     {
@@ -98,8 +109,8 @@ public class BusinessInfoController extends BaseController
     /**
      * 修改项目详情
      */
-//    @PreAuthorize("@ss.hasPermi('system:info:edit')")
-//    @Log(title = "项目详情", businessType = BusinessType.UPDATE)
+//    @PreAuthorize("@ss.hasPermi('system:business:edit')")
+    @Log(title = "项目管理", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     public AjaxResult edit(@RequestBody BusinessInfo businessInfo)
     {

dsk-admin/src/main/java/com/dsk/web/controller/business/BusinessRelateCompanyController.java

@@ -49,7 +49,7 @@ public class BusinessRelateCompanyController extends BaseController
      */
 //    @PreAuthorize("@ss.hasPermi('system:company:list')")
     @GetMapping("/list")
-    public TableDataInfo list(BusinessRelateCompany businessRelateCompany)
+    public TableDataInfo list(@RequestBody(required=false) BusinessRelateCompany businessRelateCompany)
     {
         startPage();
         List<BusinessRelateCompany> list = businessRelateCompanyService.selectBusinessRelateCompanyList(businessRelateCompany);

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

 package com.dsk.web.controller.customer;
 
+import cn.hutool.core.bean.BeanException;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.http.HttpException;
@@ -15,6 +16,7 @@ import com.dsk.system.domain.customer.dto.CustomerBusinessSearchDto;
 import com.dsk.system.domain.customer.dto.CustomerSearchDto;
 import com.dsk.system.service.ICustomerService;
 import com.dsk.web.controller.search.service.BusinessOpportunityRadarService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.util.ObjectUtils;
@@ -66,6 +68,17 @@ public class CustomerController extends BaseController {
     @PostMapping()
     @RepeatSubmit
     public AjaxResult add(@RequestBody Customer customer) {
+        if (ObjectUtils.isEmpty(customer.getCompanyName())) throw new BeanException("企业名称不能为空");
+        if (ObjectUtils.isEmpty(customer.getCompanyId())) {
+            try {
+                Map<String, Object> map = opportunityRadarService.enterpriseByName(customer.getCompanyName());
+                if (!ObjectUtils.isEmpty(map.get("data"))) {
+                    customer.setCompanyId(MapUtil.getInt(BeanUtil.beanToMap(map.get("data")), "jskEid"));
+                }
+            } catch (Exception e) {
+                logger.debug("获取企业id错误！error：{}", e.getMessage());
+            }
+        }
         return AjaxResult.success(baseService.add(customer));
     }
 

dsk-admin/src/main/java/com/dsk/web/controller/dsk/EnterpriseController.java

@@ -45,12 +45,6 @@ public class EnterpriseController {
         return enterpriseService.bidDataGroup(vo);
     }
 
-    @ApiOperation(value = "供应商列表（建设库）")
-    @PostMapping(value = "supplierPage")
-    public R supplierPage(@RequestBody @Valid EnterpriseSupplierPageBody vo) throws Exception {
-        return enterpriseService.supplierPage(vo);
-    }
-
     @ApiOperation(value = "甲方业绩数据（openApi）")
     @PostMapping(value = "projectTenderDataGroup")
     public R projectTenderDataGroup(@RequestBody @Valid EnterpriseProjectTenderDataGroupBody vo) throws Exception {
@@ -75,30 +69,6 @@ public class EnterpriseController {
         return enterpriseService.affiliates(vo);
     }
 
-    @ApiOperation(value = "招标公告列表（建设库）")
-    @PostMapping(value = "bidNoticePage")
-    public R bidNoticePage(@RequestBody @Valid EnterpriseBidNoticePageBody vo) throws Exception {
-        return enterpriseService.bidNoticePage(vo);
-    }
-
-    @ApiOperation(value = "招标公告省份（建设库）")
-    @PostMapping(value = "bidNoticeProvince")
-    public R bidNoticeProvince(@RequestBody @Valid EnterpriseBidNoticePageBody vo) throws Exception {
-        return enterpriseService.bidNoticeProvince(vo);
-    }
-
-    @ApiOperation(value = "招标公告信息类型（建设库）")
-    @PostMapping(value = "bidNoticeTenderStage")
-    public R bidNoticeTenderStage(@RequestBody @Valid EnterpriseBidNoticePageBody vo) throws Exception {
-        return enterpriseService.bidNoticeTenderStage(vo);
-    }
-
-    @ApiOperation(value = "招标公告详情（建设库）")
-    @PostMapping(value = "bidNoticeDeatil")
-    public R bidNoticeDeatil(@RequestBody @Valid EnterpriseBidNoticeDetailBody vo) throws Exception {
-        return enterpriseService.bidNoticeDeatil(vo);
-    }
-
     @ApiOperation(value = "企业动态列表（建设库）")
     @PostMapping(value = "dynamicPage")
     public TableDataInfo dynamicPage(@RequestBody @Valid EnterpriseDynamicPageBody vo) throws Exception {
@@ -129,4 +99,10 @@ public class EnterpriseController {
         return enterpriseService.bestStockPage(vo);
     }
 
+    @ApiOperation(value = "财务简析（openApi）")
+    @PostMapping(value = "financial")
+    public R financial(@RequestBody @Valid EnterpriseFinancialBody vo) throws Exception {
+        return enterpriseService.financial(vo);
+    }
+
 }

dsk-admin/src/main/java/com/dsk/web/controller/dsk/EnterpriseProjectController.java

@@ -83,6 +83,12 @@ public class EnterpriseProjectController {
         return enterpriseProjectService.specialDebtProjectDetail(body);
     }
 
+    @ApiOperation(value = "专项债列表")
+    @RequestMapping(value = "/specialDebtPage", method = RequestMethod.POST)
+    public TableDataInfo specialDebtPage(@RequestBody @Valid Object  body) throws Exception {
+        return enterpriseProjectService.specialDebtPage(body);
+    }
+
     @ApiOperation(value = "招标公告列表")
     @RequestMapping(value = "/bidNoticePage",method = RequestMethod.POST)
     public TableDataInfo bidNoticePage(@RequestBody @Valid EnterpriseProjectBidNoticePageBody body) throws Exception {

dsk-admin/src/main/java/com/dsk/web/controller/search/controller/CompanySearchController.java

@@ -26,7 +26,7 @@ public class CompanySearchController {
      */
     @RequestMapping("/index")
     public AjaxResult landMarketPage(@RequestBody ComposeQueryDto compose) {
-        return opportunityRadarService.enterprisePage(compose);
+        return opportunityRadarService.enterpriseIndex(compose);
     }
 
     /*
@@ -36,4 +36,12 @@ public class CompanySearchController {
     public AjaxResult findByName(@PathVariable String keyword) {
         return opportunityRadarService.enterpriseByName(keyword);
     }
+
+    /*
+     * 完全匹配企业名称
+     */
+    @GetMapping("/page")
+    public AjaxResult page(@RequestBody ComposeQueryDto compose) {
+        return opportunityRadarService.enterprisePage(compose);
+    }
 }

dsk-admin/src/main/java/com/dsk/web/controller/search/macroMarket/RegionalEconomicDataController.java

@@ -2,6 +2,7 @@ package com.dsk.web.controller.search.macroMarket;
 
 import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.dtos.OpRegionalEconomicDataV1Dto;
+import com.dsk.common.dtos.OpRegionalEconomicDataV1PageDto;
 import com.dsk.system.service.EconomicService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -29,7 +30,7 @@ public class RegionalEconomicDataController {
      *@date: 2023/5/18 10:29
      */
     @PostMapping("/national/nationalPage")
-    public AjaxResult nationalPage(@RequestBody OpRegionalEconomicDataV1Dto dto) {
+    public AjaxResult nationalPage(@RequestBody OpRegionalEconomicDataV1PageDto dto) {
         return economicService.nationalPage(dto);
     }
 

dsk-admin/src/main/java/com/dsk/web/controller/search/service/BusinessOpportunityRadarService.java

@@ -18,10 +18,12 @@ public interface BusinessOpportunityRadarService {
     AjaxResult landMarketPage(ComposeQueryDto compose);
     AjaxResult establishmentPage(ComposeQueryDto compose);
 
-    AjaxResult enterprisePage(ComposeQueryDto compose);
+    AjaxResult enterpriseIndex(ComposeQueryDto compose);
 
     AjaxResult enterpriseByName(String keyword);
 
+    AjaxResult enterprisePage(ComposeQueryDto compose);
+
     AjaxResult bondProjectPage(ComposeQueryDto compose);
 
     AjaxResult jskBidPlanPage(ComposeQueryDto compose);

dsk-admin/src/main/java/com/dsk/web/controller/search/service/impl/BusinessOpportunityRadarServiceImpl.java

@@ -51,11 +51,18 @@ public class BusinessOpportunityRadarServiceImpl implements BusinessOpportunityR
     }
 
     @Override
-    public AjaxResult enterprisePage(ComposeQueryDto compose) {
+    public AjaxResult enterpriseIndex(ComposeQueryDto compose) {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/index", BeanUtil.beanToMap(compose, false, false));
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
+    @Override
+    public AjaxResult enterprisePage(ComposeQueryDto compose) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/page", BeanUtil.beanToMap(compose, false, false));
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+
     @Override
     public AjaxResult enterpriseByName(String keyword){
         Map<String,Object> params = new HashMap<>();

dsk-common/src/main/java/com/dsk/common/core/domain/entity/BusinessInfo.java

@@ -118,6 +118,78 @@ public class BusinessInfo extends BaseEntity
     @Excel(name = "项目状态")
     private Integer status;
 
+    /** 评标办法 */
+    @Excel(name = "评标办法")
+    private String evaluationBidWay;
+
+    /** 开标时间 */
+    @Excel(name = "开标时间")
+    private String bidOpenTime;
+
+    /** 开标地点 */
+    @Excel(name = "开标地点")
+    private String bidOpenPlace;
+
+    /** 保证金缴纳 */
+    @Excel(name = "保证金缴纳")
+    private String earnestMoneyPay;
+
+    /** 保证金金额 */
+    @Excel(name = "保证金金额")
+    private String earnestMoney;
+
+    /** 评标委员会 */
+    @Excel(name = "评标委员会")
+    private String evaluationBidCouncil;
+
+    public String getEvaluationBidWay() {
+        return evaluationBidWay;
+    }
+
+    public void setEvaluationBidWay(String evaluationBidWay) {
+        this.evaluationBidWay = evaluationBidWay;
+    }
+
+    public String getBidOpenTime() {
+        return bidOpenTime;
+    }
+
+    public void setBidOpenTime(String bidOpenTime) {
+        this.bidOpenTime = bidOpenTime;
+    }
+
+    public String getBidOpenPlace() {
+        return bidOpenPlace;
+    }
+
+    public void setBidOpenPlace(String bidOpenPlace) {
+        this.bidOpenPlace = bidOpenPlace;
+    }
+
+    public String getEarnestMoneyPay() {
+        return earnestMoneyPay;
+    }
+
+    public void setEarnestMoneyPay(String earnestMoneyPay) {
+        this.earnestMoneyPay = earnestMoneyPay;
+    }
+
+    public String getEarnestMoney() {
+        return earnestMoney;
+    }
+
+    public void setEarnestMoney(String earnestMoney) {
+        this.earnestMoney = earnestMoney;
+    }
+
+    public String getEvaluationBidCouncil() {
+        return evaluationBidCouncil;
+    }
+
+    public void setEvaluationBidCouncil(String evaluationBidCouncil) {
+        this.evaluationBidCouncil = evaluationBidCouncil;
+    }
+
     public Integer getStatus() {
         return status;
     }
@@ -359,7 +431,12 @@ public class BusinessInfo extends BaseEntity
             .append("createTime", getCreateTime())
             .append("updateTime", getUpdateTime())
             .append("customerId", getCustomerId())
-            .append("status", getStatus())
+            .append("evaluationBidWay", getEvaluationBidWay())
+            .append("bidOpenTime", getBidOpenTime())
+            .append("bidOpenPlace", getBidOpenPlace())
+            .append("earnestMoneyPay", getEarnestMoneyPay())
+            .append("earnestMoney", getEarnestMoney())
+            .append("evaluationBidCouncil", getEvaluationBidCouncil())
             .toString();
     }
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseFinancialBody.java

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseFinancialBody
+{
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+
+}

dsk-common/src/main/java/com/dsk/common/dtos/OpRegionalEconomicDataV1Dto.java

 package com.dsk.common.dtos;
 
-import com.dsk.common.core.domain.model.BasePage;
 import lombok.Data;
 
 /**
@@ -11,27 +10,40 @@ import lombok.Data;
  * @Version
  */
 @Data
-public class OpRegionalEconomicDataV1Dto extends BasePage {
+public class OpRegionalEconomicDataV1Dto {
+
+    /**
+     * id
+     */
+    private Integer id;
 
     /**
      * 年份
      */
     private Integer year;
+
     /**
-     * 省
+     * 省Id
      */
-    private String provinceId;
+    private Integer provinceId;
+
     /**
-     * 市
+     * 市Id
      */
-    private String cityId;
+    private Integer cityId;
+
+    /**
+     * 区Id
+     */
+    private Integer areaId;
+
     /**
-     * 区
+     * 城市类型 1：直辖市
      */
-    private String areaId;
+    private Integer cityType;
 
     /**
-     * 全国宏观经济：1 / 辖区经济：2 / 地区对比：3
+     * 城市类型 1：直辖市
      */
-    private Integer type;
+    private Integer provinceType;
 }

dsk-common/src/main/java/com/dsk/common/dtos/OpRegionalEconomicDataV1PageDto.java

+package com.dsk.common.dtos;
+
+import com.dsk.common.core.domain.model.BasePage;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @ClassName OpRegionalEconomicDataV1PageDto
+ * @Description 专项债-项目类别统计
+ * @Author Dgm
+ * @Date 2023/5/23 14:05
+ * @Version
+ */
+@Data
+public class OpRegionalEconomicDataV1PageDto extends BasePage {
+
+    /**
+     * 年份
+     */
+    private Integer year;
+    /**
+     * 省
+     */
+    private List<String> provinceIds;
+    /**
+     * 市
+     */
+    private List<String> cityIds;
+    /**
+     * 区
+     */
+    private List<String> areaIds;
+
+    /**
+     * 全国宏观经济：1 / 辖区经济：2 / 地区对比：3
+     */
+    private Integer type;
+
+    /**
+     * 排序字段 默认gdp
+     */
+    private String field = "gdp";
+    /**
+     * 排序 (降序desc 升序asc)
+     */
+    private String order = "desc";
+}

dsk-common/src/main/java/com/dsk/common/dtos/SpecialBondInformationPageDto.java

@@ -12,4 +12,9 @@ import lombok.Data;
  */
 @Data
 public class SpecialBondInformationPageDto extends BasePage {
+
+    /**
+     * 专项债券唯一标识
+     */
+    private String specialBondUuid;
 }

dsk-common/src/main/java/com/dsk/common/dtos/UrbanInvestmentPlatformDto.java

@@ -56,4 +56,18 @@ public class UrbanInvestmentPlatformDto extends BasePage {
      * 区
      */
     private Integer areaId;
+
+    /**
+     * 关键词
+     */
+    private String keyword;
+
+    /**
+     * 排序字段
+     */
+    private String field;
+    /**
+     * 字段 desc asc
+     */
+    private String order;
 }

dsk-common/src/main/java/com/dsk/common/utils/DskOpenApiUtil.java

@@ -32,7 +32,8 @@ public class DskOpenApiUtil {
 	}
 
 	public Map<String,Object> requestBodyLocal(String path, Map<String, Object> bodyMap){
-		return JSONUtil.toBean(HttpUtil.post("http://127.0.0.1:8766"+path, JSONUtil.toJsonStr(bodyMap)), JSONConfig.create().setIgnoreNullValue(true), Map.class);
+		String post = HttpUtil.post("http://127.0.0.1:8766" + path, JSONUtil.toJsonStr(bodyMap));
+		return CommonUtils.assertAsMap(CommonUtils.parseJSON(post));
 	}
 
 	public Map<String,Object> requestBodyWithHeader(String path, Map<String, Object> bodyMap, Map<String, String> headerMap){

dsk-operate-ui/package.json

@@ -48,6 +48,7 @@
     "highlight.js": "9.18.5",
     "js-beautify": "1.13.0",
     "js-cookie": "3.0.1",
+    "js-md5": "^0.7.3",
     "jsencrypt": "3.0.0-rc.1",
     "nprogress": "0.2.0",
     "quill": "1.3.7",

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

+import request from '@/utils/request'
+
+// 合作情况列表
+export function getList(data) {
+  return request({
+    url: '/customer/business/list',
+    method: 'get',
+    params:data
+  })
+}
+
+// 客户详情
+export function customerInfo(data) {
+  return request({
+    url: '/customer/'+data,
+    method: 'get'
+  })
+}
+
+// 编辑客户
+export function customerUpdate(data) {
+  return request({
+    url: '/customer/',
+    method: 'put',
+    data: data
+  })
+}
+
+// 模糊查询项目名称
+export function queryProject(data) {
+  return request({
+    url: '/business/info/query/project',
+    method: 'post',
+    data
+  })
+}

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

@@ -17,3 +17,4 @@ export function addChain(data) {
     data:data
   })
 }
+

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

+import request from "@/utils/request";
+
+// 获取查询下拉选项
+export function getOption() {
+  return request({
+    url: '/getInfo',
+    method: 'get'
+  })
+}
+
+// 获取列表数据
+export function getList(data) {
+  return request({
+    url: '/getInfo',
+    method: 'get'
+  })
+}

dsk-operate-ui/src/api/riskInformation/punish.js → dsk-operate-ui/src/api/detail/party-a/riskInformation.js

@@ -8,7 +8,6 @@ export function penalizePage(data) {
     data:data
   })
 }
-
 // 行政处罚类型
 export function penalizeReasonType(data) {
   return request({
@@ -17,3 +16,22 @@ export function penalizeReasonType(data) {
     data:data
   })
 }
+
+// 经营异常列表
+export function abnormalPage(data) {
+  return request({
+    url: '/enterpriseCredit/abnormalPage',
+    method: 'post',
+    data:data
+  })
+}
+// 经营异常年份
+export function abnormalYears(data) {
+  return request({
+    url: '/enterpriseCredit/abnormalYears',
+    method: 'post',
+    data:data
+  })
+}
+
+

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

+import request from '@/utils/request'
+
+// 土地交易用途
+export function landUse(data) {
+  return request({
+    url: '/enterpriseProject/landUse',
+    method: 'post',
+    data
+  })
+}
+// 土地交易列表
+export function landTransactionPage(data) {
+  return request({
+    url: '/enterpriseProject/landTransactionPage',
+    method: 'post',
+    data
+  })
+}
+// 区域经济
+export function regionalEconomy(data) {
+  return request({
+    url: '/economic/regional/list',
+    method: 'post',
+    data
+  })
+}
+// 同地区城投
+export function urbanInvestmentPage(data) {
+  return request({
+    url: '/urbanInvestment/page',
+    method: 'post',
+    data
+  })
+}

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

+import request from '@/utils/request'
+//新增项目
+export function addProject(param) {
+  return request({
+    url: '/business/info/add',
+    method: 'POST',
+    data: param
+  })
+}
+//商机列表
+export function getProjectlist(param) {
+  return request({
+    url: '/business/info/list',
+    method: 'GET',
+    params: param
+  })
+}
+

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

@@ -82,12 +82,6 @@
         &:hover{
           background: #F3F4F5;
         }
-        .txt{
-          padding-left: 8px;
-          opacity: 0.4;
-          display: inline-block;
-          width: 100%;
-        }
         .el-input{
           margin-right: 8px;
           .el-input__inner{
@@ -100,67 +94,100 @@
             text-indent: 8px;
           }
         }
+        .el-date-editor--date{
+          .el-input__prefix{
+            display: none;
+          }
+        }
+        &.i{
+          .el-input{
+            .el-input__inner{
+              width: 100px;
+            }
+          }
+        }
+      }
+      .txt{
+        padding-left: 8px;
+        color: rgba(35,35,35,0.4);
+        display: inline-block;
+        width: 100%;
       }
       width: 438px;
       &.i{
         width: auto;
       }
-      .tipinput{
+      .inputime{
         display: inline-block;
-        margin-top: 1px;
-        width: calc(100% - 116px);
-        .el-input{
-          float: left;
-          margin-right: 8px;
-          width: 70px;
-          margin-bottom: 10px;
-          .el-input__inner{
-            width: 70px;
-            height: 24px;
-            background: #F3F4F5;
-            border-radius: 2px;
-            padding: 0;
-            text-indent: 14px;
-            border: 0;
-          }
+        width: 184px;
+        height: 28px;
+        border-radius: 2px;
+        line-height: 28px;
+        cursor: pointer;
+        >span{
+          padding-left: 8px;
         }
-        .addbtn{
-          float: left;
-          width: 20px;
-          height: 20px;
-          background: url("../../assets/images/project/add.png") no-repeat center center;
-          background-size: 100%;
-          display: inline-block;
-          margin-left: 8px;
-          margin-top: 2px;
-          &:hover{
-            background: url("../../assets/images/project/add_1.png") no-repeat center center;
-          }
+        .el-icon-caret-bottom{
+          color: rgba(35,35,32,0.4);
+          margin-left: 4px;
         }
-        .tips{
-          float: left;
-          height: 24px;
-          line-height: 24px;
-          padding: 0 14px;
-          font-size: 14px;
-          color: #0081FF;
-          background: #E4F3FD;
-          margin-right: 8px;
-          margin-bottom: 5px;
-          img{
-            margin-left: 8px;
-            margin-top: 4px;
-            float: right;
-            width: 16px;
-            display: none;
-            cursor: pointer;
-          }
-          &:hover{
-            background: #DCEAF3;
-            img{
-              display: block;
-            }
-          }
+      }
+    }
+  }
+  .tipinput{
+    display: inline-block;
+    margin-top: 1px;
+    width: calc(100% - 116px);
+    .el-input{
+      float: left;
+      margin-right: 8px;
+      width: 70px;
+      margin-bottom: 10px;
+      .el-input__inner{
+        width: 70px;
+        height: 24px;
+        background: #F3F4F5;
+        border-radius: 2px;
+        padding: 0;
+        text-indent: 14px;
+        border: 0;
+      }
+    }
+    .addbtn{
+      float: left;
+      width: 20px;
+      height: 20px;
+      background: url("../../assets/images/project/add.png") no-repeat center center;
+      background-size: 100%;
+      display: inline-block;
+      margin-left: 8px;
+      margin-top: 2px;
+      &:hover{
+        background: url("../../assets/images/project/add_1.png") no-repeat center center;
+      }
+    }
+    .tips{
+      float: left;
+      height: 24px;
+      line-height: 24px;
+      padding: 0 14px;
+      font-size: 14px;
+      color: #0081FF;
+      background: #E4F3FD;
+      margin-right: 8px;
+      margin-bottom: 5px;
+      img{
+        margin-left: 8px;
+        margin-top: 4px;
+        float: right;
+        width: 16px;
+        display: none;
+        cursor: pointer;
+      }
+      &:hover{
+        background: #DCEAF3;
+        img{
+          display: block;
         }
       }
     }
@@ -543,7 +570,7 @@
 
           .el-input__prefix{
             left: 8px;
-            top: 4px;
+            top: -2px;
           }
           .el-input__suffix{
             height: 32px;
@@ -673,6 +700,15 @@
       text-align: center;
       display: inline-block;
       margin-left: 10px;
+      &.on{
+        background: #FF3C3C;
+        color: #FF3C3C;
+      }
+      &:hover{
+        border: 1px solid #FF3C3C;
+        color: #FF3C3C;
+        background: #FFEBEB;
+      }
     }
   }
   .tasklist{
@@ -701,6 +737,21 @@
       border-radius: 4px;
       right: 16px;
       top: 30px;
+      padding: 8px 12px;
+      line-height: 16px;
+      box-sizing: border-box;
+      &.on{
+        background: #D3F0E8;
+        .color_text{
+          color: #0CBC6D;
+        }
+      }
+      .select-popper{
+        margin: 0;
+      }
+      .el-icon-caret-bottom{
+        color:rgba(35,35,35,0.4) ;
+      }
     }
   }
 }

dsk-operate-ui/src/assets/styles/public.css

@@ -306,7 +306,7 @@ select {
 
 .el-dropdown-land .el-icon-caret-bottom {
 	color: #333333;
-	margin-left: 4px;
+	margin-left: 2px;
 }
 
 .land_date_picker {

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

@@ -106,6 +106,12 @@ export const constantRoutes = [
         component: () => import('@/views/detail/party-b/index'),
         name: 'PartyB',
         meta: { title: '已方详情' }
+      },
+      {
+        path: 'structure',
+        component: () => import('@/views/detail/structure/index'),
+        name: 'Structure',
+        meta: { title: '企业链图' }
       }
     ]
   },
@@ -150,6 +156,20 @@ export const constantRoutes = [
 	      meta: { title: '土地交易详情', icon: 'radar' }
 	    }
 	  ]
+	},
+	{
+	  path: '/Establishment',
+	  component: Layout,
+	  hidden: true,
+	  redirect: 'noredirect',
+	  children: [
+	    {
+	      path: '/radar/Establishment/details/:id(\\d+)',
+	      component: () => import('@/views/radar/Establishment/details'),
+	      name: 'EstablishmentDetails',
+	      meta: { title: '拟建项目详情', icon: 'radar' }
+	    }
+	  ]
 	}
 ]
 

dsk-operate-ui/src/store/modules/user.js

@@ -7,7 +7,8 @@ const user = {
     name: '',
     avatar: '',
     roles: [],
-    permissions: []
+    permissions: [],
+    userId:'',
   },
 
   mutations: {
@@ -25,6 +26,9 @@ const user = {
     },
     SET_PERMISSIONS: (state, permissions) => {
       state.permissions = permissions
+    },
+    SET_USERID: (state, userId) => {
+      state.userId = userId
     }
   },
 
@@ -60,6 +64,7 @@ const user = {
           }
           commit('SET_NAME', user.userName)
           commit('SET_AVATAR', avatar)
+          commit('SET_USERID', user.userId)
           resolve(res)
         }).catch(error => {
           reject(error)

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

@@ -283,7 +283,7 @@
 <script>
   import { getToken } from "@/utils/auth";
   import "@/assets/styles/project.scss"
-  import {getCustomerList,importData} from '@/api/custom/custom'
+  import {getCustomerList,importData,addCustomer} from '@/api/custom/custom'
   import {getEnterprise,getDictType,} from '@/api/main'
   import prvinceTree from '@/assets/json/provinceTree'
   import axios from 'axios'
@@ -428,7 +428,7 @@ export default {
         list.push(item.cityId)
       if(item.districtId != null && item.districtId != "")
         list.push(item.districtId)
-      this.address = list
+      this.queryParam.address = list
       this.queryParam.registerAddress = item.registerAddress
       this.showlist = false
     },
@@ -441,24 +441,33 @@ export default {
       }
       this.$refs[formName].validate((valid) => {
         if (valid) {
-
+          addCustomer(this.queryParam).then(result=>{
+            if(result.code == 200){
+              this.$message.success('添加成功！')
+              this.dialogVisible = false
+              this.handleCurrentChange(1)
+              this.resetForm('ruleForm')
+            }else{
+              this.$message.error(result.msg)
+            }
+          })
         } else {
         }
       });
     },
     resetForm(formName) {
      this.queryParam = {
-          companyId:'',//jsk企业id
-          companyName:'',//客户名称（企业名称
-          customerLevel:'',//客户等级
-          legalPerson:'',//法定代表人
-          registerCapital:'',//注册资本
-          registerAddress:'',//企业注册地址
-          creditCode:'',//社会统一信用代码
-          address:'',//选择的地址
-           provinceId:'',
-           cityId:'',
-           districtId:'',
+        companyId:'',//jsk企业id
+        companyName:'',//客户名称（企业名称
+        customerLevel:'',//客户等级
+        legalPerson:'',//法定代表人
+        registerCapital:'',//注册资本
+        registerAddress:'',//企业注册地址
+        creditCode:'',//社会统一信用代码
+        address:'',//选择的地址
+        provinceId:'',
+        cityId:'',
+        districtId:'',
       },
       this.dialogVisible = false
       this.showlist = false

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

@@ -149,8 +149,6 @@ export default {
         {name:'其他单位',sum:'44',point:'21%'},
       ],
       datatype:'1',//切换类型
-      dtdata:[],//数据
-      dttime:[],//坐标
       datalist:[
         {name:'重庆市江北区国有资本投资运营管理集团有限公司',time:'2023-05-30',text:'新增招标公告：【江北房地产综合开发公司名下不动产鲤鱼池片区资产评估项目】 公开选取【资产评估】机构的公告',tip1:'正向',tip2:'招标公告'},
         {name:'上海城投（集团）有限公司',time:'2023-05-29',text:'新增招标公告：北横通道新建工程——机电、装饰工程Ⅱ标段',tip1:'正向',tip2:'招标公告'},
@@ -404,8 +402,6 @@ export default {
         default:
           break;
       }
-      this.dtdata = datas
-      this.dttime = labels
       this.initDT(datas,labels)
     },
     handleCurrentChange(val) {

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

@@ -33,9 +33,9 @@
               </el-date-picker>
             </template>
             <!-- 输入框 -->
-            <template  v-if="form.type==3">
+            <template v-if="form.type==3">
               <div class="cooperate-name">
-                <el-input v-model="form.value" placeholder="请输入关键词"></el-input>
+                <el-input v-model="form.value" :placeholder="form.placeholder"></el-input>
                 <span @click="changeSelect">搜索</span>
               </div>
             </template>

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

 <template>
-  <div id="detailPart" class="detail-container" :style="sideHeight?'height:'+sideHeight+'px':''">
+  <div id="detailPart" class="sides-container" :style="sideHeight?'height:'+sideHeight+'px':''">
     <el-input
       placeholder="搜索"
       class="side-input"
@@ -15,9 +15,9 @@
           <template slot="title">
             <span>{{item.title}}</span>
           </template>
-          <el-menu-item :index="index+'-'+idx" v-for="(it, idx) in item.children" :key="idx" @click="handleItem(it)">{{it.title}}</el-menu-item>
+          <el-menu-item :index="index+'-'+idx" v-for="(it, idx) in item.children" :key="idx" @click="handleItem(it)" :disabled="it.disabled">{{it.title}}</el-menu-item>
         </el-submenu>
-        <el-menu-item :index="index.toString()" @click="handleItem(item)" v-else>{{item.title}}</el-menu-item>
+        <el-menu-item :index="index.toString()" @click="handleItem(item)" :disabled="item.disabled" v-else>{{item.title}}</el-menu-item>
       </template>
     </el-menu>
   </div>
@@ -50,13 +50,13 @@ export default {
         ]},
         {title: '财务简析', pathName: 'financial'},
         {title: '项目商机', pathName: '', children: [
-          {title: '土地交易', pathName: ''},
-          {title: '拟建项目', pathName: ''},
-          {title: '专项债项目', pathName: ''},
-          {title: '招标计划', pathName: ''},
-          {title: '招标公告', pathName: ''},
-          {title: '标讯Pro', pathName: ''},
-          {title: '行政许可', pathName: ''}
+          {title: '土地交易', pathName: 'landtransaction'},
+          {title: '拟建项目', pathName: 'proposed'},
+          {title: '专项债项目', pathName: 'bond'},
+          {title: '招标计划', pathName: 'biddingplan'},
+          {title: '招标公告', pathName: 'announcement'},
+          {title: '标讯Pro', pathName: 'tencent'},
+          {title: '行政许可', pathName: 'administrative'}
         ]},
         {title: '业务往来', pathName: '', children: [
           {title: '客户', pathName: ''},
@@ -80,7 +80,7 @@ export default {
           {title: '开庭公告', pathName: 'openacourtsessionNotice'},
           {title: '信用中国', pathName: ''}
         ]},
-        {title: '商务信息', pathName: 'business'},
+        // {title: '商务信息', pathName: 'business'},
         {title: '招标偏好', pathName: 'preference'},
         {title: '合作情况', pathName: 'cooperate'},
         {title: '决策链条', pathName: 'decisionMaking'},
@@ -134,7 +134,7 @@ export default {
 
 <style lang="scss" scoped>
   #app{
-    .detail-container{
+    .sides-container{
       width: 144px;
       min-height: calc(100vh - 170px);
       padding-bottom: 20px;

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

@@ -21,31 +21,29 @@
         </el-table-column>
         <template v-for="item in forData">
           <el-table-column
-            v-if="item.slot"
             :label="item.label"
             :prop="item.prop"
             :width="item.width"
+            :min-width="item.minWidth"
             align="left"
             :fixed="item.fixed"
             :sortable="item.sortable"
             :resizable="false">
+              <template v-if="item.slotHeader" slot="header">
+                <slot :name="item.slotName"></slot>
+              </template>
               <template slot-scope="scope">
-                <slot :name="item.prop" :row="item" :index="scope.$index" :data="scope.row.punishReason"></slot>
+                <slot v-if="item.slot" :name="item.prop" :row="scope.row" :index="scope.$index" :data="item"></slot>
+                <span v-else>
+                  {{ scope.row[item.prop] }}
+                </span>
               </template>
           </el-table-column>
-          <el-table-column
-            v-else
-            :label="item.label"
-            :prop="item.prop"
-            :width="item.width"
-            align="left"
-            :fixed="item.fixed"
-            :sortable="item.sortable"
-            :resizable="false" />
+
         </template>
       </el-table>
     </div>
-    <div class="pagination-box">
+    <div class="pagination-box" v-if="paging">
       <el-pagination background :current-page="queryParams.pageNum" :page-size="queryParams.pageSize" :total="tableDataTotal" layout="prev, pager, next, jumper" @current-change="handleCurrentChange" @size-change="handleSizeChange" />
     </div>
   </div>
@@ -83,6 +81,10 @@ export default {
       type: Object,
       default: {}
     },
+    paging: {
+      type: Boolean,
+      default: true
+    },
   },
   data() {
     return {
@@ -104,5 +106,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-
+::v-deep .el-table__body tr.current-row > td.el-table__cell{
+  background-color: #ffffff;
+}
 </style>

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

+<!-- 表格组件 -->
+<template>
+  <div class="infoTable-container">
+    <el-form v-if="Object.keys(obj).length > 0" class="infoTable-form" label-position="left">
+      <template v-for="(item, index) in list">
+        <el-form-item :style="item.span?{width: `${100/(24/item.span)}%`}:{}" :label="item.name" :label-width="labelWidth?labelWidth+'px':'130px'" :key="index" :class="[
+            { 'infoTable-form-view': item.style },
+            { 'infoTable-form-item': !item.style },
+            { 'infoTable-form-row': item.rowstyle }
+          ]">
+          <div>
+            <template v-if="item.slot === true">
+              <slot :name="item.prop" :data="obj"></slot>
+            </template>
+            <span v-else> {{  obj[item.prop] ?obj[item.prop] !==""?item.formatter?item.formatter(obj[item.prop]):obj[item.prop]:'--' :'--' }}</span>
+          </div>
+        </el-form-item>
+      </template>
+    </el-form>
+    <div v-else class="no-data">
+      <div class="no-data-box" v-if="show">
+        <img :src="noData" alt="暂时没有找到相关数据" />
+        <span>暂时没有找到相关数据</span>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "InfoTable",
+  components: {
+
+  },
+  props: {
+    list: {
+      type: Array,
+      default: () => [],
+    },
+    obj: {
+      type: Object,
+      default: () => { }
+    },
+    labelWidth: {
+      type: Number,
+      default: null
+    }
+  },
+  data() {
+    return {
+      show:false,
+      // 当前移入单元格内容
+      noData: require("@/assets/images/detail/noData.png")
+    };
+  },
+  created() {
+  },
+  mounted(){
+    this.show = true;
+  },
+  methods: {
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.infoTable-container {
+  .infoTable-form {
+    display: flex;
+    flex-wrap: wrap;
+    border-left: 1px solid #e5e9f5;
+    border-top: 1px solid #e5e9f5;
+    border-collapse: collapse;
+    .infoTable-form-item {
+      width: 50%;
+      flex: auto;
+      margin-bottom: 0px;
+      border-right: 1px solid #e5e9f5;
+      border-bottom: 1px solid #e5e9f5;
+      font-family: Microsoft YaHei-Regular, Microsoft YaHei;
+      font-size: 12px;
+    }
+    .infoTable-form-view {
+      width: 100%;
+      flex: auto;
+      margin-bottom: 0px;
+      border-right: 1px solid #e5e9f5;
+      border-bottom: 1px solid #e5e9f5;
+      font-family: Microsoft YaHei-Regular, Microsoft YaHei;
+      font-size: 12px;
+    }
+    .infoTable-form-row {
+      width: 33%;
+      flex: auto;
+      margin-bottom: 0px;
+      border-right: 1px solid #e5e9f5;
+      border-bottom: 1px solid #e5e9f5;
+      font-family: Microsoft YaHei-Regular, Microsoft YaHei;
+      font-size: 12px;
+    }
+    ::v-deep .el-form-item__label {
+      height: 100%;
+      background-color: #F0F3FA;
+      padding: 8px 12px 8px 12px;
+      font-size: 12px;
+      font-weight: normal;
+      color: rgba(35,35,35,0.8);
+      display: flex;
+      align-items: center;
+      line-height: normal;
+    }
+    ::v-deep .el-form-item__content {
+      padding-left: 12px;
+      font-size: 12px;
+      color: #232323;
+    }
+    ::v-deep .el-form-item__content {
+      border-left: 1px solid #e5e9f5;
+      height: 100%;
+      display: flex;
+      align-items: center;
+    }
+    ::v-deep .el-col {
+      border-bottom: 1px solid #e5e9f5;
+    }
+  }
+  .no-data {
+    font-size: 14px;
+    font-family: Microsoft YaHei-Regular, Microsoft YaHei;
+    font-weight: 400;
+    color: #999999;
+    text-shadow: 0px 0px 10px rgba(0, 37, 106, 0.10000000149011612);
+    max-width: 1200px;
+    height: 328px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    background: #ffffff;
+    border-radius: 0px 0px 0px 0px;
+    opacity: 1;
+    border: 1px solid #eeeeee;
+    .no-data-box {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      img {
+        width: 64px;
+        height: 79px;
+        margin-bottom: 16px;
+      }
+    }
+  }
+  ::v-deep .el-form-item__content {
+    line-height: 22px;
+    padding: 6px 4px;
+  }
+}
+</style>

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

@@ -33,44 +33,36 @@
 
     <!-- 弹窗添加联系人 -->
     <el-dialog
-      class="popups"
+      class="popups1"
       :visible.sync="dialogVisible"
+      :before-close="cancel"
       width="464px">
       <div class="poptitle">
         <img src="@/assets/images/economies/icon.png">
         <span>重庆市轨道交通3号线二期工程4标段施工总承包</span>
       </div>
-      <el-form class="popform" label-width="137px">
-        <div class="row">
-          <span class="left">联系人姓名：</span>
-          <el-input type="text" placeholder="请输入"></el-input>
-        </div>
-        <div class="row">
-          <span class="left">联系人角色：</span>
-          <el-select  placeholder="请选择">
-            <el-option label="cccc" value="11"></el-option>
-            <el-option label="cccc" value="121"></el-option>
-          </el-select>
-        </div>
-        <div class="row">
-          <span class="left">联系人职位：</span>
-          <el-input type="text" placeholder="请输入"></el-input>
-        </div>
-        <div class="row">
-          <span class="left">联系人公司/机关：</span>
-          <el-input type="text" placeholder="请输入"></el-input>
-        </div>
-        <div class="row">
-          <span class="left">内部维护人：</span>
-          <el-input type="text" placeholder="请输入"></el-input>
-        </div>
-        <div class="row">
-          <span class="left">联系方式：</span>
-          <el-input type="text" placeholder="请输入"></el-input>
-        </div>
+      <el-form :model="addRorm" :rules="addRules" ref="addRorm" class="popform" label-width="75px">
+        <el-form-item label="姓名：" prop="name">
+          <el-input v-model="addRorm.name" placeholder="请输入"></el-input>
+        </el-form-item>
+        <el-form-item label="角色：" prop="role">
+          <el-input v-model="addRorm.role" placeholder="请输入"></el-input>
+        </el-form-item>
+        <el-form-item label="职位：" prop="workUnit">
+          <el-input v-model="addRorm.workUnit" placeholder="请输入"></el-input>
+        </el-form-item>
+        <el-form-item label="公司/机关：" prop="position">
+          <el-input v-model="addRorm.position" placeholder="请输入"></el-input>
+        </el-form-item>
+        <el-form-item label="联系方式：" prop="contactInformation">
+          <el-input v-model="addRorm.contactInformation" placeholder="请输入"></el-input>
+        </el-form-item>
+        <el-form-item label="备注：" prop="remark">
+          <el-input v-model="addRorm.remark" placeholder="请输入"></el-input>
+        </el-form-item>
         <div class="popbot">
           <div class="btn btn_cancel h32" @click="cancel">返回</div>
-          <div class="btn btn_primary h32">保存</div>
+          <div class="btn btn_primary h32" @click="add">保存</div>
         </div>
       </el-form>
     </el-dialog>
@@ -79,11 +71,11 @@
 </template>
 
 <script>
+import Tables from "../component/Tables"
 import {
   getList,
   addChain
-} from '@/api/decisionMaking/decisionMaking'
-import Tables from "../component/Tables"
+} from '@/api/detail/party-a/decisionMaking'
 export default {
   name: 'DecisionMaking',
   components: {
@@ -91,29 +83,41 @@ export default {
   },
   data() {
     return {
-      ifEmpty:true,
+      ifEmpty:false,
       queryParams:{
-        customerId:null,
+        customerId:'f25219e73249eea0d9fddc5c7f04f97f',
         pageNum:1,
         pageSize:10,
       },
       forData: [
-        {label: '姓名', prop: 'punishReason', width: '124'},
-        {label: '角色', prop: 'punishBegin', width: '110'},
-        {label: '公司/机关', prop: 'punishResult', width: '268'},
-        {label: '职位', prop: 'fileNum', width: '110'},
-        {label: '联系方式', prop: 'cgrdm', width: '105'},
-        {label: '内部维护人', prop: 'office', width: '88'},
-        {label: '备注', prop: 'dataId'},
+        {label: '姓名', prop: 'name', width: '124'},
+        {label: '角色', prop: 'role', width: '110'},
+        {label: '公司/机关', prop: 'position', width: '268'},
+        {label: '职位', prop: 'workUnit', width: '110'},
+        {label: '联系方式', prop: 'contactInformation', width: '105'},
+        {label: '内部维护人', prop: 'updateBy', width: '88'},
+        {label: '备注', prop: 'remark'},
       ],
+      addRorm: {
+        customerId:'f25219e73249eea0d9fddc5c7f04f97f',
+        name:'',
+        role:'',
+        workUnit:'',
+        position:'',
+        contactInformation:'',
+        remark:'',
+      },
+      addRules:{
+        name: [
+          { required: true, message: '请输入姓名', trigger: 'blur' },
+        ],
+      },
       stageOptions:[],
       statusOptions:[],
       //列表
       tableLoading:false,
       tableData:[],
-      pageIndex:1,
-      pageSize:10,
-      tableDataTotal:50,
+      tableDataTotal:0,
       //弹窗
       dialogVisible: false,
     }
@@ -126,21 +130,46 @@ export default {
   },
   methods: {
     list(){
+      this.tableLoading = true
       getList(this.queryParams).then((res) => {
-        console.log(res)
+        if(res.code == 200){
+          if(res.rows.length >0){
+            this.tableData = res.rows
+            this.tableDataTotal = res.total
+            this.ifEmpty = true
+          }
+          this.tableLoading = false
+        }
       })
-    },
-    resetQuery() {
-
     },
     //分页
     handleCurrentChange(e){
-      console.log(e)
+      this.queryParams.pageNum = e
+      this.list()
     },
-    handleSizeChange(e){
-
+    add(){
+      this.$refs.addRorm.validate((valid) => {
+        if (valid) {
+          addChain(this.addRorm).then((res) => {
+            if(res.data){
+              this.$message({
+                message: '新增成功',
+                type: 'success'
+              });
+              this.cancel()
+              this.list()
+            }else{
+              this.$message({
+                message: res.msg,
+                type: 'error'
+              });
+            }
+          })
+        }
+      });
     },
     cancel(){
+      this.$refs.addRorm.resetFields();
       this.dialogVisible = false
     },
     //打开新建窗口
@@ -159,7 +188,12 @@ export default {
     border: 1px solid #EFEFEF;
   }
   ::v-deep .el-form-item{
-    margin-right: 8px !important;
+    margin-bottom: 16px;
+  }
+  ::v-deep .el-input__inner{
+    border-radius: 2px 0 2px 0;
+    height: 32px;
+    line-height: 32px;
   }
   .cooperate-name{
     ::v-deep .el-form-item__content{
@@ -175,10 +209,7 @@ export default {
         cursor: pointer;
       }
     }
-    ::v-deep .el-input__inner{
-      border-right: 0;
-      border-radius: 2px 0 2px 0;
-    }
+
   }
   .query-add{
     button{
@@ -231,7 +262,7 @@ export default {
     margin-top: 10px;
   }
   // 弹窗
-  .popups{
+  .popups1{
     .poptitle {
       line-height: 48px;
       border-bottom: 1px solid #E1E1E1;
@@ -257,8 +288,14 @@ export default {
         text-overflow: ellipsis;
       }
     }
+    ::v-deep .el-dialog__body{
+      padding: 24px 24px 18px;
+    }
     .popform {
-      padding-top: 24px;
+      padding-top: 14px;
+      ::v-deep .el-form-item__label{
+        padding:0;
+      }
       .row {
         padding-bottom: 16px;
         .left {

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

@@ -193,6 +193,7 @@ export default {
     .financial-header{
       background: #FFFFFF;
       padding: 24px 16px;
+      border-radius: 4px;
       .header-box {
         justify-content: space-between;
         flex-wrap: wrap;
@@ -269,6 +270,7 @@ export default {
       background: #FFFFFF;
       padding: 24px 16px;
       margin-top: 12px;
+      border-radius: 4px;
       .zcqk-list{
         margin-top: 4px;
         overflow: hidden;
@@ -335,6 +337,7 @@ export default {
       background: #FFFFFF;
       padding: 24px 16px;
       margin-top: 12px;
+      border-radius: 4px;
       .zwqk-box{
         padding-top: 20px;
         justify-content: normal;

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

@@ -7,14 +7,23 @@
       </div>
       <div class="part-right">
         <div id="partBox" v-if="companyId">
-          <Overview v-if="currentPath.pathName=='overview'" />
-          <Businfo v-if="currentPath.pathName=='businfo'" />
-          <Holderinfo v-if="currentPath.pathName=='holderinfo'" />
-          <Execuinfo v-if="currentPath.pathName=='execuinfo'" />
-          <Overseas v-if="currentPath.pathName=='overseas'" />
-          <Branch v-if="currentPath.pathName=='branch'" />
+          <!-- 企业概览 -->
+          <Overview v-if="currentPath.pathName=='overview'" :company-id="companyId" />
+          <Businfo v-if="currentPath.pathName=='businfo'" :company-id="companyId" />
+          <Holderinfo v-if="currentPath.pathName=='holderinfo'" :company-id="companyId" />
+          <Execuinfo v-if="currentPath.pathName=='execuinfo'" :company-id="companyId" />
+          <Overseas v-if="currentPath.pathName=='overseas'" :company-id="companyId" />
+          <Branch v-if="currentPath.pathName=='branch'" :company-id="companyId" />
           <Financial v-if="currentPath.pathName=='financial'" :company-id="companyId" />
-          <Business v-if="currentPath.pathName=='business'" />
+<!--          <Business v-if="currentPath.pathName=='business'" /> 商务信息 -->
+          <!-- 项目商机 -->
+          <Landtransaction v-if="currentPath.pathName=='landtransaction'" :company-id="companyId" />
+          <Proposed v-if="currentPath.pathName=='proposed'" :company-id="companyId" />
+          <Bond v-if="currentPath.pathName=='bond'" :company-id="companyId" />
+          <Biddingplan v-if="currentPath.pathName=='biddingplan'" :company-id="companyId" />
+          <Announcement v-if="currentPath.pathName=='announcement'" :company-id="companyId" />
+          <Tencent v-if="currentPath.pathName=='tencent'" :company-id="companyId" />
+          <Administrative v-if="currentPath.pathName=='administrative'" :company-id="companyId" />
           <!-- 投诚分析 -->
           <LandAcquisition v-if="currentPath.pathName=='landAcquisition'" />
           <RegionalEconomies v-if="currentPath.pathName=='regionalEconomies'" />
@@ -34,7 +43,7 @@
           <!-- 决策链条 -->
           <DecisionMaking v-if="currentPath.pathName=='decisionMaking'" />
           <!-- 跟进记录 -->
-          <Gjjl v-if="currentPath.pathName=='gjjl'" />
+          <Gjjl v-if="currentPath.pathName=='gjjl'" types="gjdt" />
         </div>
       </div>
     </div>
@@ -53,7 +62,14 @@ import Execuinfo from "./overview/execuinfo"   //企业概览-高管信息
 import Overseas from "./overview/overseas"   //企业概览-对外投资
 import Branch from "./overview/branch"   //企业概览-分支机构
 import Financial from "./financial" //财务简析
-import Business from "./business" //商务信息
+//import Business from "./business" //商务信息
+import Landtransaction from "./opport/landtransaction"  //项目商机-土地交易
+import Proposed from "./opport/proposed"  //项目商机-拟建项目
+import Bond from "./opport/bond"  //项目商机-专项债项目
+import Biddingplan from "./opport/biddingplan"  //项目商机-招标计划
+import Announcement from "./opport/announcement"  //项目商机-招标公告
+import Tencent from "./opport/tencent"  //项目商机-标讯Pro
+import Administrative from "./opport/administrative"  //项目商机-行政许可
 import LandAcquisition from "./urbanLnvestment/landAcquisition" //投诚分析-城投拿地
 import RegionalEconomies from "./urbanLnvestment/regionalEconomies" //投诚分析-区域经济
 import SameRegion from "./urbanLnvestment/sameRegion" //投诚分析-同地区城投
@@ -80,7 +96,14 @@ export default {
     Overseas,
     Branch,
     Financial,
-    Business,
+    // Business,
+    Landtransaction,
+    Proposed,
+    Bond,
+    Biddingplan,
+    Announcement,
+    Tencent,
+    Administrative,
     LandAcquisition,
     RegionalEconomies,
     SameRegion,

dsk-operate-ui/src/views/detail/party-a/mixins/mixin.js

@@ -14,6 +14,12 @@ export default {
 
   },
   methods: {
+    // 设置下拉选项数据源
+    setFormData(fieldName, list) {
+      this.formData.forEach(item => {
+        item.fieldName == fieldName ? item.options =  list : ''
+      })
+    },
     formParams(){
       let condtion = {}
       let reqData = {}

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

+<template>
+  <div class="detail-container">
+    <head-form
+      title="行政许可"
+      :form-data="formData"
+      :query-params="queryParams"
+      :total="tableDataTotal"
+      @handle-search="handleSearch"
+    />
+
+    <tables
+      :indexFixed="true"
+      :tableLoading="tableLoading"
+      :tableData="tableData"
+      :forData="forData"
+      :tableDataTotal="tableDataTotal"
+      :queryParams="queryParams"
+      @handle-current-change="handleCurrentChange"
+    >
+      <template slot="porjectName" slot-scope="scope">
+        <span :class="[isOverHiddenFlag(scope.data.width, showList, scope.index, 0, scope.row.porjectName)?'cell-span':'']" :style="{'-webkit-line-clamp': 5}">
+          {{ scope.row.porjectName }}
+          <span v-if="isOverHiddenFlag(scope.data.width, showList, scope.index, 0, scope.row.porjectName)" @click="changeShowAll(scope.index, 0)">...<span style="color: #0081FF;">展开</span></span>
+        </span>
+      </template>
+    </tables>
+
+  </div>
+</template>
+
+<script>
+import mixin from '../mixins/mixin'
+import { getList } from '@/api/detail/party-a/opport'
+export default {
+  name: 'Administrative',
+  props: ['companyId'],
+  mixins: [mixin],
+  components: {
+  },
+  data() {
+    return {
+      queryParams: {
+        companyId: this.companyId,
+        pageNum: 1,
+        pageSize: 10
+      },
+      forData: [
+        {label: '许可决定日期', prop: 'use', width: '100'},
+        {label: '决定文书号', prop: 'type', width: '200'},
+        {label: '许可编号', prop: 'type', width: '80'},
+        {label: '决定文书名称', prop: 'type', width: '190'},
+        {label: '许可内容', prop: 'porjectName', width: '300', slot: true},
+        {label: '有效期自', prop: 'type', width: '100'},
+        {label: '有效期至', prop: 'type', width: '100'},
+        {label: '行政许可类别', prop: 'type', width: '100'},
+        {label: '许可机关', prop: 'type', width: '180'},
+        {label: '行政许可机关统一社会信用代码', prop: 'type', width: '200'},
+        {label: '数据来源单位', prop: 'type', width: '110'},
+        {label: '数据来源单位统一社会信用代码', prop: 'type', width: '200'},
+        {label: '来源', prop: 'type', width: '80'}
+      ],
+      formData: [
+        { type: 3, fieldName: 'keys', value: '', placeholder: '输入关键词查询', options: []},
+      ],
+      //列表
+      tableLoading:false,
+      tableData:[],
+      tableDataTotal:0,
+      showList:[]
+    }
+  },
+  computed: {
+  },
+  created() {
+    this.handleQuery()
+  },
+  methods: {
+    handleQuery(params) {
+      this.tableLoading = true
+      let param = params?params:this.queryParams
+      getList(param).then((res) => {
+        this.tableLoading = false
+        this.tableData = [
+          {
+            projectId: '1',
+            porjectName:'滨州医学院口腔医学大楼铝合金门窗供货及安装滨州医学院口腔医学大楼铝合金门窗供货及安装滨州医学院口腔医学大楼铝合金门窗供货及安装滨州医学院口腔医学大楼铝合金门窗供货及安装滨州医学院口腔医学大楼铝合金门窗供货及安装滨州医学院口腔医学大楼铝合金门窗供货及安装滨州医学院口腔医学大楼铝合金门窗供货及安装滨州医学院口腔医学大楼铝合金门窗供货及安装滨州医学院口腔医学大楼铝合金门窗供货及安装滨州医学院口腔医学大楼铝合金门窗供货及安装2',
+            use:'城镇住宅用地',
+            type:'房地产业',
+            way:'挂牌出让',
+            state:'重庆',
+            money:'11234万元',
+            scale:'222平米',
+            unit:'江苏省住房和城乡建设厅',
+            date:'2015-08-06',
+          }
+        ]
+        this.tableDataTotal = 100
+      })
+    },
+    changeShowAll(row, column) {
+      this.showList.push({
+        row: row,
+        column: column
+      })
+    },
+    isOverHiddenFlag(data, showList, row, column, value) {
+      if(value && String(value).length > this.getLenth(data)) {
+        return !showList.some(item => item.row==row&&item.column==column)
+      }else {
+        return false
+      }
+    },
+    getLenth(data) {
+      return Math.floor(data / 12) * 5
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.detail-container{
+  background: #ffffff;
+  border-radius: 4px;
+  padding: 16px;
+  .cell-span {
+    display: inline-block;
+    position: relative;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 4;
+    cursor: pointer;
+
+    >span {
+      display: inline-block;
+      width: 37px;
+      position: absolute;
+      right: 0;
+      bottom: 0;
+      background-color: #fff;
+      z-index: 1;
+    }
+  }
+}
+</style>

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

+<template>
+  <div class="detail-container">
+    <head-form
+      title="招标公告"
+      :form-data="formData"
+      :query-params="queryParams"
+      :total="tableDataTotal"
+      :isExcel="true"
+      @handle-search="handleSearch"
+    />
+
+    <tables
+      :indexFixed="true"
+      :tableLoading="tableLoading"
+      :tableData="tableData"
+      :forData="forData"
+      :tableDataTotal="tableDataTotal"
+      :queryParams="queryParams"
+      @handle-current-change="handleCurrentChange"
+    >
+      <template slot="porjectName" slot-scope="scope">
+        <router-link to="" tag="a" class="a-link">{{ scope.row.porjectName }}</router-link>
+      </template>
+    </tables>
+
+  </div>
+</template>
+
+<script>
+import mixin from '../mixins/mixin'
+import {getList, getOption} from '@/api/detail/party-a/opport'
+export default {
+  name: 'Announcement',
+  props: ['companyId'],
+  mixins: [mixin],
+  components: {
+  },
+  data() {
+    return {
+      queryParams: {
+        companyId: this.companyId,
+        pageNum: 1,
+        pageSize: 10
+      },
+      forData: [
+        {label: '项目名称', prop: 'porjectName', minWidth: '300', slot: true},
+        {label: '发布日期', prop: 'use', sortable: true, width: '120'},
+        {label: '预算金额（万元）', prop: 'type', sortable: true, width: '140'},
+        {label: '项目地区', prop: 'way', width: '120'},
+        {label: '项目类别', prop: 'state', width: '90'},
+        {label: '招采单位联系人', prop: 'money', width: '110'},
+        {label: '招采单位联系方式', prop: 'money', width: '130'},
+        {label: '代理单位', prop: 'money', width: '170'},
+        {label: '代理单位联系人', prop: 'money', width: '110'},
+        {label: '代理单位联系方式', prop: 'money', width: '130'},
+        {label: '报名截止日期', prop: 'money', width: '100'}
+      ],
+      formData: [
+        { type: 1, fieldName: 'projectStage', value: '', placeholder: '项目地区', options: []},
+        { type: 1, fieldName: 'projectType', value: '', placeholder: '项目类型', options: []},
+      ],
+      //列表
+      tableLoading:false,
+      tableData:[],
+      tableDataTotal:0,
+      showList:[],
+    }
+  },
+  computed: {
+  },
+  created() {
+    this.handleOption()
+    this.handleQuery()
+  },
+  methods: {
+    handleOption(){
+      getOption().then((res) => {
+        this.setFormData('projectStage', [
+          { name: '类别1', value: '1' },
+          { name: '类别2', value: '2' },
+          { name: '类别3', value: '3' },
+          { name: '类别4', value: '4' }
+        ])
+        this.setFormData('projectType', [
+          { name: '类别1', value: '1' },
+          { name: '类别2', value: '2' },
+          { name: '类别3', value: '3' },
+          { name: '类别4', value: '4' }
+        ])
+      })
+    },
+    handleQuery(params) {
+      this.tableLoading = true
+      let param = params?params:this.queryParams
+      getList(param).then((res) => {
+        this.tableLoading = false
+        this.tableData = [
+          {
+            projectId: '1',
+            porjectName:'滨州医学院口腔医学大楼铝合金门窗供货及安装',
+            use:'城镇住宅用地',
+            type:'房地产业',
+            way:'挂牌出让',
+            state:'重庆',
+            money:'11234万元',
+            scale:'222平米',
+            unit:'江苏省住房和城乡建设厅',
+            date:'2015-08-06',
+          }
+        ]
+        this.tableDataTotal = 100
+      })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.detail-container{
+  background: #ffffff;
+  border-radius: 4px;
+  padding: 16px;
+}
+</style>

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

+<template>
+  <div class="app-container detail-container">
+    biddingplan
+  </div>
+</template>
+
+<script>
+import mixin from '../mixins/mixin'
+export default {
+  name: 'Biddingplan',
+  props: ['companyId'],
+  mixins: [mixin],
+  data() {
+    return {
+
+    }
+  },
+  created() {
+
+  },
+  methods: {
+
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.detail-container{
+  margin: 0;
+  padding: 16px;
+  background: #FFFFFF;
+}
+</style>

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

+<template>
+  <div class="detail-container">
+    <head-form
+      title="专项债项目"
+      :form-data="formData"
+      :query-params="queryParams"
+      :total="tableDataTotal"
+      :isExcel="true"
+      @handle-search="handleSearch"
+    />
+
+    <tables
+      :indexFixed="true"
+      :tableLoading="tableLoading"
+      :tableData="tableData"
+      :forData="forData"
+      :tableDataTotal="tableDataTotal"
+      :queryParams="queryParams"
+      @handle-current-change="handleCurrentChange"
+    >
+      <template slot="porjectName" slot-scope="scope">
+        <router-link to="" tag="a" class="a-link">{{ scope.row.porjectName }}</router-link>
+      </template>
+    </tables>
+
+  </div>
+</template>
+
+<script>
+import mixin from '../mixins/mixin'
+import { getList } from '@/api/detail/party-a/opport'
+export default {
+  name: 'Bond',
+  props: ['companyId'],
+  mixins: [mixin],
+  components: {
+  },
+  data() {
+    return {
+      queryParams: {
+        companyId: this.companyId,
+        pageNum: 1,
+        pageSize: 10
+      },
+      forData: [
+        {label: '项目名称', prop: 'porjectName', minWidth: '300', slot: true},
+        {label: '项目总投资（亿元）', prop: 'use', sortable: true, width: '150'},
+        {label: '项目资本金（亿元）', prop: 'type', sortable: true, width: '150'},
+        {label: '项目收益倍数（倍）', prop: 'way', sortable: true, width: '150'},
+        {label: '专项债金额（亿元）', prop: 'state', sortable: true, width: '150'},
+        {label: '专项债用作资本金（亿元）', prop: 'money', sortable: true, width: '200'}
+      ],
+      formData: [
+        { type: 3, fieldName: 'keys', value: '', placeholder: '输入项目名称关键词查询', options: []},
+      ],
+      //列表
+      tableLoading:false,
+      tableData:[],
+      tableDataTotal:0,
+      showList:[],
+    }
+  },
+  computed: {
+  },
+  created() {
+    this.handleQuery()
+  },
+  methods: {
+    handleQuery(params) {
+      this.tableLoading = true
+      let param = params?params:this.queryParams
+      getList(param).then((res) => {
+        this.tableLoading = false
+        this.tableData = [
+          {
+            projectId: '1',
+            porjectName:'滨州医学院口腔医学大楼铝合金门窗供货及安装',
+            use:'城镇住宅用地',
+            type:'房地产业',
+            way:'挂牌出让',
+            state:'重庆',
+            money:'11234万元',
+            scale:'222平米',
+            unit:'江苏省住房和城乡建设厅',
+            date:'2015-08-06',
+          }
+        ]
+        this.tableDataTotal = 100
+      })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.detail-container{
+  background: #ffffff;
+  border-radius: 4px;
+  padding: 16px;
+}
+</style>

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

+<template>
+  <div class="detail-container">
+    <head-form
+      title="土地交易"
+      :form-data="formData"
+      :query-params="queryParams"
+      :total="tableDataTotal"
+      :isExcel="true"
+      @handle-search="handleSearch"
+    />
+
+    <tables
+      :indexFixed="true"
+      :tableLoading="tableLoading"
+      :tableData="tableData"
+      :forData="forData"
+      :tableDataTotal="tableDataTotal"
+      :queryParams="queryParams"
+      @handle-current-change="handleCurrentChange"
+    >
+      <template slot="porjectName" slot-scope="scope">
+        <router-link to="" tag="a" class="a-link">{{ scope.row.porjectName }}</router-link>
+      </template>
+    </tables>
+
+  </div>
+</template>
+
+<script>
+import mixin from '../mixins/mixin'
+import { getOption, getList } from '@/api/detail/party-a/opport'
+export default {
+  name: 'Landtransaction',
+  props: ['companyId'],
+  mixins: [mixin],
+  components: {
+  },
+  data() {
+    return {
+      queryParams: {
+        companyId: this.companyId,
+        pageNum: 1,
+        pageSize: 10
+      },
+      forData: [
+        {label: '项目名称', prop: 'porjectName', minWidth: '300', slot: true},
+        {label: '土地用途', prop: 'use', width: '130'},
+        {label: '行业分类', prop: 'type', width: '100'},
+        {label: '供地方式', prop: 'way', width: '100'},
+        {label: '土地坐落', prop: 'state', width: '130'},
+        {label: '成交金额（万元）', prop: 'money', sortable: true, width: '140'},
+        {label: '总面积（㎡）', prop: 'scale', sortable: true, width: '130'},
+        {label: '批准单位', prop: 'unit', width: '130'},
+        {label: '签订日期', prop: 'date', width: '130'}
+      ],
+      formData: [
+        { type: 1, fieldName: 'penalizeReasonType', value: '', placeholder: '土地用途', options: []},
+        { type: 3, fieldName: 'keys', value: '', placeholder: '输入项目名称关键词查询', options: []},
+      ],
+      //列表
+      tableLoading:false,
+      tableData:[],
+      tableDataTotal:0,
+      showList:[],
+    }
+  },
+  computed: {
+  },
+  created() {
+    this.handleOption()
+    this.handleQuery()
+  },
+  methods: {
+    handleOption(){
+      getOption().then((res) => {
+        this.setFormData('penalizeReasonType', [
+          { name: '类别1', value: '1' },
+          { name: '类别2', value: '2' },
+          { name: '类别3', value: '3' },
+          { name: '类别4', value: '4' }
+        ])
+      })
+    },
+    handleQuery(params) {
+      this.tableLoading = true
+      let param = params?params:this.queryParams
+      getList(param).then((res) => {
+        this.tableLoading = false
+        this.tableData = [
+          {
+            projectId: '1',
+            porjectName:'滨州医学院口腔医学大楼铝合金门窗供货及安装',
+            use:'城镇住宅用地',
+            type:'房地产业',
+            way:'挂牌出让',
+            state:'重庆',
+            money:'11234万元',
+            scale:'222平米',
+            unit:'江苏省住房和城乡建设厅',
+            date:'2015-08-06',
+          }
+        ]
+        this.tableDataTotal = 100
+      })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.detail-container{
+  background: #ffffff;
+  border-radius: 4px;
+  padding: 16px;
+}
+</style>

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

+<template>
+  <div class="detail-container">
+    <head-form
+      title="拟建项目"
+      :form-data="formData"
+      :query-params="queryParams"
+      :total="tableDataTotal"
+      :isExcel="true"
+      @handle-search="handleSearch"
+    />
+
+    <tables
+      :indexFixed="true"
+      :tableLoading="tableLoading"
+      :tableData="tableData"
+      :forData="forData"
+      :tableDataTotal="tableDataTotal"
+      :queryParams="queryParams"
+      @handle-current-change="handleCurrentChange"
+    >
+      <template slot="porjectName" slot-scope="scope">
+        <router-link to="" tag="a" class="a-link">{{ scope.row.porjectName }}</router-link>
+      </template>
+    </tables>
+
+  </div>
+</template>
+
+<script>
+import mixin from '../mixins/mixin'
+import { getList } from '@/api/detail/party-a/opport'
+export default {
+  name: 'Proposed',
+  props: ['companyId'],
+  mixins: [mixin],
+  components: {
+  },
+  data() {
+    return {
+      queryParams: {
+        companyId: this.companyId,
+        pageNum: 1,
+        pageSize: 10
+      },
+      forData: [
+        {label: '项目名称', prop: 'porjectName', minWidth: '300', slot: true},
+        {label: '成交金额（万元）', prop: 'use', sortable: true, width: '150'},
+        {label: '项目类别', prop: 'type', width: '100'},
+        {label: '计划开工日期', prop: 'way', sortable: true, width: '130'},
+        {label: '计划完工日期', prop: 'state', sortable: true, width: '130'},
+        {label: '审批结果', prop: 'money', width: '100'},
+        {label: '是否为民间推介项目', prop: 'scale', width: '150'}
+      ],
+      formData: [
+        { type: 3, fieldName: 'keys', value: '', placeholder: '输入项目名称关键词查询', options: []},
+      ],
+      //列表
+      tableLoading:false,
+      tableData:[],
+      tableDataTotal:0,
+      showList:[],
+    }
+  },
+  computed: {
+  },
+  created() {
+    this.handleQuery()
+  },
+  methods: {
+    handleQuery(params) {
+      this.tableLoading = true
+      let param = params?params:this.queryParams
+      getList(param).then((res) => {
+        this.tableLoading = false
+        this.tableData = [
+          {
+            projectId: '1',
+            porjectName:'滨州医学院口腔医学大楼铝合金门窗供货及安装',
+            use:'城镇住宅用地',
+            type:'房地产业',
+            way:'挂牌出让',
+            state:'重庆',
+            money:'11234万元',
+            scale:'222平米',
+            unit:'江苏省住房和城乡建设厅',
+            date:'2015-08-06',
+          }
+        ]
+        this.tableDataTotal = 100
+      })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.detail-container{
+  background: #ffffff;
+  border-radius: 4px;
+  padding: 16px;
+}
+</style>

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

+<template>
+  <div class="app-container detail-container">
+    tencent
+  </div>
+</template>
+
+<script>
+import mixin from '../mixins/mixin'
+export default {
+  name: 'Tencent',
+  props: ['companyId'],
+  mixins: [mixin],
+  data() {
+    return {
+
+    }
+  },
+  created() {
+
+  },
+  methods: {
+
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.detail-container{
+  margin: 0;
+  padding: 16px;
+  background: #FFFFFF;
+}
+</style>

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

 <template>
-  <div class="app-container part-container">
-    企业速览
+  <div class="app-container detail-container">
+    <head-form
+      title="分支机构"
+      :form-data="formData"
+      :query-params="queryParams"
+      :total="tableDataTotal"
+      :isExcel="true"
+      @handle-search="handleSearch"
+    />
+
+    <tables
+      :tableLoading="tableLoading"
+      :tableData="tableData"
+      :forData="forData"
+      :tableDataTotal="tableDataTotal"
+      :queryParams="queryParams"
+      @handle-current-change="handleCurrentChange"
+    >
+      <template slot="inReason" slot-scope="scope">
+        <router-link to="" tag="a" class="a-link">{{scope.row.inReason}}</router-link>
+        <div class="tags" v-if="scope.row.tag">
+          <span class="tag style1">{{scope.row.tag}}</span>
+          <span class="tag style1">{{scope.row.tag}}</span>
+        </div>
+      </template>
+    </tables>
   </div>
 </template>
 
 <script>
+import mixin from '../mixins/mixin'
 export default {
-  name: 'Overview',
+  name: 'Branch',
+  mixins: [mixin],
   data() {
     return {
+      queryParams: {
+        cid: 6034,
+        pageNum: 1,
+        pageSize: 10
+      },
+      forData: [
+        {label: '被投资企业名称', prop: 'inReason', slot: true},
+        {label: '负责人', prop: 'inDate'},
+        {label: '成立日期', prop: 'department'}
+      ],
+      formData: [
+        { type: 1, fieldName: 'zbgg', value: '', placeholder: '招标公告',
+          options: [
+            { name: '招标公告类别1', value: '1' },
+            { name: '招标公告类别2', value: '2' },
+            { name: '招标公告类别3', value: '3' },
+            { name: '招标公告类别4', value: '4' }
+          ]
+        }
+      ],
+      //列表
+      tableLoading:false,
+      tableData:[],
+      pageIndex:1,
+      pageSize:10,
+      tableDataTotal:0,
     }
   },
   created() {
+    this.dataRegion()
   },
   methods: {
+    async dataRegion() {
+      this.tableData = [
+        {id:1, inReason:'达萨法达萨法', inDate:'000',tag:'aaa'},
+        {id:2, inReason:'达萨法达萨法', inDate:'111'},
+        {id:3, inReason:'达萨法达萨法', inDate:'222'},
+        {id:4, inReason:'达萨法达萨法', inDate:'333'}
+      ] //测试
+    },
+    handleQuery(params) {
+      console.log(params)
+    }
   }
 }
 </script>
 
 <style lang="scss" scoped>
-  .part-container{
+  .detail-container{
     margin: 0;
-    padding: 0;
+    padding: 16px;
+    background: #FFFFFF;
+    border-radius: 4px;
+    .tags{
+      .tag{
+        display: inline-block;
+        border-radius: 2px;
+        padding: 1px 7px;
+        margin: 4px 8px 0 0;
+        &.style1{
+          background: #E4F3FD;
+          color: #41A1FD;
+        }
+      }
+    }
   }
 </style>

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

 <template>
-  <div class="app-container part-container">
-    企业速览
+  <div class="app-container detail-container">
+    <el-tabs v-model="activeName" @tab-click="handleClick" class="detail-tab">
+      <el-tab-pane label="工商信息" name="first"></el-tab-pane>
+      <el-tab-pane label="工商变更" name="second"></el-tab-pane>
+    </el-tabs>
+
+
+    <info-table class="info-tab" :list="defaultList" :obj="forInfo" :labelWidth="labelWidth" v-if="activeName=='first'">
+
+    </info-table>
+    <tables
+      :tableLoading="tableLoading"
+      :tableData="tableData"
+      :forData="forData"
+      :queryParams="queryParams"
+      :paging="false"
+      v-if="activeName=='second'"
+    />
   </div>
 </template>
 
 <script>
+import mixin from '../mixins/mixin'
+import InfoTable from '../component/infoTable'
 export default {
-  name: 'Overview',
+  name: 'Businfo',
+  props: ['companyId'],
+  components: {
+    InfoTable
+  },
+  mixins: [mixin],
   data() {
     return {
+      activeName: 'first',
+      queryParams: {
+        cid: 6034,
+        pageNum: 1,
+        pageSize: 10
+      },
+      labelWidth: 250,
+      forInfo: {projectType: 'aaa', projectPurposes: '222', projectInvestmentAmounts: '222'},
+      defaultList: [
+        { name: '企业名称', prop: 'projectTypes' },
+        { name: '社会信用代码', prop: 'projectPurposes' },
+        { name: '法定代表人', prop: 'projectInvestmentAmounts' },
+        { name: '登记状态', prop: 'projectInvestmentAmounts' },
+        { name: '成立日期', prop: 'projectInvestmentAmounts' },
+        { name: '注册资本', prop: 'projectInvestmentAmounts' },
+        { name: '实缴资本', prop: 'projectInvestmentAmounts' },
+        { name: '核准日期', prop: 'projectInvestmentAmounts' },
+        { name: '组织机构代码', prop: 'projectInvestmentAmounts' },
+        { name: '工商注册号', prop: 'projectInvestmentAmounts' },
+        { name: '纳税人识别号', prop: 'projectInvestmentAmounts' },
+        { name: '企业类型', prop: 'projectInvestmentAmounts' },
+        { name: '营业期限', prop: 'projectInvestmentAmounts' },
+        { name: '纳税人资质', prop: 'projectInvestmentAmounts' },
+        { name: '所属地区', prop: 'projectInvestmentAmounts' },
+        { name: '登记机关', prop: 'projectInvestmentAmounts' },
+        { name: '人员规模', prop: 'projectInvestmentAmounts' },
+        { name: '参保人数', prop: 'projectInvestmentAmounts' },
+        { name: '经营范围', prop: 'projectInvestmentAmounts', style: true }
+      ],
+      forData: [
+        {label: '变更日期', prop: 'inReason', width: '90', slot: true},
+        {label: '变更事项', prop: 'inDate'},
+        {label: '变更前', prop: 'department'},
+        {label: '变更后', prop: 'department'}
+      ],
+      //列表
+      tableLoading:false,
+      tableData:[]
     }
   },
   created() {
+    this.handleData()
   },
   methods: {
+    handleClick(){
+      this.handleData()
+    },
+    async handleData() {
+      this.tableData = [
+        {id:1, inReason:'达萨法达萨法', inDate:'000',tag:'aaa'},
+        {id:2, inReason:'达萨法达萨法', inDate:'111'},
+        {id:3, inReason:'达萨法达萨法', inDate:'222'},
+        {id:4, inReason:'达萨法达萨法', inDate:'333'}
+      ] //测试
+    },
+    handleQuery(params) {
+      console.log(params)
+    }
   }
 }
 </script>
 
 <style lang="scss" scoped>
-  .part-container{
-    margin: 0;
-    padding: 0;
+.detail-container{
+  margin: 0;
+  padding: 16px;
+  background: #FFFFFF;
+  border-radius: 4px;
+  .detail-tab{
+    margin: 0 0 0 -16px;
+    ::v-deep .el-tabs__nav-wrap::after{
+      display: none;
+    }
+    ::v-deep .el-tabs__item{
+      font-size: 16px;
+      height: 30px;
+      line-height: 30px;
+      padding: 0 16px;
+      &.is-active{
+        font-weight: bold;
+      }
+    }
   }
+}
 </style>

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

@@ -231,6 +231,7 @@ export default {
       padding: 24px 16px;
       background: #FFFFFF;
       overflow: hidden;
+      border-radius: 4px;
       .zbph-item{
         justify-content: space-around;
         padding-top: 26px;
@@ -296,6 +297,7 @@ export default {
       width: calc(50% - 8px);
       padding: 24px 16px;
       background: #FFFFFF;
+      border-radius: 4px;
       .table-item{
         margin-top:15px;
         .ywwl-ico{

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

@@ -178,6 +178,7 @@ export default {
     margin: 0;
     padding: 24px 16px;
     background: #FFFFFF;
+    border-radius: 4px;
     .selfTab{
       margin: 24px 0 0 -12px;
       ::v-deep .el-tabs__nav-wrap::after{

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

@@ -2,7 +2,7 @@
   <div class="app-container operations-container">
     <div class="common-title">公司经营</div>
     <div class="part-swiper">
-      <div class="swiper-containers">
+      <div class="swiper-containers swiper-oper" :style="operList.length<=6?'margin-left:0px; width: 100%;':''">
         <ul class="swiper-wrapper">
           <li class="swiper-slide" v-for="(item, index) in operList" :key="index">
             <div class="swiper-div">
@@ -15,8 +15,8 @@
           </li>
         </ul>
       </div>
-      <div class="swiper-button-prev" slot="button-prev" style="left: 0;"><i class="el-icon-arrow-left"></i></div>
-      <div class="swiper-button-next" slot="button-next" style="right: 0"><i class="el-icon-arrow-right"></i></div>
+      <div class="swiper-button-prev swiper-oper-prev" slot="button-prev" style="left: 0;"><i class="el-icon-arrow-left"></i></div>
+      <div class="swiper-button-next swiper-oper-next" slot="button-next" style="right: 0"><i class="el-icon-arrow-right"></i></div>
     </div>
     <div class="flex-box operations-list">
       <div class="list-item" v-for="(item, index) in gsjyList" :key="index">
@@ -35,7 +35,6 @@ export default {
   data() {
     return {
       operList: [
-        {name:'债务信用评级', rate:'中国标普信用', range:'AA', year:'2021'},
         {name:'债务信用评级', rate:'中国标普信用', range:'AA', year:'2021'},
         {name:'债务信用评级', rate:'中国标普信用', range:'AA', year:'2021'},
         {name:'债务信用评级', rate:'中国标普信用', range:'AA', year:'2021'},
@@ -57,12 +56,12 @@ export default {
   },
   methods: {
     companySwiper(){
-      new Swiper('.swiper-containers', {
-        slidesPerView: 4,
+      new Swiper('.swiper-oper', {
+        slidesPerView: 6,
         // 设置点击箭头
         navigation: {
-          nextEl: '.swiper-button-next',
-          prevEl: '.swiper-button-prev',
+          nextEl: '.swiper-oper-next',
+          prevEl: '.swiper-oper-prev',
         }
       })
     }
@@ -75,10 +74,11 @@ export default {
     margin: 0;
     padding: 24px 16px;
     background: #FFFFFF;
+    border-radius: 4px;
     .part-swiper{
       position: relative;
       margin-top: 16px;
-      .swiper-containers{
+      .swiper-oper{
         width: calc(100% - 38px);
         height: 96px;
         margin-top: 8px;
@@ -117,7 +117,7 @@ export default {
           }
         }
       }
-      .swiper-button-prev, .swiper-button-next{
+      .swiper-oper-prev, .swiper-oper-next{
         width: 16px;
         height: 96px;
         background: #F0F5FC;

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

@@ -92,6 +92,7 @@ export default {
     margin: 0;
     padding: 24px 16px;
     background: #FFFFFF;
+    border-radius: 4px;
     .selfTab{
       margin: 24px 0 0 -12px;
       ::v-deep .el-tabs__nav-wrap::after{

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

@@ -151,6 +151,7 @@ export default {
     margin: 0;
     padding: 24px 16px;
     background: #FFFFFF;
+    border-radius: 4px;
     .clue-box{
       width: 100%;
       justify-content: space-between;

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

@@ -49,6 +49,7 @@ export default {
     margin: 0;
     padding: 24px 16px;
     background: #FFFFFF;
+    border-radius: 4px;
     .table-item{
       margin-top: 16px;
       ::v-deep .el-table--border .el-table__cell{

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

@@ -60,6 +60,7 @@ export default {
       padding: 24px 16px;
       background: #FFFFFF;
       overflow: hidden;
+      border-radius: 4px;
       .common-title{
         margin-bottom: 10px;
       }

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

 <template>
-  <div class="app-container part-container">
-    企业速览
+  <div class="app-container detail-container">
+    <head-form
+      title="高管信息"
+      :form-data="formData"
+      :query-params="queryParams"
+      :total="tableDataTotal"
+    />
+
+    <tables
+      :tableLoading="tableLoading"
+      :tableData="tableData"
+      :forData="forData"
+      :queryParams="queryParams"
+      :paging="false"
+    />
   </div>
 </template>
 
 <script>
+import mixin from '../mixins/mixin'
 export default {
-  name: 'Overview',
+  name: 'Execuinfo',
+  props: ['companyId'],
+  mixins: [mixin],
   data() {
     return {
+      queryParams: {
+        cid: 6034,
+        pageNum: 1,
+        pageSize: 10
+      },
+      forData: [
+        {label: '姓名', prop: 'inDate'},
+        {label: '职位', prop: 'department'}
+      ],
+      formData: [],
+      //列表
+      tableLoading:false,
+      tableData:[],
+      tableDataTotal:0,
     }
   },
   created() {
+    this.handleData()
   },
   methods: {
+    async handleData() {
+      this.tableData = [
+        {id:1, inReason:'达萨法达萨法', inDate:'000',tag:'aaa'},
+        {id:2, inReason:'达萨法达萨法', inDate:'111'},
+        {id:3, inReason:'达萨法达萨法', inDate:'222'},
+        {id:4, inReason:'达萨法达萨法', inDate:'333'}
+      ] //测试
+    },
+    handleQuery(params) {
+      console.log(params)
+    }
   }
 }
 </script>
 
 <style lang="scss" scoped>
-  .part-container{
-    margin: 0;
-    padding: 0;
-  }
+.detail-container{
+  margin: 0;
+  padding: 16px;
+  background: #FFFFFF;
+  border-radius: 4px;
+}
 </style>

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

 <template>
-  <div class="app-container part-container">
-    企业速览
+  <div class="app-container detail-container">
+    <head-form
+      title=""
+      :form-data="formData"
+      :query-params="queryParams"
+      :total="tableDataTotal"
+    />
+    <el-tabs v-model="activeName" @tab-click="handleClick" class="detail-tab">
+      <el-tab-pane label="股东信息" name="first"></el-tab-pane>
+      <el-tab-pane label="历史股东" name="second"></el-tab-pane>
+    </el-tabs>
+
+    <tables
+      :tableLoading="tableLoading"
+      :tableData="tableData"
+      :forData="forData"
+      :tableDataTotal="tableDataTotal"
+      :queryParams="queryParams"
+      @handle-current-change="handleCurrentChange"
+    >
+      <template slot="inReason" slot-scope="scope">
+        <router-link to="" tag="a" class="a-link">{{scope.row.inReason}}</router-link>
+        <div class="tags" v-if="scope.row.tag">
+          <span class="tag style1">{{scope.row.tag}}</span>
+          <span class="tag style1">{{scope.row.tag}}</span>
+        </div>
+      </template>
+    </tables>
   </div>
 </template>
 
 <script>
+import mixin from '../mixins/mixin'
 export default {
-  name: 'Overview',
+  name: 'Holderinfo',
+  props: ['companyId'],
+  mixins: [mixin],
   data() {
     return {
+      activeName: 'first',
+      queryParams: {
+        cid: 6034,
+        pageNum: 1,
+        pageSize: 10
+      },
+      forData: [
+        {label: '发起人/股东', prop: 'inReason', slot: true},
+        {label: '持股比例', prop: 'inDate'},
+        {label: '认缴出资（万）', prop: 'department'},
+        {label: '实缴出资额', prop: 'department'},
+        {label: '认缴出资额', prop: 'department'},
+        {label: '参股日期', prop: 'department', width: '150'}
+      ],
+      formData: [],
+      //列表
+      tableLoading:false,
+      tableData:[],
+      pageIndex:1,
+      pageSize:10,
+      tableDataTotal:0,
     }
   },
   created() {
+    this.handleData()
   },
   methods: {
+    handleClick(){
+      this.handleData()
+    },
+    async handleData() {
+      this.tableData = [
+        {id:1, inReason:'达萨法达萨法', inDate:'000',tag:'aaa'},
+        {id:2, inReason:'达萨法达萨法', inDate:'111'},
+        {id:3, inReason:'达萨法达萨法', inDate:'222'},
+        {id:4, inReason:'达萨法达萨法', inDate:'333'}
+      ] //测试
+    },
+    handleQuery(params) {
+      console.log(params)
+    }
   }
 }
 </script>
 
 <style lang="scss" scoped>
-  .part-container{
-    margin: 0;
-    padding: 0;
+.detail-container{
+  margin: 0;
+  padding: 16px;
+  background: #FFFFFF;
+  border-radius: 4px;
+  .detail-tab{
+    margin: -34px 0 0 -16px;
+    ::v-deep .el-tabs__nav-wrap::after{
+      display: none;
+    }
+    ::v-deep .el-tabs__item{
+      font-size: 16px;
+      height: 30px;
+      line-height: 30px;
+      padding: 0 16px;
+      &.is-active{
+        font-weight: bold;
+      }
+    }
   }
+  .tags{
+    .tag{
+      display: inline-block;
+      border-radius: 2px;
+      padding: 1px 7px;
+      margin: 4px 8px 0 0;
+      &.style1{
+        background: #E4F3FD;
+        color: #41A1FD;
+      }
+    }
+  }
+}
 </style>

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

 <template>
-  <div class="app-container part-container">
-    企业速览
+  <div class="app-container detail-container">
+    <head-form
+      title="对外投资"
+      :form-data="formData"
+      :query-params="queryParams"
+      :total="tableDataTotal"
+      :isExcel="true"
+      @handle-search="handleSearch"
+    />
+
+    <tables
+      :tableLoading="tableLoading"
+      :tableData="tableData"
+      :forData="forData"
+      :tableDataTotal="tableDataTotal"
+      :queryParams="queryParams"
+      @handle-current-change="handleCurrentChange"
+    >
+      <template slot="gqzb">
+        <div class="tab-header">股权占比 <el-popover
+            placement="top-start"
+            width="280"
+            trigger="hover">
+          <div>
+            控股67%：绝对控制权67%，相当于100%的权力，修改公司章程/分立、合并、变更主营项目、重大决策<br />
+            控股51%：相对控制权51%，控制线，绝对控制公司<br />
+            控股34%：安全控制权，一票否决权</div>
+            <img src="@/assets/images/detail/overview/zbph_question.png" slot="reference">
+          </el-popover></div>
+      </template>
+      <template slot="inReason" slot-scope="scope">
+        <router-link to="" tag="a" class="a-link">{{scope.row.inReason}}</router-link>
+        <div class="tags" v-if="scope.row.tag">
+          <span class="tag style1">{{scope.row.tag}}</span>
+          <span class="tag style1">{{scope.row.tag}}</span>
+        </div>
+      </template>
+    </tables>
   </div>
 </template>
 
 <script>
+import mixin from '../mixins/mixin'
 export default {
-  name: 'Overview',
+  name: 'Overseas',
+  props: ['companyId'],
+  mixins: [mixin],
   data() {
     return {
+      queryParams: {
+        cid: 6034,
+        pageNum: 1,
+        pageSize: 10
+      },
+      forData: [
+        {label: '被投资企业名称', prop: 'inReason', slot: true},
+        {label: '法定代表人', prop: 'inDate'},
+        {label: '注册资本（万元）', prop: 'department'},
+        {label: '成立日期', prop: 'department'},
+        {label: '股权占比', prop: 'department', slotHeader: true, slotName: 'gqzb'},
+        {label: '认缴出资额（万元）', prop: 'department'}
+      ],
+      formData: [
+        { type: 1, fieldName: 'zbgg', value: '', placeholder: '招标公告',
+          options: [
+            { name: '招标公告类别1', value: '1' },
+            { name: '招标公告类别2', value: '2' },
+            { name: '招标公告类别3', value: '3' },
+            { name: '招标公告类别4', value: '4' }
+          ]
+        },
+        { type: 1, fieldName: 'gqzb', value: '', placeholder: '股权占比',
+          options: [
+            { name: '股权占比类别1', value: '1' },
+            { name: '股权占比类别2', value: '2' },
+            { name: '股权占比类别3', value: '3' },
+            { name: '股权占比类别4', value: '4' }
+          ]
+        }
+      ],
+      //列表
+      tableLoading:false,
+      tableData:[],
+      pageIndex:1,
+      pageSize:10,
+      tableDataTotal:0,
     }
   },
   created() {
+    this.handleData()
   },
   methods: {
+    async handleData() {
+      this.tableData = [
+        {id:1, inReason:'达萨法达萨法', inDate:'000',tag:'aaa'},
+        {id:2, inReason:'达萨法达萨法', inDate:'111'},
+        {id:3, inReason:'达萨法达萨法', inDate:'222'},
+        {id:4, inReason:'达萨法达萨法', inDate:'333'}
+      ] //测试
+    },
+    handleQuery(params) {
+      console.log(params)
+    }
   }
 }
 </script>
 
 <style lang="scss" scoped>
-  .part-container{
-    margin: 0;
-    padding: 0;
+.detail-container{
+  margin: 0;
+  padding: 16px;
+  background: #FFFFFF;
+  border-radius: 4px;
+  .tab-header{
+    img{
+      margin-bottom: -3px;
+      width: 14px;
+      height: 14px;
+      cursor: pointer;
+    }
   }
+  .tags{
+    .tag{
+      display: inline-block;
+      border-radius: 2px;
+      padding: 1px 7px;
+      margin: 4px 8px 0 0;
+      &.style1{
+        background: #E4F3FD;
+        color: #41A1FD;
+      }
+    }
+  }
+}
 </style>

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

 <template>
   <div class="app-container part-container">
-    企业速览
+    <div class="view-content"><Infoheader /></div><!-- 企业信息 -->
     <div class="view-content"><Operations /></div><!-- 公司经营 -->
     <div class="view-content"><Bidding /></div><!--招标偏好、业务往来-->
     <div class="view-content"><Busclue /></div><!--商机线索-->
@@ -12,6 +12,7 @@
 </template>
 
 <script>
+import Infoheader from "./component/infoheader"
 import Operations from "./component/operations"
 import Bidding from "./component/bidding"
 import Busclue from './component/busclue'
@@ -23,6 +24,7 @@ export default {
   name: 'Overview',
   props: ['companyId'],
   components: {
+    Infoheader,
     Operations,
     Bidding,
     Busclue,

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

@@ -10,7 +10,7 @@
         <div class="params-item">
           <div class="flex-box item-flex">
             <el-input
-              v-model="queryParams.key"
+              v-model="queryParams.businessCharacteristic"
               @focus="nowedit = 1"
               placeholder="请输入商务条件特点"
               class="textarea"
@@ -21,7 +21,7 @@
             </el-input>
             <div class="flex btns" v-if="nowedit === 1">
               <div class="flex">
-                <div class="btnsmall btn_primary">确定</div>
+                <div class="btnsmall btn_primary" @click="update('businessCharacteristic')">确定</div>
                 <div class="cancels " @click="nowedit = 0" style="">取消</div>
               </div>
             </div>
@@ -39,7 +39,7 @@
         <div class="params-item">
           <div class="flex-box item-flex">
             <el-input
-              v-model="queryParams.key"
+              v-model="queryParams.decisionChain"
               @focus="nowedit = 2"
               placeholder="请输入决策链条"
               class="textarea"
@@ -50,7 +50,7 @@
             </el-input>
             <div class="flex btns" v-if="nowedit === 2">
               <div class="flex">
-                <div class="btnsmall btn_primary">确定</div>
+                <div class="btnsmall btn_primary" @click="update('decisionChain')">确定</div>
                 <div class="cancels " @click="nowedit = 0" style="">取消</div>
               </div>
             </div>
@@ -68,7 +68,7 @@
         <div class="params-item">
           <div class="flex-box item-flex">
             <el-input
-              v-model="queryParams.key"
+              v-model="queryParams.bidCharacteristic"
               @focus="nowedit = 3"
               placeholder="请输入招投标流程特点"
               class="textarea"
@@ -79,7 +79,7 @@
             </el-input>
             <div class="flex btns" v-if="nowedit === 3">
               <div class="flex">
-                <div class="btnsmall btn_primary">确定</div>
+                <div class="btnsmall btn_primary" @click="update('bidCharacteristic')">确定</div>
                 <div class="cancels " @click="nowedit = 0" style="">取消</div>
               </div>
             </div>
@@ -97,7 +97,7 @@
         <div class="params-item">
           <div class="flex-box item-flex">
             <el-input
-              v-model="queryParams.key"
+              v-model="queryParams.performanceCharacteristic"
               @focus="nowedit = 4"
               placeholder="请输入履约阶段特点"
               class="textarea"
@@ -108,7 +108,36 @@
             </el-input>
             <div class="flex btns" v-if="nowedit === 4">
               <div class="flex">
-                <div class="btnsmall btn_primary">确定</div>
+                <div class="btnsmall btn_primary" @click="update('performanceCharacteristic')">确定</div>
+                <div class="cancels " @click="nowedit = 0" style="">取消</div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="preference-item">
+      <div class="flex-box query-box">
+        <div class="flex-box query-params">
+          <span class="common-title">其它管理体系特点</span>
+        </div>
+      </div>
+      <div class="query-params">
+        <div class="params-item">
+          <div class="flex-box item-flex">
+            <el-input
+              v-model="queryParams.otherMsCharacteistic"
+              @focus="nowedit = 5"
+              placeholder="请输入履约阶段特点"
+              class="textarea"
+              type="textarea"
+              :autosize="autosize"
+              maxlength="500"
+              :show-word-limit="true">
+            </el-input>
+            <div class="flex btns" v-if="nowedit === 5">
+              <div class="flex">
+                <div class="btnsmall btn_primary" @click="update('otherMsCharacteistic')">确定</div>
                 <div class="cancels " @click="nowedit = 0" style="">取消</div>
               </div>
             </div>
@@ -122,6 +151,10 @@
 </template>
 
 <script>
+import {
+  customerInfo,
+  customerUpdate
+} from '@/api/detail/party-a/cooperate'
 export default {
   name: 'Preference',
   components: {
@@ -133,21 +166,47 @@ export default {
         minRows: 8,
         maxRows: 8
       },
+      customerId: 'f25219e73249eea0d9fddc5c7f04f97f',
       queryParams:{
-
+        customerId: '',
+        businessCharacteristic: '',
+        decisionChain: '',
+        bidCharacteristic: '',
+        performanceCharacteristic: '',
+        otherMsCharacteistic: '',
       },
       key:'',
       nowedit: 0
     }
   },
   created() {
-
+    this.customerInfos()
   },
   computed: {
 
   },
   methods: {
-
+    // 客户详情
+    customerInfos(){
+      customerInfo(this.customerId).then(res=>{
+        this.queryParams = res.data
+      })
+    },
+    // 编辑客户
+    update(name){
+      let data = {
+        customerId: this.customerId,
+        [name]: this.queryParams[name],
+      }
+      customerUpdate(data).then(res=>{
+        if(res.data){
+          this.$message.success(res.msg)
+          this.nowedit = 0
+        }else{
+          this.$message.error(res.msg)
+        }
+      })
+    }
   }
 }
 </script>

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

@@ -22,6 +22,10 @@
 </template>
 
 <script>
+import {
+  abnormalPage,
+  abnormalYears
+} from '@/api/detail/party-a/riskInformation'
 import mixin from '../mixins/mixin'
 export default {
   name: 'BusinessAnomaly',
@@ -45,14 +49,7 @@ export default {
         {label: '做出决定机关（移除）', prop: 'outDepartment', width: '264'}
       ],
       formData: [
-        { type: 1, fieldName: 'years', value: '', placeholder: '列入时间',
-          options: [
-            { name: '处罚类别1', value: '1' },
-            { name: '处罚类别2', value: '2' },
-            { name: '处罚类别3', value: '3' },
-            { name: '处罚类别4', value: '4' }
-          ]
-        }
+        { type: 1, fieldName: 'years', value: '', placeholder: '列入时间', options: []}
       ],
       //列表
       tableLoading:false,
@@ -63,26 +60,18 @@ export default {
     }
   },
   created() {
-    this.dataRegion()
+    this.handleQuery()
   },
   computed: {
 
   },
   methods: {
-    async dataRegion() {
-      // await axios.post("https://files.jiansheku.com/file/json/common/dataRegion.json", {}, {
-      //   headers: {
-      //     'Content-Type': 'application/json'
-      //   }
-      // }).then(res => {
-      //   if (res.data.code == 200) {
-      //     console.log(res.data.data)
-      //   }
-      // })
-    },
     handleQuery(params) {
-      console.log(params)
-    }
+      let data = params ? params : this.queryParams
+      abnormalPage(data).then(res => {
+
+      })
+    },
   }
 }
 </script>

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

@@ -19,9 +19,9 @@
       @handle-current-change="handleCurrentChange"
     >
       <template slot="punishReason" slot-scope="scope">
-        <span :class="[isOverHiddenFlag(scope.row.width, showList, scope.index, 0, scope.data)?'cell-span':'']" :style="{'-webkit-line-clamp': 5}">
-          {{ scope.data }}
-          <span v-if="isOverHiddenFlag(scope.row.width, showList, scope.index, 0, scope.data)" @click="changeShowAll(scope.index, 0)">...<span style="color: #0081FF;">更多</span></span>
+        <span :class="[isOverHiddenFlag(scope.data.width, showList, scope.index, 0, scope.row.punishReason)?'cell-span':'']" :style="{'-webkit-line-clamp': 5}">
+          {{ scope.row.punishReason }}
+          <span v-if="isOverHiddenFlag(scope.data.width, showList, scope.index, 0, scope.row.punishReason)" @click="changeShowAll(scope.index, 0)">...<span style="color: #0081FF;">更多</span></span>
         </span>
       </template>
     </tables>
@@ -34,7 +34,7 @@ import mixin from '../mixins/mixin'
 import {
   penalizePage,
   penalizeReasonType
-} from '@/api/riskInformation/punish'
+} from '@/api/detail/party-a/riskInformation'
 export default {
   name: 'Punish',
   mixins: [mixin],
@@ -44,7 +44,7 @@ export default {
   data() {
     return {
       queryParams: {
-        cid: 6034,
+        cid: 382724726,
         pageNum: 1,
         pageSize: 10
       },
@@ -58,14 +58,7 @@ export default {
         {label: '处罚结束日期', prop: 'dataId', width: '100'},
       ],
       formData: [
-        { type: 1, fieldName: 'penalizeReasonType', value: '', placeholder: '处罚类别',
-          options: [
-            { name: '处罚类别1', value: '1' },
-            { name: '处罚类别2', value: '2' },
-            { name: '处罚类别3', value: '3' },
-            { name: '处罚类别4', value: '4' }
-          ]
-        },
+        { type: 1, fieldName: 'penalizeReasonType', value: '', placeholder: '处罚类别', options: []},
         { type: 3, fieldName: 'keys', value: '', placeholder: '请输入关键词', options: []},
       ],
       //列表
@@ -86,20 +79,20 @@ export default {
     }
   },
   created() {
-    this.dataRegion()
+    this.getList()
     this.penalizeReasonTypeData()
   },
   computed: {
 
   },
   methods: {
-    async dataRegion() {
+    getList() {
       penalizePage(this.queryParams).then((res) => {
-        console.log(res)
+        console.log(res.data.rows)
       })
     },
     penalizeReasonTypeData(){
-      penalizeReasonType({cid:6034}).then((res) => {
+      penalizeReasonType({cid:this.queryParams.cid}).then((res) => {
         console.log(res)
       })
     },
@@ -136,9 +129,7 @@ export default {
   ::v-deep .el-form-item{
     margin-right: 8px !important;
   }
-  ::v-deep .el-table__body tr.current-row > td.el-table__cell{
-    background-color: #ffffff;
-  }
+
   .query-box{
     margin: 10px 0 20px;
   }

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

@@ -22,6 +22,10 @@
 </template>
 
 <script>
+import {
+  landTransactionPage,
+  landUse
+} from '@/api/detail/party-a/urbanLnvestment'
 import mixin from '../mixins/mixin'
 export default {
   name: 'landAcquisition',
@@ -32,7 +36,8 @@ export default {
   data() {
     return {
       queryParams: {
-        cid: 6034,
+        cid: 3068,
+        sort: 3,
         pageNum: 1,
         pageSize: 10
       },
@@ -48,54 +53,40 @@ export default {
         {label: '签订日期', prop: 'dataId', width: '120'}
       ],
       formData: [
-        { type: 4, fieldName: 'penalizeReasonType', value: [], placeholder: '土地用途',
-          options: [
-            { name: '处罚类别1', value: '1' },
-            { name: '处罚类别2', value: '2' },
-            { name: '处罚类别3', value: '3' },
-            { name: '处罚类别4', value: '4' }
-          ]
-        },
+        { type: 4, fieldName: 'landUse', value: [], placeholder: '土地用途', options: []},
         { type: 3, fieldName: 'keys', value: '', placeholder: '请输入关键词', options: []},
       ],
       //列表
       tableLoading:false,
       tableData:[],
-      pageIndex:1,
-      pageSize:10,
       tableDataTotal:0,
     }
   },
   created() {
-    this.dataRegion()
+    this.getList()
+    this.getlandUse()
   },
   computed: {
 
   },
   methods: {
-    async dataRegion() {
-      // await axios.post("https://files.jiansheku.com/file/json/common/dataRegion.json", {}, {
-      //   headers: {
-      //     'Content-Type': 'application/json'
-      //   }
-      // }).then(res => {
-      //   if (res.data.code == 200) {
-      //     console.log(res.data.data)
-      //   }
-      // })
+    getList() {
+      this.tableLoading = true
+      landTransactionPage(this.queryParams).then(res=>{
+        this.tableData = res.data
+        this.tableDataTotal = res.data.total
+        this.tableLoading = false
+      })
     },
-    handleQuery() {
-
-    },
-    resetQuery() {
-
+    handleQuery(params) {
+      console.log(params)
     },
-    //分页
-    handleCurrentChange(e){
-
-    },
-    handleSizeChange(e){
-
+    //土地用途
+    getlandUse(){
+      landUse({cid: this.queryParams.cid}).then(res=>{
+        console.log(res)
+        // this.formData[0].options = res.data
+      })
     }
   }
 }

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

@@ -24,6 +24,9 @@
 </template>
 
 <script>
+import {
+  regionalEconomy
+} from '@/api/detail/party-a/urbanLnvestment'
 export default {
   name: 'regionalEconomies',
   components: {
@@ -31,47 +34,14 @@ export default {
   },
   data() {
     return {
-      tableData: [
-        {
-          zb:"2023年",
-          gdp:'129,118.58',
-          gdpzs:'124,369.67',
-          rjgdp:'134,369.67',
-        },
-        {
-          zb:"2022年",
-          gdp:'129,118.58',
-          gdpzs:'124,369.67',
-          rjgdp:'134,369.67',
-        },
-        {
-          zb:"2021年",
-          gdp:'129,118.58',
-          gdpzs:'124,369.67',
-          rjgdp:'134,369.67',
-        },
-        {
-          zb:"2020年",
-          gdp:'129,118.58',
-          gdpzs:'124,369.67',
-          rjgdp:'134,369.67',
-        },
-        {
-          zb:"2019年",
-          gdp:'129,118.58',
-          gdpzs:'124,369.67',
-          rjgdp:'134,369.67',
-        },
-        {
-          zb:"2018年",
-          gdp:'129,118.58',
-          gdpzs:'124,369.67',
-          rjgdp:'134,369.67',
-        },
-      ],
+      params: {
+        provinceId: 500000,
+          cityId: 500100
+      },
+      tableData: [],
       headers: [
         {
-          prop: 'zb',
+          prop: 'year',
           label: '指标',
         },
         {
@@ -83,51 +53,51 @@ export default {
           label: 'GDP（亿元）',
         },
         {
-          prop: 'gdpzs',
+          prop: 'gdpGrowth',
           label: 'GDP增速',
         },
         {
-          prop: 'rjgdp',
+          prop: 'gdpPerCapita',
           label: '人均GDP（元）',
         },
         {
-          prop: 'rjgdp',
+          prop: 'piAddValue',
           label: '第一产业增加值（亿元）',
         },
         {
-          prop: 'rjgdp',
+          prop: 'siAddValue',
           label: '第二产业增加值（亿元）',
         },
         {
-          prop: 'rjgdp',
+          prop: 'tiAddValue',
           label: '第三产业增加值（亿元）',
         },
         {
-          prop: 'rjgdp',
+          prop: 'population',
           label: '人口（万人）',
         },
         {
-          prop: 'rjgdp',
+          prop: 'industryAddValue',
           label: '工业增加值（亿元）',
         },
         {
-          prop: 'rjgdp',
+          prop: 'industryTotalValue',
           label: '工业总产值（亿元）',
         },
         {
-          prop: 'rjgdp',
+          prop: 'realEstateInvestment',
           label: '房地产开发投资（亿元）',
         },
         {
-          prop: 'rjgdp',
+          prop: 'eximTotalValue',
           label: '进出口总额（亿美元）',
         },
         {
-          prop: 'rjgdp',
+          prop: 'trscg',
           label: '社会消费品零售总额（亿元）',
         },
         {
-          prop: 'rjgdp',
+          prop: 'urbanPcdi',
           label: '城镇居民人均可支配收入（元）',
         },
         {
@@ -135,47 +105,47 @@ export default {
           label: '财政',
         },
         {
-          prop: 'rjgdp',
+          prop: 'gbr',
           label: '一般公共预算收入（亿元）',
         },
         {
-          prop: 'rjgdp',
-          label: '般公共预算收入增速',
+          prop: 'gbrGrowth',
+          label: '一般公共预算收入增速',
         },
         {
-          prop: 'rjgdp',
+          prop: 'taxIncome',
           label: '税收收入（亿元）',
         },
         {
-          prop: 'rjgdp',
+          prop: 'transferIncome',
           label: '转移性收入（亿元）',
         },
         {
-          prop: 'rjgdp',
+          prop: 'superiorSubsidyIncome',
           label: '上级补助收入（亿元）',
         },
         {
-          prop: 'rjgdp',
+          prop: 'gbe',
           label: '一般公共预算支出（亿元）',
         },
         {
-          prop: 'rjgdp',
+          prop: 'govFundIncome',
           label: '政府性基金收入（亿元）',
         },
         {
-          prop: 'rjgdp',
+          prop: 'landTransferIncome',
           label: '土地出让收入（亿元）',
         },
         {
-          prop: 'rjgdp',
+          prop: 'govFundExpenditure',
           label: '政府性基金支出（亿元）',
         },
         {
-          prop: 'rjgdp',
+          prop: 'soecoi',
           label: '国有资本经营收入（亿元）',
         },
         {
-          prop: 'rjgdp',
+          prop: 'soecoe',
           label: '国有资本经营支出（亿元）',
         },
         {
@@ -183,49 +153,50 @@ export default {
           label: '债务',
         },
         {
-          prop: 'rjgdp',
+          prop: 'govDebtBalance',
           label: '地方政府债务余额（亿元）',
         },
         {
-          prop: 'rjgdp',
+          prop: 'generalDebtBalance',
           label: '一般债余额（亿元）',
         },
         {
-          prop: 'rjgdp',
+          prop: 'specialDebtBalance',
           label: '专项债余额（亿元）',
         },
         {
-          prop: 'rjgdp',
+          prop: 'govDebtLimit',
           label: '地方政府债务限额（亿元）',
         },
         {
-          prop: 'rjgdp',
+          prop: 'uipInterestBearingDebt',
           label: '城投平台有息债务（亿元）',
         },
         {
-          prop: 'rjgdp',
+          prop: 'fiscalSelfSufficiencyRate',
           label: '财政自给率',
         },
         {
-          prop: 'rjgdp',
+          prop: 'govDebtToGdpRate',
           label: '负债率',
         },
         {
-          prop: 'rjgdp',
+          prop: 'govDebtToGdpRateWild',
           label: '负债率-宽口径',
         },
         {
-          prop: 'rjgdp',
+          prop: 'govDebtRate',
           label: '债务率',
         },
         {
-          prop: 'rjgdp',
+          prop: 'govDebtRateWild',
           label: '债务率-宽口径',
         },
       ],
     }
   },
   created() {
+    console.log(11)
     this.dataRegion()
   },
   computed: {
@@ -240,16 +211,10 @@ export default {
   },
   methods: {
     //地区
-    async dataRegion() {
-      // await axios.post("https://files.jiansheku.com/file/json/common/dataRegion.json", {}, {
-      //   headers: {
-      //     'Content-Type': 'application/json'
-      //   }
-      // }).then(res => {
-      //   if (res.data.code == 200) {
-      //     console.log(res.data.data)
-      //   }
-      // })
+    dataRegion() {
+      regionalEconomy(this.params).then(res => {
+        this.tableData = res.data
+      })
     },
   }
 }

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

@@ -15,13 +15,13 @@ export default {
       loading: false, // 是否加载中
       iframeHight: window.innerHeight, // iframe高度
       scrollTop: 0, // 滚动条距离内部页面顶部距离
-      token: this.$store.getters.token // 需要携带的token
+      secretid: '' // 需要携带的sdkId
     }
   },
   created() {
     if (this.$route.query.companyId) { // 获取companyId
       this.loading = true
-      this.src = `https://pre-plug.jiansheku.com/enterprise/${this.$route.query.companyId}?token=${this.token}`
+      this.src = `https://pre-plug.jiansheku.com/enterprise/${this.$route.query.companyId}?secretid=${this.secretid}`
     }
   },
   mounted() {