Merge remote-tracking branch 'origin/master'

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

@@ -23,6 +23,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -68,7 +69,7 @@ public class CustomerController extends BaseController {
     @RepeatSubmit
     public AjaxResult add(@RequestBody Customer customer) {
         dealWithcustomerData(customer);
-        return AjaxResult.success(baseService.add(customer));
+        return toAjax(baseService.add(customer));
     }
 
     /**
@@ -80,7 +81,13 @@ public class CustomerController extends BaseController {
     public AjaxResult claim(@RequestBody Customer customer) {
         if (ObjectUtils.isEmpty(customer.getUipId())) throw new BeanException("城投uipId不能为空");
         dealWithcustomerData(customer);
-        return AjaxResult.success(baseService.add(customer));
+        boolean add = baseService.add(customer);
+        if (add) {
+            Map<String, Object> map = new HashMap<>();
+            map.put("customerId", customer.getCustomerId());
+            return AjaxResult.success(map);
+        }
+        return AjaxResult.error();
     }
 
     private void dealWithcustomerData(Customer customer) {

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

@@ -62,8 +62,8 @@
         </template>
       </el-table>
     </div>
-    <div class="pagination-box" v-if="paging && tableDataTotal>queryParams.pageSize">
-      <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 class="pagination-box" v-if="show_page && tableDataTotal>queryParams.pageSize">
+      <el-pagination background :current-page="current_page" :page-size="queryParams.pageSize" :total="tableDataTotal" layout="prev, pager, next, jumper" @current-change="handleCurrentChange" @size-change="handleSizeChange" />
     </div>
   </div>
 </template>
@@ -109,14 +109,29 @@ export default {
       type: Boolean,
       default: true
     },
+    MaxPage: {  //最大页码
+      type: Number,
+      default: 1000000
+    },
   },
   data() {
     return {
+      current_page: this.queryParams.pageNum,
+      show_page: this.paging
     }
   },
   methods:{
     handleCurrentChange(e){
-      this.$emit('handle-current-change',e)
+      if(this.MaxPage<e){
+        this.show_page = false
+        this.$nextTick(() => {
+          this.current_page = this.queryParams.pageNum
+          this.$message.warning(`对不起，最多只能访问${this.MaxPage}页`)
+          this.show_page = true
+        })
+      }else{
+        this.$emit('handle-current-change',e)
+      }
     },
     handleSizeChange(e){
       this.$emit('handle-current-change',e)

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

@@ -60,7 +60,7 @@ export default {
         {name: '专项债项目', pathName: 'bond', ico: require("@//assets/images/detail/overview/clue_ico3.png"), count: 0, category:'performance', field:'specialDebt', dis_ico: require("@/assets/images/detail/overview/clue_dis_ico3.png")},
         {name: '招标计划', pathName: 'biddingplan', ico: require("@/assets/images/detail/overview/clue_ico4.png"), count: 0, category:'performance', field:'bidPlan', dis_ico: require("@/assets/images/detail/overview/clue_dis_ico4.png")},
         {name: '招标公告', pathName: 'announcement', ico: require("@/assets/images/detail/overview/clue_ico5.png"), count: 0, category:'business', field:'biddingAnnouncement', dis_ico: require("@/assets/images/detail/overview/clue_dis_ico5.png")},
-        {name: '标讯Pro', pathName: 'tencent', ico: require("@/assets/images/detail/overview/clue_ico6.png"), count: 0, category:'business', field:'proCount', dis_ico: require("@/assets/images/detail/overview/clue_dis_ico6.png")},
+        {name: '标讯Pro', pathName: 'tencent', ico: require("@/assets/images/detail/overview/clue_ico6.png"), count: 0, category:'business', field:'proBiddingAnnouncement', dis_ico: require("@/assets/images/detail/overview/clue_dis_ico6.png")},
         {name: '行政许可', pathName: 'administrative', ico: require("@/assets/images/detail/overview/clue_ico7.png"), count: 0, category:'business', field:'adminLicensing', dis_ico: require("@/assets/images/detail/overview/clue_dis_ico7.png")},
       ]
     }

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

@@ -155,7 +155,7 @@ export default {
       showState: false,
       graphList: [
         {id: 1, name:'业务往来', isShow:true, intro:[{id: 101, name:'客户', val:0, category:'global', field:'customer'},{id: 102, name:'供应商', val:0, category:'global', field:'supplier'}], ico:require('@/assets/images/detail/overview/company_ywwl.png')},
-        {id: 2, name:'商机线索', isShow:true, intro:[{id: 201, name:'专项债项目', val:0, category:'xxx', field:'yy'},{id: 202, name:'招标计划', val:0, category:'xxx', field:'zz'}], ico:require('@/assets/images/detail/overview/company_sjxs.png')},
+        {id: 2, name:'商机线索', isShow:true, intro:[{id: 201, name:'专项债项目', val:0, category:'performance', field:'specialDebt'},{id: 202, name:'招标计划', val:0, category:'performance', field:'bidPlan'}], ico:require('@/assets/images/detail/overview/company_sjxs.png')},
         {id: 3, name:'城投拿地', isShow:true, intro:[{id: 301, name:'土地交易', val:0, category:'global', field:'landInfo'},{id: 302, name:'行政许可', val:0, category:'business', field:'adminLicensing'}], ico:require('@/assets/images/detail/overview/company_ctnd.png')},
         {id: 4, name:'对外投资', isShow:true, intro:[{id: 401, name:'企业经营实力展现'}], ico:require('@/assets/images/detail/overview/company_dwtz.png')},
         {id: 5, name:'股权穿透', isShow:true, intro:[{id: 501, name:'瞬息掌握企业关系'}], ico:require('@/assets/images/detail/overview/company_gqct.png')},

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

@@ -74,8 +74,8 @@ export default {
     return {
       codeUrl: "",
       loginForm: {
-        username: "admin",
-        password: "admin123",
+        username: "",
+        password: "",
         rememberMe: false,
         code: "",
         uuid: ""

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

@@ -76,7 +76,7 @@ public class EnterpriseService {
         List<CustomerStatusListVo> claimStatusList = iCustomerService.selectStatusList(uipIds);
 
         if (CollectionUtils.isNotEmpty(claimStatusList)) {
-            companyMap.put("claimStatus", 1);
+            companyData.put("claimStatus", 1);
         }
 
         return R.ok(companyData);