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

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

@@ -97,6 +97,27 @@ public class CustomerController extends BaseController {
                 Map<String, Object> map = opportunityRadarService.enterpriseByName(customer.getCompanyName());
                 if (!ObjectUtils.isEmpty(map.get("data"))) {
                     customer.setCompanyId(MapUtil.getInt(BeanUtil.beanToMap(map.get("data")), "jskEid"));
+                    if (ObjectUtils.isEmpty(customer.getLegalPerson())) {
+                        customer.setLegalPerson(MapUtil.getStr(map, "legalPerson"));
+                    }
+                    if (ObjectUtils.isEmpty(customer.getRegisterCapital())) {
+                        customer.setRegisterCapital(MapUtil.getStr(map, "registeredCapitalStr"));
+                    }
+                    if (ObjectUtils.isEmpty(customer.getProvinceId())) {
+                        customer.setProvinceId(MapUtil.getInt(map, "provinceId"));
+                    }
+                    if (ObjectUtils.isEmpty(customer.getCityId())) {
+                        customer.setCityId(MapUtil.getInt(map, "cityId"));
+                    }
+                    if (ObjectUtils.isEmpty(customer.getDistrictId())) {
+                        customer.setDistrictId(MapUtil.getInt(map, "countyId"));
+                    }
+                    if (ObjectUtils.isEmpty(customer.getRegisterAddress())) {
+                        customer.setRegisterAddress(MapUtil.getStr(map, "domicile"));
+                    }
+                    if (ObjectUtils.isEmpty(customer.getCreditCode())) {
+                        customer.setCreditCode(MapUtil.getStr(map, "creditCode"));
+                    }
                 }
             } catch (Exception e) {
                 logger.debug("获取企业id错误！error：{}", e.getMessage());

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

@@ -100,7 +100,6 @@ export default {
     }
   },
   created() {
-    this.handleQuery()
     this.infos = this.customerInfo
     this.iscompanyInfo = this.companyInfo ? this.companyInfo : {}
   },
@@ -135,6 +134,7 @@ export default {
     customerInfos(){
       customerInfo(this.customerIds).then(res=>{
         this.infos = res.data
+        this.handleQuery()
       })
     },
     focusNowedits(e){

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

@@ -16,7 +16,6 @@
             <Overseas v-if="currentPath.pathName=='overseas'" :company-id="companyId" />
             <Branch v-if="currentPath.pathName=='branch'" :company-id="companyId" />
             <Financial v-if="currentPath.pathName=='financial'" :company-id="companyId" />
-  <!--          <Business v-if="currentPath.pathName=='business'" /> 商务信息 -->
             <!-- 项目商机 -->
             <Landtransaction v-if="currentPath.pathName=='landtransaction'" :company-id="companyId" />
             <Proposed v-if="currentPath.pathName=='proposed'" :company-id="companyId" />
@@ -205,8 +204,8 @@ export default {
     async handleQuery() {
       let res = await infoHeader({companyId:this.companyId})
       if(res.code==200){
-        this.companyInfo = res.data
-        if(this.companyInfo.companyName){
+        this.companyInfo = res.data || {}
+        if(this.companyInfo && this.companyInfo.companyName){
           this.$nextTick(()=>{
             document.getElementById('tagTitle').innerText = this.companyInfo.companyName
           })
@@ -247,6 +246,10 @@ export default {
                   this.isCustomer = true
                   this.isCompany = false
                   this.currentPath.pathName = 'business'
+                  this.companyInfo = {
+                    companyName: this.customerInfo.companyName
+                  }
+                  document.getElementById('tagTitle').innerText = this.customerInfo.companyName
                 })
               }
             } else {

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

@@ -31,9 +31,9 @@
         </div>
         <div class="zbph-account">招标动态
           <div class="labels">
-            <div :class="{'on':datatype==3}" @click="getDT(3)">近七天</div>
-            <div :class="{'on':datatype==2}" @click="getDT(2)">近三十天</div>
-            <div :class="{'on':datatype==1}" @click="getDT(1)">近五年</div>
+            <div :class="{'on':datatype==3}" @click="getDT(3)">近7天</div>
+            <div :class="{'on':datatype==2}" @click="getDT(2)">近30天</div>
+            <div :class="{'on':datatype==1}" @click="getDT(1)">近5年</div>
           </div>
         </div>
         <div id="myEcharts" style="width: 100%;height:250px; margin: 0 auto;"></div>
@@ -117,7 +117,7 @@ export default {
   methods: {
     async handleBid(){
       let res = await bidDataGroup({cid: this.companyId, spanId: this.datatype})
-      if(res.code==200){
+      if(res.code==200 && res.data){
         let {totalCount, lastYearCount, bidAmount} = res.data
         this.dataAll = {totalCount, lastYearCount, bidAmount}
         this.dtdata=res.data.groupCount.map(item=>{

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

@@ -78,7 +78,7 @@ export default {
   methods: {
     async handleQuery(){
       let res = await projectTenderDataGroup({cid: this.companyId, type: this.activeIndex})
-      if(res.code==200 && res.data.length>0){
+      if(res.code==200 && res.data){
         let data = res.data, totalVal = data.map(item => item.value).reduce((prev, cur) => prev + cur)
         this.viewData = data.map(item => {
           let it = {name:item.name, value:item.value, percent:parseFloat(Number(Number(item.value)/Number(totalVal)*100).toFixed(2))+'%'}
@@ -164,7 +164,9 @@ export default {
   },
   watch: {
     statistic(newVal, oldVal) {
-      this.handleStatistic()
+      if(newVal){
+        this.handleStatistic()
+      }
     }
   }
 }

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

@@ -12,7 +12,7 @@
         </div>
         <div class="company-title">
           <div class="company-name">
-            {{companyInfo.companyName || ''}}
+            {{companyInfo.companyName || '--'}}
           </div>
           <div class="company-tag">
             <div style="float: left;margin-top: 8px;" class="company-history" v-if="companyInfo.historyNames && companyInfo.historyNames.length>0">
@@ -306,7 +306,9 @@ export default {
       this.getClaimStatus() //获取企业认领状态
     },
     statistic(newVal, oldVal) {
-      this.handleStatistic()
+      if(newVal){
+        this.handleStatistic()
+      }
     }
   }
 }

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

@@ -73,7 +73,7 @@ export default {
     async handleQuery() {
       let res = await bondCreditRating({cid: this.companyId})
       if(res.code==200){
-        this.operList = res.data
+        this.operList = res.data || []
         this.$nextTick(() => {
           this.companySwiper()
         })

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

@@ -195,7 +195,9 @@ export default {
   },
   watch: {
     statistic(newVal, oldVal) {
-      this.handView()
+      if(newVal){
+        this.handView()
+      }
     }
   }
 }