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

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

@@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
 import java.util.Map;
 
 /**
@@ -29,67 +30,67 @@ public class EnterpriseBussinessController {
 
     @ApiOperation(value = "客户信息列表（openApi）")
     @RequestMapping(value = "/clientPage", method = RequestMethod.POST)
-    public TableDataInfo clientPage(@RequestBody EnterpriseBussinessClientPageBody paramMap) throws Exception {
+    public TableDataInfo clientPage(@RequestBody @Valid EnterpriseBussinessClientPageBody paramMap) throws Exception {
         return enterpriseBussinessService.clientPage(paramMap);
     }
 
     @ApiOperation(value = "客户项目列表（openApi）")
     @RequestMapping(value = "/clientProjectPage", method = RequestMethod.POST)
-    public Map<String, Object> clientProjectPage(@RequestBody EnterpriseBussinessClientProjectPageBody paramMap) throws Exception {
+    public Map<String, Object> clientProjectPage(@RequestBody @Valid EnterpriseBussinessClientProjectPageBody paramMap) throws Exception {
         return enterpriseBussinessService.clientProjectPage(paramMap);
     }
 
     @ApiOperation(value = "投标记录列表（开标记录）（openApi）")
     @RequestMapping(value = "/tenderPage",method = RequestMethod.POST)
-    public TableDataInfo tenderPage(@RequestBody EnterpriseBussinessTenderPageBody paramMap) throws Exception {
+    public TableDataInfo tenderPage(@RequestBody @Valid EnterpriseBussinessTenderPageBody paramMap) throws Exception {
         return enterpriseBussinessService.tenderPage(paramMap);
     }
 
     @ApiOperation(value = "投标记录详情（开标记录）（openApi）")
     @RequestMapping(value = "/tenderDetail",method = RequestMethod.POST)
-    public R tenderDetail(@RequestBody EnterpriseBussinessTenderDetailBody paramMap) throws Exception {
+    public R tenderDetail(@RequestBody @Valid EnterpriseBussinessTenderDetailBody paramMap) throws Exception {
         return enterpriseBussinessService.tenderDetail(paramMap);
     }
 
     @ApiOperation(value = "供应商列表（openApi）")
     @RequestMapping(value = "/supplierPage",method = RequestMethod.POST)
-    public TableDataInfo supplierPage(@RequestBody EnterpriseBussinessSupplierPageBody paramMap) throws Exception {
+    public TableDataInfo supplierPage(@RequestBody @Valid EnterpriseBussinessSupplierPageBody paramMap) throws Exception {
         return enterpriseBussinessService.supplierPage(paramMap);
     }
 
     @ApiOperation(value = "供应商项目列表（openApi）")
     @RequestMapping(value = "/supplierProjectPage",method = RequestMethod.POST)
-    public Map<String, Object> supplierProjectPage(@RequestBody EnterpriseBussinessSupplierProjectPageBody paramMap) throws Exception {
+    public Map<String, Object> supplierProjectPage(@RequestBody @Valid EnterpriseBussinessSupplierProjectPageBody paramMap) throws Exception {
         return enterpriseBussinessService.supplierProjectPage(paramMap);
     }
 
     @ApiOperation(value = "中标项目详情（openApi）")
     @RequestMapping(value = "/projectDetail", method = RequestMethod.POST)
-    public R projectDetail(@RequestBody EnterpriseBussinessProjectDetailBody paramMap) throws Exception {
+    public R projectDetail(@RequestBody @Valid EnterpriseBussinessProjectDetailBody paramMap) throws Exception {
         return enterpriseBussinessService.projectDetail(paramMap);
     }
 
     @ApiOperation(value = "招标代理常合作代理机构列表（openApi）")
     @RequestMapping(value = "/oftenAgencyPage",method = RequestMethod.POST)
-    public TableDataInfo oftenAgencyPage(@RequestBody EnterpriseBussinessOftenAgencyPageBody paramMap) throws Exception {
+    public TableDataInfo oftenAgencyPage(@RequestBody @Valid EnterpriseBussinessOftenAgencyPageBody paramMap) throws Exception {
         return enterpriseBussinessService.oftenAgencyPage(paramMap);
     }
 
     @ApiOperation(value = "招标合作明细列表（openApi）")
     @RequestMapping(value = "/bidCooperatePage", method = RequestMethod.POST)
-    public TableDataInfo bidCooperatePage(@RequestBody EnterpriseBussinessBidCooperatePageBody paramMap) throws Exception {
+    public TableDataInfo bidCooperatePage(@RequestBody @Valid EnterpriseBussinessBidCooperatePageBody paramMap) throws Exception {
         return enterpriseBussinessService.bidCooperatePage(paramMap);
     }
 
     @ApiOperation(value = "历史发包列表（openApi）")
     @RequestMapping(value = "/historySendPage", method = RequestMethod.POST)
-    public TableDataInfo historySendPage(@RequestBody EnterpriseBussinessHistorySendPageBody paramMap) throws Exception {
+    public TableDataInfo historySendPage(@RequestBody @Valid EnterpriseBussinessHistorySendPageBody paramMap) throws Exception {
         return enterpriseBussinessService.historySendPage(paramMap);
     }
 
     @ApiOperation(value = "历史发包省份（openApi）")
     @RequestMapping(value = "/historySendProvince", method = RequestMethod.POST)
-    public R historySendProvince(@RequestBody EnterpriseBussinessHistorySendProvinceBody paramMap) throws Exception {
+    public R historySendProvince(@RequestBody @Valid EnterpriseBussinessHistorySendProvinceBody paramMap) throws Exception {
         return enterpriseBussinessService.historySendProvince(paramMap);
     }
 

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

@@ -114,7 +114,7 @@ public class BusinessInfo extends BaseEntity
     private String customerId;
 
     /** 项目状态 */
-    @Excel(name = "项目状态")
+    @Excel(name = "项目状态(0.储备中1.跟进中2.已合作)")
     private Integer status;
 
     /** 评标办法 */

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

@@ -4,6 +4,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
+import javax.validation.constraints.AssertFalse;
 import javax.validation.constraints.NotNull;
 
 /**
@@ -20,5 +21,8 @@ public class EnterpriseAffiliatesBody extends BasePage {
 
     private Integer hasBid;
 
-
+    @AssertFalse(message = "企业不存在")
+    public boolean isVaildCid() {
+        return 0 == cid;
+    }
 }

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

@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
+import javax.validation.constraints.AssertFalse;
 import javax.validation.constraints.NotNull;
 
 @Data
@@ -22,4 +23,9 @@ public class EnterpriseBestStockPageBody extends BasePage
     //是否历史 0 否  1 是
     private Integer isHistory;
 
+    @AssertFalse(message = "企业不存在")
+    public boolean isVaildCid() {
+        return 0 == cid;
+    }
+
 }

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

@@ -5,6 +5,8 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
+import javax.validation.constraints.AssertFalse;
+import javax.validation.constraints.AssertTrue;
 import javax.validation.constraints.NotNull;
 
 @Data
@@ -24,4 +26,9 @@ public class EnterpriseBidDataGroupBody
     @NotNull(message = "spanId不能为空")
     private Integer spanId;
 
+    @AssertFalse(message = "企业不存在")
+    public boolean isVaildCid() {
+        return 0 == cid;
+    }
+
 }

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

@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
+import javax.validation.constraints.AssertFalse;
 import javax.validation.constraints.NotNull;
 
 @Data
@@ -30,4 +31,9 @@ public class EnterpriseBidNoticePageBody extends BasePage
      */
     private Integer provinceId;
 
+    @AssertFalse(message = "企业不存在")
+    public boolean isVaildCid() {
+        return 0 == companyId;
+    }
+
 }

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

@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
+import javax.validation.constraints.AssertFalse;
 import javax.validation.constraints.NotNull;
 
 @Data
@@ -19,4 +20,9 @@ public class EnterpriseBidNoticeProvinceBody
     @NotNull(message = "企业id不能为空")
     private Integer companyId;
 
+    @AssertFalse(message = "企业不存在")
+    public boolean isVaildCid() {
+        return 0 == companyId;
+    }
+
 }

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

@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
+import javax.validation.constraints.AssertFalse;
 import javax.validation.constraints.NotNull;
 
 @Data
@@ -19,4 +20,9 @@ public class EnterpriseBidNoticeTenderStageBody
     @NotNull(message = "企业id不能为空")
     private Integer companyId;
 
+    @AssertFalse(message = "企业不存在")
+    public boolean isVaildCid() {
+        return 0 == companyId;
+    }
+
 }

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

@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
+import javax.validation.constraints.AssertFalse;
 import javax.validation.constraints.NotNull;
 
 @Data
@@ -19,4 +20,9 @@ public class EnterpriseBondCreditRatingBody
     @NotNull(message = "企业id不能为空")
     private Integer cid;
 
+    @AssertFalse(message = "企业不存在")
+    public boolean isVaildCid() {
+        return 0 == cid;
+    }
+
 }

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

@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
+import javax.validation.constraints.AssertFalse;
 import javax.validation.constraints.NotNull;
 
 @Data
@@ -29,5 +30,10 @@ public class EnterpriseBussinessBidCooperatePageBody extends BasePage {
      */
     private String keys;
 
+    @AssertFalse(message = "企业不存在")
+    public boolean isVaildCid() {
+        return 0 == tendereeId || 0 == agencyId;
+    }
+
 
 }

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

@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
+import javax.validation.constraints.AssertFalse;
 import javax.validation.constraints.NotNull;
 import java.util.List;
 
@@ -31,4 +32,9 @@ public class EnterpriseBussinessClientPageBody extends BasePage {
      */
     private Integer sort;
 
+    @AssertFalse(message = "企业不存在")
+    public boolean isVaildCid() {
+        return 0 == cid;
+    }
+
 }

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

@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
+import javax.validation.constraints.AssertFalse;
 import javax.validation.constraints.NotNull;
 
 @Data
@@ -30,4 +31,9 @@ public class EnterpriseBussinessClientProjectPageBody extends BasePage {
     private String keys;
 
 
+    @AssertFalse(message = "企业不存在")
+    public boolean isVaildCid() {
+        return 0 == cid || 0 == unitId;
+    }
+
 }

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

@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
+import javax.validation.constraints.AssertFalse;
 import javax.validation.constraints.NotNull;
 
 @Data
@@ -53,6 +54,9 @@ public class EnterpriseBussinessHistorySendPageBody extends BasePage {
      */
     private Double amountMax;
 
-
+    @AssertFalse(message = "企业不存在")
+    public boolean isVaildCid() {
+        return 0 == cid;
+    }
 
 }

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

@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
+import javax.validation.constraints.AssertFalse;
 import javax.validation.constraints.NotNull;
 
 @Data
@@ -17,5 +18,8 @@ public class EnterpriseBussinessHistorySendProvinceBody {
      */
     @NotNull(message = "企业id不能为空")
     private Integer cid;
-
+    @AssertFalse(message = "企业不存在")
+    public boolean isVaildCid() {
+        return 0 == cid;
+    }
 }

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

@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
+import javax.validation.constraints.AssertFalse;
 import javax.validation.constraints.NotNull;
 
 @Data
@@ -30,4 +31,8 @@ public class EnterpriseBussinessOftenAgencyPageBody extends BasePage {
      */
     private Integer sort;
 
+    @AssertFalse(message = "企业不存在")
+    public boolean isVaildCid() {
+        return 0 == cid;
+    }
 }

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

@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
+import javax.validation.constraints.AssertFalse;
 import javax.validation.constraints.NotNull;
 
 @Data
@@ -30,4 +31,8 @@ public class EnterpriseBussinessSupplierPageBody extends BasePage {
      */
     private Integer sort;
 
+    @AssertFalse(message = "企业不存在")
+    public boolean isVaildCid() {
+        return 0 == cid;
+    }
 }

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

@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
+import javax.validation.constraints.AssertFalse;
 import javax.validation.constraints.NotNull;
 
 @Data
@@ -30,4 +31,10 @@ public class EnterpriseBussinessSupplierProjectPageBody extends BasePage {
     private String keys;
 
 
+    @AssertFalse(message = "企业不存在")
+    public boolean isVaildCid() {
+        return 0 == cid || 0 == unitId;
+    }
+    
+
 }

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

@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
+import javax.validation.constraints.AssertFalse;
 import javax.validation.constraints.NotNull;
 
 @Data
@@ -25,4 +26,9 @@ public class EnterpriseBussinessTenderPageBody extends BasePage {
     private String keys;
 
 
+    @AssertFalse(message = "企业不存在")
+    public boolean isVaildCid() {
+        return 0 == cid;
+    }
+
 }

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

@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
+import javax.validation.constraints.AssertFalse;
 import javax.validation.constraints.NotNull;
 
 @Data
@@ -19,4 +20,9 @@ public class EnterpriseChangeInfoBody extends BasePage
     @NotNull(message = "企业id不能为空")
     private Integer cid;
 
+
+    @AssertFalse(message = "企业不存在")
+    public boolean isVaildCid() {
+        return 0 == cid;
+    }
 }

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

@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
+import javax.validation.constraints.AssertFalse;
 import javax.validation.constraints.NotNull;
 import java.util.List;
 
@@ -25,4 +26,9 @@ public class EnterpriseCreditAbnormalPageBody extends BasePage {
     private List<String> years;
 
 
+    @AssertFalse(message = "企业不存在")
+    public boolean isVaildCid() {
+        return 0 == cid;
+    }
+
 }

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

@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
+import javax.validation.constraints.AssertFalse;
 import javax.validation.constraints.NotNull;
 import java.util.List;
 
@@ -20,4 +21,8 @@ public class EnterpriseCreditAbnormalYearsBody {
     private Integer cid;
 
 
+    @AssertFalse(message = "企业不存在")
+    public boolean isVaildCid() {
+        return 0 == cid;
+    }
 }

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

@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
+import javax.validation.constraints.AssertFalse;
 import javax.validation.constraints.NotNull;
 
 @Data
@@ -26,5 +27,8 @@ public class EnterpriseCreditExecutedPageBody extends BasePage {
      */
     private String dateTo;
 
-
+    @AssertFalse(message = "企业不存在")
+    public boolean isVaildCid() {
+        return 0 == cid;
+    }
 }

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

@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
+import javax.validation.constraints.AssertFalse;
 import javax.validation.constraints.NotNull;
 import java.util.List;
 
@@ -28,5 +29,8 @@ public class EnterpriseCreditExecutedPersonsPageBody extends BasePage {
      */
     private String dateTo;
 
-
+    @AssertFalse(message = "企业不存在")
+    public boolean isVaildCid() {
+        return 0 == cid;
+    }
 }

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

@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
+import javax.validation.constraints.AssertFalse;
 import javax.validation.constraints.NotNull;
 
 @Data
@@ -19,4 +20,8 @@ public class EnterpriseCreditKaitingCauseActionBody {
     private Integer cid;
 
 
+    @AssertFalse(message = "企业不存在")
+    public boolean isVaildCid() {
+        return 0 == cid;
+    }
 }

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

@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
+import javax.validation.constraints.AssertFalse;
 import javax.validation.constraints.NotNull;
 
 @Data
@@ -44,4 +45,9 @@ public class EnterpriseCreditKaitingPageBody extends BasePage {
     private String dateTo;
 
 
+    @AssertFalse(message = "企业不存在")
+    public boolean isVaildCid() {
+        return 0 == cid;
+    }
+
 }

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

@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
+import javax.validation.constraints.AssertFalse;
 import javax.validation.constraints.NotNull;
 
 @Data
@@ -18,5 +19,8 @@ public class EnterpriseCreditKaitingPureRoleBody {
     @NotNull(message = "企业id不能为空")
     private Integer cid;
 
-
+    @AssertFalse(message = "企业不存在")
+    public boolean isVaildCid() {
+        return 0 == cid;
+    }
 }

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

@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
+import javax.validation.constraints.AssertFalse;
 import javax.validation.constraints.NotNull;
 
 @Data
@@ -18,5 +19,8 @@ public class EnterpriseCreditLawsuitsCauseActionBody {
     @NotNull(message = "企业id不能为空")
     private Integer cid;
 
-
+    @AssertFalse(message = "企业不存在")
+    public boolean isVaildCid() {
+        return 0 == cid;
+    }
 }

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

@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
+import javax.validation.constraints.AssertFalse;
 import javax.validation.constraints.NotNull;
 
 @Data
@@ -41,6 +42,9 @@ public class EnterpriseCreditLawsuitsPageBody extends BasePage {
      */
     private String dateTo;
 
-
+    @AssertFalse(message = "企业不存在")
+    public boolean isVaildCid() {
+        return 0 == cid;
+    }
 
 }

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

@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
+import javax.validation.constraints.AssertFalse;
 import javax.validation.constraints.NotNull;
 
 @Data
@@ -18,5 +19,8 @@ public class EnterpriseCreditLawsuitsRoleBody {
     @NotNull(message = "企业id不能为空")
     private Integer cid;
 
-
+    @AssertFalse(message = "企业不存在")
+    public boolean isVaildCid() {
+        return 0 == cid;
+    }
 }

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

@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
+import javax.validation.constraints.AssertFalse;
 import javax.validation.constraints.NotNull;
 
 @Data
@@ -18,5 +19,8 @@ public class EnterpriseCreditNoticeCaseReasonBody {
     @NotNull(message = "企业id不能为空")
     private Integer cid;
 
-
+    @AssertFalse(message = "企业不存在")
+    public boolean isVaildCid() {
+        return 0 == cid;
+    }
 }

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

@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
+import javax.validation.constraints.AssertFalse;
 import javax.validation.constraints.NotNull;
 
 @Data
@@ -43,5 +44,8 @@ public class EnterpriseCreditNoticePageBody extends BasePage {
      */
     private String dateTo;
 
-
+    @AssertFalse(message = "企业不存在")
+    public boolean isVaildCid() {
+        return 0 == cid;
+    }
 }

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

@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
+import javax.validation.constraints.AssertFalse;
 import javax.validation.constraints.NotNull;
 
 @Data
@@ -18,5 +19,8 @@ public class EnterpriseCreditNoticeRoleBody {
     @NotNull(message = "企业id不能为空")
     private Integer cid;
 
-
+    @AssertFalse(message = "企业不存在")
+    public boolean isVaildCid() {
+        return 0 == cid;
+    }
 }

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

@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
+import javax.validation.constraints.AssertFalse;
 import javax.validation.constraints.NotNull;
 
 @Data
@@ -18,5 +19,8 @@ public class EnterpriseCreditNoticeTypeBody {
     @NotNull(message = "企业id不能为空")
     private Integer cid;
 
-
+    @AssertFalse(message = "企业不存在")
+    public boolean isVaildCid() {
+        return 0 == cid;
+    }
 }

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

@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
+import javax.validation.constraints.AssertFalse;
 import javax.validation.constraints.NotNull;
 
 @Data
@@ -28,4 +29,9 @@ public class EnterpriseCreditPenalizePageBody extends BasePage {
      */
     private String keys;
 
+
+    @AssertFalse(message = "企业不存在")
+    public boolean isVaildCid() {
+        return 0 == cid;
+    }
 }

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

@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
+import javax.validation.constraints.AssertFalse;
 import javax.validation.constraints.NotNull;
 
 @Data
@@ -18,4 +19,9 @@ public class EnterpriseCreditPenalizeReasonTypeBody {
     @NotNull(message = "企业id不能为空")
     private Integer cid;
 
+
+    @AssertFalse(message = "企业不存在")
+    public boolean isVaildCid() {
+        return 0 == cid;
+    }
 }

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

@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
+import javax.validation.constraints.AssertFalse;
 import javax.validation.constraints.NotNull;
 
 @Data
@@ -19,4 +20,9 @@ public class EnterpriseDynamicPageBody extends BasePage
     @NotNull(message = "企业id不能为空")
     private Integer companyId;
 
+
+    @AssertFalse(message = "企业不存在")
+    public boolean isVaildCid() {
+        return 0 == companyId;
+    }
 }

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

@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
+import javax.validation.constraints.AssertFalse;
 import javax.validation.constraints.NotNull;
 
 @Data
@@ -19,4 +20,9 @@ public class EnterpriseFinancialBody
     @NotNull(message = "企业id不能为空")
     private Integer cid;
 
+
+    @AssertFalse(message = "企业不存在")
+    public boolean isVaildCid() {
+        return 0 == cid;
+    }
 }

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

@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
+import javax.validation.constraints.AssertFalse;
 import javax.validation.constraints.NotNull;
 
 @Data
@@ -19,4 +20,9 @@ public class EnterpriseIcInfoBody extends BasePage
     @NotNull(message = "企业id不能为空")
     private Integer cid;
 
+
+    @AssertFalse(message = "企业不存在")
+    public boolean isVaildCid() {
+        return 0 == cid;
+    }
 }

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

@@ -5,6 +5,8 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
+import javax.validation.constraints.AssertFalse;
+import javax.validation.constraints.AssertTrue;
 import javax.validation.constraints.NotNull;
 
 @Data
@@ -19,4 +21,9 @@ public class EnterpriseInfoHeaderBody
     @NotNull(message = "企业id不能为空")
     private Integer companyId;
 
+    @AssertFalse(message = "企业不存在")
+    public boolean isVaildCid() {
+        return 0 == companyId;
+    }
+
 }

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

@@ -4,6 +4,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
+import javax.validation.constraints.AssertFalse;
 import javax.validation.constraints.NotNull;
 
 /**
@@ -21,5 +22,8 @@ public class EnterpriseInvestmentBody extends BasePage {
     private double stockPercentageMin;
     private double stockPercentageMax;
 
-
+    @AssertFalse(message = "企业不存在")
+    public boolean isVaildCid() {
+        return 0 == cid;
+    }
 }

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

@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
+import javax.validation.constraints.AssertFalse;
 import javax.validation.constraints.NotNull;
 
 @Data
@@ -19,4 +20,8 @@ public class EnterpriseKeymembersBody extends BasePage
     @NotNull(message = "企业id不能为空")
     private Integer cid;
 
+    @AssertFalse(message = "企业不存在")
+    public boolean isVaildCid() {
+        return 0 == cid;
+    }
 }

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

@@ -4,6 +4,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
+import javax.validation.constraints.AssertFalse;
 import javax.validation.constraints.NotNull;
 
 /**
@@ -18,5 +19,8 @@ public class EnterprisePartnersBody extends BasePage {
     @NotNull(message = "企业id不能为空")
     private Integer cid;
 
-
+    @AssertFalse(message = "企业不存在")
+    public boolean isVaildCid() {
+        return 0 == cid;
+    }
 }

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

@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
+import javax.validation.constraints.AssertFalse;
 import javax.validation.constraints.NotNull;
 import java.util.List;
 
@@ -30,4 +31,9 @@ public class EnterpriseProjectApprovalProjectPageBody extends BasePage {
      */
     private Integer sort;
 
+
+    @AssertFalse(message = "企业不存在")
+    public boolean isVaildCid() {
+        return 0 == cid;
+    }
 }

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

@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
+import javax.validation.constraints.AssertFalse;
 import javax.validation.constraints.NotNull;
 
 @Data
@@ -18,4 +19,9 @@ public class EnterpriseProjectBidNoticeAreaBody {
     @NotNull(message = "企业id不能为空")
     private Integer cid;
 
+
+    @AssertFalse(message = "企业不存在")
+    public boolean isVaildCid() {
+        return 0 == cid;
+    }
 }

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

@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
+import javax.validation.constraints.AssertFalse;
 import javax.validation.constraints.NotNull;
 import java.util.List;
 
@@ -49,4 +50,9 @@ public class EnterpriseProjectBidNoticePageBody extends BasePage {
      */
     private List<Integer> areaIds;
 
+
+    @AssertFalse(message = "企业不存在")
+    public boolean isVaildCid() {
+        return 0 == cid;
+    }
 }

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

@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
+import javax.validation.constraints.AssertFalse;
 import javax.validation.constraints.NotNull;
 
 @Data
@@ -18,4 +19,9 @@ public class EnterpriseProjectBidNoticeProAssessmentWayBody {
     @NotNull(message = "企业id不能为空")
     private Integer cid;
 
+
+    @AssertFalse(message = "企业不存在")
+    public boolean isVaildCid() {
+        return 0 == cid;
+    }
 }

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

@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
+import javax.validation.constraints.AssertFalse;
 import javax.validation.constraints.NotNull;
 import java.util.List;
 
@@ -40,5 +41,8 @@ public class EnterpriseProjectBidNoticeProPageBody extends BasePage {
     private String bidAssessmentWay;
 
 
-
+    @AssertFalse(message = "企业不存在")
+    public boolean isVaildCid() {
+        return 0 == cid;
+    }
 }

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

@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
+import javax.validation.constraints.AssertFalse;
 import javax.validation.constraints.NotNull;
 
 @Data
@@ -18,4 +19,9 @@ public class EnterpriseProjectBidNoticeProProjectPurposesBody {
     @NotNull(message = "企业id不能为空")
     private Integer cid;
 
+
+    @AssertFalse(message = "企业不存在")
+    public boolean isVaildCid() {
+        return 0 == cid;
+    }
 }

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

@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
+import javax.validation.constraints.AssertFalse;
 import javax.validation.constraints.NotNull;
 
 @Data
@@ -18,4 +19,9 @@ public class EnterpriseProjectBidNoticeProProjectTypeBody {
     @NotNull(message = "企业id不能为空")
     private Integer cid;
 
+
+    @AssertFalse(message = "企业不存在")
+    public boolean isVaildCid() {
+        return 0 == cid;
+    }
 }

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

@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
+import javax.validation.constraints.AssertFalse;
 import javax.validation.constraints.NotNull;
 import java.util.List;
 
@@ -19,4 +20,9 @@ public class EnterpriseProjectBidNoticeTenderStageBody {
     @NotNull(message = "企业id不能为空")
     private Integer cid;
 
+
+    @AssertFalse(message = "企业不存在")
+    public boolean isVaildCid() {
+        return 0 == cid;
+    }
 }

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

@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
+import javax.validation.constraints.AssertFalse;
 import javax.validation.constraints.NotNull;
 import java.util.List;
 
@@ -29,5 +30,8 @@ public class EnterpriseProjectBidPlanPageBody extends BasePage {
      */
     private Integer sort;
 
-
+    @AssertFalse(message = "企业不存在")
+    public boolean isVaildCid() {
+        return 0 == cid;
+    }
 }

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

@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
+import javax.validation.constraints.AssertFalse;
 import javax.validation.constraints.NotNull;
 
 @Data
@@ -23,5 +24,8 @@ public class EnterpriseProjectCreditXzxkPageBody extends BasePage {
      */
     private String keys;
 
-
+    @AssertFalse(message = "企业不存在")
+    public boolean isVaildCid() {
+        return 0 == cid;
+    }
 }

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

@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
+import javax.validation.constraints.AssertFalse;
 import javax.validation.constraints.NotNull;
 import java.util.List;
 
@@ -35,4 +36,9 @@ public class EnterpriseProjectLandTransactionPageBody extends BasePage {
      */
     private Integer sort;
 
+
+    @AssertFalse(message = "企业不存在")
+    public boolean isVaildCid() {
+        return 0 == cid;
+    }
 }

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

@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
+import javax.validation.constraints.AssertFalse;
 import javax.validation.constraints.NotNull;
 import java.util.List;
 
@@ -20,5 +21,8 @@ public class EnterpriseProjectLandUseBody  {
     private Integer cid;
 
 
-
+    @AssertFalse(message = "企业不存在")
+    public boolean isVaildCid() {
+        return 0 == cid;
+    }
 }

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

@@ -4,6 +4,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
+import javax.validation.constraints.AssertFalse;
 import javax.validation.constraints.NotNull;
 
 /**
@@ -21,4 +22,9 @@ public class EnterpriseProjectTenderDataGroupBody {
     //group类型 0：金额，1：项目类型
     private Integer type;
 
+
+    @AssertFalse(message = "企业不存在")
+    public boolean isVaildCid() {
+        return 0 == cid;
+    }
 }

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

@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
+import javax.validation.constraints.AssertFalse;
 import javax.validation.constraints.NotNull;
 
 @Data
@@ -20,4 +21,10 @@ public class EnterpriseStatisticBody
     private Integer companyId;
     private Boolean isFy = false;
 
+
+    @AssertFalse(message = "企业不存在")
+    public boolean isVaildCid() {
+        return 0 == companyId;
+    }
+
 }

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

@@ -4,6 +4,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
+import javax.validation.constraints.AssertFalse;
 import javax.validation.constraints.NotNull;
 
 /**
@@ -40,4 +41,9 @@ public class EnterpriseSupplierPageBody extends BasePage {
         sb.append('}');
         return sb.toString();
     }
+
+    @AssertFalse(message = "企业不存在")
+    public boolean isVaildCid() {
+        return 0 == companyId;
+    }
 }

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

@@ -200,6 +200,15 @@ export function urbanInvestmentStatistics(param) {
   })
 }
 
+//城投平台-认领
+export function claim(param) {
+  return request({
+    url: '/customer/claim',
+    method: 'POST',
+    data: param
+  })
+}
+
 
 
 

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

@@ -182,7 +182,8 @@ select {
 	cursor: pointer;
 	margin-right: 24px;
 }
-.select-popper .color_text{
+
+.select-popper .color_text {
 	color: #0381fa;
 }
 
@@ -270,7 +271,8 @@ select {
 	cursor: pointer;
 	position: relative;
 }
-.select-popper  .select-active{
+
+.select-popper .select-active {
 	color: #0381fa;
 }
 
@@ -309,11 +311,13 @@ select {
 .el-dropdown-land {
 	margin-right: 24px;
 }
-.el-dropdown-land .color_text{
+
+.el-dropdown-land .color_text {
 	color: #1890ff;
 	background-color: #FFFFFF;
 }
-.el-dropdown-menu .color_text{
+
+.el-dropdown-menu .color_text {
 	color: #1890ff;
 	background-color: #FFFFFF;
 }
@@ -357,6 +361,7 @@ select {
 	display: inline-block;
 	margin: 0px 8px;
 }
+
 .jabph_popper_box .jabph_popper_wrap .jabph_popper_input .el-input__inner {
 	width: 100px;
 }
@@ -438,10 +443,11 @@ select {
 	border-radius: 5px 5px 5px 5px;
 	border: 1px solid #D9D9D9;
 	text-align: center;
-	font-size:14px;
+	font-size: 14px;
 	font-weight: 400;
 }
-.toolbar-right-download .el-icon-arrow-down{
+
+.toolbar-right-download .el-icon-arrow-down {
 	margin-left: 8px;
 }
 
@@ -554,6 +560,7 @@ select {
 	padding-left: 4px;
 	margin-right: 24px;
 }
+
 .content_item_list {
 	line-height: 34px;
 }
@@ -570,6 +577,7 @@ select {
 	height: 40px;
 	opacity: 0;
 }
+
 .el-select-dropdown.is-multiple .el-select-dropdown__item:hover {
 	color: #3181fa;
 }
@@ -590,6 +598,7 @@ select {
 	background-color: #fff;
 	padding: 6px 0px;
 }
+
 .select-radio {
 	max-height: 400px;
 	background: #fff;
@@ -598,6 +607,7 @@ select {
 .select-radio[x-placement^=bottom] {
 	margin-top: 8px;
 }
+
 .select-radio .select-radio-list {
 	position: relative;
 }
@@ -649,10 +659,12 @@ select {
 	float: right;
 	margin-top: 4px;
 }
-.select-list .el-dropdown-menu__item{
+
+.select-list .el-dropdown-menu__item {
 	padding: 0;
 }
-.select-list .el-dropdown-menu__item :hover{
+
+.select-list .el-dropdown-menu__item :hover {
 	color: #0381fa;
 	background: #f2f7ff;
 }
@@ -695,6 +707,7 @@ select {
 	border-left: 1px solid #ccc;
 	margin-left: 2px;
 }
+
 .select-list .el-radio {
 	display: block;
 	line-height: 36px;
@@ -721,36 +734,43 @@ select {
 .select-list .el-radio__input {
 	display: none;
 }
-.checkbox{
+
+.checkbox {
 	display: flex;
 	align-items: center;
 }
-.checkbox .checkbox-titel{
+
+.checkbox .checkbox-titel {
 	font-size: 14px;
 	font-weight: 400;
 	color: rgba(35, 35, 35, 0.8);
-	margin-right:24px;
+	margin-right: 24px;
 }
-.checkbox  .checkbox-content{
+
+.checkbox .checkbox-content {
 	display: flex;
 	align-items: center;
 }
-.checkbox  .el-checkbox__label{
+
+.checkbox .el-checkbox__label {
 	padding-left: 8px;
 	color: #232323;
 }
-.checkbox  .checkbox-content .checkbox-content-qx{
+
+.checkbox .checkbox-content .checkbox-content-qx {
 	margin-right: 30px;
 }
- .toolbar-right-search {
+
+.toolbar-right-search {
 	margin-left: 16px;
 }
 
 
-.bottomlist-title-left{
+.bottomlist-title-left {
 	display: inline-flex;
 	align-items: center;
 }
+
 .toolbar-right-search .toolbar-right_input {
 	width: 228px;
 	display: inline-flex;
@@ -763,6 +783,7 @@ select {
 	line-height: 32px;
 
 }
+
 .toolbar-right-search .el-input .el-input__inner {
 	border-top-right-radius: 0;
 	border-bottom-right-radius: 0;
@@ -770,9 +791,11 @@ select {
 	height: 32px;
 	line-height: 32px;
 }
-.toolbar-right-search  .el-input-group__append{
+
+.toolbar-right-search .el-input-group__append {
 	padding: 0;
 }
+
 .toolbar-right-search .result-search {
 	height: 32px;
 	line-height: 32px;
@@ -802,6 +825,7 @@ select {
 .toolbar-right-search .result-search:hover {
 	background: #0074E5;
 }
+
 .info-list {
 	display: flex;
 	/* width: 1200px; */
@@ -1126,6 +1150,37 @@ select {
 .performance_pagination_wrap .common-pagination {
 	margin-top: 16px;
 }
-.table-item .el-table tr,.table-item .el-table td{
+
+.table-item .el-table tr,
+.table-item .el-table td {
 	font-size: 13px;
 }
+
+.table-item-jf1 {
+	padding: 0px 16px;
+}
+
+.table-item-jf1 .item-jf-img {
+	display: block;
+	margin: 24px auto;
+	width: 108px;
+
+}
+
+.table-item-jf1 .item-jf-titel {
+	font-size: 16px;
+	font-weight: 400;
+	color: #333333;
+	line-height: 21px;
+	margin-bottom: 8px;
+	text-align: center;
+}
+
+.table-item-jf1 .item-jf-text {
+	font-size: 14px;
+	font-weight: 400;
+	color: #999999;
+	line-height: 18px;
+	margin-bottom: 24px;
+	text-align: center;
+}
\ No newline at end of file

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

@@ -7,7 +7,7 @@
     </div>
 
     <div class="app-container">
-    <gjjl types="gjdt" :data="datas" isDisabled=false></gjjl>
+    <gjjl types="gjdt" :data="datas" isDisabled=true></gjjl>
     </div>
   </div>
 </template>

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

@@ -153,7 +153,7 @@ export default {
       queryParams: {
         customerId: this.customerIds,
         pageNum: 1,
-        pageSize: 10
+        pageSize: 20
       },
       forData: [
         {label: '项目名称', prop: 'projectName', slot: true},

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

@@ -88,7 +88,7 @@ export default {
       queryParams:{
         customerId:this.customerIds,
         pageNum:1,
-        pageSize:10,
+        pageSize:20,
       },
       forData: [
         {label: '姓名', prop: 'name', width: '124'},

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

@@ -39,7 +39,7 @@ export default {
       queryParams: {
         cid: this.companyId,//382724726
         pageNum: 1,
-        pageSize: 10
+        pageSize: 20
       },
       forData: [
         {label: '列入原因', prop: 'inReason', width: '508'},

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

@@ -41,7 +41,7 @@ export default {
       queryParams: {
         cid: this.companyId, //20734
         pageNum: 1,
-        pageSize: 10
+        pageSize: 20
       },
       forData: [
         {label: '案由', prop: 'caseReason'},

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

@@ -39,7 +39,7 @@ export default {
       queryParams: {
         cid: this.companyId,//5504335
         pageNum: 1,
-        pageSize: 10
+        pageSize: 20
       },
       forData: [
         {label: '失信被执行人行为具体情形', prop: 'executionDesc', width: '508', fixed: true},

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

@@ -38,7 +38,7 @@ export default {
       queryParams: {
         cid: this.companyId,//194738907
         pageNum: 1,
-        pageSize: 10
+        pageSize: 20
       },
       forData: [
         {label: '执行标的（元）', prop: 'amount', width: '140'},

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

@@ -47,7 +47,7 @@ export default {
       queryParams: {
         cid: this.companyId,//5504335
         pageNum: 1,
-        pageSize: 10
+        pageSize: 20
       },
       forData: [
         {label: '案由', prop: 'causeAction', width: '240'},

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

@@ -47,7 +47,7 @@ export default {
       queryParams: {
         cid: this.companyId,//20734
         pageNum: 1,
-        pageSize: 10
+        pageSize: 20
       },
       forData: [
         {label: '案由', prop: 'causeAction', width: '240', fixed: true},

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

@@ -47,7 +47,7 @@ export default {
       queryParams: {
         cid: this.companyId,
         pageNum: 1,
-        pageSize: 10
+        pageSize: 20
       },
       forData: [
         {label: '处罚原因', prop: 'punishReason', width: '508', slot: true, fixed: true},

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

@@ -45,7 +45,7 @@ export default {
         cid: this.companyId,//3068
         sort: 3,
         pageNum: 1,
-        pageSize: 10
+        pageSize: 20
       },
       forData: [
         {label: '项目名称', prop: 'projectName', width: '508', slot: true},

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

@@ -143,7 +143,7 @@ export default {
         platformImportance: [],
         developmentZone: [],
         pageNum: 1,
-        pageSize: 15
+        pageSize: 20
       },
       forData: [
         {label: '企业名称', prop: 'companyName', width: '369', slot: true},

dsk-operate-ui/src/views/enterpriseData/components/Owner/index.vue

@@ -137,20 +137,22 @@
 	  		</div>
 	  		  
 	  	</div>
-		<div class=" table-item-jf table-item-jf1"v-if="tableData.length==0">
-			<div class="item-jf-text">暂无数据！</div>
+		<div class="table-item-jf table-item-jf1" v-if="tableData.length==0">
+			<img class="item-jf-img" src="@/assets/images/kong.png" alt="">
+			<div class="item-jf-titel">抱歉，没找到相关数据！</div>
+			<div class="item-jf-text">建议调整关键词或筛选条件，重新搜索！</div>
 		</div>
 	  	<div class=" table-item-jf" v-if="tableData.length>0">
 	  	  <el-table :data="tableData" :header-cell-style="{ background:'#F0F3FA'}"  element-loading-text="Loading" border  highlight-current-row>
-	  			<el-table-column type="index" label="序号" width="60">
+	  			<el-table-column type="index" label="序号" fixed width="60">
 	  			 <template slot-scope="scope">
 	  			 	<span>{{(pageNum - 1) *20 + scope.$index + 1}}</span>
 	  			 </template>
 	  			</el-table-column>
-	  			<el-table-column  label="公司名称" width="430" >
+	  			<el-table-column  label="公司名称" fixed width="430" >
 	  						 <template slot-scope="scope">
 								 <div class="renling">
-									 <router-link  :to="`/enterprise/${encodeStr(scope.row.agencyId)}`" tag="a" class="list-titel-a" v-html="scope.row.companyName" ></router-link>
+									 <router-link  :to="`/enterprise/${encodeStr(scope.row.companyId)}`" tag="a" class="list-titel-a" v-html="scope.row.companyName" ></router-link>
 									 <div class="renling-btn">
 									 	<img src="@/assets/images/owner/renling1.png" alt="">					 
 									 	<span v-if="scope.row.claimStatus" class="renling-hui">
@@ -426,11 +428,7 @@
 														  	{{scope.row.developmentZone||"--"}}
 													</template>
 										</el-table-column>
-										<el-table-column  label="开发区类别" width="84" >
-													<template slot-scope="scope">
-														  	{{scope.row.developmentZone||"--"}}
-													</template>
-										</el-table-column>
+										
 	  	  </el-table>
 	  	</div>
 	  	<div class="pagination clearfix"  v-show="total>0">
@@ -827,7 +825,7 @@ export default {
 	    delete params.provinceIds
 	  }
 	  if(data.cityIds.length>0){
-	   params['cityIds'] = data.provinceIds;
+	   params['cityIds'] = data.cityIds;
 	  }else{
 	    delete params.cityIds
 	  }
@@ -1095,98 +1093,8 @@ export default {
 			
 			padding-bottom: 0px;
 		}
-		.bottomlist-list{
-			padding: 16px;
-			font-size: 14px;
-			border-bottom: 1px solid #EFEFEF;
-			padding-bottom: 14px;
-			.list-titel{
-				font-size: 16px;
-				font-weight: 700;
-				color: #3D3D3D;
-				line-height: 19px;
-				.list-titel-a{
-					text-decoration: none;
-					color:#3D3D3D;
-				}
-				a:hover, a:visited, a:link, a:active{
-					color:#3D3D3D;
-				}
-			}
-			.content-label{
-				margin-top: 12px;
-				.list-label{
-					background: #F3F3FF;
-					color: #8491E8;
-					border-radius: 1px 1px 1px 1px;
 
-					padding: 3px 7px;
-					font-size: 12px;
 		
-				}
-			}
-			
-			
-			.list-content{
-				margin-top: 8px;
-				display: flex;
-				justify-content: start;
-				align-items: center;
-				
-				.list-content-text{
-					margin-top: 7px;
-					display: flex;
-					justify-content: start;
-					align-items: center;
-					margin-right: 27px;
-					font-size: 14px;
-					
-					span:first-child{
-						font-weight: 400;
-						color: rgba(35,35,35,0.4);
-						line-height: 15px
-					}
-					span:last-child{
-						font-weight: 400;
-						color: rgba(35,35,35,0.8);
-						line-height: 15px
-					}
-					.blue{
-						color: #0081FF !important;
-						cursor: pointer;
-						
-					}
-					
-				}
-				
-				
-			}
-			.list-addree{
-				width: auto;
-				background: #F3F4F5;
-				display: inline-flex;
-				margin-top: 7px;
-				.list-content-text{
-					margin-top: 0px;
-					span{
-						line-height: 30px!important;
-					}
-				}
-				img{
-					width: 14px;
-					margin: 0  8px;
-					
-				}
-			}
-			
-			
-		}
-		
-		.bottomlist-list:hover{
-			background: #F6F9FC;
-			cursor: pointer;
-			
-		}
 		.table-item-jf{
 			padding:0px 16px;
 			.list-titel-a{
@@ -1210,14 +1118,6 @@ export default {
 			 ::v-deep .el-table--border .el-table__cell{
 				border-right:1px solid #E6EAF1;
 			}
-			.item-jf-text{
-				width: 100%;
-				text-align: center;
-				padding: 56px 0px;
-				font-size: 18px;
-				font-weight: 400;
-				color: rgba(35,35,35,0.8);
-			}
 			.renling{
 				display: flex;
 				align-items: center;
@@ -1253,6 +1153,7 @@ export default {
 		}
 		.table-item-jf1{
 			border-top:1px solid  #EFEFEF;
+			
 		}
 		.pagination{
 			padding: 14px ;

dsk-operate-ui/src/views/enterpriseData/components/SearchEnterprise/index.vue

@@ -119,7 +119,7 @@
 							@input="addressListbtn" v-model="addressType" :options="addressList" :props="props"
 							collapse-tags></el-cascader>
 					</div>
-					<div class="select-popper">
+					<!-- <div class="select-popper">
 						<el-dropdown trigger="click" placement='bottom-start'>
 							<div class="el-dropdown-link " :class="radioQuali?'select-active':''">
 								有无资质{{radioQuali?' 1项':''}}
@@ -135,7 +135,7 @@
 							</el-dropdown-menu>
 					
 						</el-dropdown>
-					</div>
+					</div> -->
 					<!-- <div class="select-popper">
 						<el-dropdown trigger="click" placement='bottom-start'>
 							<div class="el-dropdown-link " :class="hasPhone?'select-active':''">
@@ -418,7 +418,7 @@
 		    <div class="content_item content_item_nopadding ">
 		    	<div class="search-new" >
 		    		<span @click="submitbtn()">查询</span>
-		    		<span @click="parentreset()">重置</span>
+		    		<span @click="reset()">重置</span>
 		    	</div>
 		    
 		    </div>
@@ -453,6 +453,11 @@
         			</p>
         		</div>
         		  
+        	</div>
+			<div class="table-item-jf1" v-if="tableData.length==0">
+				<img class="item-jf-img" src="@/assets/images/kong.png" alt="">
+				<div class="item-jf-titel">抱歉，没找到相关数据！</div>
+				<div class="item-jf-text">建议调整关键词或筛选条件，重新搜索！</div>
 			</div>
         	<ul class="bottomlist-content" v-if="tableData.length>0">
         		<li class="info-list" v-for="(item,index) in tableData" :key="index">
@@ -2585,9 +2590,7 @@
 
 
 			},
-			parentreset() {
-				this.$parent.reset();
-			},
+			
 			reset() {
 
 				Object.assign(this.$data, this.$options.data()) //重置data
@@ -3096,6 +3099,7 @@
 			background: #F6F9FC;
 			cursor: pointer;
 		}
+		
 		.pagination{
 			padding: 14px ;
 		   .el-pagination{

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

@@ -134,7 +134,7 @@
               </div>
             </div>
             <div>
-              <div id="fx-echarts" style="height: 200px;"></div>
+              <div id="fx-echarts" style="height: 260px;"></div>
             </div>
           </div>
 
@@ -608,7 +608,7 @@ export default {
                 },
                 {
                   offset: 1,
-                  color: "#0CBC6D",
+                  color: "#9DDCCA",
                 },
               ]),
             },
@@ -636,11 +636,11 @@ export default {
               color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [
                 {
                   offset: 0.2,
-                  color: "#DFEAFF",
+                  color: "#FAFDFF",
                 },
                 {
                   offset: 1,
-                  color: "#5895FF",
+                  color: "#C5E3FF",
                 },
               ]),
             },
@@ -668,11 +668,11 @@ export default {
               color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [
                 {
                   offset: 0.2,
-                  color: "#ECE8FF",
+                  color: "#FAF9FF",
                 },
                 {
                   offset: 1,
-                  color: "#BCC0FF",
+                  color: "#E2DCFF",
                 },
               ]),
             },
@@ -1042,7 +1042,7 @@ export default {
             height: 60px;
             background: #FFFFFF;
             border-radius: 4px;
-            border: 1px solid #E6E6E9;
+            /*border: 1px solid #E6E6E9;*/
             color:#0081FF;
             line-height: 64px;
             font-size: 14px;
@@ -1261,7 +1261,7 @@ export default {
         }
       }
       .analysis{
-        height: 242px;
+        height: 314px;
         background: #FFFFFF;
         border-radius: 4px;
         padding: 16px;
@@ -1474,7 +1474,7 @@ export default {
         }
       }
       .zbgg{
-        height: 382px;
+        height: 450px;
         background: #FFFFFF;
         border-radius: 4px;
         padding: 16px;

dsk-operate-ui/src/views/macro/economies/component/regionalEconomy.vue

@@ -700,7 +700,7 @@ export default {
         .item{
           width: 19%;
           .item-title{
-            font-size: 13px;
+            font-size: 12px;
             color: rgba(35,35,35,0.8);
             i{
               width: 2px;
@@ -750,7 +750,7 @@ export default {
           border-right: 1px solid #E4E4E4;
           display: inline-block;
           color: rgba(35,35,35,0.8);
-          font-size: 13px;
+          font-size: 12px;
           padding-left: 16px;
           width: 20%;
           line-height: 26px;
@@ -773,7 +773,7 @@ export default {
             font-style: normal;
             margin-left: 4px;
             font-weight: 400;
-            font-size: 13px;
+            font-size: 12px;
           }
         }
         span:last-child{

dsk-operate-ui/src/views/macro/enterprises/index.vue

@@ -50,9 +50,9 @@
           <!--<el-table-column label="最大中标金额（万元）" prop="cgfs" sortable="custom" width="160" :formatter="formatStatus"/>-->
           <!--<el-table-column label="中标总金额（万元）" prop="cgfs" sortable="custom" width="160" :formatter="formatStatus"/>-->
           <el-table-column label="四库业绩" prop="skyCount" sortable="custom" width="120" :formatter="formatStatus"/>
-          <!--<el-table-column label="公路业绩" prop="cgfs" sortable="custom" width="100" :formatter="formatStatus"/>-->
-          <!--<el-table-column label="水利业绩" prop="cgfs" sortable="custom" width="100" :formatter="formatStatus"/>-->
-          <!--<el-table-column label="常合作业主" prop="cgfs" width="130" :formatter="formatStatus"/>-->
+          <el-table-column label="公路业绩" prop="cgfs" sortable="custom" width="100" :formatter="formatStatus"/>
+          <el-table-column label="水利业绩" prop="cgfs" sortable="custom" width="100" :formatter="formatStatus"/>
+          <el-table-column label="常合作业主" prop="cgfs" width="130" :formatter="formatStatus"/>
           <el-table-column label="客户（个）" prop="customerCount" sortable="custom" width="120" :formatter="formatStatus"/>
           <el-table-column label="供应商（个）" prop="supplierCount" sortable="custom" width="130" :formatter="formatStatus"/>
           <!--<el-table-column label="常合作供应商" prop="gys" width="120" :formatter="formatStatus"/>-->
@@ -101,7 +101,7 @@ export default {
       tableData: [],
       tableLoading: false,
       pageIndex: 1,
-      pageSize: 10,
+      pageSize: 20,
       tableDataTotal: null,
       aptitudeCodeList:[],
       aptitudeType:'',

dsk-operate-ui/src/views/macro/financing/details.vue

@@ -11,28 +11,28 @@
         <div class="list">
           <div class="item color1">
             <div class="item-left">
-              <h4>{{details.projectTotalInvestment || '-'}}<span>{{details.projectTotalInvestment ? '亿' : ''}}</span></h4>
+              <h4>{{details.projectTotalInvestment || '-'}}<span>{{details.projectTotalInvestment ? '万' : ''}}</span></h4>
               <p>项目总投资额</p>
             </div>
             <img class="img" src="@/assets/images/financing/icon1.png" />
           </div>
           <div class="item color2">
             <div class="item-left">
-              <h4>{{details.projectCapital || '-'}}<span>{{details.projectCapital ? '亿' : ''}}</span></h4>
+              <h4>{{details.projectCapital || '-'}}<span>{{details.projectCapital ? '万' : ''}}</span></h4>
               <p>项目资本金</p>
             </div>
             <img class="img" src="@/assets/images/financing/icon2.png" />
           </div>
           <div class="item color3">
             <div class="item-left">
-              <h4>{{details.specialBondFinancing || '-'}}<span>{{details.specialBondFinancing ? '亿' : ''}}</span></h4>
+              <h4>{{details.specialBondFinancing || '-'}}<span>{{details.specialBondFinancing ? '万' : ''}}</span></h4>
               <p>专项债融资</p>
             </div>
             <img class="img" src="@/assets/images/financing/icon3.png" />
           </div>
           <div class="item color4">
             <div class="item-left">
-              <h4>{{details.specialBondCapital || '-'}}<span>{{details.specialBondCapital ? '亿' : ''}}</span></h4>
+              <h4>{{details.specialBondCapital || '-'}}<span>{{details.specialBondCapital ? '万' : ''}}</span></h4>
               <p>专项债用作资本金</p>
             </div>
             <img class="img" src="@/assets/images/financing/icon4.png" />
@@ -41,28 +41,28 @@
         <div class="list">
           <div class="item color4">
             <div class="item-left">
-              <h4>{{details.otherFunds || '-'}}<span>{{details.otherFunds ? '亿' : ''}}</span></h4>
+              <h4>{{details.otherFunds || '-'}}<span>{{details.otherFunds ? '万' : ''}}</span></h4>
               <p>其他资金</p>
             </div>
             <img class="img" src="@/assets/images/financing/icon5.png" />
           </div>
           <div class="item color3">
             <div class="item-left">
-              <h4>{{details.specialBondFinancingAmount || '-'}}<span>{{details.specialBondFinancingAmount ? '亿' : ''}} / {{details.specialBondIssueNumber || '-'}}{{details.specialBondIssueNumber ? '只' : ''}}</span></h4>
+              <h4>{{details.specialBondFinancingAmount || '-'}}<span>{{details.specialBondFinancingAmount ? '万' : ''}} / {{details.specialBondIssueNumber || '-'}}{{details.specialBondIssueNumber ? '只' : ''}}</span></h4>
               <p>专项债融资额/专项债只数</p>
             </div>
             <img class="img" src="@/assets/images/financing/icon6.png" />
           </div>
           <div class="item color4">
             <div class="item-left">
-              <h4>{{details.otherFinancing || '-'}}<span>{{details.otherFinancing ? '亿' : ''}}</span></h4>
+              <h4>{{details.otherFinancing || '-'}}<span>{{details.otherFinancing ? '万' : ''}}</span></h4>
               <p>其他融资</p>
             </div>
             <img class="img" src="@/assets/images/financing/icon7.png" />
           </div>
           <div class="item color2">
             <div class="item-left">
-              <h4>{{details.govSupportFunds || '-'}}<span>{{details.govSupportFunds ? '亿' : ''}}</span></h4>
+              <h4>{{details.govSupportFunds || '-'}}<span>{{details.govSupportFunds ? '万' : ''}}</span></h4>
               <p>政府安排资金</p>
             </div>
             <img class="img" src="@/assets/images/financing/icon8.png" />
@@ -95,7 +95,7 @@
         </p>
         <p>
           <label class="label">项目预测总收益</label>
-          <span>{{details.projectForecastTotalRevenue || '-'}}{{details.projectForecastTotalRevenue ? '亿' : ''}}</span>
+          <span>{{details.projectForecastTotalRevenue || '-'}}{{details.projectForecastTotalRevenue ? '万' : ''}}</span>
         </p>
       </div>
     </div>
@@ -130,8 +130,8 @@
               {{formatDate(scope.row.tenderDate)}}
             </template>
           </el-table-column>
-          <el-table-column prop="actualBondIssueScale" label="专项债规模（亿）"  width="260" />
-          <el-table-column prop="isUsedProjectScale" label="用于项目规模(亿)" width="260" />
+          <el-table-column prop="actualBondIssueScale" label="专项债规模（万）"  width="260" />
+          <el-table-column prop="isUsedProjectScale" label="用于项目规模(万)" width="260" />
           <el-table-column prop="isUsedCapital" label="是否资本金" width="200" />
         </el-table>
       </div>

dsk-operate-ui/src/views/macro/nationalEconomies/component/qgjjdq.vue

@@ -39,7 +39,7 @@
           highlight-current-row
           v-if="tableDataTotal > 0"
         >
-          <el-table-column label="序号" width="50" align="left" fixed>
+          <el-table-column label="序号" width="60" align="left" fixed>
             <template slot-scope="scope">{{ pageIndex * pageSize - pageSize + scope.$index + 1 }}</template>
           </el-table-column>
           <el-table-column label="地区" min-width="150" align="left" fixed>
@@ -56,12 +56,12 @@
           <el-table-column label="GDP增速（%）" prop="gdpGrowth" :formatter="formatStatus" sortable="custom" min-width="120" align="right"></el-table-column>
           <el-table-column label="人均GDP（元）" prop="gdpPerCapita" :formatter="formatStatus" sortable="custom" width="125" align="right"></el-table-column>
           <el-table-column label="人口（万人）" prop="population" :formatter="formatStatus" sortable="custom" width="120" align="right"></el-table-column>
-          <el-table-column label="一般公共预算收入（亿元）" prop="gbr" sortable="custom" width="170" align="right"></el-table-column>
+          <el-table-column label="一般公共预算收入（亿元）" prop="gbr" sortable="custom" :formatter="formatStatus" width="170" align="right"></el-table-column>
           <el-table-column label="一般公共预算收入增速（%）" prop="gbrGrowth" :formatter="formatStatus" sortable="custom" min-width="140" align="right"></el-table-column>
           <el-table-column label="一般公共预算收入：税收收入（亿元）" prop="taxIncome" :formatter="formatStatus" sortable="custom" min-width="140" align="right"></el-table-column>
           <el-table-column label="一般公共预算支出（亿元）" prop="gbe" :formatter="formatStatus" sortable="custom" width="140" align="right"></el-table-column>
           <el-table-column label="政府性基金收入（亿元）" width="140" prop="govFundIncome" :formatter="formatStatus" sortable="custom" align="right"></el-table-column>
-          <el-table-column label="政府性基金收入：土地出让收入（亿元）" prop="landTransferIncome" sortable="custom" width="150" align="right"></el-table-column>
+          <el-table-column label="政府性基金收入：土地出让收入（亿元）" prop="landTransferIncome" sortable="custom" :formatter="formatStatus" width="150" align="right"></el-table-column>
           <el-table-column label="政府性基金支出（亿元）" prop="govFundExpenditure" :formatter="formatStatus" width="170" sortable="custom" align="right"></el-table-column>
           <el-table-column label="国有资本经营收入（亿元）" prop="soecoi" width="160" :formatter="formatStatus" align="right"></el-table-column>
           <el-table-column label="国有资本经营支出（亿元）" prop="soecoe" width="160" :formatter="formatStatus" align="right"></el-table-column>
@@ -137,7 +137,7 @@
         tableData: [],
         tableLoading: false,
         pageIndex: 1,
-        pageSize: 10,
+        pageSize: 20,
         tableDataTotal: null,
       }
     },

dsk-operate-ui/src/views/macro/nationalEconomies/component/zhaobiao.vue

@@ -64,7 +64,7 @@
             fit
             highlight-current-row
           >
-            <el-table-column label="序号" width="50" align="left">
+            <el-table-column label="序号" width="60" align="left">
               <template slot-scope="scope">{{ scope.$index + 1 }}</template>
             </el-table-column>
             <el-table-column prop="type" label="地区"/>
@@ -80,7 +80,7 @@
           <span class="common-title">全国招标项目概览</span>
         </div>
       </div>
-      <div class="text">通过对{{year}}年全国招标数据进行分析，发现该企业主要集中在{{dataSort[0].label}}（{{dataSort[0].count}}个）、{{dataSort[1].label}}（{{dataSort[1].count}}个）进行招标。</div>
+      <div class="text">通过对{{year}}年全国招标数据进行分析，发现主要集中在{{dataSort[0].label}}（{{dataSort[0].count}}个）、{{dataSort[1].label}}（{{dataSort[1].count}}个）进行招标。</div>
       <div class="main1">
         <div id="gl-echarts" style="height: 250px"></div>
         <p class="tips"><i class="el-icon-info"></i>数据来源大司空建筑大数据平台，统计范围为{{year}}年全国公开的招标项目，未公开的不含在内</p>
@@ -99,7 +99,7 @@
             fit
             highlight-current-row
           >
-            <el-table-column label="序号" width="50" align="left">
+            <el-table-column label="序号" width="60" align="left">
               <template slot-scope="scope">{{ scope.$index + 1 }}</template>
             </el-table-column>
             <el-table-column prop="label" label="月份"/>

dsk-operate-ui/src/views/macro/nationalEconomies/component/zhongbiao.vue

@@ -32,7 +32,7 @@
             fit
             highlight-current-row
           >
-            <el-table-column label="序号" width="50" align="left">
+            <el-table-column label="序号" width="60" align="left">
               <template slot-scope="scope">{{ scope.$index + 1 }}</template>
             </el-table-column>
             <el-table-column prop="major" label="资质类型"/>
@@ -78,7 +78,7 @@
           fit
           highlight-current-row
         >
-          <el-table-column label="序号" width="50" align="left">
+          <el-table-column label="序号" width="60" align="left">
             <template slot-scope="scope">{{ scope.$index + 1 }}</template>
           </el-table-column>
           <el-table-column prop="province" label="地区"/>
@@ -121,7 +121,7 @@
           fit
           highlight-current-row
         >
-          <el-table-column label="序号" width="50" align="left">
+          <el-table-column label="序号" width="60" align="left">
             <template slot-scope="scope">{{ scope.$index + 1 }}</template>
           </el-table-column>
           <el-table-column prop="province" label="地区" />

dsk-operate-ui/src/views/macro/urban/index.vue

@@ -153,13 +153,13 @@
           fit
           highlight-current-row
         >
-          <el-table-column label="序号" width="50" align="left" fixed>
+          <el-table-column label="序号" width="60" align="left" fixed>
             <template slot-scope="scope">{{ pageIndex * pageSize - pageSize + scope.$index + 1 }}</template>
           </el-table-column>
           <el-table-column prop="companyName" label="公司名称" width="300" fixed>
             <template slot-scope="scope">
               <router-link  :to="`/enterprise/${encodeStr(scope.row.companyId)}`" tag="a" class="a-link companyName" v-html="scope.row.companyName" ></router-link>
-              <span class="table-span" style="color: #3D3D3D;" v-if="scope.row.claimStatus === 0"><img src="@/assets/images/urban/rl_icon1.png"/>认领</span>
+              <span @click="handleClick(scope.row)" class="table-span" style="color: #3D3D3D;cursor: pointer;" v-if="scope.row.claimStatus === 0"><img src="@/assets/images/urban/rl_icon1.png"/>认领</span>
               <span class="table-span" style="color: rgba(35,35,35,0.4);" v-if="scope.row.claimStatus === 1"><img src="@/assets/images/urban/rl_icon2.png"/>已认领</span>
             </template>
           </el-table-column>
@@ -191,7 +191,7 @@
           </el-table-column>
           <el-table-column prop="actualController" label="实控人" :formatter="formatStatus" width="250" />
           <el-table-column prop="latestReportPeriod" label="最新报告期" :formatter="formatStatus" width="120" />
-          <el-table-column prop="totalAssets" label="总资产（亿元）" :formatter="formatStatus" sortable="custom" width="120" align="right"/>
+          <el-table-column prop="totalAssets" label="总资产（亿元）" :formatter="formatStatus" sortable="custom" width="130" align="right"/>
           <el-table-column prop="belongNetAssets" label="归母净资产（亿元）" :formatter="formatStatus" sortable="custom" width="160" align="right"/>
           <el-table-column prop="monetaryFunds" label="货币资金（亿元）" :formatter="formatStatus" sortable="custom" width="150" align="right"/>
           <el-table-column prop="landAssets" label="土地资产（亿元）" :formatter="formatStatus" sortable="custom" width="150" align="right"/>
@@ -241,13 +241,20 @@
         <el-pagination background :current-page="pageIndex" :page-size="pageSize" :total="tableDataTotal" layout="prev, pager, next, jumper" @current-change="handleCurrentChange" @size-change="handleSizeChange" />
       </div>
     </div>
+    <el-dialog :visible.sync="claimVisible" width="244" :show-close="false">
+      <div>认领成功，是否完善客户信息？</div>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="innerVisible = true">立即完善</el-button>
+        <el-button @click="claimVisible = false">稍后</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
   import {encodeStr} from "@/assets/js/common.js"
   import dataRegion from '@/assets/json/dataRegion'
-  import { uipGroupData,urbanInvestmentPage,urbanInvestmentStatistics } from '@/api/macro/macro'
+  import { uipGroupData,urbanInvestmentPage,urbanInvestmentStatistics,claim } from '@/api/macro/macro'
 export default {
   name: 'Urban',
   data() {
@@ -279,7 +286,8 @@ export default {
       addresslength: 0,
       searchState:false,
       typeList:[],
-      statistics:{}
+      statistics:{},
+      claimVisible:false,
     }
   },
   watch:{
@@ -571,7 +579,14 @@ export default {
         message: '功能正在开发中',
         type: 'warning'
       });
+    },
+    handleClick(item){
+      claim({uipId:item.uipId,companyName:item.companyName}).then(res => {
+        if(res.code === 200){
+          this.claimVisible=true;
         }
+      })
+    },
   },
 }
 </script>
@@ -773,5 +788,43 @@ export default {
         }
       }
     }
+    ::v-deep .el-dialog{
+      width: 244px;
+      margin: 0 !important;
+      position: absolute;
+      top: 50%;
+      left: 50%;
+      transform: translate(-50%, -50%);
+      .el-dialog__header{
+        display: none;
+      }
+      .el-dialog__body{
+        padding: 24px;
+      }
+      .el-dialog__footer{
+        text-align: center;
+        padding: 0 24px 24px;
+        .el-button{
+          width: 72px;
+          height: 28px;
+          border-radius: 2px;
+          font-size: 12px;
+        }
+        .el-button:first-child{
+          background: #0081FF;
+          border: 1px solid #0081FF;
+
+          color: #FFFFFF;
+        }
+        .el-button:last-child{
+          background: #FFFFFF;
+          border: 1px solid #CCCCCC;
+          color: rgba(35,35,35,0.8);
+        }
+        .el-button--medium{
+          padding: 0;
+        }
+      }
+    }
   }
 </style>

dsk-operate-ui/src/views/radar/Bidding/details.vue

@@ -3,7 +3,7 @@
 		<div class="bottomlist">
 			<ul class="bottomlist-content">
 				<li class="bottomlist-list"  >
-					<p class="list-titel" v-html="textList.projectName">
+					<p class="list-titel" v-html="textList.title">
 						 <!-- <div  v-else-if="item.projectName" ></div> -->
 					</p>
 					<div class="content-label">
@@ -24,13 +24,16 @@
 					<div  class="list-content">
 						<p class="list-content-text">
 							<span>招采单位：</span>
-							<span v-if="textList.Name">{{textList.Name}}</span>
-							<span>--</span>
+							<span v-if="textList.tenderee">
+								<router-link  v-if="textList.uipId"  :to="'/enterprise/' + encodeStr(textList.uipId)  + '/?index=true'" tag="a" class="list-titel-a blue" v-html="textList.tenderee"></router-link>
+								<router-link  v-else  :to="'/company/' + encodeStr(textList.tendereeId)  + '/?index=true'" tag="a" class="list-titel-a blue" v-html="textList.tenderee"></router-link>
+							</span>
+							<span v-else>--</span>
 						</p>
 						<p class="list-content-text">
 							<span>预算金款：</span>
-							<span v-if="textList.planTenderAmount">{{textList.planTenderAmount}}</span>
-							<span>--</span>
+							<span v-if="textList.planTenderAmount">{{textList.planTenderAmount}}万元</span>
+							<span  v-else>--</span>
 						</p>
 						<p class="list-content-text">
 							<span>资金来源：</span>
@@ -82,11 +85,13 @@
 <script>
 	import api from '@/api/radar/radar.js';
 	import "@/assets/styles/public.css";
+	import {encodeStr} from "@/assets/js/common.js"
 	export default {
 
 		name: 'BiddingDetails',
 		data() {
 			return {
+				encodeStr,
 				id: '',
 				textList: {},
 				showimg:true

dsk-operate-ui/src/views/radar/Establishment/details.vue

@@ -72,9 +72,9 @@
 					<label class="label">审批类型</label>
 					<span>{{textList.projectType||'--'}}</span>
 				</p>
-				<p>
+				<p >
 					<label class="label">建设规模</label>
-					<span>{{textList.buildScale||'--'}}</span>
+					<span class="span-one">{{textList.buildScale||'--'}}</span>
 				</p>
 				<p>
 					<label class="label">计划开工日期</label>
@@ -596,25 +596,26 @@
 					align-items: center;
 					margin: 0;
 					border-left: 1px solid #E6E9F0;
+					border-right: 1px solid #E6E9F0;
 					border-bottom: 1px solid #E6E9F0;
+					background: #F0F3FA;
 
 					.label {
 						width: 10%;
+						height: 100%;
 						font-weight: 400;
-						line-height: 40px;
+						line-height: 22px;
 						font-size: 12px;
-						height: 40px;
-						background: #F0F3FA;
-						padding-left: 12px;
+						padding: 9px 12px;
 					}
 
 					span {
 						width: 40%;
 						color: #000;
-						height: 40px;
-						line-height: 40px;
-						padding-left: 12px;
+						line-height: 22px;
+						padding: 9px 12px;
 						font-size: 12px;
+						background: #fff;
 					}
 
 					.span-one {

dsk-operate-ui/src/views/radar/Land/details.vue

@@ -10,7 +10,10 @@
 					<div class="list-content">
 						<p class="list-content-text">
 							<span>受让人：</span>
-							<router-link v-if="textList.company" :to="'/company/' + encodeStr(textList.id)  + '/?index=true'" tag="a" class="list-titel-a blue" v-html="textList.company"></router-link>
+							<span v-if="textList.company">
+								<router-link  v-if="textList.uipId"  :to="'/enterprise/' + encodeStr(textList.uipId)  + '/?index=true'" tag="a" class="list-titel-a blue" v-html="textList.company"></router-link>
+								<router-link  v-else  :to="'/company/' + encodeStr(textList.id)  + '/?index=true'" tag="a" class="list-titel-a blue" v-html="textList.company"></router-link>
+							</span>
 							<span v-else class="blue">{{textList.company||"--"}}</span>
 						</p>
 						<p class="list-content-text">
@@ -153,9 +156,9 @@
 			<div class="main3-box">
 				<p>
 					<label class="label">招拍挂起始时间</label>
-					<span>{{textList.projectName||"--"}}</span>
+					<span>{{textList.auctionBeginTime||"--"}}</span>
 					<label class="label">招拍挂截止时间</label>
-					<span>{{textList.projectName||"--"}}</span>
+					<span>{{textList.auctionEndTime||"--"}}</span>
 				</p>
 				<p>
 					<label class="label">报名起始时间</label>

dsk-operate-ui/src/views/radar/Tender/details.vue

@@ -4,9 +4,13 @@
 			<ul class="bottomlist-content">
 				<li class="bottomlist-list"  >
 					<p class="list-titel">
-						{{textList.projectName}}
+						{{textList.title}}
 					</p>
 					<div class="content-label">
+						<span class="list-label list-label-zb" v-if="textList.tenderStage">
+							{{textList.tenderStage}}
+						</span>
+						
 						<span class="list-label" v-if="textList.province||textList.city||textList.area">
 							{{textList.province}}
 							<template v-if="textList.city">
@@ -28,13 +32,12 @@
 						<p class="list-content-text" v-if="textList.tenderee">
 							<span>招采单位：</span>
 							<router-link v-if="textList.projectUnitId" :to="'/company/' + encodeStr(textList.projectUnitId)  + '/?index=true'" tag="a" class="list-titel-a blue" v-html="textList.tenderee"></router-link>
-							<span v-else class="blue">	{{textList.tenderee||'--'}}</span>
+							<span v-else >	{{textList.tenderee||'--'}}</span>
 						</p>
 						<p class="list-content-text"  v-if="textList.agency">
 							<span>代理单位：</span>
-							<span class="blue">{{textList.agency||'--'}}</span>
 							<router-link v-if="textList.agencyId" :to="'/company/' + encodeStr(textList.agencyId)  + '/?index=true'" tag="a" class="list-titel-a blue" v-html="textList.agency"></router-link>
-							<span v-else class="blue">	{{textList.agency||'--'}}</span>
+							<span v-else >	{{textList.agency||'--'}}</span>
 							
 						</p>
 						
@@ -42,7 +45,8 @@
 					<div  class="list-content">
 						<p class="list-content-text">
 							<span>预算金款：</span>
-							<span>{{textList.projectAmount||'--'}}万元</span>
+							<span v-if="textList.projectAmount">{{textList.projectAmount}}万元</span>
+							<span v-else>--</span>
 						</p>
 						<p class="list-content-text">
 							<span>联系方式：</span>
@@ -76,7 +80,7 @@
 				<img v-if="showimg" src="@/assets/images/bxpro/original1.png">
 				<img v-else src="@/assets/images/bxpro/original.png">
 				<span>
-					<a :href="textList.url">原文链接</a>
+					<a :href="textList.url" target="_blank">原文链接</a>
 				</span>
 			</div>
 			<div class="main3-box" v-html="textList.content">

dsk-operate-ui/src/views/radar/components/BidRecord/index.vue

@@ -129,6 +129,11 @@
 	  		</div>
 	  		  
 	  	</div>
+		<div class="table-item-jf1" v-if="tableData.length==0">
+			<img class="item-jf-img" src="@/assets/images/kong.png" alt="">
+			<div class="item-jf-titel">抱歉，没找到相关数据！</div>
+			<div class="item-jf-text">建议调整关键词或筛选条件，重新搜索！</div>
+		</div>
 	  	<ul class="bottomlist-content" v-if="tableData.length>0">
 	  		<li class="bottomlist-list" v-for="item in tableData">
 	  			<p class="list-titel">
@@ -261,7 +266,7 @@ export default {
 	  conditionsArr: [],
 	  
 	  tableData:[],
-	  total:6000,
+	  total:0,
 	  page: 1,
 	  limit: 20,
     };

dsk-operate-ui/src/views/radar/components/Bidding/index.vue

@@ -149,6 +149,11 @@
 	  		</div>
 	  		  
 	  	</div>
+		<div class="table-item-jf1" v-if="tableData.length==0">
+			<img class="item-jf-img" src="@/assets/images/kong.png" alt="">
+			<div class="item-jf-titel">抱歉，没找到相关数据！</div>
+			<div class="item-jf-text">建议调整关键词或筛选条件，重新搜索！</div>
+		</div>
 	  	<ul class="bottomlist-content" v-if="tableData.length>0">
 	  		<li class="bottomlist-list" v-for="item in tableData">
 	  			<p class="list-titel">
@@ -206,7 +211,7 @@
 				<div  class="list-content list-addree"  v-if="item.projectScale">
 					<p class="list-content-text">
 						<span class="content-text-gc">工程规模：</span>
-						<span class="content-text-p">{{item.projectScale||'--'}}</span>
+						<span class="content-text-p" v-html="item.projectScale"></span>
 					</p>
 					
 				</div>
@@ -818,6 +823,7 @@ export default {
 			background: #F6F9FC;
 			cursor: pointer;
 		}
+		
 		.pagination{
 			padding: 14px ;
 		   .el-pagination{

dsk-operate-ui/src/views/radar/components/Establishment/index.vue

@@ -185,6 +185,11 @@
 				</div>
 				  
 			</div>
+			<div class="table-item-jf1" v-if="tableData.length==0">
+				<img class="item-jf-img" src="@/assets/images/kong.png" alt="">
+				<div class="item-jf-titel">抱歉，没找到相关数据！</div>
+				<div class="item-jf-text">建议调整关键词或筛选条件，重新搜索！</div>
+			</div>  
 			<ul class="bottomlist-content" v-if="tableData.length>0">
 				<li class="bottomlist-list" v-for="item in tableData">
 					<p class="list-titel">

dsk-operate-ui/src/views/radar/components/Land/index.vue

@@ -224,6 +224,11 @@
 					</div>
 					  
 				</div>
+				<div class="table-item-jf1" v-if="tableData.length==0">
+					<img class="item-jf-img" src="@/assets/images/kong.png" alt="">
+					<div class="item-jf-titel">抱歉，没找到相关数据！</div>
+					<div class="item-jf-text">建议调整关键词或筛选条件，重新搜索！</div>
+				</div>  
 				
 				<ul class="bottomlist-content" v-if="tableData.length>0">
 					<li class="bottomlist-list" v-for="item in tableData">
@@ -483,7 +488,7 @@
 				],
 				
 				tableData:[],
-				total:6000,
+				total:0,
 				page:1,
 				pageSize:20
 			};

dsk-operate-ui/src/views/radar/components/Tender/index.vue

@@ -183,6 +183,11 @@
 					  <span>导出EXCEL</span>
 				  </p>
 			</div>
+			<div class="table-item-jf1" v-if="tableData.length==0">
+				<img class="item-jf-img" src="@/assets/images/kong.png" alt="">
+				<div class="item-jf-titel">抱歉，没找到相关数据！</div>
+				<div class="item-jf-text">建议调整关键词或筛选条件，重新搜索！</div>
+			</div>  
 			<ul class="bottomlist-content" v-if="tableData.length>0">
 				<li class="bottomlist-list" v-for="item in tableData">
 					<p class="list-titel">

dsk-operate-ui/src/views/radar/components/bxprozbgg/index.vue

@@ -341,14 +341,20 @@
 			</div>
 			  
 		</div>
-		<div class="table-item">
+		<div class="table-item-jf1" v-if="tableData.length==0">
+			<img class="item-jf-img" src="@/assets/images/kong.png" alt="">
+			<div class="item-jf-titel">抱歉，没找到相关数据！</div>
+			<div class="item-jf-text">建议调整关键词或筛选条件，重新搜索！</div>
+		</div>  
+		
+		<div class="table-item" v-if="tableData.length>0">
 		  <el-table :data="tableData"  element-loading-text="Loading" border fit highlight-current-row>
 				<el-table-column  label="序号" width="60">
 				  <template slot-scope="scope">
 					 <span>{{(page - 1) *20 + scope.$index + 1}}</span>
 				  </template>
 				</el-table-column>
-				<el-table-column  label="发布日期" width="160" >
+				<el-table-column  label="发布日期" width="100" >
 							  <template slot-scope="scope">
 							   {{ scope.row.pubdate||'--'}}
 							  </template>
@@ -359,18 +365,59 @@
 						</template>
 							  
 				</el-table-column>
-				<el-table-column  label="工程用途" width="200" >
+				<el-table-column  label="工程用途" width="161" >
 							  <template slot-scope="scope">
 								 {{ scope.row.projectPurposes||'--'}}
 								</template>
 								
 				</el-table-column>
-				<el-table-column prop="zj" label="项目金额" width="200" >
+				<el-table-column prop="zj" label="项目金额" width="161" >
 							<template slot-scope="scope">
 								{{ scope.row.projectAmount||'--'}}
 							</template>
 								
 				 </el-table-column>
+				 <el-table-column prop="zj" label="债券保证金（万元）" width="146" >
+				 			<template slot-scope="scope">
+				 				{{ scope.row.projectEnsureAmount||'--'}}
+				 			</template>
+				  </el-table-column>
+				  <el-table-column prop="zj" label="评标办法" width="106" >
+				  			<template slot-scope="scope">
+				  				{{ scope.row.bidAssessmentWay||'--'}}
+				  			</template>
+				   </el-table-column>
+				   <el-table-column prop="zj" label="评标委员会有无业主代表" width="176" >
+				   			<template slot-scope="scope">
+								<template v-if="scope.row.bidMettingHasProjectUnit==1">
+									无
+								</template>
+								<template v-else-if="scope.row.bidMettingHasProjectUnit==2">
+									有
+								</template>
+								<template v-else>
+									--
+								</template>
+				   			</template>
+				    </el-table-column>
+					<el-table-column prop="zj" label="有无预付款" width="94" >
+								<template slot-scope="scope">
+									<template v-if="scope.row.hasAdvanceAmount==1">
+										无
+									</template>
+									<template v-else-if="scope.row.hasAdvanceAmount==2">
+										有
+									</template>
+									<template v-else>
+										--
+									</template>
+								</template>
+					 </el-table-column>
+					 <el-table-column prop="zj" label="招标人" width="312" >
+					 			<template slot-scope="scope">
+					 				<router-link  :to="'/company/'+encodeStr(scope.row.tendereeId) " tag="a" class="list-titel-a"  v-html="scope.row.tenderee"></router-link>
+					 			</template>
+					  </el-table-column>
 		  </el-table>
 		</div>
 		
@@ -408,6 +455,7 @@
     },
     data(){
       return{
+		  encodeStr,
         allDownloadList:[],
         province:[
           {

dsk-operate-ui/src/views/radar/components/debtProject/index.vue

@@ -89,7 +89,7 @@
 		   
 		</div>
 		
-		<div class="bottomlist" v-if="tableData.length>0">
+		<div class="bottomlist">
 			<div class="bottomlist-title">
 				  <p>共有{{total}}条</p>
 				  <p>
@@ -97,7 +97,12 @@
 					  <span>导出EXCEL</span>
 				  </p>
 			</div>
-			<ul class="bottomlist-content">
+			<div class="table-item-jf1" v-if="tableData.length==0">
+				<img class="item-jf-img" src="@/assets/images/kong.png" alt="">
+				<div class="item-jf-titel">抱歉，没找到相关数据！</div>
+				<div class="item-jf-text">建议调整关键词或筛选条件，重新搜索！</div>
+			</div>   
+			<ul class="bottomlist-content"  v-if="tableData.length>0">
 				<li class="bottomlist-list" v-for="item in tableData">
 					<p class="list-titel">
 						 <router-link :to="'/radar/debtProject/details/'+item.uuid " tag="a" class="list-titel-a" v-html="item.projectName"></router-link>

dsk-operate-ui/src/views/radar/debtProject/details.vue

@@ -161,7 +161,7 @@
 					<el-table-column prop="tenderDate" label="招标日期" width="220" />
 					<el-table-column prop="actualBondIssueScale" label="专项债规模（亿）" width="260" />
 					<el-table-column prop="isUsedProjectScale" label="用于项目规模(亿)" width="260" />
-					<el-table-column prop="zj" label="是否资本金" width="200" />
+					
 					<el-table-column label="是否资本金" width="200">
 						<template slot-scope="scope">
 							<span v-if="scope.row.isUsedCapital==1">是</span>

dsk-system/src/main/java/com/dsk/system/domain/vo/BusinessBrowseVo.java

@@ -32,6 +32,11 @@ public class BusinessBrowseVo {
      */
     private String projectCategory;
 
+    /**
+     * 项目状态(0.储备中1.跟进中2.已合作)
+     */
+    private Integer status;
+
     /**
      * 投资估算
      */

dsk-system/src/main/java/com/dsk/system/dskService/EnterpriseService.java

@@ -51,7 +51,7 @@ public class EnterpriseService {
     public R infoHeader(EnterpriseInfoHeaderBody body) throws Exception {
         Map<String, Object> companyMap = dskOpenApiUtil.requestBody("/api/jsk/enterprise/infoHeader", BeanUtil.beanToMap(body, false, false));
         Integer companyCode = MapUtils.getInteger(companyMap, "code", 300);
-        if (200 != companyCode) throw new RuntimeException();
+        if (200 != companyCode) return R.ok();
         Map companyData = MapUtils.getMap(companyMap, "data", null);
         companyData.put("claimStatus", 0);
         companyData.put("uipId", null);
@@ -113,6 +113,7 @@ public class EnterpriseService {
     }
 
     public R bidDataGroup(EnterpriseBidDataGroupBody body) throws Exception {
+
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/bidDataGroup", BeanUtil.beanToMap(body, false, false));
         return BeanUtil.toBean(map, R.class);
     }
@@ -198,9 +199,7 @@ public class EnterpriseService {
         for (Object companyObj : list) {
             Map<String, Object> companyMap = CommonUtils.assertAsMap(companyObj);
             String uipId = MapUtils.getString(companyMap, "uipId");
-            if (CollectionUtils.isEmpty(claimStatusList)) {
             companyMap.put("claimStatus", 0);
-            }
             for (CustomerStatusListVo vo : claimStatusList) {
                 if (uipId.equals(vo.getUipId())) {
                     companyMap.put("claimStatus", 1);