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

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

@@ -41,6 +41,11 @@ public class EnterpriseUipSearchBody extends BasePage {
      */
     private List<Integer> areaIds;
 
+    /**
+     * 地区级别 1 省级，2 地市级，3区县级
+     */
+    private Integer regionLevel;
+
     /**
      * 城投业务类型
      */

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

@@ -3,10 +3,10 @@
     <div class="financial-header">
       <div class="common-title">财务简析</div>
       <div class="flex-box header-box">
-        <div class="header-item">总资产<div class="header-item-amount"><span>9332.6</span>亿元</div><img src="@/assets/images/detail/financial/financial_header01_ico.png"></div>
-        <div class="header-item">净资产<div class="header-item-amount"><span>459.4</span>亿元</div><img src="@/assets/images/detail/financial/financial_header02_ico.png"></div>
-        <div class="header-item">营业收入<div class="header-item-amount"><span>150.0</span>亿元</div><img src="@/assets/images/detail/financial/financial_header03_ico.png"></div>
-        <div class="header-item">授信余额<div class="header-item-amount"><span>192.11</span>亿元</div><img src="@/assets/images/detail/financial/financial_header04_ico.png"></div>
+        <div class="header-item">总资产<div class="header-item-amount"><span>{{financialDetail.totalAssets || ''}}</span>亿元</div><img src="@/assets/images/detail/financial/financial_header01_ico.png"></div>
+        <div class="header-item">净资产<div class="header-item-amount"><span>{{financialDetail.belongNetAssets || ''}}</span>亿元</div><img src="@/assets/images/detail/financial/financial_header02_ico.png"></div>
+        <div class="header-item">营业收入<div class="header-item-amount"><span>{{financialDetail.operatingIncome || ''}}</span>亿元</div><img src="@/assets/images/detail/financial/financial_header03_ico.png"></div>
+        <div class="header-item">授信余额<div class="header-item-amount"><span>{{financialDetail.creditBalance || ''}}</span>亿元</div><img src="@/assets/images/detail/financial/financial_header04_ico.png"></div>
       </div>
     </div>
     <div class="financial-zcqk">
@@ -14,7 +14,7 @@
       <ul class="zcqk-list">
         <li v-for="(item, index) in zcqkList" :key="index" :style="zcqkList.length==1?'border-right: 0;':''">
           <div class="zcqk-list-box" :style="(parity(zcqkList) && index==zcqkList.length-2) || (index == zcqkList.length-1)?'border-bottom: 0':''">
-            <div class="flex-box zcqk-list-line"><span class="flex-box"><img :src="item.ico">{{item.name}}</span><span><i>{{item.amount}}</i>亿元</span></div>
+            <div class="flex-box zcqk-list-line"><span class="flex-box"><img :src="item.ico">{{item.name}}</span><span v-if="item.amount"><i>{{item.amount}}</i>亿元</span></div>
             <div class="zcqk-list-intro">{{item.intro}}</div>
           </div>
         </li>
@@ -25,8 +25,8 @@
       <div class="flex-box zwqk-box">
         <div class="zwqk-info">
           <div class="zwqk-title">总负债</div>
-          <div class="zwqk-amount"><span>468.65</span>亿元</div>
-          <div class="zwqk-pro">资产负债率 50%</div>
+          <div class="zwqk-amount"><span>{{financialDetail.totalLiabilities || '0'}}</span>亿元</div>
+          <div class="zwqk-pro">资产负债率 {{financialDetail.tdr+'%' || '--'}}</div>
           <img src="@/assets/images/detail/financial/zwqk_bg_ico.png">
         </div>
         <div id="myEcharts" style="width: 444px;height:250px; margin: 0 auto;"></div>
@@ -34,8 +34,8 @@
       <div class="flex-box zwqk-list">
         <div class="list-item" v-for="(item, index) in zwqkList" :key="index">
           <div class="flex-box list-item-all">{{item.name}}<img :src="item.ico"></div>
-          <div class="list-item-amount"><span>{{item.amount}}</span>{{item.unit}}</div>
-          <div class="list-item-pro">{{item.intro}}<span>{{item.introPro}}</span></div>
+          <div class="list-item-amount"><template v-if="item.amount"><span>{{item.amount}}</span>{{item.unit}}</template><template v-else>--</template></div>
+          <div class="list-item-pro">{{item.intro}}<span>{{item.introPro || '--'}}</span></div>
         </div>
       </div>
     </div>
@@ -44,7 +44,7 @@
       <ul class="zcqk-list">
         <li v-for="(item, index) in zjqkList" :key="index" :style="zjqkList.length==1?'border-right: 0;':''">
           <div class="zcqk-list-box" :style="(parity(zjqkList) && index==zjqkList.length-2) || (index == zjqkList.length-1)?'border-bottom: 0':''">
-            <div class="flex-box zcqk-list-line"><span class="flex-box"><img :src="item.ico">{{item.name}}</span><span><i>{{item.amount}}</i>{{item.unit}}</span></div>
+            <div class="flex-box zcqk-list-line"><span class="flex-box"><img :src="item.ico">{{item.name}}</span><span v-if="item.amount"><i>{{item.amount}}</i>{{item.unit}}</span></div>
             <div class="zcqk-list-intro">{{item.intro}}</div>
           </div>
         </li>
@@ -54,41 +54,42 @@
 </template>
 
 <script>
-import { getList } from '@/api/detail/party-a/financial'
+import { financial } from '@/api/detail/party-a/financial'
 import * as echarts from 'echarts'
 export default {
   name: 'Financial',
   props: ['companyId'],
   data() {
     return {
+      financialDetail: {},
       // 资产情况
       zcqkList: [
-        { name: '总资产', ico: require('@/assets/images/detail/financial/zcqk_ico1.png'), intro: '总资产越大，表示企业规模越大', amount: '99213', unit: '亿元'},
-        { name: '净资产', ico: require('@/assets/images/detail/financial/zcqk_ico2.png'), intro: '该指标越大说明企业实力越强', amount: '99213', unit: '亿元'},
-        { name: '货币资金', ico: require('@/assets/images/detail/financial/zcqk_ico3.png'), intro: '该指标越大说明企业越有活力、越有保障', amount: '99213', unit: '亿元'},
-        { name: '应收账款', ico: require('@/assets/images/detail/financial/zcqk_ico4.png'), intro: '该指标越大说明企业实力越强', amount: '99213', unit: '亿元'},
-        { name: '土地资产', ico: require('@/assets/images/detail/financial/zcqk_ico5.png'), intro: '该指标越大说明企业越有实力，但需要关注抵押情况', amount: '99213', unit: '亿元'},
-        { name: '其它应收款', ico: require('@/assets/images/detail/financial/zcqk_ico6.png'), intro: '该指标越大说明企业实力越强', amount: '99213', unit: '亿元'},
-        { name: '受限资产', ico: require('@/assets/images/detail/financial/zcqk_ico7.png'), intro: '该指标越大，资产流动性越差', amount: '99213', unit: '亿元'},
-        { name: '应收类款项来自政府占比', ico: require('@/assets/images/detail/financial/zcqk_ico8.png'), intro: '该指标越大，说明企业资质及信用越好', amount: '99213', unit: '亿元'},
-        { name: '政府补助', ico: require('@/assets/images/detail/financial/zcqk_ico9.png'), intro: '该指标越大，说明企业越被政府看好与扶持', amount: '99213', unit: '亿元'}
+        { name: '总资产', ico: require('@/assets/images/detail/financial/zcqk_ico1.png'), intro: '总资产越大，表示企业规模越大', amount: '', unit: '亿元'},
+        { name: '净资产', ico: require('@/assets/images/detail/financial/zcqk_ico2.png'), intro: '该指标越大说明企业实力越强', amount: '', unit: '亿元'},
+        { name: '货币资金', ico: require('@/assets/images/detail/financial/zcqk_ico3.png'), intro: '该指标越大说明企业越有活力、越有保障', amount: '', unit: '亿元'},
+        { name: '应收账款', ico: require('@/assets/images/detail/financial/zcqk_ico4.png'), intro: '该指标越大说明企业实力越强', amount: '', unit: '亿元'},
+        { name: '土地资产', ico: require('@/assets/images/detail/financial/zcqk_ico5.png'), intro: '该指标越大说明企业越有实力，但需要关注抵押情况', amount: '', unit: '亿元'},
+        { name: '其它应收款', ico: require('@/assets/images/detail/financial/zcqk_ico6.png'), intro: '该指标越大说明企业实力越强', amount: '', unit: '亿元'},
+        { name: '受限资产', ico: require('@/assets/images/detail/financial/zcqk_ico7.png'), intro: '该指标越大，资产流动性越差', amount: '', unit: '亿元'},
+        { name: '应收类款项来自政府占比', ico: require('@/assets/images/detail/financial/zcqk_ico8.png'), intro: '该指标越大，说明企业资质及信用越好', amount: '', unit: '%'},
+        { name: '政府补助', ico: require('@/assets/images/detail/financial/zcqk_ico9.png'), intro: '该指标越大，说明企业越被政府看好与扶持', amount: '', unit: '亿元'}
       ],
       // 负债情况及偿债能力
       zwqkList: [
-        { name: '借款总额', ico: require('@/assets/images/detail/financial/zwqk_ico1.png'), intro: '借款/有息债务', introPro: '95.19%', amount: '1699.7', unit: '亿元'},
-        { name: '债券余额', ico: require('@/assets/images/detail/financial/zwqk_ico2.png'), intro: '债券余额/有息债务', introPro: '95.19%', amount: '1699.7', unit: '亿元'},
-        { name: '非标余额', ico: require('@/assets/images/detail/financial/zwqk_ico3.png'), intro: '非标余额/有息债务', introPro: '95.19%', amount: '1699.7', unit: '亿元'},
-        { name: '对外担保金额', ico: require('@/assets/images/detail/financial/zwqk_ico4.png'), intro: '对外担保比例', introPro: '95.19%', amount: '1699.7', unit: '亿元'}
+        { name: '借款总额', ico: require('@/assets/images/detail/financial/zwqk_ico1.png'), intro: '借款/有息债务', introPro: '', amount: '', unit: '亿元'},
+        { name: '债券余额', ico: require('@/assets/images/detail/financial/zwqk_ico2.png'), intro: '债券余额/有息债务', introPro: '', amount: '', unit: '亿元'},
+        { name: '非标余额', ico: require('@/assets/images/detail/financial/zwqk_ico3.png'), intro: '非标余额/有息债务', introPro: '', amount: '', unit: '亿元'},
+        { name: '对外担保金额', ico: require('@/assets/images/detail/financial/zwqk_ico4.png'), intro: '对外担保比例', introPro: '', amount: '', unit: '亿元'}
       ],
       echartsData: [],
       // 资金情况
       zjqkList: [
-        { name: '经营现金流', ico: require('@/assets/images/detail/financial/zjqk_ico1.png'), intro: '该指标越高，说明经营活动的造血能力越强', amount: '99213', unit: '亿元'},
-        { name: '现金比率', ico: require('@/assets/images/detail/financial/zjqk_ico2.png'), intro: '该指标越高，风险越低', amount: '0.8', unit: '%'},
-        { name: '筹资现金流', ico: require('@/assets/images/detail/financial/zjqk_ico3.png'), intro: '该指标越高，说明负债越高', amount: '99213', unit: '亿元'},
-        { name: '现金流量比率', ico: require('@/assets/images/detail/financial/zjqk_ico4.png'), intro: '该指标越高，风险越低', amount: '0.8', unit: '%'},
-        { name: '投资现金流', ico: require('@/assets/images/detail/financial/zjqk_ico5.png'), intro: '该指标越高，说明投资带来的收益越高', amount: '99213', unit: '亿元'},
-        { name: '现金到期债务比', ico: require('@/assets/images/detail/financial/zjqk_ico6.png'), intro: '该指标越高，风险越低', amount: '0.8', unit: '%'}
+        { name: '经营现金流', ico: require('@/assets/images/detail/financial/zjqk_ico1.png'), intro: '该指标越高，说明经营活动的造血能力越强', amount: '', unit: '亿元'},
+        { name: '现金比率', ico: require('@/assets/images/detail/financial/zjqk_ico2.png'), intro: '该指标越高，风险越低', amount: '', unit: '%'},
+        { name: '筹资现金流', ico: require('@/assets/images/detail/financial/zjqk_ico3.png'), intro: '该指标越高，说明负债越高', amount: '', unit: '亿元'},
+        { name: '现金流量比率', ico: require('@/assets/images/detail/financial/zjqk_ico4.png'), intro: '该指标越高，风险越低', amount: '', unit: '%'},
+        { name: '投资现金流', ico: require('@/assets/images/detail/financial/zjqk_ico5.png'), intro: '该指标越高，说明投资带来的收益越高', amount: '', unit: '亿元'},
+        { name: '现金到期债务比', ico: require('@/assets/images/detail/financial/zjqk_ico6.png'), intro: '该指标越高，风险越低', amount: '', unit: '%'}
       ]
     }
   },
@@ -112,19 +113,42 @@ export default {
     this.handleQuery()
   },
   methods: {
-    handleQuery() {
-      let param = {}
-      getList(param).then((res) => {
+    async handleQuery() {
+      this.tableLoading = true
+      let res = await financial({cid:90669031})
+      this.tableLoading = false
+      if(res.code==200){
+        this.financialDetail = res.data
+        //资产情况
+        let { totalAssets, belongNetAssets, monetaryFunds, accountsReceivable, landAssets, otherReceivable, restrictedAssets, receivableFromGovRatio, govSubsidy } = this.financialDetail
+        let zcqkObj = { totalAssets, belongNetAssets, monetaryFunds, accountsReceivable, landAssets, otherReceivable, restrictedAssets, receivableFromGovRatio, govSubsidy }
+        this.zcqkList.forEach((item, index) => {
+          item.amount = zcqkObj[Object.keys(zcqkObj)[index]]
+        })
+        //负债情况及偿债能力
+        let { loan, econData_006, bondBalance, econData_005, nonStandardBalance, nonStandardRatio, guaranteeAmount, guaranteeRatio } = this.financialDetail
+        let zwAmountObj = { loan, bondBalance, nonStandardBalance, guaranteeAmount }
+        let zwPercentObj = { econData_006, econData_005, nonStandardRatio, guaranteeRatio }
+        this.zwqkList.forEach((item, index) => {
+          item.amount = zwAmountObj[Object.keys(zwAmountObj)[index]]
+          item.introPro = zwPercentObj[Object.keys(zwPercentObj)[index]]?zwPercentObj[Object.keys(zwPercentObj)[index]]+'%':''
+        })
+        //资金情况
+        let { netOperatingCashFlow, cashRatio, netFinancingCashFlow, cashFlowRatio, netInvestmentCashFlow, cashDebtRatio } = this.financialDetail
+        let zjqkObj = { netOperatingCashFlow, cashRatio, netFinancingCashFlow, cashFlowRatio, netInvestmentCashFlow, cashDebtRatio }
+        this.zjqkList.forEach((item, index) => {
+          item.amount = zjqkObj[Object.keys(zjqkObj)[index]]
+        })
         this.echartsData = [
-          { value: 1048, name: '有息债务' },
-          { value: 735, name: '有息债务/总债务' },
-          { value: 580, name: '综合融资成本' },
-          { value: 484, name: 'EBITDA保障倍数' }
+          { value: res.data.uipInterestBearingDebt, name: '有息债务' },
+          { value: res.data.econData_002, name: '有息债务/总债务' },
+          { value: res.data.ofcb, name: '综合融资成本' },
+          { value: res.data.ebitdaIcr, name: 'EBITDA保障倍数' }
         ]
         this.$nextTick(() => {
           this.getEcharts()
         })
-      })
+      }
     },
     getEcharts(){
       let myChart = echarts.init(document.getElementById("myEcharts"));
@@ -413,6 +437,7 @@ export default {
             justify-content: space-between;
           }
           .list-item-amount{
+            height: 39px;
             padding-top: 11px;
             span{
               font-size: 24px;

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

@@ -45,18 +45,18 @@ export default {
         pageSize: 20
       },
       forData: [
-        {label: '许可决定日期', prop: 'xxx', width: '100'},
+        {label: '许可决定日期', prop: 'deciTime', width: '100'},
         {label: '决定文书号', prop: 'deciWritNo', width: '200'},
-        {label: '许可编号', prop: 'xxx', width: '100'},
+        {label: '许可编号', prop: 'permitNo', width: '100'},
         {label: '决定文书名称', prop: 'deciWritName', width: '190'},
         {label: '许可内容', prop: 'content', width: '300', slot: true},
         {label: '有效期自', prop: 'valiBegin', width: '100'},
         {label: '有效期至', prop: 'valiEnd', width: '100'},
-        {label: '行政许可类别', prop: 'xxx', width: '100'},
+        {label: '行政许可类别', prop: 'permitType', width: '100'},
         {label: '许可机关', prop: 'office', width: '180'},
         {label: '行政许可机关统一社会信用代码', prop: 'xxx', width: '200'},
-        {label: '数据来源单位', prop: 'xxx', width: '110'},
-        {label: '数据来源单位统一社会信用代码', prop: 'xxx', width: '200'},
+        {label: '数据来源单位', prop: 'dataSourceOffice', width: '110'},
+        {label: '数据来源单位统一社会信用代码', prop: 'dataSourceOfficeCreditCode', width: '200'},
         {label: '来源', prop: 'dataSource', width: '80'}
       ],
       formData: [

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

@@ -128,7 +128,6 @@ export default {
       this.tableDataTotal = res.total
     },
     getAreaList(params){
-      console.log('参数1：',params)
       if(params.province&&params.province.length>0){
         let provinceIds = [], cityIds = [], areaIds = []
         for(let i=0;i<params.province.length;i++){
@@ -147,7 +146,6 @@ export default {
           return self.indexOf(value) === index
         })
       }
-      console.log('参数2：',params)
       return params
     }
   }