Merge remote-tracking branch 'origin/master'

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

@@ -76,7 +76,7 @@ export default {
         ]},
         {title: '城投分析', pathName: '', children: [
           {title: '区域经济', pathName: 'regionalEconomies'},
-          {title: '城投那地', pathName: 'landAcquisition'},
+          {title: '城投拿地', pathName: 'landAcquisition'},
           {title: '同地区城投', pathName: 'sameRegion'}
         ]},
         {title: '风险信息', pathName: '', children: [

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

@@ -26,7 +26,7 @@
       >
         <template slot="projectAllName" slot-scope="scope">
           <div class="flex-box">
-            <img class="tip-img" src="@/assets/images/detail/ico_pdf.png" v-if="scope.row.sourceUrl" @click="handlePic(scope.row.sourceUrl)"/>
+            <img class="tip-img" src="@/assets/images/detail/ico_pdf.png" v-if="scope.row.snapshootPic" @click="handlePic(scope.row.snapshootPic, true)"/>
             <div class="a-link" @click="handlePic(scope.row.sourceUrl)" v-if="scope.row.sourceUrl&&scope.row.projectAllName" v-html="scope.row.projectAllName" style="cursor: pointer"></div>
 <!--            <router-link to="" tag="a" class="a-link" v-if="scope.row.id&&scope.row.projectAllName" v-html="scope.row.projectAllName"></router-link>-->
             <span v-else v-html="scope.row.projectAllName || '--'"></span>
@@ -35,6 +35,9 @@
         <template slot="province" slot-scope="scope">
           {{scope.row.province}}{{`${scope.row.city?'-'+scope.row.city:''}`}}
         </template>
+        <template slot="lowerRate" slot-scope="scope">
+          <span>{{scope.row.lowerRate ? scope.row.lowerRate+'%' : '--'}}</span>
+        </template>
       </tables>
     </el-drawer>
   </div>
@@ -74,7 +77,7 @@ export default {
         {label: '项目地区', prop: 'province', width: '160', slot: true},
         {label: '项目类型', prop: 'boundType', width: '130'},
         {label: '工期（天）', prop: 'period', width: '90'},
-        {label: '下浮率', prop: 'lowerRate', width: '90'}
+        {label: '下浮率', prop: 'lowerRate', width: '90', slot: true}
       ],
       //列表
       tableLoading:false,
@@ -99,7 +102,8 @@ export default {
       this.tableDataTotal = res.total
       this.amountTotal = res.totalAmount
     },
-    handlePic(url){
+    handlePic(url, isPic){
+      isPic ? url = 'https://imgs.jiansheku.com/'+url : ''
       if(url){
         window.open(url, "_blank")
       }

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

@@ -26,7 +26,7 @@
       >
         <template slot="projectAllName" slot-scope="scope">
           <div class="flex-box">
-            <img class="tip-img" src="@/assets/images/detail/ico_pdf.png" v-if="scope.row.sourceUrl" @click="handlePic(scope.row.sourceUrl)"/>
+            <img class="tip-img" src="@/assets/images/detail/ico_pdf.png" v-if="scope.row.snapshootPic" @click="handlePic(scope.row.snapshootPic, true)"/>
             <div class="a-link" @click="handlePic(scope.row.sourceUrl)" v-if="scope.row.sourceUrl&&scope.row.projectAllName" v-html="scope.row.projectAllName" style="cursor: pointer"></div>
 <!--            <router-link to="" tag="a" class="a-link" v-if="scope.row.id&&scope.row.projectAllName" v-html="scope.row.projectAllName"></router-link>-->
             <span v-else v-html="scope.row.projectAllName || '--'"></span>
@@ -35,6 +35,9 @@
         <template slot="province" slot-scope="scope">
           {{scope.row.province}}{{`${scope.row.city?'-'+scope.row.city:''}`}}
         </template>
+        <template slot="lowerRate" slot-scope="scope">
+          <span>{{scope.row.lowerRate ? scope.row.lowerRate+'%' : '--'}}</span>
+        </template>
       </tables>
     </el-drawer>
   </div>
@@ -74,7 +77,7 @@ export default {
         {label: '项目地区', prop: 'province', width: '160', slot: true},
         {label: '项目类型', prop: 'boundType', width: '130'},
         {label: '工期（天）', prop: 'period', width: '90'},
-        {label: '下浮率', prop: 'lowerRate', width: '90'}
+        {label: '下浮率', prop: 'lowerRate', width: '90', slot: true}
       ],
       //列表
       tableLoading:false,
@@ -99,7 +102,8 @@ export default {
       this.tableDataTotal = res.total
       this.amountTotal = res.totalAmount
     },
-    handlePic(url){
+    handlePic(url, isPic){
+      isPic ? url = 'https://imgs.jiansheku.com/'+url : ''
       if(url){
         window.open(url, "_blank")
       }

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

@@ -44,6 +44,7 @@
 import mixin from '../mixins/mixin'
 import { clientPage } from '@/api/detail/party-a/dealings'
 import ClientDetail from './component/customDetail'
+import auth from "@/plugins/auth";
 export default {
   name: 'Custom',
   props: ['companyId'],
@@ -90,6 +91,12 @@ export default {
       this.tableLoading = false
       if(res.code==200){
         this.tableData = res.rows
+        if(this.tableData&&this.tableData.length>0){
+          this.tableData.forEach(item => {
+            typeof item.projectInfo=='string' ? item.projectInfo = JSON.parse(item.projectInfo) : ''
+            item.amount ? item.amount = parseFloat(item.amount.toFixed(4)) : ''
+          })
+        }
       }
       this.tableDataTotal = res.total
     },

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

@@ -90,6 +90,12 @@ export default {
       this.tableLoading = false
       if(res.code==200){
         this.tableData = res.rows
+        if(this.tableData&&this.tableData.length>0){
+          this.tableData.forEach(item => {
+            typeof item.projectInfo=='string' ? item.projectInfo = JSON.parse(item.projectInfo) : ''
+            item.amount ? item.amount = parseFloat(item.amount.toFixed(4)) : ''
+          })
+        }
       }
       this.tableDataTotal = res.total
     },

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

@@ -51,7 +51,7 @@ export default {
       ],
       formData: [
         { type: 1, fieldName: 'hasBid', value: '', placeholder: '招标公告', options: [
-            {name:'不限',value:''},
+            {name:'不限',value:'noLimit'},
             {name:'有招标公告',value:1},
             {name:'无招标公告',value:0}
           ]
@@ -70,6 +70,9 @@ export default {
     async handleQuery(params) {
       this.tableLoading = true
       let param = params?params:this.queryParams
+      if(param.hasBid=='noLimit'){
+        delete param.hasBid
+      }
       let res = await affiliates(param)
       this.tableLoading = false
       if(res.code==200){

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

@@ -9,7 +9,7 @@
               <div class="operations-title">{{item.bratingSubjectLevel}}-<span>{{item.ratingDate}}</span></div>
               <div class="flex-box operations-info">
                 <div>{{item.bondType || '--'}}</div>
-                <span class="text-cl1"><img src="@/assets/images/detail/overview/oper_source.png">{{item.creditRatingAgency || '--'}}</span>
+                <span class="text-cl1" :title="item.creditRatingAgency"><img src="@/assets/images/detail/overview/oper_source.png">{{item.creditRatingAgency || '--'}}</span>
               </div>
             </div>
           </li>

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

 <template>
   <div class="app-container rela-container">
     <div class="common-title">关系企业</div>
-    <el-tabs v-model="activeName" @tab-click="handleQuery" class="tabpane selfTab">
+    <el-tabs v-model="activeName" @tab-click="handleClick" class="tabpane selfTab">
       <el-tab-pane label="股东" name="first"></el-tab-pane>
       <el-tab-pane label="对外投资" name="second"></el-tab-pane>
     </el-tabs>
     <div class="table-item">
-      <div class="rela-person" v-if="activeName=='first'">实际控制人：{{financial&&financial.actualController || '--'}}</div>
+      <div class="rela-person" v-show="activeName=='first'">实际控制人：{{financial&&financial.actualController || '--'}}</div>
       <el-table :data="holderData" border style="width: 100%" v-show="activeName=='first'">
         <el-table-column label="序号" width="55" align="left" fixed>
           <template slot-scope="scope">{{ holderParams.pageNum * holderParams.pageSize - holderParams.pageSize + scope.$index + 1 }}</template>
         </el-table-column>
         <el-table-column prop="stockName" min-width="140" label="股东名称"></el-table-column>
-        <el-table-column prop="shouldCapiConv" label="持股数量（亿）"></el-table-column>
-        <el-table-column label="持股比例">
+        <el-table-column prop="shouldCapiConv" label="应缴金额"></el-table-column>
+        <el-table-column prop="stockPercent" label="持股比例"></el-table-column>
+        <el-table-column prop="" label="法定代表人">
           <template slot-scope="scope">
-            <span>{{scope.row.stockPercent?parseFloat(Number(scope.row.stockPercent*100).toFixed(4))+'%':'--'}}</span>
+            <span>{{scope.row.corporatePerson || '--'}}</span>
           </template>
         </el-table-column>
-        <el-table-column label="法定代表人">
+        <el-table-column prop="" label="成立日期">
           <template slot-scope="scope">
-            <span>{{scope.row.corporatePerson || '--'}}</span>
+            <span>{{scope.row.registeredDate || '--'}}</span>
           </template>
         </el-table-column>
-        <el-table-column label="成立日期">
+        <el-table-column prop="" label="企业状态">
           <template slot-scope="scope">
-            <span>{{scope.row.registeredDate || '--'}}</span>
+            <span>{{scope.row.businessStatus || '--'}}</span>
           </template>
         </el-table-column>
       </el-table>
@@ -44,16 +45,16 @@
           </template>
         </el-table-column>
         <el-table-column prop="investOperName" label="法定代表人"></el-table-column>
-        <el-table-column prop="investRegistCapi" label="注册资本（万元）"></el-table-column>
-        <el-table-column prop="investStartDate" label="成立日期"></el-table-column>
-        <el-table-column prop="stockPercentage" label="股权占比">
+        <el-table-column label="注册资本">
           <template slot-scope="scope">
-            <span>{{scope.row.stockPercentage?parseFloat(Number(scope.row.stockPercentage*100).toFixed(4))+'%':'--'}}</span>
+            <span>{{scope.row.investRegistCapi || '--'}}</span>
           </template>
         </el-table-column>
+        <el-table-column prop="investStartDate" label="成立日期"></el-table-column>
+        <el-table-column prop="stockPercentage" label="股权占比"></el-table-column>
         <el-table-column prop="shouldCapi" label="认缴出资额（万元）"></el-table-column>
       </el-table>
-      <div class="rela-more" v-if="activeName=='second'&& shipTotal>shipParams.pageSize"><span class="a-link" @click="handlePath">查看更多数据 ></span></div>
+      <div class="rela-more" v-show="activeName=='second'&& shipTotal>shipParams.pageSize"><span class="a-link" @click="handlePath">查看更多数据 ></span></div>
     </div>
   </div>
 </template>
@@ -87,16 +88,35 @@ export default {
   },
   created() {
     this.handleQuery()
+    this.handleInvest()
   },
   mounted() {
   },
   methods: {
     async handleQuery(){
-      let res = this.activeName=='first'?await bestStockPage(this.holderParams):await investment(this.shipParams)
+      let res = await bestStockPage(this.holderParams)
       if(res.code==200){
-        this.activeName=='first'?this.holderData = res.rows:this.shipData = res.rows
+        if(res.rows&&res.rows.length>0){
+          res.rows.forEach(item => {
+            item.stockPercent?item.stockPercent = parseFloat(Number(item.stockPercent*100).toFixed(4))+'%':''
+          })
         }
-      this.activeName=='second'?this.shipTotal = res.total:''
+        this.holderData = res.rows
+      }
+    },
+    async handleInvest(){
+      let res = await investment(this.shipParams)
+      if(res.code==200){
+        if(res.rows&&res.rows.length>0){
+          res.rows.forEach(item => {
+            item.stockPercentage?item.stockPercentage = parseFloat(Number(item.stockPercentage*100).toFixed(4))+'%':''
+          })
+        }
+        this.shipData = res.rows
+        this.shipTotal = res.total
+      }
+    },
+    handleClick(){
     },
     handlePath(){
       changePath(this, 'overseas')

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

@@ -5,7 +5,7 @@
       <template v-if="zbggList.length>0">
         <div class="tender-item" v-for="(item, index) in zbggList" :key="index">
           <div class="flex-box tender-title"><div class="text-cl1" :title="item.projectName"><router-link :to="'/radar/Bidding/details/'+item.bid" tag="a" class="a-link">{{item.projectName}}</router-link></div><span :class="item.tenderStage=='项目动态'?'style2':item.tag=='招投标'?'style4':'style1'">{{item.tenderStage}}</span></div>
-          <span class="tender-time">{{item.contact}} {{item.issueTime}}</span>
+          <span class="tender-time">{{item.issueTime}}</span>
         </div>
       </template>
       <div class="tender-no-data" v-else>

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

@@ -24,6 +24,7 @@
         <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>
+          <span class="tag style1" v-if="scope.row.biddingAnnouncement">招标{{scope.row.biddingAnnouncement}}</span>
         </div>
       </template>
       <template slot="stockPercent" slot-scope="scope">
@@ -52,7 +53,7 @@ export default {
       forData: [
         {label: '发起人/股东', prop: 'stockName', minWidth: '230', slot: true},
         {label: '持股比例', prop: 'stockPercent', slot: true},
-        {label: '认缴出资（万）', prop: 'shouldCapiConv'},
+        {label: '认缴出资', prop: 'shouldCapiConv'},
         {label: '实缴出资额', prop: 'realCapi'},
         {label: '认缴出资日期', prop: 'conDate'},
         {label: '参股日期', prop: 'realCapiDate', width: '150'}

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

@@ -59,20 +59,20 @@ export default {
       forData: [
         {label: '被投资企业名称', prop: 'investName', minWidth: '180', slot: true},
         {label: '法定代表人', prop: 'investOperName'},
-        {label: '注册资本（万元）', prop: 'investRegistCapi'},
+        {label: '注册资本', prop: 'investRegistCapi'},
         {label: '成立日期', prop: 'investStartDate'},
         {label: '股权占比', prop: 'stockPercentage', slot: true, slotHeader: true, slotName: 'proportion'},
         {label: '认缴出资额（万元）', prop: 'shouldCapi'}
       ],
       formData: [
         { type: 1, fieldName: 'hasBid', value: '', placeholder: '招标公告', options: [
-          {name:'不限',value:''},
+          {name:'不限',value:'noLimit'},
           {name:'有招标公告',value:1},
           {name:'无招标公告',value:0}
           ]
         },
         { type: 1, fieldName: 'proportion', value: '', placeholder: '股权占比', options: [
-            {name:'不限',value:''},
+            {name:'不限',value:'noLimit'},
             {name:'100%',value:'1~1'},
             {name:'66.66%以上',value:'0.6666~1'},
             {name:'50%以上',value:'0.4~1'},
@@ -105,10 +105,15 @@ export default {
     handleSearch(){
       let params = this.formParams()
       if(params.proportion){
+        if(params.proportion!='noLimit'){
           params.stockPercentageMin = parseFloat(params.proportion.split('~')[0])
           params.stockPercentageMax = parseFloat(params.proportion.split('~')[1])
+        }
         delete params.proportion
       }
+      if(params.hasBid=='noLimit'){
+        delete params.hasBid
+      }
       params.pageNum = 1
       this.queryParams.pageNum = 1
       this.handleQuery(params)

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

@@ -21,8 +21,8 @@ export default {
   created() {
     if (this.$route.params.id) { // 获取companyId
       this.loading = true
-      this.src = `https://pre-plug.jiansheku.com/enterprise/${this.$route.params.id}?ak=${this.ak}`
-      // this.src = `http://192.168.60.30:3300/enterprise/${this.$route.params.id}?ak=aec7b3ff2y2q8x6t49a7e2c463ce21912`
+      // this.src = `https://pre-plug.jiansheku.com/enterprise/${this.$route.params.id}?ak=${this.ak}`
+      this.src = `http://192.168.60.30:3300/enterprise/${this.$route.params.id}?ak=${this.ak}`
     }
   },
   mounted() {