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
Expand all 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/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