Commit 17645c41 authored by caixingbing's avatar caixingbing

*

parent 32579922
......@@ -99,7 +99,7 @@ export const constantRoutes = [
path: '/enterprise/:id',
component: () => import('@/views/detail/party-a/index'),
name: 'PartyA',
meta: { title: '甲方详情', icon: 'enterprise' },
meta: { title: '企业详情', icon: 'enterprise', noCache: false },
}
]
},
......@@ -113,7 +113,7 @@ export const constantRoutes = [
path: '/company/:id',
component: () => import('@/views/detail/party-b/index'),
name: 'Company',
meta: { title: '乙方详情' }
meta: { title: '企业详情' }
}
]
},
......@@ -127,7 +127,7 @@ export const constantRoutes = [
path: '/personnel/:id',
component: () => import('@/views/detail/party-b/index'),
name: 'Personnel',
meta: { title: '已方人员详情' }
meta: { title: '人员详情' }
}
]
},
......
......@@ -44,9 +44,9 @@
</template>
<!-- 输入框 -->
<template v-if="form.type==3">
<div class="cooperate-name">
<div class="cooperate-name" :id="'detailFocus'+i">
<el-input @focus="clickFocus('detailFocus'+i)" @blur="clickFocus('detailFocus'+i)" v-model="form.value" :placeholder="form.placeholder" :style="form.width?'width:'+form.width+'px':'width:180px'"></el-input>
<span :id="'detailFocus'+i" @click="changeSelect">搜索</span>
<span @click="changeSelect">搜索</span>
</div>
</template>
<!-- 多选 -->
......@@ -134,7 +134,7 @@ export default {
border-bottom: 1px solid #E1E1E1;
}
::v-deep .el-input__inner{
border: 1px solid #EFEFEF;
border: 0;
height: 32px;
line-height: 32px;
}
......@@ -174,6 +174,8 @@ export default {
}
.cooperate-name {
display: flex;
border-radius: 2px 0px 0px 2px;
border: 1px solid #D9D9D9;
span {
width: 60px;
height: 32px;
......@@ -186,10 +188,13 @@ export default {
border-left: 0;
cursor: pointer;
}
.span-ba{
color: #ffffff;
background: #0081FF;
&.span-ba{
border: 1px solid #0081FF;
span{
color: #ffffff;
background: #0081FF;
border: 1px solid #0081FF;
}
}
::v-deep .el-input{
flex: 1;
......
......@@ -11,7 +11,7 @@
v-model="form.value"
clearable
class="form-content-width"
style="max-width: 110px"
:style="form.width?'width:'+form.width+'px':'max-width: 110px'"
:placeholder="form.placeholder"
@change="changeSelect">
<el-option v-for="(item, index) in form.options" :key="index" :label="item.name" :value="item.value" />
......@@ -34,9 +34,9 @@
</template>
<!-- 输入框 -->
<template v-if="form.type==3">
<div class="cooperate-name">
<div class="cooperate-name" :id="'focus'+i">
<el-input clearable @clear="changeSelect" @focus="clickFocus('focus'+i)" @blur="clickFocus('focus'+i)" v-model="form.value" :placeholder="form.placeholder" :style="form.width?'width:'+form.width+'px':'width:180px'"></el-input>
<span :id="'focus'+i" @click="changeSelect">搜索</span>
<span @click="changeSelect">搜索</span>
</div>
</template>
<!-- 多选 -->
......@@ -208,6 +208,8 @@ export default {
}
.cooperate-name {
display: flex;
border-radius: 2px 0px 0px 2px;
border: 1px solid #D9D9D9;
span {
width: 60px;
height: 32px;
......@@ -220,17 +222,20 @@ export default {
border-left: 0;
cursor: pointer;
}
.span-ba{
color: #ffffff;
background: #0081FF;
&.span-ba{
border: 1px solid #0081FF;
span{
color: #ffffff;
background: #0081FF;
border: 1px solid #0081FF;
}
}
::v-deep .el-input{
flex: 1;
}
::v-deep .el-input__inner {
border-radius: 2px 0 2px 0;
border: 1px solid #D9D9D9;
border: 0;
border-right: 0;
}
}
......
<template>
<div class="header-container">
<div class="bread-crumb">
<!-- <div class="bread-crumb">
<el-breadcrumb separator="/">
<el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
<el-breadcrumb-item :to="{ path: fromPath }" v-if="fromName">{{fromName}}</el-breadcrumb-item>
<el-breadcrumb-item v-if="cooDetail"><el-link :underline="false" @click="cooperateList">合作情况</el-link></el-breadcrumb-item>
<!-- <el-breadcrumb-item :to="{ path: '/enterpriseData?tag=1' }">查企业</el-breadcrumb-item>-->
<el-breadcrumb-item>{{companyInfo.simpleName || companyInfo.companyName || '--'}}</el-breadcrumb-item>
&lt;!&ndash; <el-breadcrumb-item :to="{ path: '/enterpriseData?tag=1' }">查企业</el-breadcrumb-item>&ndash;&gt;
<el-breadcrumb-item>{{companyInfo.simpleName || companyInfo.companyName || '&#45;&#45;'}}</el-breadcrumb-item>
</el-breadcrumb>
</div>
</div>-->
<div class="flex-box part-header">
<img class="header-logo" :src="companyInfo.logoUrl || require('@/assets/images/detail/company_logo.png')">
{{companyInfo.companyName || '--'}}
......@@ -19,7 +19,7 @@
<script>
export default {
name: 'Header',
props: ['companyId', 'companyInfo', 'fromPath', 'fromName', 'cooDetail'],
props: ['companyId', 'companyInfo', 'cooDetail'],
data() {
return {
}
......
......@@ -21,7 +21,7 @@
@sort-change="sortChange"
>
<template slot="agency" slot-scope="scope">
<router-link :to="`/enterprise/${encodeStr(scope.row.agencyId)}`" tag="a" class="a-link" v-if="scope.row.agencyId&&scope.row.agency" v-html="scope.row.agency"></router-link>
<router-link :to="scope.row.uipId?`/enterprise/${encodeStr(scope.row.agencyId)}`:`/company/${encodeStr(scope.row.agencyId)}`" tag="a" class="a-link" v-if="scope.row.agencyId&&scope.row.agency" v-html="scope.row.agency"></router-link>
<div v-else v-html="scope.row.agency || '--'"></div>
</template>
<template slot="projectInfo" slot-scope="scope">
......
......@@ -21,7 +21,7 @@
@sort-change="sortChange"
>
<template slot="companyName" slot-scope="scope">
<router-link :to="`/enterprise/${encodeStr(scope.row.projectUnitId)}`" tag="a" class="a-link" v-if="scope.row.projectUnitId&&scope.row.companyName" v-html="scope.row.companyName"></router-link>
<router-link :to="scope.row.uipId?`/enterprise/${encodeStr(scope.row.projectUnitId)}`:`/company/${encodeStr(scope.row.projectUnitId)}`" tag="a" class="a-link" v-if="scope.row.projectUnitId&&scope.row.companyName" v-html="scope.row.companyName"></router-link>
<div v-else v-html="scope.row.companyName || '--'"></div>
</template>
<template slot="projectAllName" slot-scope="scope">
......
......@@ -26,7 +26,7 @@
<div v-else v-html="scope.row.projectAllName || '--'"></div>
</template>
<template slot="companyName" slot-scope="scope">
<router-link :to="`/enterprise/${encodeStr(scope.row.companyId)}`" tag="a" class="a-link" v-if="scope.row.companyId&&scope.row.companyName">{{ scope.row.companyName }}</router-link>
<router-link :to="scope.row.uipId?`/enterprise/${encodeStr(scope.row.companyId)}`:`/company/${encodeStr(scope.row.companyId)}`" tag="a" class="a-link" v-if="scope.row.companyId&&scope.row.companyName">{{ scope.row.companyName }}</router-link>
<div v-else>{{ scope.row.companyName || '--' }}</div>
</template>
</tables>
......
......@@ -21,7 +21,7 @@
@sort-change="sortChange"
>
<template slot="companyName" slot-scope="scope">
<router-link :to="`/enterprise/${encodeStr(scope.row.companyId)}`" tag="a" class="a-link" v-if="scope.row.companyId&&scope.row.companyName" v-html="scope.row.companyName"></router-link>
<router-link :to="scope.row.uipId?`/enterprise/${encodeStr(scope.row.companyId)}`:`/company/${encodeStr(scope.row.companyId)}`" tag="a" class="a-link" v-if="scope.row.companyId&&scope.row.companyName" v-html="scope.row.companyName"></router-link>
<div v-else v-html="scope.row.companyName || '--'"></div>
</template>
<template slot="projectAllName" slot-scope="scope">
......
<template>
<div class="app-container part-container">
<Header :company-id="companyId" :companyInfo="companyInfo" :fromPath="fromPath" :fromName="fromName" :cooDetail="cooDetail" v-if="companyId" @close-detail="closeDetail" />
<Header :company-id="companyId" :companyInfo="companyInfo" :cooDetail="cooDetail" v-if="companyId" @close-detail="closeDetail" />
<div class="flex-box part-main">
<div class="part-left">
<side-bar @currentPath="showPartPage" :pathName="currentPath.pathName" :partBoxHeight="partBoxHeight" :customerId="customerId" />
......@@ -148,15 +148,16 @@ export default {
pathName: 'overview' //默认展示页
},
partBoxHeight: null,
fromPath: '',
fromName: '',
cooDetail: false
}
},
computed: {
routes() {
return this.$store.state.permission.routes
}
},
beforeRouteEnter(to, from, next) {
next(vm => {
vm.fromPath = from.path
vm.fromName = from.meta.title
if(from.name == 'CustomList'){
if (to.query.path){
vm.currentPath.pathName = to.query.path
......@@ -177,8 +178,7 @@ export default {
}
},
mounted() {
},
activated(){
console.log('进入了mounted')
},
methods: {
showPartPage(e){
......
......@@ -23,11 +23,11 @@
<div v-else v-html="scope.row.projectName || '--'"></div>
</template>
<template slot="tenderee" slot-scope="scope">
<router-link :to="`/enterprise/${encodeStr(scope.row.tendereeId)}`" tag="a" class="a-link" v-if="scope.row.tendereeId&&scope.row.tenderee " v-html="scope.row.tenderee"></router-link>
<router-link :to="scope.row.uipId?`/enterprise/${encodeStr(scope.row.tendereeId)}`:`/company/${encodeStr(scope.row.tendereeId)}`" tag="a" class="a-link" v-if="scope.row.tendereeId&&scope.row.tenderee " v-html="scope.row.tenderee"></router-link>
<div v-else v-html="scope.row.tenderee || '--'"></div>
</template>
<template slot="agency" slot-scope="scope">
<router-link :to="`/enterprise/${encodeStr(scope.row.agencyId)}`" tag="a" class="a-link" v-if="scope.row.agencyId&&scope.row.agency " v-html="scope.row.agency"></router-link>
<router-link :to="scope.row.uipId?`/enterprise/${encodeStr(scope.row.agencyId)}`:`/company/${encodeStr(scope.row.agencyId)}`" tag="a" class="a-link" v-if="scope.row.agencyId&&scope.row.agency " v-html="scope.row.agency"></router-link>
<div v-else v-html="scope.row.agency || '--'"></div>
</template>
<template slot="province" slot-scope="scope">
......
......@@ -19,7 +19,7 @@
@handle-current-change="handleCurrentChange"
>
<template slot="name" slot-scope="scope">
<router-link :to="`/enterprise/${encodeStr(scope.row.id)}`" tag="a" class="a-link" v-if="scope.row.id&&scope.row.name " v-html="scope.row.name"></router-link>
<router-link :to="scope.row.uipId?`/enterprise/${encodeStr(scope.row.id)}`:`/company/${encodeStr(scope.row.id)}`" 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>
......
......@@ -84,7 +84,7 @@ export default {
{ name: '经营范围', prop: 'scope', style: true }
],
forData: [
{label: '变更日期', prop: 'changeDate', width: '90'},
{label: '变更日期', prop: 'changeDate', width: '100'},
{label: '变更事项', prop: 'type'},
{label: '变更前', prop: 'beforeContent'},
{label: '变更后', prop: 'afterContent'}
......
......@@ -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)">近七天</div>
<div :class="{'on':datatype==2}" @click="getDT(2)">近三十天</div>
<div :class="{'on':datatype==1}" @click="getDT(1)">近五</div>
</div>
</div>
<div id="myEcharts" style="width: 100%;height:250px; margin: 0 auto;"></div>
......@@ -61,7 +61,7 @@
prop="companyName"
label="公司名称">
<template slot-scope="scope">
<router-link :to="`/company/${encodeStr(scope.row.companyId)}`" tag="a" class="a-link">{{ scope.row.companyName }}</router-link>
<router-link :to="scope.row.uipId?`/enterprise/${encodeStr(scope.row.companyId)}`:`/company/${encodeStr(scope.row.companyId)}`" tag="a" class="a-link">{{ scope.row.companyName }}</router-link>
</template>
</el-table-column>
<el-table-column
......@@ -168,9 +168,7 @@ export default {
containLabel: true
},
tooltip:{
axisPointer:{ //悬浮于圆点展示标签
type:'axis'
},
trigger: 'axis',
borderWidth:0,
backgroundColor:"rgba(255, 255, 255, 0.8)",
formatter: '{a}<br/>{c}',
......@@ -266,15 +264,14 @@ export default {
margin-top: 35px;
font-size: 14px;
.labels{
width: 120px;
height: 22px;
position: absolute;
border-radius: 2px;
right: 0;
top: 2px;
>div{
width: 40px;
height: 100%;
padding: 0 12px;
text-align: center;
line-height: 22px;
float: left;
......
......@@ -171,7 +171,6 @@ export default {
created() {
},
mounted() {
this.getClaimStatus() //获取企业认领状态
this.handleWidth() //企业背景是否收起
this.companySwiper() //swiper滚动板块
},
......@@ -292,6 +291,7 @@ export default {
companyInfo(newVal, oldVal) {
this.getCompanyInfo() //处理曾用名
this.handleWidth()
this.getClaimStatus() //获取企业认领状态
},
statistic(newVal, oldVal) {
this.handleStatistic()
......
......@@ -13,7 +13,7 @@
</el-table-column>
<el-table-column min-width="140" label="股东名称">
<template slot-scope="scope">
<router-link :to="`/enterprise/${encodeStr(scope.row.stockId)}`" tag="a" class="a-link" v-if="scope.row.stockId&&scope.row.stockName" v-html="scope.row.stockName"></router-link>
<router-link :to="scope.row.uipId?`/enterprise/${encodeStr(scope.row.stockId)}`:`/company/${encodeStr(scope.row.stockId)}`" 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>
</template>
</el-table-column>
......@@ -41,7 +41,7 @@
</el-table-column>
<el-table-column min-width="140" label="被投资企业名称">
<template slot-scope="scope">
<router-link :to="`/enterprise/${encodeStr(scope.row.id)}`" tag="a" class="a-link" v-if="scope.row.id&&scope.row.investName" v-html="scope.row.investName"></router-link>
<router-link :to="scope.row.uipId?`/enterprise/${encodeStr(scope.row.id)}`:`/company/${encodeStr(scope.row.id)}`" 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" :class="labelArr.includes(scope.row.businessStatus)?'style2':'style1'" v-if="scope.row.businessStatus">{{scope.row.businessStatus}}</span>
......
......@@ -4,8 +4,8 @@
<div class="common-title">招标公告</div>
<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/Notice/details/'+item.bid" tag="a" class="a-link">{{item.projectName}}</router-link></div><span :class="item.projectCategory=='项目动态'?'style2':item.tag=='招投标'?'style4':'style1'">{{item.projectCategory}}</span></div>
<span class="tender-time">{{item.issueTime}}</span>
<div class="flex-box tender-title"><div class="text-cl1" :title="item.projectName"><router-link :to="'/radar/Notice/details/'+item.bid" tag="a" class="a-link">{{item.projectName}}</router-link></div><span :class="item.projectCategory=='项目动态'?'style2':item.tag=='招投标'?'style4':'style1'" v-if="item.projectCategory">{{item.projectCategory}}</span></div>
<span class="tender-time"><span @click="handleUrl(item.url)" style="cursor: pointer;">{{item.dataSource}}</span> {{item.issueTime}}</span>
</div>
</template>
<div class="tender-no-data" v-else>
......@@ -88,6 +88,11 @@ export default {
if(namic.code==200){
this.trendList = namic.rows
}
},
handleUrl(url){
if(url){
window.open(url, "_blank")
}
}
}
}
......
......@@ -11,9 +11,23 @@
:tableLoading="tableLoading"
:tableData="tableData"
:forData="forData"
:isIndex="false"
:queryParams="queryParams"
:paging="false"
/>
>
<template slot="serial" slot-scope="scope">
<span>{{scope.row.serial}}</span>
</template>
<template slot="serials" slot-scope="scope">
<span>{{scope.row.userNames?scope.row.serials:''}}</span>
</template>
<template slot="userNames" slot-scope="scope">
<span>{{scope.row.userNames || ''}}</span>
</template>
<template slot="userJobs" slot-scope="scope">
<span>{{scope.row.userJobs || ''}}</span>
</template>
</tables>
</div>
</template>
......@@ -32,8 +46,12 @@ export default {
pageSize: 100
},
forData: [
{label: '姓名', prop: 'name'},
{label: '职位', prop: 'jobTitle'}
{label: '序号', prop: 'serial', width:55, slot: true},
{label: '姓名', prop: 'userName'},
{label: '职位', prop: 'userJob'},
{label: '序号', prop: 'serials', width:55, slot: true},
{label: '姓名', prop: 'userNames', slot: true},
{label: '职位', prop: 'userJobs', slot: true}
],
formData: [],
//列表
......@@ -52,7 +70,22 @@ export default {
let res = await keymembers(param)
this.tableLoading = false
if(res.code==200){
this.tableData = res.rows
let tempRows = []
if(res.rows&&res.rows.length>0){
let arrLength = res.rows.length%2==0?(res.rows.length/2):(Math.floor(res.rows.length/2)+1)
for(let i=0; i<arrLength; i++){
let obj = {
serial: 2*i+1,
userName:res.rows[2*i]?res.rows[2*i].name:'',
userJob:res.rows[2*i]?res.rows[2*i].jobTitle:'',
serials: 2*i+2,
userNames:res.rows[2*i+1]?res.rows[2*i+1].name:'',
userJobs:res.rows[2*i+1]?res.rows[2*i+1].jobTitle:''
}
tempRows.push(obj)
}
}
this.tableData = tempRows
}
this.tableDataTotal = res.total
}
......
......@@ -20,7 +20,7 @@
@handle-current-change="handleCurrentChange"
>
<template slot="stockName" slot-scope="scope">
<router-link :to="`/enterprise/${encodeStr(scope.row.stockId)}`" tag="a" class="a-link" v-if="scope.row.stockId&&scope.row.stockName " v-html="scope.row.stockName"></router-link>
<router-link :to="scope.row.uipId?`/enterprise/${encodeStr(scope.row.stockId)}`:`/company/${encodeStr(scope.row.stockId)}`" 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" :class="labelArr.includes(scope.row.businessStatus)?'style2':'style1'" v-if="scope.row.businessStatus">{{scope.row.businessStatus}}</span>
......
......@@ -19,7 +19,7 @@
@handle-current-change="handleCurrentChange"
>
<template slot="investName" slot-scope="scope">
<router-link :to="`/enterprise/${encodeStr(scope.row.id)}`" tag="a" class="a-link" v-if="scope.row.id&&scope.row.investName " v-html="scope.row.investName"></router-link>
<router-link :to="scope.row.uipId?`/enterprise/${encodeStr(scope.row.id)}`:`/company/${encodeStr(scope.row.id)}`" 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" :class="labelArr.includes(scope.row.businessStatus)?'style2':'style1'" v-if="scope.row.businessStatus">{{scope.row.businessStatus}}</span>
......@@ -69,7 +69,8 @@ export default {
{name:'不限',value:'noLimit'},
{name:'有招标公告',value:1},
{name:'无招标公告',value:0}
]
],
width: 130
},
{ type: 1, fieldName: 'proportion', value: '', placeholder: '股权占比', options: [
{name:'不限',value:'noLimit'},
......@@ -79,7 +80,8 @@ export default {
{name:'33.33%以上',value:'0.3333~1'},
{name:'25%以上',value:'0.25~1'},
{name:'不到5%',value:'0~0.05'}
]
],
width: 130
}
],
//列表
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment