Skip to content

D
dsk-operate-sys-cscec
Commit a8e546c9 authored by dengguangman's avatar dengguangman
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 63b961b1 653543a6
Show whitespace changes
Inline Side-by-side
Showing with 167 additions and 68 deletions
dsk-admin/src/main/resources/application-dev.yml
View file @ a8e546c9
...@@ -157,7 +157,7 @@ token: ...@@ -157,7 +157,7 @@ token:
# 令牌密钥 # 令牌密钥
secret: abcdefghijklmnopqrstuvwxyz secret: abcdefghijklmnopqrstuvwxyz
# 令牌有效期（默认30分钟） # 令牌有效期（默认30分钟）
expireTime: 30 expireTime: 240
#mybatis: #mybatis:
......
dsk-operate-ui/src/assets/icons/svg/enterpriseTag.svg 0 → 100644
View file @ a8e546c9
This source diff could not be displayed because it is too large. You can view the blob instead.
dsk-operate-ui/src/assets/icons/svg/enterpriseTags.svg 0 → 100644
View file @ a8e546c9
This source diff could not be displayed because it is too large. You can view the blob instead.
dsk-operate-ui/src/assets/styles/project.scss
View file @ a8e546c9
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
width: 200px; width: 200px;
height: 114px; height: 114px;
background: #FFFFFF; background: #FFFFFF;
box-shadow: 0px 0px 8px 0px rgba(0,0,0,0.1608); box-shadow: 0px 0px 8px 0px rgba(0,0,0,0.12);
border-radius: 2px; border-radius: 2px;
position: absolute; position: absolute;
z-index: 3; z-index: 3;
...@@ -279,12 +279,15 @@ ...@@ -279,12 +279,15 @@
//表格样式 //表格样式
.tables{ .tables{
padding: 0 16px 24px; padding: 0 16px 24px;
.el-table .el-table__header-wrapper th{ .el-table .el-table__header-wrapper th,.el-table th.el-table__cell.is-leaf{
color: #4f4f4f; color: #4f4f4f;
background: #F0F3FA; background: #F0F3FA;
font-size: 12px; font-size: 12px;
font-weight: 400; font-weight: 400;
} }
.el-table__fixed::before{
background: none;
}
.is-sortable .sort-caret.ascending{ .is-sortable .sort-caret.ascending{
border-bottom-color: #0081FF; border-bottom-color: #0081FF;
opacity: 0.4; opacity: 0.4;
...@@ -315,6 +318,9 @@ ...@@ -315,6 +318,9 @@
.el-table th.el-table__cell.is-leaf{ .el-table th.el-table__cell.is-leaf{
border-bottom: 0; border-bottom: 0;
} }
.el-table__body tr.hover-row > td.el-table__cell,.el-table__body tr.el-table__row--striped.hover-row > td.el-table__cell{
background: #DCEBFF;
}
.has-gutter{ .has-gutter{
th{ th{
height: 40px; height: 40px;
...@@ -339,7 +345,7 @@ ...@@ -339,7 +345,7 @@
font-weight: 400; font-weight: 400;
color: #333333; color: #333333;
line-height: 21px; line-height: 21px;
margin-bottom: 4px; margin-bottom: 8px;
} }
.p2{ .p2{
height: 18px; height: 18px;
......
dsk-operate-ui/src/layout/components/Navbar.vue
View file @ a8e546c9
...@@ -58,7 +58,7 @@ export default { ...@@ -58,7 +58,7 @@ export default {
}, },
methods: { methods: {
async logout() { async logout() {
this.$confirm('确定注销并退出系统吗？', '提示', { this.$confirm('确定退出系统吗？', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
......
dsk-operate-ui/src/router/index.js
View file @ a8e546c9
...@@ -99,7 +99,7 @@ export const constantRoutes = [ ...@@ -99,7 +99,7 @@ export const constantRoutes = [
path: '/enterprise/:id', path: '/enterprise/:id',
component: () => import('@/views/detail/party-a/index'), component: () => import('@/views/detail/party-a/index'),
name: 'PartyA', name: 'PartyA',
meta: { title: '甲方详情' }, meta: { title: '甲方详情', icon: 'enterprise' },
} }
] ]
}, },
...@@ -113,7 +113,7 @@ export const constantRoutes = [ ...@@ -113,7 +113,7 @@ export const constantRoutes = [
path: '/company/:id', path: '/company/:id',
component: () => import('@/views/detail/party-b/index'), component: () => import('@/views/detail/party-b/index'),
name: 'Company', name: 'Company',
meta: { title: '已方详情' } meta: { title: '乙方详情' }
} }
] ]
}, },
......
dsk-operate-ui/src/views/custom/customList/index.vue
View file @ a8e546c9
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
<el-table-column <el-table-column
prop="index" prop="index"
label="序号" label="序号"
fixed="left"
width="47"> width="47">
<template slot-scope='scope'> <template slot-scope='scope'>
<span>{{ (searchParam.pageNum - 1) * searchParam.pageSize + scope.$index + 1 }}</span> <span>{{ (searchParam.pageNum - 1) * searchParam.pageSize + scope.$index + 1 }}</span>
...@@ -42,6 +43,7 @@ ...@@ -42,6 +43,7 @@
<el-table-column <el-table-column
prop="date" prop="date"
label="企业名称" label="企业名称"
fixed="left"
width="441"> width="441">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="ps1"> <div class="ps1">
...@@ -515,7 +517,7 @@ export default { ...@@ -515,7 +517,7 @@ export default {
transform: translate(-50%,-50%); transform: translate(-50%,-50%);
.btn{ .btn{
margin-right: 8px; margin-right: 8px;
margin-top: 12px; margin-top: 16px;
} }
} }
} }
......
dsk-operate-ui/src/views/detail/party-a/component/HeadDetailForm.vue
View file @ a8e546c9
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
<!-- 输入框 --> <!-- 输入框 -->
<template v-if="form.type==3"> <template v-if="form.type==3">
<div class="cooperate-name"> <div class="cooperate-name">
<el-input @focus="clickFocus('detailFocus'+i)" @blur="clickFocus('detailFocus'+i)" v-model="form.value" :placeholder="form.placeholder"></el-input> <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 :id="'detailFocus'+i" @click="changeSelect">搜索</span>
</div> </div>
</template> </template>
...@@ -197,7 +197,6 @@ export default { ...@@ -197,7 +197,6 @@ export default {
::v-deep .el-input__inner { ::v-deep .el-input__inner {
border-right: 0; border-right: 0;
border-radius: 2px 0 2px 0; border-radius: 2px 0 2px 0;
width: 180px;
} }
} }
.fromTime{ .fromTime{
......
dsk-operate-ui/src/views/detail/party-a/component/HeadForm.vue
View file @ a8e546c9
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
<!-- 输入框 --> <!-- 输入框 -->
<template v-if="form.type==3"> <template v-if="form.type==3">
<div class="cooperate-name"> <div class="cooperate-name">
<el-input clearable @clear="changeSelect" @focus="clickFocus('focus'+i)" @blur="clickFocus('focus'+i)" v-model="form.value" :placeholder="form.placeholder"></el-input> <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 :id="'focus'+i" @click="changeSelect">搜索</span>
</div> </div>
</template> </template>
...@@ -230,7 +230,6 @@ export default { ...@@ -230,7 +230,6 @@ export default {
} }
::v-deep .el-input__inner { ::v-deep .el-input__inner {
border-radius: 2px 0 2px 0; border-radius: 2px 0 2px 0;
width: 180px;
border: 1px solid #D9D9D9; border: 1px solid #D9D9D9;
border-right: 0; border-right: 0;
} }
......
dsk-operate-ui/src/views/detail/party-a/component/Header.vue
View file @ a8e546c9
...@@ -2,8 +2,9 @@ ...@@ -2,8 +2,9 @@
<div class="header-container"> <div class="header-container">
<div class="bread-crumb"> <div class="bread-crumb">
<el-breadcrumb separator="/"> <el-breadcrumb separator="/">
<el-breadcrumb-item :to="{ path: '/enterpriseData' }">企业数据</el-breadcrumb-item> <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
<el-breadcrumb-item :to="{ path: '/enterpriseData?tag=1' }">查企业</el-breadcrumb-item> <el-breadcrumb-item :to="{ path: fromPath }" v-if="fromName">{{fromName}}</el-breadcrumb-item>
<!-- <el-breadcrumb-item :to="{ path: '/enterpriseData?tag=1' }">查企业</el-breadcrumb-item>-->
<el-breadcrumb-item>{{companyInfo.simpleName || companyInfo.companyName || '--'}}</el-breadcrumb-item> <el-breadcrumb-item>{{companyInfo.simpleName || companyInfo.companyName || '--'}}</el-breadcrumb-item>
</el-breadcrumb> </el-breadcrumb>
</div> </div>
...@@ -17,7 +18,7 @@ ...@@ -17,7 +18,7 @@
<script> <script>
export default { export default {
name: 'Header', name: 'Header',
props: ['companyId', 'companyInfo'], props: ['companyId', 'companyInfo', 'fromPath', 'fromName'],
data() { data() {
return { return {
} }
......
dsk-operate-ui/src/views/detail/party-a/component/Tables.vue
View file @ a8e546c9
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<el-table-column <el-table-column
v-if="isIndex" v-if="isIndex"
label="序号" label="序号"
width="50" :width="flexWidth(tableData)"
align="left" align="left"
:fixed="indexFixed" :fixed="indexFixed"
:resizable="false"> :resizable="false">
...@@ -112,7 +112,6 @@ export default { ...@@ -112,7 +112,6 @@ export default {
}, },
data() { data() {
return { return {
} }
}, },
methods:{ methods:{
...@@ -124,6 +123,14 @@ export default { ...@@ -124,6 +123,14 @@ export default {
}, },
sortChange(e){ sortChange(e){
this.$emit('sort-change',e) this.$emit('sort-change',e)
},
flexWidth(tableData) {
let currentMax = this.queryParams.pageNum*this.queryParams.pageSize - this.queryParams.pageSize + tableData.length, wdth = 50
// return currentMax.toString().length*25 + 'px'
if(currentMax.toString().length>3){
wdth = wdth + (currentMax.toString().length-3)*10
}
return wdth+'px'
} }
} }
} }
......
dsk-operate-ui/src/views/detail/party-a/dealings/component/bidagencyDetail.vue
View file @ a8e546c9
...@@ -63,7 +63,7 @@ export default { ...@@ -63,7 +63,7 @@ export default {
pageSize: 20 pageSize: 20
}, },
formData: [ formData: [
{ type: 3, fieldName: 'keys', value: '', placeholder: '输入合作项目/工程名称查询', options: []}, { type: 3, fieldName: 'keys', value: '', placeholder: '输入合作项目/工程名称查询', options: [], width: 260},
], ],
forData: [ forData: [
{label: '合作项目/工程名称', prop: 'dealTitle', width: '720', slot: true}, {label: '合作项目/工程名称', prop: 'dealTitle', width: '720', slot: true},
......
dsk-operate-ui/src/views/detail/party-a/dealings/component/supplierDetail.vue
View file @ a8e546c9
...@@ -68,7 +68,7 @@ export default { ...@@ -68,7 +68,7 @@ export default {
pageSize: 20 pageSize: 20
}, },
formData: [ formData: [
{ type: 3, fieldName: 'keys', value: '', placeholder: '输入合作项目/工程名称查询', options: []}, { type: 3, fieldName: 'keys', value: '', placeholder: '输入合作项目/工程名称查询', options: [], width: 260},
], ],
forData: [ forData: [
{label: '合作项目/工程名称', prop: 'projectAllName', width: '720', fixed: true, slot: true}, {label: '合作项目/工程名称', prop: 'projectAllName', width: '720', fixed: true, slot: true},
......
dsk-operate-ui/src/views/detail/party-a/index.vue
View file @ a8e546c9
<template> <template>
<div class="app-container part-container"> <div class="app-container part-container">
<Header :company-id="companyId" :companyInfo="companyInfo" v-if="companyId" /> <Header :company-id="companyId" :companyInfo="companyInfo" :fromPath="fromPath" :fromName="fromName" v-if="companyId" />
<div class="flex-box part-main"> <div class="flex-box part-main">
<div class="part-left"> <div class="part-left">
<side-bar @currentPath="showPartPage" :pathName="currentPath.pathName" :partBoxHeight="partBoxHeight" :customerId="customerId" /> <side-bar @currentPath="showPartPage" :pathName="currentPath.pathName" :partBoxHeight="partBoxHeight" :customerId="customerId" />
...@@ -147,9 +147,17 @@ export default { ...@@ -147,9 +147,17 @@ export default {
currentPath: { currentPath: {
pathName: 'overview' //默认展示页 pathName: 'overview' //默认展示页
}, },
partBoxHeight: null partBoxHeight: null,
fromPath: '',
fromName: ''
} }
}, },
beforeRouteEnter(to, from, next) {
next(vm => {
vm.fromPath = from.path
vm.fromName = from.meta.title
})
},
created() { created() {
if (this.$route.params.id) { // 获取companyId if (this.$route.params.id) { // 获取companyId
let companyId = this.$route.params.id let companyId = this.$route.params.id
......
dsk-operate-ui/src/views/detail/party-a/opport/bond.vue
View file @ a8e546c9
...@@ -54,7 +54,7 @@ export default { ...@@ -54,7 +54,7 @@ export default {
{label: '专项债用作资本金（亿元）', prop: 'specialBondCapital', sortable: 'custom', descending: '19', ascending: '20', width: '200'} {label: '专项债用作资本金（亿元）', prop: 'specialBondCapital', sortable: 'custom', descending: '19', ascending: '20', width: '200'}
], ],
formData: [ formData: [
{ type: 3, fieldName: 'keys', value: '', placeholder: '输入项目名称关键词查询', options: []}, { type: 3, fieldName: 'keys', value: '', placeholder: '输入项目名称关键词查询', options: [], width: 220},
], ],
//列表 //列表
tableLoading:false, tableLoading:false,
......
dsk-operate-ui/src/views/detail/party-a/opport/landtransaction.vue
View file @ a8e546c9
...@@ -60,7 +60,7 @@ export default { ...@@ -60,7 +60,7 @@ export default {
], ],
formData: [ formData: [
{ type: 4, fieldName: 'landUse', value: '', placeholder: '土地用途', options: []}, { type: 4, fieldName: 'landUse', value: '', placeholder: '土地用途', options: []},
{ type: 3, fieldName: 'keys', value: '', placeholder: '输入项目名称关键词查询', options: []} { type: 3, fieldName: 'keys', value: '', placeholder: '输入项目名称关键词查询', options: [], width: 220}
], ],
//列表 //列表
tableLoading:false, tableLoading:false,
......
dsk-operate-ui/src/views/detail/party-a/opport/proposed.vue
View file @ a8e546c9
...@@ -60,7 +60,7 @@ export default { ...@@ -60,7 +60,7 @@ export default {
{label: '是否为民间推介项目', prop: 'isProjcet', width: '150', slot: true} {label: '是否为民间推介项目', prop: 'isProjcet', width: '150', slot: true}
], ],
formData: [ formData: [
{ type: 3, fieldName: 'keys', value: '', placeholder: '输入项目名称关键词查询', options: []}, { type: 3, fieldName: 'keys', value: '', placeholder: '输入项目名称关键词查询', options: [], width: 220},
], ],
//列表 //列表
tableLoading:false, tableLoading:false,
......
dsk-operate-ui/src/views/detail/party-a/opport/tencent.vue
View file @ a8e546c9
...@@ -56,6 +56,7 @@ export default { ...@@ -56,6 +56,7 @@ export default {
}, },
forData: [ forData: [
{label: '项目名称', prop: 'projectName', minWidth: '320', slot: true}, {label: '项目名称', prop: 'projectName', minWidth: '320', slot: true},
{label: '发布日期', prop: 'pubdate', width: '110'},
{label: '金额（万元）', prop: '', children: [ {label: '金额（万元）', prop: '', children: [
{ label: '建安费暂估', prop: 'projectSafeAmount', width: '88px'}, { label: '建安费暂估', prop: 'projectSafeAmount', width: '88px'},
{ label: '勘察费暂估', prop: 'projectSurveyAmount', width: '88px'}, { label: '勘察费暂估', prop: 'projectSurveyAmount', width: '88px'},
...@@ -74,8 +75,7 @@ export default { ...@@ -74,8 +75,7 @@ export default {
{label: '分部分项', prop: 'projectSub', width: '130'}, {label: '分部分项', prop: 'projectSub', width: '130'},
{label: '项目级别', prop: 'projectLevel', width: '130'}, {label: '项目级别', prop: 'projectLevel', width: '130'},
{label: '评标办法', prop: 'bidAssessmentWay', width: '130'}, {label: '评标办法', prop: 'bidAssessmentWay', width: '130'},
{label: '项目属地', prop: 'province', width: '130', slot: true}, {label: '项目属地', prop: 'province', width: '130', slot: true}
{label: '发布日期', prop: 'pubdate', width: '130'}
], ],
formData: [ formData: [
{ type: 1, fieldName: 'projectType', value: '', placeholder: '项目类别', options: []}, { type: 1, fieldName: 'projectType', value: '', placeholder: '项目类别', options: []},
...@@ -131,6 +131,13 @@ export default { ...@@ -131,6 +131,13 @@ export default {
this.tableLoading = false this.tableLoading = false
if(res.code==200){ if(res.code==200){
this.tableData = res.rows this.tableData = res.rows
if(this.tableData&&this.tableData.length>0){
this.tableData.forEach(item => {
item.projectSafeAmount ? item.projectSafeAmount = parseFloat(parseFloat(item.projectSafeAmount).toFixed(4)) : ''
item.projectSurveyAmount ? item.projectSurveyAmount = parseFloat(parseFloat(item.projectSurveyAmount).toFixed(4)) : ''
item.projectEnsureAmount ? item.projectEnsureAmount = parseFloat(parseFloat(item.projectEnsureAmount).toFixed(4)) : ''
})
}
} }
this.tableDataTotal = res.total this.tableDataTotal = res.total
} }
......
dsk-operate-ui/src/views/detail/party-a/overview/businfo.vue
View file @ a8e546c9
<template> <template xmlns="http://www.w3.org/1999/html">
<div class="app-container detail-container"> <div class="app-container detail-container">
<el-tabs v-model="activeName" @tab-click="handleClick" class="detail-tab"> <el-tabs v-model="activeName" @tab-click="handleClick" class="detail-tab">
<el-tab-pane label="工商信息" name="first"></el-tab-pane> <el-tab-pane label="工商信息" name="first"></el-tab-pane>
...@@ -10,6 +10,22 @@ ...@@ -10,6 +10,22 @@
<template slot="provinceCode" slot-scope="scope"> <template slot="provinceCode" slot-scope="scope">
<span>{{showRegion(scope.data.provinceCode)}}</span> <span>{{showRegion(scope.data.provinceCode)}}</span>
</template> </template>
<template slot="term" slot-scope="scope">
<span v-if="scope.data.termStart&&scope.data.termEnd">{{ scope.data.termStart }} ~ {{ scope.data.termEnd }}</span>
<span v-else-if="scope.data.termStart&&!scope.data.termEnd">{{ scope.data.termStart }}起</span>
<span v-else-if="!scope.data.termStart&&scope.data.termEnd">{{ scope.data.termEnd }}止</span>
<span v-else>--</span>
</template>
<template slot="actualCapi" slot-scope="scope">
<span>
{{ scope.data.actualCapi?scope.data.actualCapi+'万元人民币':'--' }}
</span>
</template>
<template slot="colleguesNum" slot-scope="scope">
<span>
{{ scope.data.colleguesNum?scope.data.colleguesNum+'人':'--' }}
</span>
</template>
</info-table> </info-table>
<tables <tables
:tableLoading="tableLoading" :tableLoading="tableLoading"
...@@ -53,18 +69,18 @@ export default { ...@@ -53,18 +69,18 @@ export default {
{ name: '登记状态', prop: 'status' }, { name: '登记状态', prop: 'status' },
{ name: '成立日期', prop: 'startDate' }, { name: '成立日期', prop: 'startDate' },
{ name: '注册资本', prop: 'registCapi' }, { name: '注册资本', prop: 'registCapi' },
{ name: '实缴资本', prop: 'actualCapi' }, { name: '实缴资本', prop: 'actualCapi', slot: true },
{ name: '核准日期', prop: 'checkDate' }, { name: '核准日期', prop: 'checkDate' },
{ name: '组织机构代码', prop: 'orgNo' }, { name: '组织机构代码', prop: 'orgNo' },
{ name: '工商注册号', prop: 'regNo' }, { name: '工商注册号', prop: 'regNo' },
{ name: '纳税人识别号', prop: 'creditNo' }, { name: '纳税人识别号', prop: 'creditNo' },
{ name: '企业类型', prop: 'econKind' }, { name: '企业类型', prop: 'econKind' },
{ name: '营业期限', prop: 'termEnd' }, { name: '营业期限', prop: 'term', slot: true },
{ name: '纳税人资质', prop: 'qualification' }, { name: '纳税人资质', prop: 'qualification' },
{ name: '所属地区', prop: 'provinceCode', slot: true }, { name: '所属地区', prop: 'provinceCode', slot: true },
{ name: '登记机关', prop: 'belongOrg' }, { name: '登记机关', prop: 'belongOrg' },
{ name: '人员规模', prop: 'colleguesNum' }, { name: '人员规模', prop: 'colleguesNum', slot: true },
{ name: '参保人数', prop: 'colleguesNum' }, { name: '参保人数', prop: 'colleguesNum', slot: true },
{ name: '经营范围', prop: 'scope', style: true } { name: '经营范围', prop: 'scope', style: true }
], ],
forData: [ forData: [
......
dsk-operate-ui/src/views/enterpriseData/components/Owner/index.vue
View file @ a8e546c9
...@@ -168,7 +168,6 @@ ...@@ -168,7 +168,6 @@
</el-table-column> </el-table-column>
<el-table-column label="区域" width="120"> <el-table-column label="区域" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<router-link :to="'/radar/bxprozbgg/details/'+ 1" tag="a" class="list-titel-a" >
{{scope.row.province}} {{scope.row.province}}
<template v-if="scope.row.city"> <template v-if="scope.row.city">
- -
...@@ -178,8 +177,6 @@ ...@@ -178,8 +177,6 @@
- -
</template> </template>
{{scope.row.area}} {{scope.row.area}}
</router-link>
</template> </template>
</el-table-column> </el-table-column>
...@@ -591,7 +588,7 @@ export default { ...@@ -591,7 +588,7 @@ export default {
}, },
mounted() { mounted() {
this.addressListfn(); this.init();
}, },
methods: { methods: {
domicileChange() { domicileChange() {
...@@ -675,7 +672,7 @@ export default { ...@@ -675,7 +672,7 @@ export default {
}, },
init(){ init(){
// this.search(); this.search();
this.addressListfn(); this.addressListfn();
}, },
......
dsk-operate-ui/src/views/enterpriseData/components/SearchEnterprise/index.vue
View file @ a8e546c9
...@@ -2764,11 +2764,11 @@ ...@@ -2764,11 +2764,11 @@
}, },
toEnterprise(id, html,type) { toEnterprise(id, html,type) {
return '/enterprise/' + encodeStr(id) + html + '/'+(type?'?flag=true&type='+type:''); return '/company/' + encodeStr(id) + html + '/'+(type?'?flag=true&type='+type:'');
}, },
toEnterpriseDetail(id) { toEnterpriseDetail(id) {
return '/enterprise/' + encodeStr(id) + '/?index=true'; return '/company/' + encodeStr(id) + '/?index=true';
}, },
labelsWidth(e,t=0){ labelsWidth(e,t=0){
......
dsk-operate-ui/src/views/radar/BidRecord/details.vue
View file @ a8e546c9
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
<el-table-column label="项目名称" > <el-table-column label="项目名称" >
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.name||'--'}} <router-link v-if="scope.row.companyId" :to="'/company/' + encodeStr(scope.row.companyId) + '/?index=true'" tag="a" class="list-titel-a blue" v-html="scope.row.name"></router-link>
</template> </template>
</el-table-column> </el-table-column>
...@@ -100,14 +100,14 @@ ...@@ -100,14 +100,14 @@
<script> <script>
import "@/assets/styles/public.css"; import "@/assets/styles/public.css";
import { import {encodeStr} from "@/assets/js/common.js"
encodeStr
} from "@/assets/js/common.js"
import api from '@/api/radar/radar.js'; import api from '@/api/radar/radar.js';
export default { export default {
name: 'BidRecordDetails', name: 'BidRecordDetails',
data() { data() {
return { return {
encodeStr,
id: '', id: '',
tableData: [], tableData: [],
"pageNum": 1, "pageNum": 1,
......
dsk-operate-ui/src/views/radar/Land/details.vue
View file @ a8e546c9
...@@ -10,7 +10,8 @@ ...@@ -10,7 +10,8 @@
<div class="list-content"> <div class="list-content">
<p class="list-content-text"> <p class="list-content-text">
<span>受让人：</span> <span>受让人：</span>
<span class="blue">{{textList.company||"--"}}</span> <router-link v-if="textList.company" :to="'/company/' + encodeStr(textList.id) + '/?index=true'" tag="a" class="list-titel-a blue" v-html="textList.company"></router-link>
<span v-else class="blue">{{textList.company||"--"}}</span>
</p> </p>
<p class="list-content-text"> <p class="list-content-text">
<span>成交金额：</span> <span>成交金额：</span>
...@@ -192,12 +193,14 @@ ...@@ -192,12 +193,14 @@
<script> <script>
import api from '@/api/radar/radar.js'; import api from '@/api/radar/radar.js';
import {encodeStr} from "@/assets/js/common.js"
export default { export default {
name: 'LandDetails', name: 'LandDetails',
data() { data() {
return { return {
id: '', id: '',
encodeStr,
textList: {} textList: {}
} }
......
dsk-operate-ui/src/views/radar/Tender/details.vue
View file @ a8e546c9
...@@ -25,13 +25,17 @@ ...@@ -25,13 +25,17 @@
</div> </div>
<div class="list-content"> <div class="list-content">
<p class="list-content-text"> <p class="list-content-text" v-if="textList.tenderee">
<span>招采单位：</span> <span>招采单位：</span>
<span class="blue"> {{textList.tenderee||'--'}}</span> <router-link v-if="textList.projectUnitId" :to="'/company/' + encodeStr(textList.projectUnitId) + '/?index=true'" tag="a" class="list-titel-a blue" v-html="textList.tenderee"></router-link>
<span v-else class="blue"> {{textList.tenderee||'--'}}</span>
</p> </p>
<p class="list-content-text"> <p class="list-content-text" v-if="textList.agency">
<span>代理单位：</span> <span>代理单位：</span>
<span class="blue">{{textList.agency||'--'}}</span> <span class="blue">{{textList.agency||'--'}}</span>
<router-link v-if="textList.agencyId" :to="'/company/' + encodeStr(textList.agencyId) + '/?index=true'" tag="a" class="list-titel-a blue" v-html="textList.agency"></router-link>
<span v-else class="blue"> {{textList.agency||'--'}}</span>
</p> </p>
</div> </div>
...@@ -89,11 +93,13 @@ ...@@ -89,11 +93,13 @@
<script> <script>
import "@/assets/styles/public.css"; import "@/assets/styles/public.css";
import api from '@/api/radar/radar.js'; import api from '@/api/radar/radar.js';
import {encodeStr} from "@/assets/js/common.js"
export default { export default {
name: 'TenderDetails', name: 'TenderDetails',
data() { data() {
return { return {
encodeStr,
id: '', id: '',
textList:{}, textList:{},
showimg:true showimg:true
......
dsk-operate-ui/src/views/radar/bxprozbgg/details.vue
View file @ a8e546c9
...@@ -173,10 +173,13 @@ ...@@ -173,10 +173,13 @@
<div class="main3-box"> <div class="main3-box">
<p> <p>
<label class="label">招标人</label> <label class="label">招标人</label>
<span class="color2">{{textList.tenderee||'--'}}</span> <router-link v-if="textList.tendereeId" :to="'/company/' + encodeStr(textList.tendereeId) + '/?index=true'" tag="a" class="list-titel-a color2" v-html="textList.tenderee"></router-link>
<span v-else class="color2">{{textList.tenderee||'--'}}</span>
<label class="label">代理机构</label> <label class="label">代理机构</label>
<span class="color2">{{textList.agency||'--'}}</span> <router-link v-if="textList.agencyId" :to="'/company/' + encodeStr(textList.agencyId) + '/?index=true'" tag="a" class="list-titel-a color2" v-html="textList.agency"></router-link>
<span v-else class="color2">{{textList.agency||'--'}}</span>
</p> </p>
<p> <p>
<label class="label">招标人联系方式</label> <label class="label">招标人联系方式</label>
<span>{{textList.tendereeTel||'--'}}</span> <span>{{textList.tendereeTel||'--'}}</span>
...@@ -199,11 +202,13 @@ ...@@ -199,11 +202,13 @@
<script> <script>
import "@/assets/styles/public.css"; import "@/assets/styles/public.css";
import api from '@/api/radar/radar.js'; import api from '@/api/radar/radar.js';
import {encodeStr} from "@/assets/js/common.js"
export default { export default {
name: 'bxprozbggDetails', name: 'bxprozbggDetails',
data() { data() {
return { return {
encodeStr,
id: '', id: '',
textList: {}, textList: {},
showimg:true, showimg:true,
...@@ -512,6 +517,11 @@ ...@@ -512,6 +517,11 @@
.color2{ .color2{
color: #0081FF; color: #0081FF;
cursor: pointer; cursor: pointer;
display: flex;
align-items: center;
width: 40%;
padding: 12px;
font-size: 12px;
} }
} }
......
dsk-operate-ui/src/views/radar/components/Bidding/index.vue
View file @ a8e546c9
...@@ -164,7 +164,8 @@ ...@@ -164,7 +164,8 @@
<div class="list-content"> <div class="list-content">
<p class="list-content-text"> <p class="list-content-text">
<span>招采单位：</span> <span>招采单位：</span>
<span class="blue">{{item.tenderee||'--'}}</span> <router-link v-if="item.tendereeId" :to="'/company/' + encodeStr(item.tendereeId) + '/?index=true'" tag="a" class="list-titel-a blue" v-html="item.tenderee"></router-link>
<span v-else>{{item.tenderee||'--'}}</span>
</p> </p>
<p class="list-content-text"> <p class="list-content-text">
<span>合同预估金额（万元）：</span> <span>合同预估金额（万元）：</span>
......
dsk-operate-ui/src/views/radar/components/Land/index.vue
View file @ a8e546c9
...@@ -234,7 +234,7 @@ ...@@ -234,7 +234,7 @@
<div class="list-content"> <div class="list-content">
<p class="list-content-text"> <p class="list-content-text">
<span>受让人：</span> <span>受让人：</span>
<span class="blue">{{item.companyName||'--'}}</span> <router-link :to="'/company/' + encodeStr(item.id) + '/?index=true'" tag="a" class="list-titel-a blue" v-html="item.companyName"></router-link>
</p> </p>
<p class="list-content-text"> <p class="list-content-text">
<span>成交金额：</span> <span>成交金额：</span>
...@@ -1127,7 +1127,7 @@ ...@@ -1127,7 +1127,7 @@
} }
.bottomlist-list:hover{ .bottomlist-list:hover{
background: #F6F9FC; background: #F6F9FC;
cursor: pointer;
} }
.pagination{ .pagination{
padding: 14px ; padding: 14px ;
......
dsk-operate-ui/src/views/radar/components/Tender/index.vue
View file @ a8e546c9
...@@ -207,11 +207,13 @@ ...@@ -207,11 +207,13 @@
<div class="list-content" v-if="item.companyName||item.agency"> <div class="list-content" v-if="item.companyName||item.agency">
<p class="list-content-text" v-if="item.companyName"> <p class="list-content-text" v-if="item.companyName">
<span>招采单位：</span> <span>招采单位：</span>
<span class="blue">{{item.companyName||'--'}}</span> <router-link v-if="item.jskEid" :to="'/company/' + encodeStr(item.jskEid) + '/?index=true'" tag="a" class="list-titel-a blue" v-html="item.companyName"></router-link>
<span v-else class="blue">{{item.companyName||'--'}}</span>
</p> </p>
<p class="list-content-text" v-if="item.agency"> <p class="list-content-text" v-if="item.agency">
<span>代理单位：</span> <span>代理单位：</span>
<span class="blue">{{item.agency||'--'}}</span> <router-link v-if="item.agencyId" :to="'/company/' + encodeStr(item.agencyId) + '/?index=true'" tag="a" class="list-titel-a blue" v-html="item.agency"></router-link>
<span v-else class="blue">{{item.agency||'--'}}</span>
</p> </p>
</div> </div>
...@@ -275,6 +277,7 @@ ...@@ -275,6 +277,7 @@
data() { data() {
return { return {
//有无联系方式 //有无联系方式
encodeStr,
phonePointType: [{ phonePointType: [{
value: '', value: '',
label: '不限' label: '不限'
......
dsk-operate-ui/src/views/radar/components/debtProject/index.vue
View file @ a8e546c9
...@@ -103,20 +103,20 @@ ...@@ -103,20 +103,20 @@
<router-link :to="'/radar/debtProject/details/'+item.uuid " tag="a" class="list-titel-a" v-html="item.projectName"></router-link> <router-link :to="'/radar/debtProject/details/'+item.uuid " tag="a" class="list-titel-a" v-html="item.projectName"></router-link>
</p> </p>
<div class="content-label"> <div class="content-label" v-if="item.domicile">
<span class="list-label">{{item.domicile}}</span> <span class="list-label">{{item.domicile}}</span>
</div> </div>
<div class="list-content"> <div class="list-content">
<p class="list-content-text"> <p class="list-content-text" v-if="item.projectType">
<span>项目类型：</span> <span>项目类型：</span>
<span>{{item.projectType}}</span> <span>{{item.projectType}}</span>
</p> </p>
<p class="list-content-text"> <p class="list-content-text"v-if="item.projectTotalInvestment">
<span>项目总投资(亿)：</span> <span>项目总投资(亿)：</span>
<span>{{item.projectTotalInvestment}}</span> <span>{{item.projectTotalInvestment}}</span>
</p> </p>
<p class="list-content-text"> <p class="list-content-text" v-if="item.specialCapital">
<span>项目资本金(亿)：</span> <span>项目资本金(亿)：</span>
<span>{{item.projectCapital}}</span> <span>{{item.projectCapital}}</span>
</p> </p>
...@@ -126,17 +126,17 @@ ...@@ -126,17 +126,17 @@
</p> </p>
</div> </div>
<div class="list-content"> <div class="list-content">
<p class="list-content-text"> <p class="list-content-text" v-if="item.specialCapital">
<span>项目主体：</span> <span>项目主体：</span>
<span class="blue">{{item.projectEntity}}</span> <span >{{item.projectEntity}}</span>
</p> </p>
<p class="list-content-text"> <p class="list-content-text" v-if="item.chargeDepartment">
<span>主管部门：</span> <span>主管部门：</span>
<span class="blue">{{item.chargeDepartment}}</span> <span >{{item.chargeDepartment}}</span>
</p> </p>
<p class="list-content-text"> <p class="list-content-text" v-if="item.piu">
<span>实施单位：</span> <span>实施单位：</span>
<span class="blue">{{item.piu}}</span> <span >{{item.piu}}</span>
</p> </p>
</div> </div>
</li> </li>
......
dsk-operate-ui/src/views/radar/index.vue
View file @ a8e546c9
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
import "@/assets/styles/public.css"; import "@/assets/styles/public.css";
export default { export default {
name: 'radar', name: 'Radar',
components: { debtProject,Land,Establishment,bxprozbgg,Tender,BidRecord,Bidding }, components: { debtProject,Land,Establishment,bxprozbgg,Tender,BidRecord,Bidding },
data() { data() {
return { return {
...@@ -95,7 +95,9 @@ ...@@ -95,7 +95,9 @@
personnelHerf:'debtProject' personnelHerf:'debtProject'
} }
}, },
created() {}, created() {
// console.log(this.$route.name)
},
methods: { methods: {
personnelListbtn(index) { personnelListbtn(index) {
for (var i = 0; i < this.personnelList.length; i++) { for (var i = 0; i < this.personnelList.length; i++) {
......
dsk-system/src/main/java/com/dsk/system/dskService/EnterpriseBussinessService.java
View file @ a8e546c9
package com.dsk.system.dskService; package com.dsk.system.dskService;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import com.dsk.common.core.domain.R; import com.dsk.common.core.domain.R;
import com.dsk.common.core.domain.model.*; import com.dsk.common.core.domain.model.*;
...@@ -12,6 +13,7 @@ import org.slf4j.LoggerFactory; ...@@ -12,6 +13,7 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -52,6 +54,30 @@ public class EnterpriseBussinessService { ...@@ -52,6 +54,30 @@ public class EnterpriseBussinessService {
public R tenderDetail(EnterpriseBussinessTenderDetailBody body) throws Exception { public R tenderDetail(EnterpriseBussinessTenderDetailBody body) throws Exception {
Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/tenderDetail", BeanUtil.beanToMap(body, false, false)); Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/tenderDetail", BeanUtil.beanToMap(body, false, false));
Map data = MapUtils.getMap(map, "data", null);
String mongoContentId = MapUtils.getString(data, "mongoContentId");
if (ObjectUtil.isEmpty(mongoContentId)) {
return BeanUtil.toBean(map, R.class);
}
HashMap<String, Object> contentParam = new HashMap<>();
contentParam.put("data_type", "kaibiao");
contentParam.put("filter_type", 2);
contentParam.put("strategy_id", mongoContentId);
Map<String, Object> contentMap = dskOpenApiUtil.requestBody("/mongocontent/v1/cjb/mongo_content", contentParam);
Map contentData = MapUtils.getMap(contentMap, "data", null);
log.info("contentData:{}", JSONUtil.toJsonStr(contentData));
if (200 != MapUtils.getInteger(contentMap, "code", 300)) {
return BeanUtil.toBean(map, R.class);
}
String htmlContent = MapUtils.getString(contentData, "htmlContent");
data.put("content", htmlContent);
map.put("data", data);
return BeanUtil.toBean(map, R.class); return BeanUtil.toBean(map, R.class);
} }
......
dsk-system/src/main/java/com/dsk/system/dskService/EnterpriseProjectService.java
View file @ a8e546c9
...@@ -2,6 +2,7 @@ package com.dsk.system.dskService; ...@@ -2,6 +2,7 @@ package com.dsk.system.dskService;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.hutool.json.JSONUtil;
import com.dsk.common.core.domain.R; import com.dsk.common.core.domain.R;
import com.dsk.common.core.domain.model.*; import com.dsk.common.core.domain.model.*;
import com.dsk.common.core.page.TableDataInfo; import com.dsk.common.core.page.TableDataInfo;
...@@ -124,9 +125,10 @@ public class EnterpriseProjectService { ...@@ -124,9 +125,10 @@ public class EnterpriseProjectService {
contentParam.put("data_type", "bid_plan"); contentParam.put("data_type", "bid_plan");
contentParam.put("filter_type", 2); contentParam.put("filter_type", 2);
contentParam.put("strategy_id", contentId); contentParam.put("strategy_id", contentId);
Map<String, Object> contentMap = dskOpenApiUtil.requestBody("/mongocontent/v1/cjb/mongo_content", BeanUtil.beanToMap(contentParam, false, false)); Map<String, Object> contentMap = dskOpenApiUtil.requestBody("/mongocontent/v1/cjb/mongo_content", contentParam);
Map contentData = MapUtils.getMap(contentMap, "data", null); Map contentData = MapUtils.getMap(contentMap, "data", null);
log.info("contentData:{}", JSONUtil.toJsonStr(contentData));
if (200 != MapUtils.getInteger(contentMap, "code", 300)) { if (200 != MapUtils.getInteger(contentMap, "code", 300)) {
return BeanUtil.toBean(map, R.class); return BeanUtil.toBean(map, R.class);
...@@ -134,7 +136,8 @@ public class EnterpriseProjectService { ...@@ -134,7 +136,8 @@ public class EnterpriseProjectService {
String htmlContent = MapUtils.getString(contentData, "htmlContent"); String htmlContent = MapUtils.getString(contentData, "htmlContent");
map.put("content", htmlContent); data.put("content", htmlContent);
map.put("data", data);
return BeanUtil.toBean(map, R.class); return BeanUtil.toBean(map, R.class);
} }
......
dsk-system/src/main/java/com/dsk/system/service/impl/BusinessInfoServiceImpl.java
View file @ a8e546c9
...@@ -32,6 +32,7 @@ import org.springframework.transaction.annotation.Transactional; ...@@ -32,6 +32,7 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
...@@ -80,7 +81,7 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService { ...@@ -80,7 +81,7 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
*/ */
@Override @Override
public List<BusinessListVo> selectBusinessInfoList(BusinessListDto dto) { public List<BusinessListVo> selectBusinessInfoList(BusinessListDto dto) {
List<BusinessListVo> othersList = null; List<BusinessListVo> othersList = new ArrayList<>();
//userId不传值，就查询全部他人可见项目+自己的 //userId不传值，就查询全部他人可见项目+自己的
if (dto.getUserId() == null) { if (dto.getUserId() == null) {
Long userId = SecurityUtils.getLoginUser().getUserId(); Long userId = SecurityUtils.getLoginUser().getUserId();
......
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