Skip to content

D
dsk-cr20g
Commit 96cce16c authored by zhangyi's avatar zhangyi
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents cc62290f 2cbc5db4
Hide whitespace changes
Inline Side-by-side
Showing with 963 additions and 196 deletions
dsk-operate-ui/src/api/enterpriseData/enterpriseData.js
View file @ 96cce16c
...@@ -51,7 +51,17 @@ let claim= function claim(param) { ...@@ -51,7 +51,17 @@ let claim= function claim(param) {
data: param data: param
}) })
} }
// 查建筑企业
let enterprisePage= function enterprisePage(param) {
return request({
url: '/enterprise/page',
method: 'post',
data: param
})
}
export default {aptitudeCode,personCert,searchDic,regionWebList,uipGroupData,uipSerach,claim} export default {aptitudeCode,personCert,searchDic,regionWebList,uipGroupData,uipSerach,claim,enterprisePage}
\ No newline at end of file \ No newline at end of file
dsk-operate-ui/src/assets/styles/public.css
View file @ 96cce16c
...@@ -463,21 +463,6 @@ select { ...@@ -463,21 +463,6 @@ select {
display: inline-block; display: inline-block;
} }
.viewlist-el-popover .pup_list li .VIP {
width: 24px;
height: 12px;
top: 0px;
right: -8px;
position: absolute;
}
.viewlist-el-popover .pup_list li .SVIP {
width: 24px;
height: 12px;
top: 0px;
right: -10px;
position: absolute;
}
.viewlist-el-popover .pup_list li:hover { .viewlist-el-popover .pup_list li:hover {
color: #0081FF; color: #0081FF;
...@@ -725,3 +710,365 @@ select { ...@@ -725,3 +710,365 @@ select {
.checkbox .checkbox-content .checkbox-content-qx{ .checkbox .checkbox-content .checkbox-content-qx{
margin-right: 30px; margin-right: 30px;
} }
.toolbar-right-search {
margin-left: 16px;
}
.bottomlist-title-left{
display: inline-flex;
align-items: center;
}
.toolbar-right-search .toolbar-right_input {
width: 228px;
display: inline-flex;
align-items: center;
}
.toolbar-right-search .el-input__inner {
width: 228px;
height: 32px;
line-height: 32px;
}
.toolbar-right-search .el-input .el-input__inner {
border-top-right-radius: 0;
border-bottom-right-radius: 0;
border-right: none;
height: 32px;
line-height: 32px;
}
.toolbar-right-search .el-input-group__append{
padding: 0;
}
.toolbar-right-search .result-search {
height: 32px;
line-height: 32px;
}
.toolbar-right-search .toolbar-right-search .el-input .el-input__inner {
border-top-right-radius: 0;
border-bottom-right-radius: 0;
border-right: none;
height: 32px;
line-height: 32px;
}
.toolbar-right-search .result-search {
width: 80px;
height: 32px;
background: #0081FF;
border-top-right-radius: 2px;
border-bottom-right-radius: 2px;
text-align: center;
line-height: 32px;
padding: 0;
cursor: pointer;
color: #fff;
}
.toolbar-right-search .result-search:hover {
background: #0074E5;
}
.info-list {
display: flex;
/* width: 1200px; */
margin: auto;
background: #fff;
padding: 24px 0px;
border-bottom: 1px solid #EFEFEF;
/* cursor: pointer; */
}
.info-list:hover {
background: #F5FAFF;
}
.info-list .info-list-left {
width: 128px;
display: flex;
justify-content: center;
align-items: flex-start;
}
.info-list .info-list-right {
width: auto;
}
.info-list-left img {
width: 96px;
height: 96px;
}
.info-list-left .list-left-titel {
width: 78px;
height: 78px;
line-height: 78px;
border-radius: 4px 4px 4px 4px;
text-align: center;
color: #fff;
font-size: 32px;
}
.info-list-right .card-right-title {
display: flex;
align-items: center;
line-height: 18px;
/* cursor: pointer; */
}
.info-list-right .card-right-title .card-right-img {
width: 14px;
height: 14px;
margin-right: 2px;
margin-top: 2px;
}
.info-list-right .card-right-title .right-title-black {
display: inline-block;
font-weight: 400;
color: #333333;
margin-right: 24px;
}
.info-list-right .card-right-title .right-title-black-640 {
max-width: 640px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.info-list-right .card-right-title .right-title-blue {
font-weight: 400;
color: #0081FF;
margin-right: 24px;
cursor: pointer;
}
.info-list-right .card-right-title .right-title-grey {
font-weight: 400;
color: #999999;
}
.info-list-right .card-right-title .right-title-blue .blue {
color: #0081FF;
margin-right: 12px;
}
.info-list-right .card-right-title .right-title-blue .black {
color: #333333;
margin-right: 12px;
}
.info-list-right .card-right-title .right-title-blue .grey {
color: #999999;
margin-right: 12px;
}
/* 标题 */
.info-list-right .card-right-title .title {
font-size: 18px;
font-weight: bold;
color: #333333;
margin-right: 12px;
line-height: 24px;
cursor: pointer;
padding: 0;
}
.info-list-right .card-right-title .right-title-caption {
font-size: 18px;
font-weight: bold;
color: #333333;
margin-right: 12px;
line-height: 24px;
cursor: pointer;
/* height: 24px; */
}
/* 地区标签 */
.info-list-right .card-right-title .region {
display: inline-block;
border-radius: 2px 2px 2px 2px;
border: 1px solid #099D4B;
display: inline-block;
text-align: center;
font-size: 12px;
line-height: 22px;
padding: 0 16px;
background: #F3F3FF;
color: #8491E8;
margin-right: 8px;
}
/* 曾用名 */
.info-list-right .card-right-title .formername {
display: inline-block;
border-radius: 2px 2px 2px 2px;
display: inline-block;
text-align: center;
font-size: 12px;
line-height: 22px;
padding: 0 16px;
background: #EEEEEE;
color: #838383;
margin-right: 8px;
}
/* 正向标签 */
.info-list-right .card-right-title .positive {
border-radius: 2px 2px 2px 2px;
display: inline-block;
text-align: center;
font-size: 12px;
line-height: 22px;
height: 22px;
padding: 0 16px;
color: #54BC7E;
background-color: #ECF6E7;
margin-right: 8px;
}
/* 中性标签 */
.info-list-right .card-right-title .neutral {
display: inline-block;
border-radius: 2px 2px 2px 2px;
display: inline-block;
text-align: center;
font-size: 12px;
line-height: 22px;
padding: 0 16px;
background: #E4F3FD;
color: #41A1FD;
margin-right: 8px;
}
.info-list-right .card-right-title .neutral1 {
margin-bottom: 8px;
}
/* 警示标签 */
.info-list-right .card-right-title .warning {
display: inline-block;
border-radius: 2px 2px 2px 2px;
display: inline-block;
text-align: center;
font-size: 12px;
line-height: 22px;
padding: 0 16px;
background: #FFF3F3;
color: #FD5757;
margin-right: 8px;
}
/* 其它紫色 */
.info-list-right .card-right-title .purple {
display: inline-block;
border-radius: 2px 2px 2px 2px;
display: inline-block;
text-align: center;
font-size: 12px;
line-height: 22px;
padding: 0 16px;
background: #FCF3FF;
color: #B589DB;
margin-right: 8px;
}
/*地区淡蓝色 */
.info-list-right .card-right-title .cityblue {
display: inline-block;
border-radius: 2px 2px 2px 2px;
display: inline-block;
text-align: center;
font-size: 12px;
line-height: 22px;
padding: 0 16px;
background: #F3F3FF;
color: #8491E8;
margin-right: 8px;
}
/* 工程用途 */
.info-list-right .card-right-title .purposeStr {
display: inline-block;
border-radius: 2px 2px 2px 2px;
display: inline-block;
text-align: center;
font-size: 12px;
line-height: 22px;
padding: 0 16px;
background: #E3F6F8;
color: #44BCC4;
margin-right: 8px;
}
/* 荣誉奖项 */
.info-list-right .card-right-title .honoraryaward {
display: inline-block;
border-radius: 2px 2px 2px 2px;
display: inline-block;
text-align: center;
font-size: 12px;
line-height: 22px;
padding: 0 16px;
background: #FFF1DC;
color: #BFA061;
margin-right: 8px;
}
.info-list-right .card-right-title .honoraryaward .color-0 {
background: #E4F3FD;
color: #41A1FD;
}
.info-list-right .card-right-title .honoraryaward .color-1 {
background: #FFF1DC;
color: #BFA061;
}
.info-list-right .card-right-title .honoraryaward .color-2 {
background: #E3F6F8;
color: #44BCC4;
}
.info-list-right .card-right-title .honoraryaward .color-3 {
background: #F3F3FF;
color: #8491E8;
}
.info-list-right .card-right-title .honoraryaward .color-4 {
background: #FCF3FF;
color: #B589DB;
}
.info-list-right .card-right-title .honoraryaward .color-5 {
background: #E4F3FD;
color: #41A1FD;
}
.info-list-right .card-right-title .honoraryaward .color-6 {
background: #FFF1DC;
color: #BFA061;
}
.info-list-right .card-right-title .honoraryaward .color-7 {
background: #E3F6F8;
color: #44BCC4;
}
.info-list-right .card-right-title .honoraryaward .color-8 {
background: #F3F3FF;
color: #8491E8;
}
.info-list-right .card-right-title .honoraryaward .color-9 {
background: #FCF3FF;
color: #B589DB;
}
dsk-operate-ui/src/router/index.js
View file @ 96cce16c
...@@ -107,17 +107,30 @@ export const constantRoutes = [ ...@@ -107,17 +107,30 @@ export const constantRoutes = [
path: '/company', path: '/company',
component: Layout, component: Layout,
hidden: true, hidden: true,
name: 'Company',
redirect: 'noredirect', redirect: 'noredirect',
children: [ children: [
{ {
path: '/company/:id', path: '/company/:id',
component: () => import('@/views/detail/party-b/index'), component: () => import('@/views/detail/party-b/index'),
name: 'PartyB', name: 'Company',
meta: { title: '已方详情' } meta: { title: '已方详情' }
} }
] ]
}, },
{
path: '/personnel',
component: Layout,
hidden: true,
redirect: 'noredirect',
children: [
{
path: '/personnel/:id',
component: () => import('@/views/detail/party-b/index'),
name: 'Personnel',
meta: { title: '已方人员详情' }
}
]
},
{ {
path: '/structure', path: '/structure',
component: Layout, component: Layout,
......
dsk-operate-ui/src/views/custom/customList/index.vue
View file @ 96cce16c
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
</div> </div>
<div class="table_search"> <div class="table_search">
<div class="searchInput"> <div class="searchInput">
<el-input type="text" v-model="searchParam.companyName" placeholder="输入企业名称查询"></el-input> <el-input type="text" clearable v-model="searchParam.companyName" placeholder="输入企业名称查询"></el-input>
<div class="btn" @click="handleCurrentChange(1)">搜索</div> <div class="btn" @click="handleCurrentChange(1)">搜索</div>
</div> </div>
<div class="dc"> <div class="dc">
...@@ -120,7 +120,10 @@ ...@@ -120,7 +120,10 @@
prop="isMajor" prop="isMajor"
label="局级大客户" width="88"> label="局级大客户" width="88">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.isMajor">
{{scope.row.isMajor == 1?"是":"否"}} {{scope.row.isMajor == 1?"是":"否"}}
</span>
<span v-else>--</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -219,7 +222,7 @@ ...@@ -219,7 +222,7 @@
<el-input type="text" placeholder="请输入" v-model="queryParam.creditCode"></el-input> <el-input type="text" placeholder="请输入" v-model="queryParam.creditCode"></el-input>
</el-form-item> </el-form-item>
<div class="popbot"> <div class="popbot">
<div class="wordprimary">前往城投平台寻找客户线索></div> <div class="wordprimary" @click="toct">前往城投平台寻找客户线索></div>
<div class="btn btn_cancel h32" @click="resetForm('ruleForm')">返回</div> <div class="btn btn_cancel h32" @click="resetForm('ruleForm')">返回</div>
<div class="btn btn_primary h32" @click="submitForm('ruleForm')">添加</div> <div class="btn btn_primary h32" @click="submitForm('ruleForm')">添加</div>
</div> </div>
...@@ -297,6 +300,9 @@ export default { ...@@ -297,6 +300,9 @@ export default {
this.prvinceTree() this.prvinceTree()
}, },
methods:{ methods:{
toct(){
this.$router.push({path:'/macro/urban'})
},
getDictType(){ getDictType(){
//获取客户等级 //获取客户等级
getDictType('customer_level_type').then(result=>{ getDictType('customer_level_type').then(result=>{
...@@ -543,4 +549,7 @@ export default { ...@@ -543,4 +549,7 @@ export default {
padding-right: 26px; padding-right: 26px;
} }
} }
.app-container{
height: auto;
}
</style> </style>
dsk-operate-ui/src/views/detail/party-a/component/Sidebar.vue
View file @ 96cce16c
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
</el-input> </el-input>
<el-menu <el-menu
ref="sideMenu" ref="sideMenu"
:unique-opened="true"
:default-active="routeIndex" :default-active="routeIndex"
class="detail-menu" class="detail-menu"
@open="handleOpen"> @open="handleOpen">
......
dsk-operate-ui/src/views/detail/party-a/cooperate/index.vue
View file @ 96cce16c
...@@ -86,17 +86,17 @@ ...@@ -86,17 +86,17 @@
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="项目阶段：" prop="projectStage"> <el-form-item label="项目阶段：" prop="projectStage">
<el-select v-model="addParam.projectStage" style="width: 100%" class="form-content-width" placeholder="请选择项目状态"> <el-select v-model="addParam.projectStage" style="width: 100%" class="form-content-width" placeholder="请选择项目阶段">
<el-option v-for="(item, index) in projectStage" :key="index" :label="item.dictLabel" :value="item.dictValue" /> <el-option v-for="(item, index) in projectStage" :key="index" :label="item.dictLabel" :value="item.dictValue" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="项目类型：" prop="projectType"> <el-form-item label="项目类型：" prop="projectType">
<el-select v-model="addParam.projectType" style="width: 100%" class="form-content-width" placeholder="请选择项目阶段"> <el-select v-model="addParam.projectType" style="width: 100%" class="form-content-width" placeholder="请选择项目类型">
<el-option v-for="(item, index) in projectType" :key="index" :label="item.dictLabel" :value="item.dictValue" /> <el-option v-for="(item, index) in projectType" :key="index" :label="item.dictLabel" :value="item.dictValue" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="项目类别：" prop="projectCategory"> <el-form-item label="项目类别：" prop="projectCategory">
<el-select v-model="addParam.projectCategory" style="width: 100%" class="form-content-width" placeholder="请选择项目阶段"> <el-select v-model="addParam.projectCategory" style="width: 100%" class="form-content-width" placeholder="请选择项目类别">
<el-option v-for="(item, index) in projectCategory" :key="index" :label="item.dictLabel" :value="item.dictValue" /> <el-option v-for="(item, index) in projectCategory" :key="index" :label="item.dictLabel" :value="item.dictValue" />
</el-select> </el-select>
</el-form-item> </el-form-item>
......
dsk-operate-ui/src/views/detail/party-a/overview/branch.vue
View file @ 96cce16c
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<div v-else v-html="scope.row.name || '--'"></div> <div v-else v-html="scope.row.name || '--'"></div>
<div class="tags" v-if="scope.row.status || scope.row.biddingAnnouncement"> <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.status">{{scope.row.status}}</span>
<span class="tag style1" v-if="scope.row.biddingAnnouncement">招标数{{scope.row.biddingAnnouncement}}</span> <span class="tag style1" v-if="scope.row.biddingCount">招标数{{scope.row.biddingCount}}</span>
</div> </div>
</template> </template>
</tables> </tables>
......
dsk-operate-ui/src/views/detail/party-a/overview/component/relationship.vue
View file @ 96cce16c
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<div v-else v-html="scope.row.investName || '--'"></div> <div v-else v-html="scope.row.investName || '--'"></div>
<div class="tags" v-if="scope.row.businessStatus || scope.row.biddingAnnouncement"> <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.businessStatus">{{scope.row.businessStatus}}</span>
<span class="tag style1" v-if="scope.row.biddingAnnouncement">招标数{{scope.row.biddingAnnouncement}}</span> <span class="tag style1" v-if="scope.row.biddingCount">招标数{{scope.row.biddingCount}}</span>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
......
dsk-operate-ui/src/views/detail/party-a/overview/holderinfo.vue
View file @ 96cce16c
...@@ -24,7 +24,9 @@ ...@@ -24,7 +24,9 @@
<div v-else v-html="scope.row.stockName || '--'"></div> <div v-else v-html="scope.row.stockName || '--'"></div>
<div class="tags" v-if="scope.row.businessStatus"> <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.businessStatus">{{scope.row.businessStatus}}</span>
<span class="tag style1" v-if="scope.row.biddingAnnouncement">招标{{scope.row.biddingAnnouncement}}</span> <span class="tag style1" v-if="scope.row.biddingCount">招标{{scope.row.biddingCount}}</span>
<span class="tag style1" v-if="scope.row.landInfoCount">土地{{scope.row.landInfoCount}}</span>
<span class="tag style1" v-if="scope.row.proposedProjectCount">拟建{{scope.row.proposedProjectCount}}</span>
</div> </div>
</template> </template>
<template slot="stockPercent" slot-scope="scope"> <template slot="stockPercent" slot-scope="scope">
......
dsk-operate-ui/src/views/detail/party-a/overview/overseas.vue
View file @ 96cce16c
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<div v-else v-html="scope.row.investName || '--'"></div> <div v-else v-html="scope.row.investName || '--'"></div>
<div class="tags" v-if="scope.row.businessStatus || scope.row.biddingAnnouncement"> <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.businessStatus">{{scope.row.businessStatus}}</span>
<span class="tag style1" v-if="scope.row.biddingAnnouncement">招标数{{scope.row.biddingAnnouncement}}</span> <span class="tag style1" v-if="scope.row.biddingCount">招标数{{scope.row.biddingCount}}</span>
</div> </div>
</template> </template>
<template slot="proportion"> <template slot="proportion">
...@@ -75,9 +75,9 @@ export default { ...@@ -75,9 +75,9 @@ export default {
{name:'不限',value:'noLimit'}, {name:'不限',value:'noLimit'},
{name:'100%',value:'1~1'}, {name:'100%',value:'1~1'},
{name:'66.66%以上',value:'0.6666~1'}, {name:'66.66%以上',value:'0.6666~1'},
{name:'50%以上',value:'0.4~1'}, {name:'50%以上',value:'0.5~1'},
{name:'33.33%以上',value:'0.3333~1'}, {name:'33.33%以上',value:'0.3333~1'},
{name:'25%以上',value:'0.05~0.25'}, {name:'25%以上',value:'0.25~1'},
{name:'不到5%',value:'0~0.05'} {name:'不到5%',value:'0~0.05'}
] ]
} }
......
dsk-operate-ui/src/views/detail/party-a/urbanLnvestment/regionalEconomies.vue
View file @ 96cce16c
...@@ -94,6 +94,10 @@ export default { ...@@ -94,6 +94,10 @@ export default {
prop: 'industryTotalValue', prop: 'industryTotalValue',
label: '工业总产值（亿元）', label: '工业总产值（亿元）',
}, },
{
prop: 'fixedInvestment',
label: '固定资产投资（亿元）',
},
{ {
prop: 'realEstateInvestment', prop: 'realEstateInvestment',
label: '房地产开发投资（亿元）', label: '房地产开发投资（亿元）',
...@@ -291,9 +295,9 @@ export default { ...@@ -291,9 +295,9 @@ export default {
} }
} }
::v-deep .el-table__body-wrapper tr:nth-child(2) td:first-child, ::v-deep .el-table__body-wrapper tr:nth-child(2) td,
::v-deep .el-table__body-wrapper tr:nth-child(16) td:first-child, ::v-deep .el-table__body-wrapper tr:nth-child(17) td,
::v-deep .el-table__body-wrapper tr:nth-child(28) td:first-child{ ::v-deep .el-table__body-wrapper tr:nth-child(29) td{
font-weight: bold; font-weight: bold;
color: #232323; color: #232323;
} }
......
dsk-operate-ui/src/views/detail/party-a/urbanLnvestment/sameRegion.vue
View file @ 96cce16c
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<span class="wrap_label">行政等级</span> <span class="wrap_label">行政等级</span>
<div class="item_ckquery"> <div class="item_ckquery">
<span :class="{color_text:queryParams.uipExecutiveLevel == ''}" @click="changeXZDJ('')">全部</span> <span :class="{color_text:queryParams.uipExecutiveLevel == ''}" @click="changeXZDJ('')">全部</span>
<template v-for="(item,index) in xzdj"> <template v-for="(item,index) in uipGroupDatalist.uipExecutiveLevel">
<span :class="{color_text:item == queryParams.uipExecutiveLevel}" @click="changeXZDJ(item)">{{item}}</span> <span :class="{color_text:item == queryParams.uipExecutiveLevel}" @click="changeXZDJ(item)">{{item}}</span>
</template> </template>
</div> </div>
...@@ -101,6 +101,16 @@ ...@@ -101,6 +101,16 @@
<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="`/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>
<div v-else v-html="scope.row.companyName || '--'"></div> <div v-else v-html="scope.row.companyName || '--'"></div>
</template> </template>
<template slot="area" slot-scope="scope">
<template v-if="scope.row.province || scope.row.city || scope.row.area">
<span v-if="scope.row.province"> {{ scope.row.province }}</span>
<span v-if="scope.row.city"> <span v-if="scope.row.province">-</span>{{ scope.row.city }}</span>
<span v-if="scope.row.area"> <span v-if="scope.row.city">-</span>{{ scope.row.area }}</span>
</template>
<template v-else>
--
</template>
</template>
</tables> </tables>
</div> </div>
...@@ -137,7 +147,7 @@ export default { ...@@ -137,7 +147,7 @@ export default {
}, },
forData: [ forData: [
{label: '企业名称', prop: 'companyName', width: '369', slot: true}, {label: '企业名称', prop: 'companyName', width: '369', slot: true},
{label: '区域', prop: 'area', width: '100'}, {label: '区域', prop: 'area', width: '120', slot: true},
{label: '招标数量', prop: 'biddingCount', width: '100', sortable: true}, {label: '招标数量', prop: 'biddingCount', width: '100', sortable: true},
{label: '城投拿地', prop: 'landInfoCount', width: '100', sortable: true}, {label: '城投拿地', prop: 'landInfoCount', width: '100', sortable: true},
{label: '供应商', prop: 'supplierCount', width: '100', sortable: true}, {label: '供应商', prop: 'supplierCount', width: '100', sortable: true},
......
dsk-operate-ui/src/views/detail/party-b/index.vue
View file @ 96cce16c
...@@ -15,6 +15,8 @@ export default { ...@@ -15,6 +15,8 @@ export default {
loading: false, // 是否加载中 loading: false, // 是否加载中
iframeHight: window.innerHeight, // iframe高度 iframeHight: window.innerHeight, // iframe高度
scrollTop: 0, // 滚动条距离内部页面顶部距离 scrollTop: 0, // 滚动条距离内部页面顶部距离
// domain: 'https://pre-plug.jiansheku.com',
domain: 'http://192.168.60.30:3300',
ak: 'aec7b3ff2y2q8x6t49a7e2c463ce21912' // 需要携带的sdkId ak: 'aec7b3ff2y2q8x6t49a7e2c463ce21912' // 需要携带的sdkId
} }
}, },
...@@ -22,7 +24,12 @@ export default { ...@@ -22,7 +24,12 @@ export default {
if (this.$route.params.id) { // 获取companyId if (this.$route.params.id) { // 获取companyId
this.loading = true this.loading = true
// this.src = `https://pre-plug.jiansheku.com/enterprise/${this.$route.params.id}?ak=${this.ak}` // 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}` if(this.$route.name=='Company'){ //企业详情
this.src = `${this.domain}/enterprise/${this.$route.params.id}?ak=${this.ak}`
}
if(this.$route.name=='Personnel'){ //人员详情
this.src = `${this.domain}/personnel/${this.$route.params.id}.html?ak=${this.ak}&referrer=true`
}
} }
}, },
mounted() { mounted() {
......
dsk-operate-ui/src/views/enterpriseData/components/SearchEnterprise/index.vue
View file @ 96cce16c
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="content_item"> <div class="content_item content_item1">
<div class="label">更多选项</div> <div class="label">更多选项</div>
<div class="content_right "> <div class="content_right ">
<div class="select-popper"> <div class="select-popper">
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
</div> </div>
<div class="select-popper"> <div class="select-popper">
<template v-if="filePlaceCode"> <template v-if="filePlaceCode">
<el-dropdown trigger="click" class="select-popper" placement='bottom-start'> <el-dropdown trigger="click" placement='bottom-start'>
<div class="el-dropdown-link " :class="filePlaceType?'select-active':''"> <div class="el-dropdown-link " :class="filePlaceType?'select-active':''">
本省与进省企业{{filePlaceType?' 1项':''}} 本省与进省企业{{filePlaceType?' 1项':''}}
<i class="el-icon-caret-bottom"></i> <i class="el-icon-caret-bottom"></i>
...@@ -155,7 +155,7 @@ ...@@ -155,7 +155,7 @@
</el-dropdown> </el-dropdown>
</div> </div>
<div class="select-popper"> <div class="select-popper">
<el-dropdown trigger="click" class="select-popper" placement='bottom-start'> <el-dropdown trigger="click" placement='bottom-start'>
<div class="el-dropdown-link " :class="hasLiceCert!=''?'select-active':''"> <div class="el-dropdown-link " :class="hasLiceCert!=''?'select-active':''">
<span>建筑安许证{{hasLiceCert!=''?' 1项':''}}</span> <span>建筑安许证{{hasLiceCert!=''?' 1项':''}}</span>
<i class="el-icon-caret-bottom"></i> <i class="el-icon-caret-bottom"></i>
...@@ -417,13 +417,157 @@ ...@@ -417,13 +417,157 @@
<div class="content_item content_item_nopadding "> <div class="content_item content_item_nopadding ">
<div class="search-new" > <div class="search-new" >
<span @click="submitbtn('', '', '', '', '1')">查询</span> <span @click="submitbtn()">查询</span>
<span @click="parentreset()">重置</span> <span @click="parentreset()">重置</span>
</div> </div>
</div> </div>
</div> </div>
<div class="bottomlist">
<div class="bottomlist-title">
<div class="bottomlist-title-left">
<el-popover v-model="fieldshow" placement="bottom-start" trigger="click"
popper-class="viewlist-el-popover">
<ul class="pup_list">
<li v-for="(itme,i) in fieldOptions" :class="itme.status?'activefield':''"
@click="handsequencingList(i)" :key="i">
{{itme.value}}
</li>
</ul>
<span slot="reference" class="toolbar-right-download" >
{{fieldText}}<i class="el-icon-arrow-down"
:style="{transform:fieldshow?'rotate(180deg)':''}"></i>
</span>
</el-popover>
<div class="toolbar-right-search">
<el-input placeholder="请输入企业名称关键词" class="toolbar-right_input" v-model="resultEname">
<div slot="append" class="result-search" @click="submitbtn()">过滤企业</div>
</el-input>
</div>
</div>
<div class="title-right">
<p>共有{{total}}条</p>
<p>
<img src="@/assets/images/EXCEL.png" alt="">
<span>导出EXCEL</span>
</p>
</div>
</div>
<ul class="bottomlist-content" v-if="tableData.length>0">
<li class="info-list" v-for="(item,index) in tableData" :key="index">
<div class="info-list-left">
<img v-if="item.logoUrl" :src="item.logoUrl" :alt="item.name.replace(/<font color='#FF204E'>/g,'').replace(/<\/font>/g,'')" />
<img v-else src="@/assets/images/enterprise.png" :alt="item.name.replace(/<font color='#FF204E'>/g,'').replace(/<\/font>/g,'')" />
</div>
<div class="info-list-right">
<p class="card-right-title">
<router-link :to="toEnterpriseDetail(item.jskEid)" >
<span class="title" v-html="item.name"> </span>
</router-link>
</p>
<p class="card-right-title card-right-title1" :ref="'labels'+item.id" :style="{padding: '10px 0px 8px 0px',height: '40px'}">
<span :ref="'cardRightTitle1span'+item.id" >
<span class="positive positive1" v-if="item.businessStatus" style="margin-right: 3px !important;">{{item.businessStatus}}</span>
<template v-for="(itemLabels,indexLabels) in item.labels">
<span class="positive positive1" :style="{'background':itemLabels.bgColor,'color':itemLabels.fontColor}">{{ itemLabels.labelName }} <template v-if="itemLabels.num>1">{{itemLabels.num}}</template></span>
</template>
</span>
<!-- <span class="positive-gdbq" :ref="'positivegdbq'+item.id" v-if="labelsWidth('labels'+item.id,1)" @click="labelsClick('labels'+item.id,'positivegdbq'+item.id,'cardRightTitle1span'+item.id)">更多标签 <i class="el-icon-caret-bottom"></i></span> -->
</p>
<p class="card-right-title">
<template v-if="item.legalPerson!=null">
<span class="right-title-grey">法定代表人：</span>
<span class="right-title-black">{{item.legalPerson}}</span>
</template>
<template v-if="item.registeredCapitalStr!=null&&item.registeredCapitalStr!==0">
<span class="right-title-grey">注册资本：</span>
<span class="right-title-black">{{item.registeredCapitalStr}}万元</span>
</template>
<template v-if="item.registeredDate!=null">
<span class="right-title-grey">成立日期：</span>
<span class="right-title-black">{{item.registeredDate}}</span>
</template>
<template v-if="item.registeredDate!=null">
<span class="right-title-grey"> 统一社会信用代码：</span>
<span class="right-title-black">{{item.creditCode}}</span>
</template>
</p>
<p class="card-right-title" style="padding-top: 10px ;">
<template v-if="item.aptitudeCountNew!=null">
<span class="right-title-grey">资质资格：</span>
<router-link :to="toEnterprise(item.jskEid,'')" target="_blank" >
<span class="right-title-blue" v-html="item.aptitudeCountNew"> </span>
</router-link>
</template>
<template v-if="item.recentlyCount!=null">
<span class="right-title-grey">中标业绩：</span>
<router-link :to="toEnterprise(item.jskEid,'/performance')" target="_blank" >
<span class="right-title-blue" v-html="item.recentlyCount"> </span>
</router-link>
</template>
<template v-if="item.skyCount!=null">
<span class="right-title-grey">四库业绩：</span>
<router-link :to="toEnterprise(item.jskEid,'/performance',1)" target="_blank" >
<span class="right-title-blue" v-html="item.skyCount"> </span>
</router-link>
</template>
<template v-if="item.registeredPersonnelCount!=null">
<span class="right-title-grey">注册人员：</span>
<router-link :to="toEnterprise(item.jskEid,'/personnel',1)" target="_blank" >
<span class="right-title-blue" v-html="item.registeredPersonnelCount"> </span>
</router-link>
</template>
<template v-if="item.threePersonnelCount!=null">
<span class="right-title-grey">三类人员：</span>
<router-link :to="toEnterprise(item.jskEid,'/personnel',4)" target="_blank" >
<span class="right-title-blue" v-html="item.threePersonnelCount"> </span>
</router-link>
</template>
<template v-if="item.jskBidCount>0">
<span class="right-title-grey">招标公告：</span>
<router-link :to="toEnterprise(item.jskEid,'/business',6)" target="_blank" >
<span class="right-title-blue" v-html="item.jskBidCount"> </span>
</router-link>
</template>
<template v-if="item.customerCount>0">
<span class="right-title-grey">客户：</span>
<router-link :to="toEnterprise(item.jskEid,'/business',1)" target="_blank" >
<span class="right-title-blue" v-html="item.customerCount"> </span>
</router-link>
</template>
<template v-if="item.supplierCount>0">
<span class="right-title-grey">供应商：</span>
<router-link :to="toEnterprise(item.jskEid,'/business',2)" target="_blank" >
<span class="right-title-blue" v-html="item.supplierCount"> </span>
</router-link>
</template>
</p>
<p class="card-right-title" v-if="item.formerName!=null&&(item.formerName.indexOf('color')!=-1||item.name.indexOf('color')!=-1)" style="padding: 10px 0px 0px 0px;">
<
<span class="right-title-grey">曾用名：</span>
<span class="right-title-grey" style="width: 984px;" v-html="item.formerName"></span>
</p>
</div>
</li>
</ul>
<div class="pagination clearfix" v-show="total>0">
<el-pagination
background
:page-size="limit"
:current-page="page"
@current-change="handleCurrentChange"
layout="prev, pager, next"
:total="total">
</el-pagination>
</div>
</div>
</div> </div>
</template> </template>
<script> <script>
...@@ -432,6 +576,7 @@ ...@@ -432,6 +576,7 @@
import jabph from '@/assets/json/jabph.json'; import jabph from '@/assets/json/jabph.json';
import options from '@/assets/json/options.json'; import options from '@/assets/json/options.json';
import api from '@/api/enterpriseData/enterpriseData.js'; import api from '@/api/enterpriseData/enterpriseData.js';
import {encodeStr} from "@/assets/js/common.js"
export default { export default {
name: 'EnterpriseQuery', name: 'EnterpriseQuery',
directives: { directives: {
...@@ -451,6 +596,7 @@ ...@@ -451,6 +596,7 @@
}, },
data() { data() {
return { return {
encodeStr,
ename: '', ename: '',
enameQueryTypeList: [{ enameQueryTypeList: [{
key: 'and', key: 'and',
...@@ -1190,6 +1336,61 @@ ...@@ -1190,6 +1336,61 @@
}, },
startTimetext: '', startTimetext: '',
openDatePicker: false, openDatePicker: false,
fieldshow: false,
fieldText: '默认排序',
field: '', //查询结果排序方式
orderText: '', //查询结果新排序字段
fieldOptions: [
{
value: '默认排序',
status: true,
order: '',
key: ''
},
{
value: '注册人员从少到多',
status: false,
order: 'asc',
key: 'registeredPersonnelCount'
},
{
value: '注册人员从多到少',
status: false,
order: 'desc',
key: 'registeredPersonnelCount'
},
{
value: '企业业绩从多到少',
status: false,
order: 'desc',
key: 'projectCount'
},
{
value: '资质资格从多到少',
status: false,
order: 'desc',
key: 'aptitudeCountNew'
},
{
value: '成立日期从晚到早',
status: false,
order: 'desc',
key: 'registeredDate'
},
{
value: '注册资本从高到低',
status: false,
order: 'desc',
key: 'registeredCapital'
}
],
resultEname: '',
tableData:[],
total:0,
page:1,
limit:20
} }
...@@ -1208,6 +1409,7 @@ ...@@ -1208,6 +1409,7 @@
}); });
this.getaddressList(); this.getaddressList();
this.submitbtn();
}, },
mounted() { mounted() {
...@@ -1242,74 +1444,7 @@ ...@@ -1242,74 +1444,7 @@
}, },
watch: {
aptitudelist: {
handler(val, oldVal) {
this.$emit("getAptitudelist", {
aptitudelist: this.aptitudelist,
aptitudeDtoList: this.aptitudeDtoList,
aptitudeDtoListOut: this.aptitudeDtoListOut,
})
},
deep: true
},
aptitudeDtoList: {
handler(val, oldVal) {
this.$emit("getAptitudelist", {
aptitudelist: this.aptitudelist,
aptitudeDtoListOut: this.aptitudeDtoListOut,
aptitudeDtoList: this.aptitudeDtoList,
})
},
deep: true
},
aptitudeDtoListOut: {
handler(val, oldVal) {
this.$emit("getAptitudelist", {
aptitudelist: this.aptitudelist,
aptitudeDtoListOut: this.aptitudeDtoListOut,
aptitudeDtoList: this.aptitudeDtoList,
})
},
deep: true
},
'$route'(to, from) {
if (to.fullPath !== from.fullPath) {
this.$nextTick(() => {
if (this.$route.query.keyword) {
this.ename = this.$route.query.keyword;
this.projectNamebtn('ename', this.ename, '关键字:');
}
if (this.$route.query.province_city) {
var addressType = []
for (let i = 0; i < this.addressList.length; i++) {
if (this.addressList[i].label == this.$route.query.territory) {
for (let j in this.addressList[i].children) {
if (this.addressList[i].children[j].label == this.$route.query
.province_city) {
for (let k in this.addressList[i].children[j].children) {
addressType.push([this.addressList[i].id, this.addressList[i]
.children[j].id, this
.addressList[i].children[j].children[k].id
])
}
}
}
}
}
this.addressType = addressType;
this.addressListbtn();
}
})
}
}
},
methods: { methods: {
// 关键字 // 关键字
projectNamebtn(key, text, teiti) { projectNamebtn(key, text, teiti) {
...@@ -2478,6 +2613,26 @@ ...@@ -2478,6 +2613,26 @@
this.getRegionWebList(); this.getRegionWebList();
}, },
reloadPage() {
this.pageFlag = false;
this.$nextTick(() => {
this.pageFlag = true;
});
},
handsequencingList(index) {
this.fieldshow = false;
this.field = this.fieldOptions[index].key;
for (let i = 0; i < this.fieldOptions.length; i++) {
this.fieldOptions[i].status = false;
}
this.fieldText = this.fieldOptions[index].value;
this.fieldOptions[index].status = true;
this.search();
},
handleCurrentChange(page) {
this.page = page;
this.search(page, this.limit);
},
// 空白点击 // 空白点击
outClick(e) { outClick(e) {
if (this) { if (this) {
...@@ -2491,8 +2646,156 @@ ...@@ -2491,8 +2646,156 @@
}, },
// submitbtn // submitbtn
submitbtn() { submitbtn(page, limit,exportFlag){
this.$parent.submitbtn('', '', '', '', '1'); // return false;
if (!page) {
this.page = 1;
}
if (!limit) {
this.limit = 20;
}
if (!page && !limit) {
this.reloadPage();
}
var data = {
eid: "",
aptitudeQueryDto: {
queryType: "and",
nameStr: ""
},
"page": {
"page": this.page,
"limit": this.limit,
"field": this.field,
"order": this.orderText
},
}
this.showList = true
if (this.resultEname) {
data.aptitudeQueryDto['resultEname'] = this.resultEname;
}
if (this.aptitudelist.length > 0 || this.aptitudeDtoList.length > 0) {
// console.log(this.aptitudelist);
// 资质部分传值
var queryTypeof = -1;
var aptitudeDtoList = [];
var dataList = {
codeStr: [],
queryType: '',
aptitudeType:''
};
var aptitudeType = '';
if(this.qualificationsTab == '按资质项'){
aptitudeType = 'qualification'
}else if(this.qualificationsTab == '按等级'){
aptitudeType = 'level'
}
for (let i = 0; i < this.aptitudeDtoList.length; i++) {
if (this.aptitudeDtoList[i].codeStr && this.aptitudeDtoList[i].codeStr.length > 0) {
dataList.codeStr.push(this.aptitudeDtoList[i].codeStr[this.aptitudeDtoList[i].codeStr.length -
1]);
}
dataList.queryType = this.aptitudeDtoList[this.aptitudeDtoList.length-1].queryType;
dataList.aptitudeType=aptitudeType;
}
dataList.codeStr = dataList.codeStr.join(',');
aptitudeDtoList.push(dataList);
for (let i = 0; i < this.aptitudelist.length; i++) {
if (this.aptitudelist[i].keyid == "address") {
data.aptitudeQueryDto['province'] = this.aptitudelist[i].provinceCode.join(',');
data.aptitudeQueryDto['city'] = this.aptitudelist[i].cityCode.join(',');
data.aptitudeQueryDto['county'] = this.aptitudelist[i].countyCode.join(',');
} else if (this.aptitudelist[i].keyid == "systemType") {
data.aptitudeQueryDto['systemType'] = this.aptitudelist[i].systemValue;
} else if (this.aptitudelist[i].keyid == "regionWeb") {
data.aptitudeQueryDto['regionWeb'] = this.aptitudelist[i].regionWeb.join(',');
} else if (this.aptitudelist[i].keyid == "taxYear") {
data.aptitudeQueryDto['taxYear'] = this.aptitudelist[i].key.join(',');
} else if (this.aptitudelist[i].keyid == "companyType") {
data.aptitudeQueryDto['companyType'] = this.aptitudelist[i].key.join(',');
} else if (this.aptitudelist[i].keyid == "businessStatus") {
data.aptitudeQueryDto['businessStatus'] = this.aptitudelist[i].key.join(',');
} else if (this.aptitudelist[i].keyid == "establish") {
data.aptitudeQueryDto['startRegisteredDate'] = this.aptitudelist[i].startTime
data.aptitudeQueryDto['endRegisteredDate'] = this.aptitudelist[i].endTime
} else if (this.aptitudelist[i].keyid == "RegisteredCapital") {
data.aptitudeQueryDto['leftRegisteredCapital'] = this.aptitudelist[i].start
data.aptitudeQueryDto['rightRegisteredCapital'] = this.aptitudelist[i].end
} else if (this.aptitudelist[i].keyid == "actualCapi") {
data.aptitudeQueryDto['leftActualCapi'] = this.aptitudelist[i].start
data.aptitudeQueryDto['rightActualCapi'] = this.aptitudelist[i].end
} else if (this.aptitudelist[i].keyid == "InsuredNum") {
data.aptitudeQueryDto['startInsuredNum'] = this.aptitudelist[i].start
data.aptitudeQueryDto['endInsuredNum'] = this.aptitudelist[i].end
} else {
data.aptitudeQueryDto[this.aptitudelist[i].keyid] = this.aptitudelist[i].key;
}
}
data.aptitudeQueryDto['aptitudeQueryType'] = this.aptitudeQueryType;
data.aptitudeQueryDto['businessScopeQueryType'] = this.businessScopeQueryType;
data.aptitudeQueryDto['filePlaceType'] = this.filePlaceType;
data.aptitudeQueryDto['aptitudeDtoList'] = aptitudeDtoList;
data.aptitudeQueryDto['aptitudeSource'] = 'new';
}
api.enterprisePage(data).then(res=>{
if (res.code==200) {
this.tableData=res.data.list;
this.total=res.data.total;
}
}).catch(error=>{
});
},
toEnterprise(id, html,type) {
return '/enterprise/' + encodeStr(id) + html + '/'+(type?'?flag=true&type='+type:'');
},
toEnterpriseDetail(id) {
return '/enterprise/' + encodeStr(id) + '/?index=true';
},
labelsWidth(e,t=0){
setTimeout(()=>{
if(this.$refs[e]){
let k = 0;
for (var j=0;j<this.$refs[e][0].children.length;j++){
k = k+ (this.$refs[e][0].children[j].offsetWidth+14)
}
if(k>1074){
if(t==1){
return true
}
return '982px'
}else {
if(t==1){
return false
}
return '100%'
}
}
},1000)
},
labelsClick(e,i,s){
this.$refs[e][0].style.height = 'auto'
this.$refs[s][0].style.width = '100%'
this.$refs[i][0].style.display = 'none'
}, },
chkPrice(obj) { chkPrice(obj) {
obj = obj.replace(/[^\d.]/g, ""); obj = obj.replace(/[^\d.]/g, "");
...@@ -2639,45 +2942,63 @@ ...@@ -2639,45 +2942,63 @@
} }
.content_item_padding0{ .content_item_padding0{
padding: 0; padding: 0;
} }
.content_item1{
align-items: flex-start;
.content_right{
width: 1400px;
.select-popper{
margin-bottom: 8px;
}
}
}
} }
.bottomlist{ .bottomlist{
width: 100%; width: 100%;
background-color: #FFFFFF; background-color: #FFFFFF;
border-radius: 4px 4px 4px 4px; border-radius: 4px 4px 4px 4px;
.bottomlist-title{ .bottomlist-title{
display: flex; display: flex;
justify-content: end; justify-content: space-between;
align-items: center; align-items: center;
margin-top: 12px; margin-top: 12px;
padding: 24px ; padding: 16px ;
border-bottom: 1px solid #EFEFEF; border-bottom: 1px solid #EFEFEF;
p:first-child{
font-size: 12px; .title-right{
font-weight: 400; display: flex;
color: #3D3D3D; align-items: center;
margin-right: 10px; p:first-child{
} font-size: 12px;
p:last-child{ font-weight: 400;
font-size: 14px; color: #3D3D3D;
font-weight: 400; margin-right: 10px;
color: rgba(35,35,35,0.8); }
} p:last-child{
img{ display: flex;
width: 18px; align-items: center;
height: 18px; font-size: 14px;
font-weight: 400;
color: rgba(35,35,35,0.8);
}
img{
width: 18px;
height: 18px;
}
} }
} }
.bottomlist-content{ .bottomlist-content{
padding-bottom: 0px; padding-bottom: 0px;
} }
.bottomlist-list{ .bottomlist-list{
padding: 14px; padding: 16px;
font-size: 14px; font-size: 14px;
border-bottom: 1px solid #EFEFEF; border-bottom: 1px solid #EFEFEF;
padding-bottom: 14px; padding-bottom: 14px;
...@@ -2695,21 +3016,30 @@ ...@@ -2695,21 +3016,30 @@
} }
} }
.content-label{ .content-label{
margin-top: 7px; margin-top: 12px;
.list-label{ .list-label{
background: #F3F3FF; background: #F3F3FF;
color: #8491E8; color: #8491E8;
border-radius: 1px 1px 1px 1px; border-radius: 1px 1px 1px 1px;
padding: 3px 7px; padding: 3px 7px;
font-size: 12px; font-size: 12px;
margin-right: 16px;
} }
.list-label-wl{
background: #e8f7f0;
color: #38c8bf;
}
.list-label-lx{
background: #e4f3fd;
color: #41a1fd;
}
} }
.list-content{ .list-content{
margin-top: 3px; margin-top: 8px;
display: flex; display: flex;
justify-content: start; justify-content: start;
align-items: center; align-items: center;
...@@ -2718,7 +3048,7 @@ ...@@ -2718,7 +3048,7 @@
margin-top: 7px; margin-top: 7px;
display: flex; display: flex;
justify-content: start; justify-content: start;
align-items: center; align-items:flex-start ;
margin-right: 27px; margin-right: 27px;
font-size: 14px; font-size: 14px;
...@@ -2732,6 +3062,12 @@ ...@@ -2732,6 +3062,12 @@
color: rgba(35,35,35,0.8); color: rgba(35,35,35,0.8);
line-height: 15px line-height: 15px
} }
.content-text-gc{
width: 72px;
}
.content-text-p{
width: 1200px;
}
.blue{ .blue{
color: #0081FF !important; color: #0081FF !important;
cursor: pointer; cursor: pointer;
...@@ -2742,6 +3078,23 @@ ...@@ -2742,6 +3078,23 @@
} }
.list-addree{
width: auto;
background: #F3F4F5;
display: inline-flex;
margin-top: 7px;
.list-content-text{
margin-top: 0px;
span{
line-height: 30px!important;
}
}
img{
width: 14px;
margin: 0 8px;
}
}
} }
...@@ -2755,39 +3108,48 @@ ...@@ -2755,39 +3108,48 @@
float: right; float: right;
} }
} }
.card-right-title1{
display: block !important;
overflow: hidden;
}
.positive1{
padding: 0 8px !important;
margin-bottom: 8px;
margin-right: 7px !important;
}
.positive-gdbq{
font-size: 12px;
font-weight: 400;
color: #0081FF;
cursor:pointer;
}
} }
</style>
<style scoped lang="scss">
.content_item_ckquery{ .content_item_ckquery{
.item_ckquery{ .item_ckquery{
margin-bottom:0px; margin-bottom:0px;
} }
} }
.aptitude_choice_wrap {
position: relative;
display: inline-block;
width: 1060px;
.aptitude_choice_wrap { .resultsSour_btnlist_span {
position: relative; margin-right: 16px;
display: inline-block; }
width: 1060px;
.resultsSour_btnlist_span {
margin-right: 16px;
}
.resultsSour_btnlist_span_24 {
margin-right: 24px;
}
.choice_radio {
position: absolute;
right: -16px;
bottom: 0;
}
.resultsSour_btnlist_span_24 {
margin-right: 24px;
} }
.choice_radio {
position: absolute;
right: -16px;
bottom: 0;
}
}
</style> </style>
\ No newline at end of file
dsk-operate-ui/src/views/project/projectList/component/addProject.vue
View file @ 96cce16c
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<div class="popbot"> <div class="popbot">
<div class="wordprimary">前往商机雷达寻找项目线索></div> <div class="wordprimary" @click="toradar">前往商机雷达寻找项目线索></div>
<div class="btn btn_cancel h32" @click="resetForm('ruleForm')">返回</div> <div class="btn btn_cancel h32" @click="resetForm('ruleForm')">返回</div>
<div class="btn btn_primary h32" @click="submitForm('ruleForm')">新建商机</div> <div class="btn btn_primary h32" @click="submitForm('ruleForm')">新建商机</div>
</div> </div>
...@@ -109,6 +109,9 @@ ...@@ -109,6 +109,9 @@
}) })
}, },
methods:{ methods:{
toradar(){
this.$router.push({path:'/radar'})
},
handleALL(event){ handleALL(event){
var one = document.getElementById("box"); var one = document.getElementById("box");
if(one){ if(one){
......
dsk-operate-ui/src/views/project/projectList/component/batchImport.vue
View file @ 96cce16c
...@@ -42,7 +42,8 @@ ...@@ -42,7 +42,8 @@
<div class="p3"> <div class="p3">
<img src="@/assets/images/project/success.png">查询成功 <img src="@/assets/images/project/success.png">查询成功
</div> </div>
<div class="p2">导入成功，已为您去掉重复{{titletext}}{{successCount}}条</div> <!--<div class="p2">导入成功，已为您去掉重复{{titletext}}{{successCount}}条</div>-->
<div class="p2">{{messages}}</div>
<div class="btns"> <div class="btns">
<div class="btn btn_primary h32" @click="getmsg">查看</div> <div class="btn btn_primary h32" @click="getmsg">查看</div>
</div> </div>
...@@ -74,6 +75,7 @@ ...@@ -74,6 +75,7 @@
downloadhref:'',//样例地址 downloadhref:'',//样例地址
titletext:'', titletext:'',
successCount:0,//成功条数 successCount:0,//成功条数
messages:'',
} }
}, },
created(){ created(){
...@@ -120,6 +122,7 @@ ...@@ -120,6 +122,7 @@
onSuccess(res, file, fileList) { onSuccess(res, file, fileList) {
if (res.code == 200) { if (res.code == 200) {
this.successCount = res.successCount this.successCount = res.successCount
this.messages = res.msg
this.addsuccess = true this.addsuccess = true
}else { }else {
this.importCancel() this.importCancel()
......
dsk-operate-ui/src/views/project/projectList/component/lxr.vue
View file @ 96cce16c
...@@ -57,6 +57,9 @@ ...@@ -57,6 +57,9 @@
prop="accendant" prop="accendant"
label="内部维护人" label="内部维护人"
width="146"> width="146">
<template slot-scope="scope">
{{scope.row.accendant || '--'}}
</template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="bottems"> <div class="bottems">
......
dsk-operate-ui/src/views/project/projectList/index.vue
View file @ 96cce16c
...@@ -368,7 +368,7 @@ export default { ...@@ -368,7 +368,7 @@ export default {
this.$router.push({ path: '/project/projectList/detail', query: {id:id,tag:tag} }); this.$router.push({ path: '/project/projectList/detail', query: {id:id,tag:tag} });
}, },
handleClick(){ handleClick(){
this.getList(1)
}, },
handleChange(value) { handleChange(value) {
// console.log(value); // console.log(value);
......
dsk-operate-ui/src/views/radar/components/debtProject/index.vue
View file @ 96cce16c
...@@ -228,6 +228,7 @@ ...@@ -228,6 +228,7 @@
created() { created() {
this.addressListfn(); this.addressListfn();
this.searchDic(); this.searchDic();
this.search();
}, },
methods: { methods: {
searchDic(){ searchDic(){
...@@ -319,16 +320,16 @@ ...@@ -319,16 +320,16 @@
let arr = (this.$refs.address.getCheckedNodes()) let arr = (this.$refs.address.getCheckedNodes())
let provinceCode = [], let provinceCode = [],
cityCode = [], cityCode = [],
countyCode = []; areaCode = [];
let province = [], let province = [],
city = [], city = [],
county = []; area = [];
for (var i in arr) { for (var i in arr) {
if (arr[i].parent) { if (arr[i].parent) {
if (!arr[i].parent.checked) { if (!arr[i].parent.checked) {
arr[i].hasChildren && cityCode.push(arr[i].value); arr[i].hasChildren && cityCode.push(arr[i].value);
!arr[i].hasChildren && countyCode.push(arr[i].value); !arr[i].hasChildren && areaCode.push(arr[i].value);
} }
} else { } else {
provinceCode.push(arr[i].value) provinceCode.push(arr[i].value)
...@@ -360,12 +361,12 @@ ...@@ -360,12 +361,12 @@
} }
} }
if (countyCode.length > 0) { if (areaCode.length > 0) {
for (let i = 0; i < countyCode.length; i++) { for (let i = 0; i < areaCode.length; i++) {
if (countyCode[i] == jsk_data[j].id) { if (areaCode[i] == jsk_data[j].id) {
county.push({ area.push({
value: jsk_data[j].regionName, value: jsk_data[j].regionName,
key: countyCode[i] key: areaCode[i]
}) })
} }
...@@ -373,7 +374,7 @@ ...@@ -373,7 +374,7 @@
} }
} }
if (province.length > 0 || city.length > 0 || county.length > 0) { if (province.length > 0 || city.length > 0 || area.length > 0) {
let arrlist = []; let arrlist = [];
if (province.length > 0) { if (province.length > 0) {
for (let i in province) { for (let i in province) {
...@@ -385,9 +386,9 @@ ...@@ -385,9 +386,9 @@
arrlist.push(city[i].value) arrlist.push(city[i].value)
} }
} }
if (county.length > 0) { if (area.length > 0) {
for (let i in county) { for (let i in area) {
arrlist.push(county[i].value) arrlist.push(area[i].value)
} }
} }
console.log(this.addressType); console.log(this.addressType);
...@@ -396,7 +397,7 @@ ...@@ -396,7 +397,7 @@
keyid: 'address', keyid: 'address',
provinceCode: provinceCode, provinceCode: provinceCode,
cityCode: cityCode, cityCode: cityCode,
countyCode: countyCode, areaCode: areaCode,
title: '项目属地：', title: '项目属地：',
key: '', key: '',
addressType:this.addressType addressType:this.addressType
...@@ -464,17 +465,14 @@ ...@@ -464,17 +465,14 @@
if (this.arrList[i].keyid == "address") { if (this.arrList[i].keyid == "address") {
params.specialBondProjectDto['province'] = this.arrList[i].provinceCode.join(','); params.specialBondProjectDto['province'] = this.arrList[i].provinceCode.join(',');
params.specialBondProjectDto['city'] = this.arrList[i].cityCode.join(','); params.specialBondProjectDto['city'] = this.arrList[i].cityCode.join(',');
params.specialBondProjectDto['county'] = this.arrList[i].countyCode.join(','); params.specialBondProjectDto['area'] = this.arrList[i].areaCode.join(',');
} }
} }
} }
if(this.projectType.length>0&&this.projectType[0]!='不限'){ if(this.projectType.length>0&&this.projectType[0]!='不限'){
params.specialBondProjectDto['projectType'] = this.projectType.join(','); params.specialBondProjectDto['projectType'] = this.projectType.join(',');
} }
if(!this.ckhasValue(params.specialBondProjectDto)){
this.$message.warning("请选择筛选条件后添加多组业绩!");
return
}
api.bondProjectPage(params).then(res=>{ api.bondProjectPage(params).then(res=>{
if (res.code==200) { if (res.code==200) {
this.tableData=res.data.list; this.tableData=res.data.list;
......
dsk-system/src/main/java/com/dsk/system/service/impl/BusinessFollowRecordServiceImpl.java
View file @ 96cce16c
package com.dsk.system.service.impl; package com.dsk.system.service.impl;
import com.dsk.common.core.domain.entity.BusinessFollowRecord; import com.dsk.common.core.domain.entity.BusinessFollowRecord;
import com.dsk.common.exception.base.BaseException;
import com.dsk.common.utils.DateUtils; import com.dsk.common.utils.DateUtils;
import com.dsk.common.utils.SecurityUtils;
import com.dsk.system.domain.BusinessIdDto; import com.dsk.system.domain.BusinessIdDto;
import com.dsk.system.domain.BusinessListDto; import com.dsk.system.domain.BusinessListDto;
import com.dsk.system.domain.vo.BusinessListVo; import com.dsk.system.domain.vo.BusinessListVo;
...@@ -47,12 +45,12 @@ public class BusinessFollowRecordServiceImpl implements IBusinessFollowRecordSer ...@@ -47,12 +45,12 @@ public class BusinessFollowRecordServiceImpl implements IBusinessFollowRecordSer
@Override @Override
public List<BusinessFollowRecord> allFollow(BusinessListDto dto) { public List<BusinessFollowRecord> allFollow(BusinessListDto dto) {
//userId不传值，就查询全部门项目 //userId不传值，就查询全部
if (dto.getUserId() == null) { // if (dto.getUserId() == null) {
Long deptId = SecurityUtils.getLoginUser().getDeptId(); // Long deptId = SecurityUtils.getLoginUser().getDeptId();
if (deptId == null) throw new BaseException("请登录"); // if (deptId == null) throw new BaseException("请登录");
dto.setDeptId(deptId.intValue()); // dto.setDeptId(deptId.intValue());
} // }
return businessFollowRecordMapper.allFollow(dto); return businessFollowRecordMapper.allFollow(dto);
} }
......
dsk-system/src/main/java/com/dsk/system/service/impl/BusinessInfoServiceImpl.java
View file @ 96cce16c
...@@ -81,11 +81,11 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService { ...@@ -81,11 +81,11 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
@Override @Override
public List<BusinessListVo> selectBusinessInfoList(BusinessListDto dto) { public List<BusinessListVo> selectBusinessInfoList(BusinessListDto dto) {
//userId不传值，就查询全部门项目 //userId不传值，就查询全部门项目
if (dto.getUserId() == null) { // if (dto.getUserId() == null) {
Long deptId = SecurityUtils.getLoginUser().getDeptId(); // Long deptId = SecurityUtils.getLoginUser().getDeptId();
if (deptId == null) throw new BaseException("请登录"); // if (deptId == null) throw new BaseException("请登录");
dto.setDeptId(deptId.intValue()); // dto.setDeptId(deptId.intValue());
} // }
return businessInfoMapper.selectBusinessInfoList(dto); return businessInfoMapper.selectBusinessInfoList(dto);
} }
...@@ -146,7 +146,7 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService { ...@@ -146,7 +146,7 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
} }
} }
result.add("导入项目成功条数" + rowSuccess); result.add("导入项目成功条数" + rowSuccess);
result.add("导入项目失败条数" + errorCount); result.add("导入项目去重条数" + errorCount);
AjaxResult success = AjaxResult.success(String.join(",", result)); AjaxResult success = AjaxResult.success(String.join(",", result));
success.put("successCount",rowSuccess); success.put("successCount",rowSuccess);
return success; return success;
......
dsk-system/src/main/resources/mapper/business/BusinessFollowRecordMapper.xml
View file @ 96cce16c
...@@ -72,9 +72,6 @@ ...@@ -72,9 +72,6 @@
<if test="userId != null"> <if test="userId != null">
and f.user_id = #{userId} and f.user_id = #{userId}
</if> </if>
<if test="deptId != null">
and u.dept_id = #{deptId}
</if>
</where> </where>
ORDER BY f.creat_time DESC ORDER BY f.creat_time DESC
</select> </select>
......
dsk-system/src/main/resources/mapper/business/BusinessInfoMapper.xml
View file @ 96cce16c
...@@ -131,8 +131,8 @@ ...@@ -131,8 +131,8 @@
<if test="userId != null"> <if test="userId != null">
and bu.user_id = #{userId} and bu.user_id = #{userId}
</if> </if>
<if test="deptId != null"> <if test="userId == null">
and bu.dept_id = #{deptId} and i.is_private = 1 and i.is_private = 1
</if> </if>
<if test="provinceId != null and provinceId.size > 0 and cityId == null and districtId == null"> <if test="provinceId != null and provinceId.size > 0 and cityId == null and districtId == null">
......
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