修改

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

@@ -125,7 +125,7 @@ export const constantRoutes = [
         path: '/macro/financing/details/:id(\\d+)',
         component: () => import('@/views/macro/financing/details'),
         name: 'financingDetails',
-        meta: { title: '区域专项债详情',icon: ''}
+        meta: { title: '区域专项债详情',icon: 'radar'}
       }
     ]
   },

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

@@ -86,6 +86,8 @@ export default {
       if(this.queryParams.order){
         params.order=this.queryParams.order
       }
+
+      params.provinceIds=[this.dataQuery.provinceId]
       nationalPage(params).then(res => {
         this.tableData = res.data.list
         this.tableDataTotal = res.data.totalCount

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

 <template>
   <div class="app-container enterprises">
     <div class="flex-box eco-header">
-      <el-tabs v-model="activeName">
+      <el-tabs v-model="activeName" @tab-click="handleClick">
         <el-tab-pane label="本地企业" name="first"></el-tab-pane>
         <el-tab-pane label="异地备案" name="second"></el-tab-pane>
       </el-tabs>
-      <div class="location"><i class="el-icon-location"></i>重庆市</div>
+      <div class="location"><i class="el-icon-location"></i>{{province}}</div>
     </div>
     <div class="content">
       <div class="search">
         <el-cascader
-          ref="address"
+          ref="aptitudeCode"
           :options="aptitudeCodeList"
           :props="props"
           v-model="queryParams.codeStr"
+          @change="handleChange"
           placeholder="资质资格"
           collapse-tags
           clearable></el-cascader>
-        <el-input placeholder="输入企业名称关键词" v-model="queryParams.key">
-          <el-button slot="append">搜索</el-button>
+        <el-input placeholder="输入企业名称关键词" v-model="queryParams.ename">
+          <el-button slot="append" @click="querySubmit()">搜索</el-button>
         </el-input>
         <span class="total">共{{tableDataTotal}}条</span>
       </div>
@@ -36,22 +37,22 @@
           </el-table-column>
           <el-table-column label="公司名称" align="left" width="300">
             <template slot-scope="scope">
-              <router-link to="" tag="a" class="a-link">{{ scope.row.name}}</router-link>
+              <router-link to="" tag="a" class="a-link" v-html="scope.row.name"></router-link>
             </template>
           </el-table-column>
-          <el-table-column label="注册地区" prop="address" width="80"/>
-          <el-table-column label="资质资格" prop="aptitudeCountNew" sortable width="120" align="right" />
-          <el-table-column label="专业人员" prop="persionCount" sortable width="130" align="right" />
-          <el-table-column label="中标业绩" prop="recentlyCount" sortable width="130" align="right" />
-          <el-table-column label="最大中标金额（万元）" prop="cgfs" sortable width="160" align="right" />
-          <el-table-column label="中标总金额（万元）" prop="cgfs" sortable width="160" align="right" />
-          <el-table-column label="四库业绩" prop="skyCount" sortable width="130" align="right" />
-          <el-table-column label="公路业绩" prop="cgfs" sortable width="130" align="right" />
-          <el-table-column label="水利业绩" prop="cgfs" sortable width="130" align="right" />
-          <el-table-column label="常合作业主" prop="cgfs" width="280" align="right" />
-          <el-table-column label="客户（个）" prop="customerCount" sortable width="130" align="right" />
-          <el-table-column label="供应商（个）" prop="supplierCount" sortable width="130" align="right" />
-          <el-table-column label="常合作供应商" prop="cgfs" width="280" align="right" />
+          <el-table-column label="注册地址" prop="domicile" width="150"/>
+          <el-table-column label="资质资格" prop="aptitudeCountNew" sortable width="100"/>
+          <el-table-column label="专业人员" prop="persionCount" sortable width="100"/>
+          <el-table-column label="中标业绩" prop="recentlyCount" sortable width="100"/>
+          <el-table-column label="最大中标金额（万元）" prop="cgfs" sortable width="160"/>
+          <el-table-column label="中标总金额（万元）" prop="cgfs" sortable width="160"/>
+          <el-table-column label="四库业绩" prop="skyCount" sortable width="100"/>
+          <el-table-column label="公路业绩" prop="cgfs" sortable width="100"/>
+          <el-table-column label="水利业绩" prop="cgfs" sortable width="100"/>
+          <el-table-column label="常合作业主" prop="cgfs" width="130"/>
+          <el-table-column label="客户（个）" prop="customerCount" sortable width="100"/>
+          <el-table-column label="供应商（个）" prop="supplierCount" sortable width="130" />
+          <el-table-column label="常合作供应商" prop="supplierCount" width="120"/>
         </el-table>
       </div>
       <div class="pagination-box">
@@ -68,7 +69,7 @@
   // import LocalEnterprises from './component/localEnterprises'
   // import Offsite from './component/offsite'
   import aptitudeCode from '@/assets/json/aptitudeCode'
-  import { enterprise } from '@/api/macro/macro'
+  import { enterprise,location } from '@/api/macro/macro'
 export default {
   name: 'Enterprises',
   // components: {LocalEnterprises,Offsite},
@@ -76,36 +77,36 @@ export default {
     return {
       activeName: 'first',
       queryParams:{
-        key:'',
-        codeStr:''
+        ename:'',
+        codeStr:'',
       },
       props: {
         value: 'id',
         multiple: true,
-        // checkStrictly:true,
+        checkStrictly:true,
         label:'name',
         children:'list',
         expandTrigger:'hover'
       },
-      tableData: [
-        {
-          dataId:'1',
-          cgrssqy:'100',
-          cgfs:'200',
-          address:'江北区',
-          name:'重庆市江北区国有资本投资运营管理集团有限公司'
-        }
-      ],
+      tableData: [],
       tableLoading: false,
       pageIndex: 1,
       pageSize: 10,
       tableDataTotal: 1,
       aptitudeCodeList:[],
+      aptitudeType:'',
+      province:'',
+      provinceId:''
     }
   },
   created() {
+    location({provinceId:'500000'}).then(res => {
+      this.province=res.data.currentProvince.regionName;
+      this.provinceId=res.data.currentProvince.id;
+      this.querySubmit()
+    })
     this.aptitudeCode()
-    this.querySubmit()
+
   },
   methods: {
 //资质Json
@@ -129,8 +130,32 @@ export default {
       if(this.queryParams.order){
         params.order=this.queryParams.order
       }
+      params.aptitudeQueryDto={
+        filePlaceType:this.activeName === 'first' ? 3 : 2,
+        aptitudeSource:'new',
+        aptitudeQueryType:'or',
+        filePlaceCode:this.provinceId
+      }
+      if(this.queryParams.ename){
+        params.aptitudeQueryDto.ename=this.queryParams.ename
+      }
+      if(this.aptitudeType){
+        let aptitudeType=[];
+        aptitudeType.push({
+          codeStr:this.aptitudeType,
+          queryType: "and",
+          aptitudeType: "qualification"
+        })
+        params.aptitudeQueryDto.aptitudeDtoList=aptitudeType
+      }
+      if(this.aptitudeType || this.queryParams.ename){
+
+      }
+      console.log(params)
       enterprise(params).then(res => {
         console.log(res.data)
+        this.tableData=res.data.list;
+        this.tableDataTotal=res.data.total;
       })
     },
     // 重置页数
@@ -144,6 +169,28 @@ export default {
       this.pageIndex = val
       this.querySubmit()
     },
+    handleChange(){
+      // console.log(this.queryParams.codeStr)
+      let codeStr=this.queryParams.codeStr;
+      let arr=[]
+      for(let i=0; i<codeStr.length; i++){
+        arr.push(codeStr[i][codeStr[i].length - 1])
+      }
+      this.aptitudeType=arr.join(',')
+      console.log(this.aptitudeType)
+      this.$refs.aptitudeCode.toggleDropDownVisible(false)
+      this.querySubmit()
+    },
+    handleClick(){
+      this.queryParams.codeStr=[]
+      this.aptitudeType='';
+      this.queryParams={
+        ename:'',
+        codeStr:'',
+      }
+      this.pageIndex=1;
+      this.querySubmit()
+    }
   }
 }
 </script>

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

@@ -2,10 +2,8 @@
   <div class="app-container qyzx-details">
     <p class="tab">区域专项债 <span>/ 专项债项目详情</span></p>
     <div class="content main1">
-      <div class="title"><img src="@/assets/images/financing/head_icon.png" />重庆至黔江高速铁路项目一项目详情</div>
-      <p>本项目是厦渝高铁通道的重要组成部分，是成渝地区、海西经济区间高速客运交流的主通道;是成渝地区与华南、华东地区间客运交流的辅助通道;是以重庆主城为核心的城际客流的快速客运通道;
-        是整合区域旅游资源，促进沿线旅游资源开发的黄金旅游通道。线路起自重庆站，经巴南、南川、武隆、彭水，终至江，正线全长265公里，设8座，其中新建6座。
-        同步建设重庆东动车所动车出入段，重庆枢纽东环联络线。</p>
+      <div class="cont-title"><img src="@/assets/images/financing/head_icon.png" />{{details.projectName}}</div>
+      <p>{{details.projectScale}}</p>
     </div>
     <div class="content main2">
       <div class="common-title">项目筹资</div>
@@ -13,28 +11,28 @@
         <div class="list">
           <div class="item color1">
             <div class="item-left">
-              <h4>535.00<span>亿</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>535.00<span>亿</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>535.00<span>亿</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>535.00<span>亿</span></h4>
+              <h4>{{details.specialCapital || '-'}}<span>{{details.specialCapital ? '亿' : ''}}</span></h4>
               <p>专项债用作资本金</p>
             </div>
             <img class="img" src="@/assets/images/financing/icon4.png" />
@@ -43,28 +41,28 @@
         <div class="list">
           <div class="item color4">
             <div class="item-left">
-              <h4>535.00<span>亿</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>535.00<span>亿 / 10只</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>535.00<span>亿</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>535.00<span>亿</span></h4>
+              <h4>{{details.govSupportFunds || '-'}}<span>{{details.govSupportFunds ? '亿' : ''}}</span></h4>
               <p>政府安排资金</p>
             </div>
             <img class="img" src="@/assets/images/financing/icon8.png" />
@@ -77,27 +75,27 @@
       <div class="main3-box">
         <p>
           <label class="label">项目总收益/项目总债务融资本息(覆盖倍数)</label>
-          <span>1.36倍</span>
+          <span>{{details.econData007}}倍</span>
         </p>
         <p>
           <label class="label">项目总收益/项目总地方债券融资本息</label>
-          <span>1.96倍</span>
+          <span>{{details.econData008}}倍</span>
         </p>
         <p>
           <label class="label">项目总收益/项目总投资</label>
-          <span>1.96倍</span>
+          <span>{{details.econData009}}倍</span>
         </p>
         <p>
           <label class="label">项目总收益/项目总地方债券融资本金</label>
-          <span>1.96倍</span>
+          <span>{{details.econData010}}倍</span>
         </p>
         <p>
           <label class="label">项目总收益/项目总债务融资本金</label>
-          <span>2.45倍</span>
+          <span>{{details.econData011}}倍</span>
         </p>
         <p>
           <label class="label">项目预测总收益</label>
-          <span>2.45倍</span>
+          <span>{{details.projectForecastTotalRevenue}}亿</span>
         </p>
       </div>
     </div>
@@ -105,11 +103,11 @@
       <div class="common-title">项目当事人</div>
       <div class="main4-box">
         <label class="label">项目主体</label>
-        <span>重庆铁路投资集团有限公司</span>
+        <span>{{details.projectEntity || '-'}}</span>
         <label class="label">主管部门</label>
-        <span>-</span>
+        <span>{{details.chargeDepartment || '-'}}</span>
         <label class="label">实施单位</label>
-        <span>重庆铁路投资集团有限公司</span>
+        <span>{{details.piu || '-'}}</span>
       </div>
     </div>
     <div class="content main5">
@@ -122,15 +120,19 @@
           fit
           highlight-current-row
         >
-          <el-table-column prop="name" label="债券简称">
+          <el-table-column prop="bondAbbreviation" label="债券简称">
+            <!--<template slot-scope="scope">-->
+              <!--<router-link :to="'/macro/financing/details/'+ scope.row.id" tag="a" class="a-link">{{ scope.row.bondAbbreviation}}</router-link>-->
+            <!--</template>-->
+          </el-table-column>
+          <el-table-column label="招标日期" width="220">
             <template slot-scope="scope">
-              <router-link :to="'/macro/financing/details/'+ scope.row.id" tag="a" class="a-link">{{ scope.row.name}}</router-link>
+              {{formatDate(scope.row.tenderDate)}}
             </template>
           </el-table-column>
-          <el-table-column prop="name" label="招标日期" width="220" />
-          <el-table-column prop="gm" label="专项债规模（亿）"  width="260" />
-          <el-table-column prop="gm" label="用于项目规模(亿)" width="260" />
-          <el-table-column prop="zj" label="是否资本金" width="200" />
+          <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>
     </div>
@@ -138,28 +140,53 @@
 </template>
 
 <script>
+  import { details,bondPage } from '@/api/macro/macro'
 export default {
   name: 'financingDetails',
   data() {
     return {
       id:'',
-      tableData:[
-        {
-          id:0,
-          name:'20重庆债14(2005938)',
-          time:'2020-09-18',
-          gm:'285.24',
-          zj:'否',
-        }
-      ]
+      tableData:[],
+      details:{},
+      tableLoading: false,
+      pageIndex: 1,
+      pageSize: 10,
+      tableDataTotal: 1,
     }
   },
   created() {
     console.log(this.$route.params)
-    this.id=this.$route.params.id
+    this.id=this.$route.params.id;
+    this.getDetails()
+
   },
   methods: {
-
+    getDetails(){
+      details({id:this.id}).then(res => {
+        this.details=res.data;
+        this.getData()
+      })
+    },
+    getData(){
+      const params = { pageNum: this.pageIndex, pageSize: this.pageSize,specialBondUuid:'2e59fca0-21a6-47db-975d-5481e1c52f45_74'}
+      // const params = { pageNum: this.pageIndex, pageSize: this.pageSize,specialBondUuid:this.details.specialBondUuid}
+      bondPage(params).then(res => {
+        console.log(res.data)
+        this.tableData=res.data.list;
+        this.tableDataTotal=res.data.totalCount;
+      })
+    },
+    formatDate(cellValue) {
+      if (cellValue == null || cellValue == "") return "";
+      var date = new Date(cellValue)
+      var year = date.getFullYear()
+      var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1
+      var day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate()
+      var hours = date.getHours() < 10 ? '0' + date.getHours() : date.getHours()
+      var minutes = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()
+      var seconds = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds()
+      return year + '-' + month + '-' + day + ' ' + hours + ':' + minutes + ':' + seconds
+    }
   }
 }
 </script>
@@ -186,7 +213,7 @@ export default {
       margin-bottom: 8px;
     }
     .main1{
-      .title{
+      .cont-title{
         color: #232323;
         font-size: 16px;
         line-height: 28px;

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

@@ -55,7 +55,7 @@
           <el-table-column prop="projectCapital" label="项目资本金（亿）" sortable="custom"  width="155" />
           <el-table-column prop="econData007" label="项目收益倍数（倍）" sortable="custom" width="150" />
           <el-table-column prop="zxz" label="专项债金额（亿）" sortable="custom" width="150" />
-          <el-table-column prop="specialCapital" label="专项债用作资本金（亿）" width="170" />
+          <el-table-column prop="specialBondCapital" label="专项债用作资本金（亿）" width="170" />
           <el-table-column prop="projectEntity" label="项目主体">
             <!--<template slot-scope="scope">-->
               <!--<router-link :to="'/macro/financing/details/'+ scope.row.projectEntityId" tag="a" class="a-link">{{ scope.row.projectEntity}}</router-link>-->