*

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>{{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 class="header-item">总资产<div class="header-item-amount" v-if="financialDetail.totalAssets"><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" v-if="financialDetail.belongNetAssets"><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" v-if="financialDetail.operatingIncome"><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" v-if="financialDetail.creditBalance"><span>{{financialDetail.creditBalance || ''}}</span>亿元</div><img src="@/assets/images/detail/financial/financial_header04_ico.png"></div>
       </div>
     </div>
     <div class="financial-zcqk">
@@ -115,7 +115,7 @@ export default {
   methods: {
     async handleQuery() {
       this.tableLoading = true
-      let res = await financial({cid:90669031})
+      let res = await financial({cid:this.companyId})
       this.tableLoading = false
       if(res.code==200){
         this.financialDetail = res.data

dsk-operate-ui/src/views/detail/party-a/mixins/mixin.js

@@ -24,7 +24,7 @@ export default {
       let condtion = {}
       let reqData = {}
       this.formData.forEach(item => {
-        if(item.value || (item.value && item.value.length)) {
+        if(item.value || (item.value && item.value.length) || item.value===0) {
           if(item.fieldName == 'time') {
             condtion[item.startTime] = item.value[0];
             condtion[item.endTime] = item.value[1];
@@ -39,7 +39,7 @@ export default {
         }
       })
       Object.keys(condtion).forEach(key => {
-        if(condtion[key]) {
+        if(condtion[key] || condtion[key]===0) {
           if(Array.isArray(condtion[key]) && condtion[key].length == 0){
             delete condtion[key]
           }

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

@@ -18,10 +18,12 @@
       :queryParams="queryParams"
       @handle-current-change="handleCurrentChange"
     >
-      <template slot="projectName" slot-scope="scope">
-        <router-link to="" tag="a" class="a-link">{{scope.row.projectName}}</router-link>
-        <div class="tags" v-if="scope.row.tag">
-          <span class="tag style1">{{scope.row.tag}}</span>
+      <template slot="name" slot-scope="scope">
+        <router-link to="" tag="a" class="a-link" v-if="scope.row.id&&scope.row.name " v-html="scope.row.name"></router-link>
+        <div v-else v-html="scope.row.name  || '--'"></div>
+        <div class="tags" v-if="scope.row.status || scope.row.biddingAnnouncement">
+          <span class="tag style1" v-if="scope.row.status">{{scope.row.status}}</span>
+          <span class="tag style1" v-if="scope.row.biddingAnnouncement">招标数{{scope.row.biddingAnnouncement}}</span>
         </div>
       </template>
     </tables>
@@ -30,7 +32,7 @@
 
 <script>
 import mixin from '../mixins/mixin'
-import {getList, getOption} from '@/api/detail/party-a/overview'
+import {affiliates} from '@/api/detail/party-a/overview'
 export default {
   name: 'Branch',
   props: ['companyId'],
@@ -40,15 +42,19 @@ export default {
       queryParams: {
         cid: this.companyId,
         pageNum: 1,
-        pageSize: 10
+        pageSize: 20
       },
       forData: [
-        {label: '被投资企业名称', prop: 'projectName', slot: true},
-        {label: '负责人', prop: 'type'},
-        {label: '成立日期', prop: 'date'}
+        {label: '被投资企业名称', prop: 'name', slot: true},
+        {label: '负责人', prop: 'operName'},
+        {label: '成立日期', prop: 'startDate'}
       ],
       formData: [
-        { type: 1, fieldName: 'zbgg', value: '', placeholder: '招标公告', options: []
+        { type: 1, fieldName: 'hasBid', value: '', placeholder: '招标公告', options: [
+            {name:'不限',value:''},
+            {name:'有招标公告',value:1},
+            {name:'无招标公告',value:0}
+          ]
         }
       ],
       //列表
@@ -58,42 +64,18 @@ export default {
     }
   },
   created() {
-    this.handleOption()
     this.handleQuery()
   },
   methods: {
-    handleOption(){
-      getOption().then((res) => {
-        this.setFormData('zbgg', [
-          { name: '类别1', value: '1' },
-          { name: '类别2', value: '2' },
-          { name: '类别3', value: '3' },
-          { name: '类别4', value: '4' }
-        ])
-      })
-    },
-    handleQuery(params) {
+    async handleQuery(params) {
       this.tableLoading = true
       let param = params?params:this.queryParams
-      getList(param).then((res) => {
-        this.tableLoading = false
-        this.tableData = [
-          {
-            projectId: '1',
-            tag: '在业',
-            projectName:'滨州医学院口腔医学大楼铝合金门窗供货及安装',
-            use:'城镇住宅用地',
-            type:'房地产业',
-            way:'挂牌出让',
-            state:'重庆',
-            money:'11234万元',
-            scale:'222平米',
-            unit:'江苏省住房和城乡建设厅',
-            date:'2015-08-06',
-          }
-        ]
-        this.tableDataTotal = 100
-      })
+      let res = await affiliates(param)
+      this.tableLoading = false
+      if(res.code==200){
+        this.tableData = res.rows
+      }
+      this.tableDataTotal = res.total
     }
   }
 }

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

@@ -37,7 +37,7 @@ export default {
       queryParams: {
         cid: this.companyId,
         pageNum: 1,
-        pageSize: 10
+        pageSize: 20
       },
       labelWidth: 250,
       forInfo: {projectType: 'aaa', projectPurposes: '222', projectInvestmentAmounts: '222'},

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

@@ -19,7 +19,7 @@
 
 <script>
 import mixin from '../mixins/mixin'
-import {getList} from '@/api/detail/party-a/overview'
+import {keymembers} from '@/api/detail/party-a/overview'
 export default {
   name: 'Execuinfo',
   props: ['companyId'],
@@ -29,11 +29,11 @@ export default {
       queryParams: {
         cid: this.companyId,
         pageNum: 1,
-        pageSize: 10
+        pageSize: 20
       },
       forData: [
-        {label: '姓名', prop: 'projectName'},
-        {label: '职位', prop: 'type'}
+        {label: '姓名', prop: 'name'},
+        {label: '职位', prop: 'jobTitle'}
       ],
       formData: [],
       //列表
@@ -46,27 +46,15 @@ export default {
     this.handleQuery()
   },
   methods: {
-    handleQuery() {
+    async handleQuery(params) {
       this.tableLoading = true
-      getList(this.queryParams).then((res) => {
-        this.tableLoading = false
-        this.tableData = [
-          {
-            projectId: '1',
-            tag: '在业',
-            projectName:'滨州医学院口腔医学大楼铝合金门窗供货及安装',
-            use:'城镇住宅用地',
-            type:'房地产业',
-            way:'挂牌出让',
-            state:'重庆',
-            money:'11234万元',
-            scale:'222平米',
-            unit:'江苏省住房和城乡建设厅',
-            date:'2015-08-06',
-          }
-        ]
-        this.tableDataTotal = 100
-      })
+      let param = params?params:this.queryParams
+      let res = await keymembers(param)
+      this.tableLoading = false
+      if(res.code==200){
+        this.tableData = res.rows
+      }
+      this.tableDataTotal = res.total
     }
   }
 }

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

@@ -19,19 +19,23 @@
       :queryParams="queryParams"
       @handle-current-change="handleCurrentChange"
     >
-      <template slot="projectName" slot-scope="scope">
-        <router-link to="" tag="a" class="a-link">{{scope.row.projectName}}</router-link>
-        <div class="tags" v-if="scope.row.tag">
-          <span class="tag style1">{{scope.row.tag}}</span>
+      <template slot="stockName" slot-scope="scope">
+        <router-link to="" tag="a" class="a-link" v-if="scope.row.stockId&&scope.row.stockName " v-html="scope.row.stockName"></router-link>
+        <div v-else v-html="scope.row.stockName  || '--'"></div>
+        <div class="tags" v-if="scope.row.businessStatus">
+          <span class="tag style1" v-if="scope.row.businessStatus">{{scope.row.businessStatus}}</span>
         </div>
       </template>
+      <template slot="stockPercent" slot-scope="scope">
+        <span>{{scope.row.stockPercent?parseFloat(Number(scope.row.stockPercent*100).toFixed(4))+'%':'--'}}</span>
+      </template>
     </tables>
   </div>
 </template>
 
 <script>
 import mixin from '../mixins/mixin'
-import {getList} from '@/api/detail/party-a/overview'
+import {bestStockPage} from '@/api/detail/party-a/overview'
 export default {
   name: 'Holderinfo',
   props: ['companyId'],
@@ -41,16 +45,17 @@ export default {
       activeName: 'first',
       queryParams: {
         cid: this.companyId,
+        isHistory: 0,
         pageNum: 1,
-        pageSize: 10
+        pageSize: 20
       },
       forData: [
-        {label: '发起人/股东', prop: 'projectName', minWidth: '230', slot: true},
-        {label: '持股比例', prop: 'inDate'},
-        {label: '认缴出资（万）', prop: 'department'},
-        {label: '实缴出资额', prop: 'department'},
-        {label: '认缴出资额', prop: 'department'},
-        {label: '参股日期', prop: 'department', width: '150'}
+        {label: '发起人/股东', prop: 'stockName', minWidth: '230', slot: true},
+        {label: '持股比例', prop: 'stockPercent', slot: true},
+        {label: '认缴出资（万）', prop: 'shouldCapiConv'},
+        {label: '实缴出资额', prop: 'realCapi'},
+        {label: '认缴出资日期', prop: 'conDate'},
+        {label: '参股日期', prop: 'realCapiDate', width: '150'}
       ],
       formData: [],
       //列表
@@ -66,28 +71,16 @@ export default {
     handleClick(){
       this.handleQuery()
     },
-    handleQuery() {
-      console.log('索引：',this.activeName)
+    async handleQuery(params) {
       this.tableLoading = true
-      getList(this.queryParams).then((res) => {
-        this.tableLoading = false
-        this.tableData = [
-          {
-            projectId: '1',
-            tag: '在业',
-            projectName:'滨州医学院口腔医学大楼铝合金门窗供货及安装',
-            use:'城镇住宅用地',
-            type:'房地产业',
-            way:'挂牌出让',
-            state:'重庆',
-            money:'11234万元',
-            scale:'222平米',
-            unit:'江苏省住房和城乡建设厅',
-            date:'2015-08-06',
-          }
-        ]
-        this.tableDataTotal = 100
-      })
+      let param = params?params:this.queryParams
+      param.isHistory = this.activeName == 'first' ? 0 : 1
+      let res = await bestStockPage(param)
+      this.tableLoading = false
+      if(res.code==200){
+        this.tableData = res.rows
+      }
+      this.tableDataTotal = res.total
     }
   }
 }

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

@@ -18,20 +18,25 @@
       :queryParams="queryParams"
       @handle-current-change="handleCurrentChange"
     >
-      <template slot="gqzb">
+      <template slot="investName" slot-scope="scope">
+        <router-link to="" tag="a" class="a-link" v-if="scope.row.id&&scope.row.investName " v-html="scope.row.investName"></router-link>
+        <div v-else v-html="scope.row.investName  || '--'"></div>
+        <div class="tags" v-if="scope.row.businessStatus || scope.row.biddingAnnouncement">
+          <span class="tag style1" v-if="scope.row.businessStatus">{{scope.row.businessStatus}}</span>
+          <span class="tag style1" v-if="scope.row.biddingAnnouncement">招标数{{scope.row.biddingAnnouncement}}</span>
+        </div>
+      </template>
+      <template slot="proportion">
         <div class="tab-header">股权占比 <el-popover placement="top-start" width="280" trigger="hover">
           <div style="font-size: 12px;">
             控股67%：绝对控制权67%，相当于100%的权力，修改公司章程/分立、合并、变更主营项目、重大决策<br />
             控股51%：相对控制权51%，控制线，绝对控制公司<br />
             控股34%：安全控制权，一票否决权</div>
-            <img src="@/assets/images/detail/overview/zbph_question.png" slot="reference">
-          </el-popover></div>
+          <img src="@/assets/images/detail/overview/zbph_question.png" slot="reference">
+        </el-popover></div>
       </template>
-      <template slot="projectName" slot-scope="scope">
-        <router-link to="" tag="a" class="a-link">{{scope.row.projectName}}</router-link>
-        <div class="tags" v-if="scope.row.tag">
-          <span class="tag style1">{{scope.row.tag}}</span>
-        </div>
+      <template slot="stockPercentage" slot-scope="scope">
+        <span>{{scope.row.stockPercentage?parseFloat(Number(scope.row.stockPercentage*100).toFixed(4))+'%':'--'}}</span>
       </template>
     </tables>
   </div>
@@ -39,7 +44,7 @@
 
 <script>
 import mixin from '../mixins/mixin'
-import {getList, getOption} from '@/api/detail/party-a/overview'
+import {investment} from '@/api/detail/party-a/overview'
 export default {
   name: 'Overseas',
   props: ['companyId'],
@@ -49,19 +54,33 @@ export default {
       queryParams: {
         cid: this.companyId,
         pageNum: 1,
-        pageSize: 10
+        pageSize: 20
       },
       forData: [
-        {label: '被投资企业名称', prop: 'projectName', minWidth: '180', slot: true},
-        {label: '法定代表人', prop: 'inDate'},
-        {label: '注册资本（万元）', prop: 'department'},
-        {label: '成立日期', prop: 'department'},
-        {label: '股权占比', prop: 'department', slotHeader: true, slotName: 'gqzb'},
-        {label: '认缴出资额（万元）', prop: 'department'}
+        {label: '被投资企业名称', prop: 'investName', minWidth: '180', slot: true},
+        {label: '法定代表人', prop: 'investOperName'},
+        {label: '注册资本（万元）', prop: 'investRegistCapi'},
+        {label: '成立日期', prop: 'investStartDate'},
+        {label: '股权占比', prop: 'stockPercentage', slot: true, slotHeader: true, slotName: 'proportion'},
+        {label: '认缴出资额（万元）', prop: 'shouldCapi'}
       ],
       formData: [
-        { type: 1, fieldName: 'zbgg', value: '', placeholder: '招标公告', options: [] },
-        { type: 1, fieldName: 'gqzb', value: '', placeholder: '股权占比', options: [] }
+        { type: 1, fieldName: 'hasBid', value: '', placeholder: '招标公告', options: [
+          {name:'不限',value:''},
+          {name:'有招标公告',value:1},
+          {name:'无招标公告',value:0}
+          ]
+        },
+        { type: 1, fieldName: 'proportion', value: '', placeholder: '股权占比', options: [
+            {name:'不限',value:''},
+            {name:'100%',value:'1~1'},
+            {name:'66.66%以上',value:'0.6666~1'},
+            {name:'50%以上',value:'0.4~1'},
+            {name:'33.33%以上',value:'0.3333~1'},
+            {name:'25%以上',value:'0.05~0.25'},
+            {name:'不到5%',value:'0~0.05'}
+          ]
+        }
       ],
       //列表
       tableLoading:false,
@@ -70,48 +89,29 @@ export default {
     }
   },
   created() {
-    this.handleOption()
     this.handleQuery()
   },
   methods: {
-    handleOption(){
-      getOption().then((res) => {
-        this.setFormData('zbgg', [
-          { name: '类别1', value: '1' },
-          { name: '类别2', value: '2' },
-          { name: '类别3', value: '3' },
-          { name: '类别4', value: '4' }
-        ])
-        this.setFormData('gqzb', [
-          { name: '类别1', value: '1' },
-          { name: '类别2', value: '2' },
-          { name: '类别3', value: '3' },
-          { name: '类别4', value: '4' }
-        ])
-      })
-    },
-    handleQuery(params) {
+    async handleQuery(params) {
       this.tableLoading = true
       let param = params?params:this.queryParams
-      getList(param).then((res) => {
-        this.tableLoading = false
-        this.tableData = [
-          {
-            projectId: '1',
-            tag: '在业',
-            projectName:'滨州医学院口腔医学大楼铝合金门窗供货及安装',
-            use:'城镇住宅用地',
-            type:'房地产业',
-            way:'挂牌出让',
-            state:'重庆',
-            money:'11234万元',
-            scale:'222平米',
-            unit:'江苏省住房和城乡建设厅',
-            date:'2015-08-06',
-          }
-        ]
-        this.tableDataTotal = 100
-      })
+      let res = await investment(param)
+      this.tableLoading = false
+      if(res.code==200){
+        this.tableData = res.rows
+      }
+      this.tableDataTotal = res.total
+    },
+    handleSearch(){
+      let params = this.formParams()
+      if(params.proportion){
+        params.stockPercentageMin = parseFloat(params.proportion.split('~')[0])
+        params.stockPercentageMax = parseFloat(params.proportion.split('~')[1])
+        delete params.proportion
+      }
+      params.pageNum = 1
+      this.queryParams.pageNum = 1
+      this.handleQuery(params)
     }
   }
 }