Skip to content

D
dsk-cr20g
Commit 1f21ae1a authored by danfuman's avatar danfuman
Browse files
Options

Merge branch 'master' of http://192.168.60.201/root/dsk-operate-sys

parents 78c8860e 6698fe4d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 412 additions and 230 deletions
dsk-admin/src/main/java/com/dsk/web/controller/business/BusinessFileController.java
View file @ 1f21ae1a
......@@ -19,6 +19,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.io.IOException;
import java.util.Comparator;
import java.util.List;
import java.util.stream.Collectors;
......@@ -68,6 +69,8 @@ public class BusinessFileController extends BaseController {
List<BusinessFileVo> allFileName = FileUtils.getAllFileNames(filePath.getFilePath());
allFiles = allFileName.stream().filter(p -> p.getFilePath().contains(filePath.getKeyword())).collect(Collectors.toList());
}
//文件按照时间倒序
allFiles = allFiles.stream().sorted(Comparator.comparing(BusinessFileVo::getCreatTime).reversed()).collect(Collectors.toList());
return getDataTable(allFiles);
}
......
dsk-admin/src/main/java/com/dsk/web/controller/customer/CustomerController.java
View file @ 1f21ae1a
......@@ -97,6 +97,27 @@ public class CustomerController extends BaseController {
Map<String, Object> map = opportunityRadarService.enterpriseByName(customer.getCompanyName());
if (!ObjectUtils.isEmpty(map.get("data"))) {
customer.setCompanyId(MapUtil.getInt(BeanUtil.beanToMap(map.get("data")), "jskEid"));
if (ObjectUtils.isEmpty(customer.getLegalPerson())) {
customer.setLegalPerson(MapUtil.getStr(map, "legalPerson"));
}
if (ObjectUtils.isEmpty(customer.getRegisterCapital())) {
customer.setRegisterCapital(MapUtil.getStr(map, "registeredCapitalStr"));
}
if (ObjectUtils.isEmpty(customer.getProvinceId())) {
customer.setProvinceId(MapUtil.getInt(map, "provinceId"));
}
if (ObjectUtils.isEmpty(customer.getCityId())) {
customer.setCityId(MapUtil.getInt(map, "cityId"));
}
if (ObjectUtils.isEmpty(customer.getDistrictId())) {
customer.setDistrictId(MapUtil.getInt(map, "countyId"));
}
if (ObjectUtils.isEmpty(customer.getRegisterAddress())) {
customer.setRegisterAddress(MapUtil.getStr(map, "domicile"));
}
if (ObjectUtils.isEmpty(customer.getCreditCode())) {
customer.setCreditCode(MapUtil.getStr(map, "creditCode"));
}
}
} catch (Exception e) {
logger.debug("获取企业id错误！error：{}", e.getMessage());
......
dsk-admin/src/main/java/com/dsk/web/controller/dsk/EnterpriseController.java
View file @ 1f21ae1a
......@@ -10,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.List;
/**
......@@ -125,8 +126,14 @@ public class EnterpriseController {
@ApiOperation(value = "企业主体信用评级")
@PostMapping(value = "bondCreditRating")
public R remark(@RequestBody @Valid EnterpriseBondCreditRatingBody vo) throws Exception {
public R bondCreditRating(@RequestBody @Valid EnterpriseBondCreditRatingBody vo) throws Exception {
return enterpriseService.bondCreditRating(vo);
}
@ApiOperation(value = "通过建设库企业id批量获取城投企业id")
@PostMapping(value = "getUipIdByCid")
public R getUipIdByCid(@RequestBody List<Integer> vo) throws Exception {
return enterpriseService.getUipIdByCid(vo);
}
}
dsk-common/src/main/java/com/dsk/common/core/domain/entity/BusinessFileVo.java
View file @ 1f21ae1a
......@@ -15,6 +15,6 @@ public class BusinessFileVo {
public BusinessFileVo(String filePath, String creatTime) {
this.filePath = filePath;
this.creatTime = creatTime;
this.creatTime = creatTime == null ? "" : creatTime;
}
}
dsk-operate-ui/src/assets/styles/public.css
View file @ 1f21ae1a
......@@ -442,7 +442,7 @@ select {
font-weight: 400;
color: #232323;
background: #FFFFFF;
border-radius: 5px 5px 5px 5px;
border-radius: 2px;
border: 1px solid #D9D9D9;
text-align: center;
font-size: 14px;
......
dsk-operate-ui/src/layout/components/TagsView/index.vue
View file @ 1f21ae1a
......@@ -15,7 +15,7 @@
<svg :class="isActive(tag)?'tags-icon tags-icon-active':'tags-icon'" aria-hidden="true">
<use :xlink:href="iconName(tag)" />
</svg>
{{ tag.title }}
<span :id="isActive(tag)?'tagTitle':''">{{ tag.title }}</span>
<span v-if="!isAffix(tag)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
<i :class="index!=visitedViews.length-1 && index != isActiveIndex() && index != isActiveIndex()-1?'tags-item-line':'tags-item-line item-color'" />
</router-link>
......
dsk-operate-ui/src/store/modules/user.js
View file @ 1f21ae1a
......@@ -62,7 +62,7 @@ const user = {
} else {
commit('SET_ROLES', ['ROLE_DEFAULT'])
}
commit('SET_NAME', user.userName)
commit('SET_NAME', user.nickName)
commit('SET_AVATAR', avatar)
commit('SET_USERID', user.userId)
resolve(res)
......
dsk-operate-ui/src/utils/request.js
View file @ 1f21ae1a
......@@ -88,7 +88,7 @@ service.interceptors.response.use(res => {
});
}
return Promise.reject('无效的会话，或者会话已过期，请重新登录。')
} else if (code === 500) {
}/* else if (code === 500) {
Message({ message: msg, type: 'error' })
return Promise.reject(new Error(msg))
} else if (code === 601) {
......@@ -97,19 +97,19 @@ service.interceptors.response.use(res => {
} else if (code !== 200) {
Notification.error({ title: msg })
return Promise.reject('error')
} else {
}*/ else {
return res.data
}
},error => {
console.log('err' + error)
let { message } = error;
if (message == "Network Error") {
/*if (message == "Network Error") {
message = "后端接口连接异常";
} else if (message.includes("timeout")) {
message = "系统接口请求超时";
} else if (message.includes("Request failed with status code")) {
message = "系统接口" + message.substr(message.length - 3) + "异常";
}
}*/
if(message=='数据正在处理，请勿重复提交'){ //重复提交，提示样式特殊处理
Message({ message: message, type: 'warning', duration: 5 * 1000 })
}else{
......
dsk-operate-ui/src/views/custom/customList/index.vue
View file @ 1f21ae1a
......@@ -151,7 +151,7 @@
prop="address"
label="企业母公司" width="268">
<template slot-scope="scope">
<div class="wordprimary">{{scope.row.superCompany || '--'}}</div>
<div class="">{{scope.row.superCompany || '--'}}</div>
</template>
</el-table-column>
<el-table-column :key="keys"
......@@ -365,6 +365,9 @@ export default {
let customerId = row.customerId
let companyId = row.companyId
let path = type
if(companyId == null){
path = 'business'
}
this.$router.push({path:'/enterprise/'+encodeStr(companyId),query:{customerId:customerId,path:path}})
},
clearname(value){
......
dsk-operate-ui/src/views/custom/trends/index.vue
View file @ 1f21ae1a
......@@ -7,7 +7,7 @@
<!--</div>-->
<div class="app-container">
<gjjl types="gjdt" :data="datas" isDisabled=true></gjjl>
<gjjl types="gjdt" isDisabled=true></gjjl>
</div>
</div>
</template>
......
dsk-operate-ui/src/views/detail/party-a/business/component/info.vue
View file @ 1f21ae1a
......@@ -3,19 +3,19 @@
<div class="company-box">
<div class="company-nav flex-box">
<div class="company-left">
<img :src="companyInfo.logoUrl" :alt="companyInfo.companyName" :title="companyInfo.companyName" v-if="companyInfo.logoUrl">
<img :src="companyInfo.logoUrl" :alt="companyInfo.companyName" :title="companyInfo.companyName" v-if="companyInfo && companyInfo.logoUrl">
<span
:class="companyInfo.nameSimple&&companyInfo.nameSimple.length<3?'conenctLogo textOne bg'+companyInfo.nameSimple.length:'conenctLogo textTwo bg'+companyInfo.nameSimple.length"
v-else-if="companyInfo.nameSimple"
v-else-if="companyInfo && companyInfo.nameSimple"
v-html="companyInfo.nameSimple"></span>
<img :src="require('@/assets/images/detail/overview/logo@2x.png')" :alt="companyInfo.companyName" :title="companyInfo.companyName" v-else>
</div>
<div class="company-title">
<div class="company-name">
{{companyInfo.companyName || ''}}
{{companyInfo && companyInfo.companyName || '--'}}
</div>
<div class="company-tag">
<div style="float: left;margin-top: 8px;" class="company-history" v-if="companyInfo.historyNames && companyInfo.historyNames.length>0">
<div style="float: left;margin-top: 8px;" class="company-history" v-if="companyInfo && companyInfo.historyNames && companyInfo.historyNames.length>0">
<el-popover
placement="bottom-start"
popper-class="enterpriseLabel-item"
......@@ -26,18 +26,18 @@
</ul>
</el-popover>
</div>
<span style="float: left;" :class="!labelArr.includes(companyInfo.businessStatus)?'label-bg1':'label-bg3'" v-if="companyInfo.businessStatus">{{companyInfo.businessStatus}}</span>
<span style="float: left;" :class="!labelArr.includes(companyInfo.businessStatus)?'label-bg1':'label-bg3'" v-if="companyInfo && companyInfo.businessStatus">{{companyInfo.businessStatus}}</span>
</div>
</div>
</div>
<div class="company-info">
<div class="info-item flex-box">
<div class="flex-box item"><label>法定代表人：</label><span class="text-cl1">{{companyInfo.corporatePerson || '--'}}</span></div>
<div class="flex-box item"><label>统一社会信用代码：</label><span class="text-cl1">{{companyInfo.creditCode || '--'}}</span></div>
<div class="flex-box item"><label>法定代表人：</label><span class="text-cl1">{{companyInfo && companyInfo.corporatePerson || '--'}}</span></div>
<div class="flex-box item"><label>统一社会信用代码：</label><span class="text-cl1">{{companyInfo && companyInfo.creditCode || '--'}}</span></div>
</div>
<div class="info-item flex-box">
<div class="flex-box item"><label>注册资本：</label><span class="text-cl1">{{companyInfo.regCapital || '--'}}</span></div>
<div class="flex-box item"><label>注册地址：</label><span class="text-cl1">{{companyInfo.addressDetail || '--'}}</span></div>
<div class="flex-box item"><label>注册资本：</label><span class="text-cl1">{{companyInfo && companyInfo.regCapital || '--'}}</span></div>
<div class="flex-box item"><label>注册地址：</label><span class="text-cl1">{{companyInfo && companyInfo.addressDetail || '--'}}</span></div>
</div>
</div>
</div>
......
dsk-operate-ui/src/views/detail/party-a/business/index.vue
View file @ 1f21ae1a
......@@ -3,7 +3,7 @@
<template v-if="isInfo">
<!-- 企业信息 -->
<div class="view-content">
<Info :companyInfo="companyInfo" />
<Info :companyInfo="iscompanyInfo" />
</div>
<!-- 基本信息 -->
<div class="view-content">
......@@ -95,12 +95,13 @@ export default {
}
],//局级大客户
creditLevellist: [],//资信等级
}
},
iscompanyInfo:{}
}
},
created() {
this.handleQuery()
this.infos = this.customerInfo
this.iscompanyInfo = this.companyInfo ? this.companyInfo : {}
},
mounted(){
this.customerInfos()
......@@ -133,6 +134,7 @@ export default {
customerInfos(){
customerInfo(this.customerIds).then(res=>{
this.infos = res.data
this.handleQuery()
})
},
focusNowedits(e){
......
dsk-operate-ui/src/views/detail/party-a/component/Header.vue
View file @ 1f21ae1a
......@@ -10,8 +10,8 @@
</el-breadcrumb>
</div>-->
<div class="flex-box part-header">
<img class="header-logo" :src="companyInfo.logoUrl || require('@/assets/images/detail/company_logo.png')">
{{companyInfo.companyName || '--'}}
<img class="header-logo" :src="companyInfo && companyInfo.logoUrl || require('@/assets/images/detail/company_logo.png')">
{{companyInfo && companyInfo.companyName || '--'}}
</div>
</div>
</template>
......
dsk-operate-ui/src/views/detail/party-a/component/Sidebar.vue
View file @ 1f21ae1a
......@@ -16,16 +16,15 @@
class="detail-menu"
@open="handleOpen">
<template v-for="(item, index) in sideRoute">
<el-submenu :index="index.toString()" v-if="item.children">
<el-submenu :index="index.toString()" v-if="item.children" :disabled="!isCompanyId(item.title)">
<template slot="title">
<span>{{item.title}}</span>
</template>
<el-menu-item :index="index+'-'+idx" v-for="(it, idx) in item.children" :key="idx" @click="handleItem(it)" :disabled="it.disabled">{{it.title}}</el-menu-item>
</el-submenu>
<template v-else>
<el-menu-item :index="index.toString()" @click="handleItem(item)" :disabled="item.disabled" v-if="isCustomerId(item.pathName)">{{item.title}}</el-menu-item>
<el-menu-item :index="index.toString()" @click="handleItem(item)" :disabled="!isCompanyId(item.title) || item.disabled" v-if="isCustomerId(item.pathName)">{{item.title}}</el-menu-item>
</template>
</template>
</el-menu>
</div>
......@@ -46,6 +45,14 @@ export default {
customerId: {
type: String,
default: ''
},
isCompany: {
type: Boolean,
default: true
},
isCustomer: {
type: Boolean,
default: false
}
},
data() {
......@@ -106,6 +113,15 @@ export default {
'decisionMaking',
'gjjl'
],
companys:[
'企业概要',
'财务简析',
'项目商机',
'业务往来',
'城投分析',
'风险信息',
],
uniqueOpened:false,
searchIndex: ''
}
},
......@@ -171,7 +187,16 @@ export default {
},
isCustomerId(name){
if(this.customer.indexOf(name) != -1){
if(this.customerId){
if(this.customerId && this.isCustomer){
return true
}
return false
}
return true
},
isCompanyId(name){
if(this.companys.indexOf(name) != -1){
if(this.isCompany){
return true
}
return false
......
dsk-operate-ui/src/views/detail/party-a/cooperate/index.vue
View file @ 1f21ae1a
......@@ -57,7 +57,7 @@
width="604px">
<div class="poptitle">
<img src="@/assets/images/economies/icon.png">
<span>{{ companyInfo.companyName }}</span>
<span>{{ companyInfo && companyInfo.companyName || customerInfo.companyName }}</span>
</div>
<div class="addhzqk_from">
<el-form :model="addParam" :rules="rules" ref="addParam" size="small" label-width="70px">
......@@ -244,6 +244,10 @@ export default {
getDictType('project_category').then(result=>{
this.projectCategory = result.code == 200 ? result.data:[]
})
//项目状态
getDictType('project_status_type').then(result=>{
this.status = result.code == 200 ? result.data:[]
})
},
computed: {
......@@ -344,7 +348,6 @@ export default {
value:res.data[i].dictValue
})
}
this.status = res.data
}
})
},
......
dsk-operate-ui/src/views/detail/party-a/dealings/custom.vue
View file @ 1f21ae1a
......@@ -44,7 +44,6 @@
import mixin from '../mixins/mixin'
import { clientPage } from '@/api/detail/party-a/dealings'
import ClientDetail from './component/customDetail'
import auth from "@/plugins/auth";
export default {
name: 'Custom',
props: ['companyId'],
......
dsk-operate-ui/src/views/detail/party-a/dealings/supplier.vue
View file @ 1f21ae1a
......@@ -21,7 +21,7 @@
@sort-change="sortChange"
>
<template slot="companyName" slot-scope="scope">
<router-link :to="scope.row.uipId?`/enterprise/${encodeStr(scope.row.companyId)}`:`/company/${encodeStr(scope.row.companyId)}`" tag="a" class="a-link" v-if="scope.row.companyId&&scope.row.companyName" v-html="scope.row.companyName"></router-link>
<router-link :to="`/company/${encodeStr(scope.row.companyId)}`" tag="a" class="a-link" v-if="scope.row.companyId&&scope.row.companyName" v-html="scope.row.companyName"></router-link>
<div v-else v-html="scope.row.companyName || '--'"></div>
</template>
<template slot="projectAllName" slot-scope="scope">
......
dsk-operate-ui/src/views/detail/party-a/decisionMaking/index.vue
View file @ 1f21ae1a
......@@ -39,7 +39,7 @@
width="464px">
<div class="poptitle">
<img src="@/assets/images/economies/icon.png">
<span>{{ companyInfo.companyName }}</span>
<span>{{ companyInfo && companyInfo.companyName || customerInfo.companyName }}</span>
</div>
<el-form :model="addRorm" :rules="addRules" ref="addRorm" class="popform" label-width="90px">
<el-form-item label="姓名：" prop="name">
......@@ -81,7 +81,7 @@ export default {
components: {
Tables
},
props: ['customerIds','companyInfo'],
props: ['customerIds','companyInfo','customerInfo'],
data() {
return {
ifEmpty:false,
......
dsk-operate-ui/src/views/detail/party-a/overview/component/bidding.vue
View file @ 1f21ae1a
......@@ -31,9 +31,9 @@
</div>
<div class="zbph-account">招标动态
<div class="labels">
<div :class="{'on':datatype==3}" @click="getDT(3)">近七天</div>
<div :class="{'on':datatype==2}" @click="getDT(2)">近三十天</div>
<div :class="{'on':datatype==1}" @click="getDT(1)">近五年</div>
<div :class="{'on':datatype==3}" @click="getDT(3)">近7天</div>
<div :class="{'on':datatype==2}" @click="getDT(2)">近30天</div>
<div :class="{'on':datatype==1}" @click="getDT(1)">近5年</div>
</div>
</div>
<div id="myEcharts" style="width: 100%;height:250px; margin: 0 auto;"></div>
......@@ -61,7 +61,7 @@
prop="companyName"
label="公司名称">
<template slot-scope="scope">
<router-link :to="scope.row.uipId?`/enterprise/${encodeStr(scope.row.companyId)}`:`/company/${encodeStr(scope.row.companyId)}`" tag="a" class="a-link">{{ scope.row.companyName }}</router-link>
<router-link :to="`/company/${encodeStr(scope.row.companyId)}`" tag="a" class="a-link">{{ scope.row.companyName }}</router-link>
</template>
</el-table-column>
<el-table-column
......@@ -117,7 +117,7 @@ export default {
methods: {
async handleBid(){
let res = await bidDataGroup({cid: this.companyId, spanId: this.datatype})
if(res.code==200){
if(res.code==200 && res.data){
let {totalCount, lastYearCount, bidAmount} = res.data
this.dataAll = {totalCount, lastYearCount, bidAmount}
this.dtdata=res.data.groupCount.map(item=>{
......@@ -163,7 +163,7 @@ export default {
grid:{
left:'1',
top:'8%',
right:'2%',
right:'5%',
bottom:'8%',
containLabel: true
},
......
dsk-operate-ui/src/views/detail/party-a/overview/component/busclue.vue
View file @ 1f21ae1a
......@@ -78,7 +78,7 @@ export default {
methods: {
async handleQuery(){
let res = await projectTenderDataGroup({cid: this.companyId, type: this.activeIndex})
if(res.code==200 && res.data.length>0){
if(res.code==200 && res.data){
let data = res.data, totalVal = data.map(item => item.value).reduce((prev, cur) => prev + cur)
this.viewData = data.map(item => {
let it = {name:item.name, value:item.value, percent:parseFloat(Number(Number(item.value)/Number(totalVal)*100).toFixed(2))+'%'}
......@@ -164,7 +164,9 @@ export default {
},
watch: {
statistic(newVal, oldVal) {
this.handleStatistic()
if(newVal){
this.handleStatistic()
}
}
}
}
......
dsk-operate-ui/src/views/detail/party-a/overview/component/infoheader.vue
View file @ 1f21ae1a
......@@ -12,7 +12,7 @@
</div>
<div class="company-title">
<div class="company-name">
{{companyInfo.companyName || ''}}
{{companyInfo.companyName || '--'}}
</div>
<div class="company-tag">
<div style="float: left;margin-top: 8px;" class="company-history" v-if="companyInfo.historyNames && companyInfo.historyNames.length>0">
......@@ -306,7 +306,9 @@ export default {
this.getClaimStatus() //获取企业认领状态
},
statistic(newVal, oldVal) {
this.handleStatistic()
if(newVal){
this.handleStatistic()
}
}
}
}
......
dsk-operate-ui/src/views/detail/party-a/overview/component/operations.vue
View file @ 1f21ae1a
......@@ -73,7 +73,7 @@ export default {
async handleQuery() {
let res = await bondCreditRating({cid: this.companyId})
if(res.code==200){
this.operList = res.data
this.operList = res.data || []
this.$nextTick(() => {
this.companySwiper()
})
......
dsk-operate-ui/src/views/detail/party-a/overview/component/risk.vue
View file @ 1f21ae1a
......@@ -195,7 +195,9 @@ export default {
},
watch: {
statistic(newVal, oldVal) {
this.handView()
if(newVal){
this.handView()
}
}
}
}
......
dsk-operate-ui/src/views/detail/party-a/riskInformation/businessAnomaly.vue
View file @ 1f21ae1a
......@@ -42,7 +42,7 @@ export default {
pageSize: 20
},
forData: [
{label: '列入原因', prop: 'inReason', width: '508'},
{label: '列入原因', prop: 'inReason'},
{label: '列入日期', prop: 'inDate', width: '95'},
{label: '做出决定机关（移入）', prop: 'department', width: '264'},
{label: '移出经营异常名录原因', prop: 'outReason', width: '320'},
......
dsk-operate-ui/src/views/detail/party-a/riskInformation/dishonesty.vue
View file @ 1f21ae1a
......@@ -42,7 +42,7 @@ export default {
pageSize: 20
},
forData: [
{label: '失信被执行人行为具体情形', prop: 'executionDesc', width: '508', fixed: true},
{label: '失信被执行人行为具体情形', prop: 'executionDesc', fixed: true},
{label: '立案日期', prop: 'date', width: '95'},
{label: '履行情况', prop: 'executionStatus', width: '120'},
{label: '立案文号', prop: 'caseNumber', width: '210'},
......
dsk-operate-ui/src/views/detail/party-a/riskInformation/judgment.vue
View file @ 1f21ae1a
......@@ -50,7 +50,7 @@ export default {
pageSize: 20
},
forData: [
{label: '案由', prop: 'causeAction', width: '240'},
{label: '案由', prop: 'causeAction'},
{label: '执行案号', prop: 'causeNo', width: '210'},
{label: '身份', prop: 'role', width: '120'},
{label: '当事人', prop: 'relatedCompanies', width: '240', slot: true},
......
dsk-operate-ui/src/views/detail/party-a/riskInformation/openacourtsessionNotice.vue
View file @ 1f21ae1a
......@@ -50,7 +50,7 @@ export default {
pageSize: 20
},
forData: [
{label: '案由', prop: 'causeAction', width: '240', fixed: true},
{label: '案由', prop: 'causeAction', fixed: true},
{label: '开庭日期', prop: 'hearingDate', width: '95'},
{label: '当事人', prop: 'relatedCompanies', width: '428', slot: true},
{label: '身份', prop: 'pureRole', width: '120'},
......
dsk-operate-ui/src/views/detail/party-a/riskInformation/punish.vue
View file @ 1f21ae1a
......@@ -50,12 +50,12 @@ export default {
pageSize: 20
},
forData: [
{label: '处罚原因', prop: 'punishReason', width: '508', slot: true, fixed: true},
{label: '处罚原因', prop: 'punishReason', slot: true, fixed: true},
{label: '决定日期', prop: 'punishBegin', width: '105'},
{label: '处罚结果', prop: 'punishResult', width: '264'},
{label: '处罚文书号', prop: 'fileNum', width: '240'},
{label: '处罚机关', prop: 'office', width: '264'},
{label: '处罚结束日期', prop: 'punishEnd', width: '100'},
{label: '处罚结束日期', prop: 'punishEnd', width: '110'},
],
formData: [
{ type: 1, fieldName: 'penalizeReasonType', value: '', placeholder: '处罚类别', options: []},
......
dsk-operate-ui/src/views/detail/party-a/urbanLnvestment/landAcquisition.vue
View file @ 1f21ae1a
......@@ -48,7 +48,7 @@ export default {
pageSize: 20
},
forData: [
{label: '项目名称', prop: 'projectName', width: '508', slot: true},
{label: '项目名称', prop: 'projectName', slot: true},
{label: '土地用途', prop: 'landUse', width: '120'},
{label: '行业分类', prop: 'industry', width: '120'},
{label: '供地方式', prop: 'supplyLandWay', width: '120'},
......
dsk-operate-ui/src/views/detail/party-a/urbanLnvestment/regionalEconomies.vue
View file @ 1f21ae1a
......@@ -12,11 +12,13 @@
:data="getValues"
:show-header="false"
border
:cell-style="rowStyle"
>
<el-table-column
v-for="(item, index) in getHeaders"
:key="index"
:prop="item"
:formatter="formatStatus"
>
</el-table-column>
</el-table>
......@@ -252,6 +254,22 @@ export default {
}
this.addressList = str.join(' - ');
},
formatStatus: function(row, column, cellValue) {
if(row.title === '经济'||row.title === '财政'||row.title === '债务'){
return cellValue
}else {
return cellValue? cellValue : '--'
}
},
rowStyle(row){
if (row.row.title === '经济'||row.row.title === '财政'||row.row.title === '债务'){
return {
// background: '#FAF5EB',
color:'#232323',
fontWeight: 'bold'
}
}
},
}
}
</script>
......@@ -298,8 +316,8 @@ export default {
::v-deep .el-table__body-wrapper tr:nth-child(2) td,
::v-deep .el-table__body-wrapper tr:nth-child(17) td,
::v-deep .el-table__body-wrapper tr:nth-child(29) td{
font-weight: bold;
color: #232323;
//font-weight: bold;
//color: #232323;
}
</style>
dsk-operate-ui/src/views/enterpriseData/components/Owner/index.vue
View file @ 1f21ae1a
......@@ -452,7 +452,9 @@
width="244px">
<span>认领成功，是否完善客户信息？</span>
<div slot="footer" class="dialog-footer">
<span class="dialog-footer-btn1" type="primary" @click="renlin()">立即完善</span>
<span class="dialog-footer-btn1" type="primary" >
<router-link :to="'/enterprise/'+encodeStr(companyId)+'?customerId='+customerId+'&path=business' " tag="a" class="list-titel-a">立即完善</router-link>
</span>
<span class="dialog-footer-btn2" @click="search(pageNum, pageSize)">稍后</span>
</div>
</el-dialog>
......@@ -533,6 +535,8 @@ export default {
},
],
companyId:'',
customerId:'',
dialogVisible: false,
tableData:[],
......@@ -771,7 +775,7 @@ export default {
});
},
claimbtn(item){
console.log(item.companyName);
this.companyId=item.companyId;
var params={
companyId:item.companyId,
uipId:item.uipId,
......@@ -791,6 +795,7 @@ export default {
// console.log(res)
if (res.code==200) {
this.dialogVisible=true;
this.customerId=res.data.customerId;
}
}).catch(error=>{
......
dsk-operate-ui/src/views/project/projectList/component/gjjl.vue
View file @ 1f21ae1a
......@@ -4,7 +4,7 @@
<div class="cardtitles" v-if="showtype != 'projectgjdt'">跟进记录</div>
<div style="height: 24px" v-if="showtype == 'projectgjdt'"></div>
<div class="records">
<div class="writeIn" v-if="isDisabled == false">
<div class="writeIn" v-if="isDisableds == false">
<div class="default" v-if="isEdit == false" @click="getEdit">
<img src="@/assets/images/project/add_3.png">
<div>新建一条跟进记录，如:周五上午预约客户上门拜访</div>
......@@ -91,7 +91,7 @@
<div class="rec_time">
<i class="el-icon-time"></i>
<div>{{item.creatTime}}</div>
<div class="operate" v-if="isDisabled == false">
<div class="operate" v-if="isDisableds == false">
<!--<img src="@/assets/images/edit.png">第一期不做编辑-->
<img @click="delRecord(item.id)" src="@/assets/images/delete.png">
</div>
......@@ -146,7 +146,7 @@
default: 0
},
datas:[],//数据源
isDisabled:false,
isDisabled:true,
},
name: 'gjjl',
data(){
......@@ -173,7 +173,7 @@
projectId:this.detailId ? this.detailId : parseInt(this.$route.query.id),//项目详情id
userId:this.$store.state.user.userId,//当前用户id
projectList:[],//关联项目
isDisabled:this.isDisabled,
isDisableds:this.isDisabled,
}
},
computed: {
......@@ -186,7 +186,7 @@
this.showtype = this.types
//客户管理跟进动态
if(this.showtype == 'gjdt'){
this.isDisabled = false
this.isDisableds = false
getUserList().then(result=>{
this.glqylist = result.data
})
......@@ -198,7 +198,7 @@
}
//项目管理跟进动态
if(this.showtype == 'projectgjdt'){
this.isDisabled = false
this.isDisableds = false
this.projectId = null//项目id暂时清空，必须手选id
relateProject(this.userId).then(res=>{
this.projectList = res.data
......
dsk-operate-ui/src/views/project/projectList/component/gzdb.vue
View file @ 1f21ae1a
......@@ -3,7 +3,7 @@
<el-card class="box-card noborder">
<div class="cardtitles">工作待办</div>
<div class="records">
<div class="writeIn" v-if="isDisabled == false">
<div class="writeIn" v-if="isDisableds == false">
<div class="default" v-if="isEdit == false" @click="getEdit">
<img src="@/assets/images/project/add_3.png">
<div>新建一条工作代办，如:周五上午预约客户上门拜访</div>
......@@ -40,7 +40,7 @@
{{item.state == 2?"已完成":"未完成"}}
<i class="el-icon-caret-bottom"></i>
</span>
<el-select v-if="isDisabled == false" placeholder="请选择" v-model="item.state" class="select-multiple" @change="changes(item.id,$event)">
<el-select v-if="isDisableds == false" placeholder="请选择" v-model="item.state" class="select-multiple" @change="changes(item.id,$event)">
<el-option label="未完成" value="1"></el-option>
<el-option label="已完成" value="2"></el-option>
</el-select>
......@@ -97,7 +97,7 @@
},
datalist:[],
yqnum:0,//已逾期数量
isDisabled:this.isDisabled,
isDisableds:this.isDisabled,
}
},
created(){
......
dsk-operate-ui/src/views/project/projectList/component/jsnr.vue
View file @ 1f21ae1a
......@@ -8,7 +8,7 @@
<div class="con">
<span>总投资额（万元） ：</span>
<div class="inputxt" id="inputxt1">
<div class="flex" v-if="nowedit == 1 && isDisabled == false">
<div class="flex" v-if="nowedit == 1 && isDisableds == false">
<el-input placeholder="待添加" v-model="investmentAmount" @input="number"></el-input>
<div class="flex">
<div class="btnsmall btn_primary h28" style="width: 56px" @click="changes({'investmentAmount':investmentAmount})">确定</div>
......@@ -21,7 +21,7 @@
<div class="con i">
<span>资金来源 ：</span>
<div class="inputxt" id="inputxt2">
<div class="flex" v-if="nowedit == 2 && isDisabled == false">
<div class="flex" v-if="nowedit == 2 && isDisableds == false">
<el-input placeholder="待添加" v-model="amountSource"></el-input>
<div class="flex">
<div class="btnsmall btn_primary h28" @click="changes({'amountSource':amountSource})" style="width: 56px">确定</div>
......@@ -36,7 +36,7 @@
<div class="con">
<span>建设性质 ：</span>
<div class="inputxt" id="inputxt3">
<div class="flex" v-if="nowedit == 3 && isDisabled == false">
<div class="flex" v-if="nowedit == 3 && isDisableds == false">
<el-input placeholder="待添加" v-model="buildProperty"></el-input>
<div class="flex">
<div class="btnsmall btn_primary h28" @click="changes({'buildProperty':buildProperty})" style="width: 56px">确定</div>
......@@ -50,7 +50,7 @@
<span>计划招标 ：</span>
<div class="inputime">
<div class="flex" style="">
<el-date-picker class="timeinput" v-if="isDisabled == false"
<el-date-picker class="timeinput" v-if="isDisableds == false"
v-model="planBidTime"
type="date"
value-format="yyyy-MM-dd"
......@@ -66,7 +66,7 @@
<span>计划开工 ：</span>
<div class="inputime">
<div class="flex" style="opacity: 0;height: 0">
<el-date-picker class="timeinput" v-if="isDisabled == false"
<el-date-picker class="timeinput" v-if="isDisableds == false"
v-model="planStartTime"
type="date"
value-format="yyyy-MM-dd"
......@@ -80,7 +80,7 @@
<span>计划竣工 ：</span>
<div class="inputime">
<div class="flex" style="opacity: 0;height: 0">
<el-date-picker class="timeinput" v-if="isDisabled == false"
<el-date-picker class="timeinput" v-if="isDisableds == false"
v-model="planCompleteTime"
type="date"
value-format="yyyy-MM-dd"
......@@ -96,7 +96,7 @@
<el-card class="box-card noborder">
<div class="cardtitles">项目概况与建设规模</div>
<div class="baseinfo" >
<el-input id="inputxt9" :disabled="isDisabled" v-model="projectDetails" @focus="nowedit = 9" class="textarea" type="textarea" placeholder="请输入项目概况与建设规模详细信息" maxlength="500" :show-word-limit="true" ></el-input>
<el-input id="inputxt9" :disabled="isDisableds" v-model="projectDetails" @focus="nowedit = 9" class="textarea" type="textarea" placeholder="请输入项目概况与建设规模详细信息" maxlength="500" :show-word-limit="true" ></el-input>
<div class="flex btns" v-if="nowedit == 9">
<div class="flex">
<div class="btnsmall btn_primary h28" @click="changes({'projectDetails':projectDetails})" style="width: 56px">确定</div>
......@@ -112,7 +112,7 @@
<div class="con">
<span>评标办法 ：</span>
<div class="inputxt" id="inputxt4">
<div class="flex" v-if="nowedit == 4 && isDisabled == false">
<div class="flex" v-if="nowedit == 4 && isDisableds == false">
<el-input placeholder="待添加" v-model="evaluationBidWay"></el-input>
<div class="flex">
<div class="btnsmall btn_primary h28" @click="changes({'evaluationBidWay':evaluationBidWay})" style="width: 56px">确定</div>
......@@ -126,7 +126,7 @@
<span>开标时间 ：</span>
<div class="inputime">
<div class="flex" style="opacity: 0;height: 0">
<el-date-picker class="timeinput" v-if="isDisabled == false"
<el-date-picker class="timeinput" v-if="isDisableds == false"
v-model="bidOpenTime"
type="date"
value-format="yyyy-MM-dd"
......@@ -141,7 +141,7 @@
<div class="con">
<span>保证金缴纳 ：</span>
<div class="inputxt" id="inputxt5">
<div class="flex" v-if="nowedit == 5 && isDisabled == false">
<div class="flex" v-if="nowedit == 5 && isDisableds == false">
<el-input placeholder="待添加" v-model="earnestMoneyPay"></el-input>
<div class="flex">
<div class="btnsmall btn_primary h28" @click="changes({'earnestMoneyPay':earnestMoneyPay})" style="width: 56px">确定</div>
......@@ -154,7 +154,7 @@
<div class="con i">
<span>保证金金额（万元） ：</span>
<div class="inputxt" id="inputxt6">
<div class="flex" v-if="nowedit == 6 && isDisabled == false">
<div class="flex" v-if="nowedit == 6 && isDisableds == false">
<el-input placeholder="待添加" @input="number1" v-model="earnestMoney"></el-input>
<div class="flex">
<div class="btnsmall btn_primary h28" @click="changes({'earnestMoney':earnestMoney})" style="width: 56px">确定</div>
......@@ -169,7 +169,7 @@
<div class="con">
<span>开标地点 ：</span>
<div class="inputxt" id="inputxt7">
<div class="flex" v-if="nowedit == 7 && isDisabled == false">
<div class="flex" v-if="nowedit == 7 && isDisableds == false">
<el-input placeholder="待添加" v-model="bidOpenPlace"></el-input>
<div class="flex">
<div class="btnsmall btn_primary h28" @click="changes({'bidOpenPlace':bidOpenPlace})" style="width: 56px">确定</div>
......@@ -182,7 +182,7 @@
<div class="con i">
<span>评标委员会 ：</span>
<div class="inputxt" id="inputxt8">
<div class="flex" v-if="nowedit == 8 && isDisabled == false">
<div class="flex" v-if="nowedit == 8 && isDisableds == false">
<el-input placeholder="待添加" v-model="evaluationBidCouncil"></el-input>
<div class="flex">
<div class="btnsmall btn_primary h28" @click="changes({'evaluationBidCouncil':evaluationBidCouncil})" style="width: 56px">确定</div>
......@@ -229,14 +229,14 @@
earnestMoney: '',//保证金金额
earnestMoneyPay: '',//保证金缴纳
evaluationBidCouncil: '',//评标委员会
isDisabled:this.isDisabled,
isDisableds:this.isDisabled,
}
},
watch:{
},
mounted(){
document.getElementById('jsnr').addEventListener('mouseup',(e) => {
if(this.isDisabled == true)
if(this.isDisableds == true)
return false
let j = 0
for(var i=1;i<=9;i++){
......@@ -309,7 +309,7 @@
changes(str){
let param = str
param.id = this.id
if(this.isDisabled == true)
if(this.isDisableds == true)
return false
editXMNR(param).then(result=>{
if(result.code == 200){
......
dsk-operate-ui/src/views/project/projectList/component/lxr.vue
View file @ 1f21ae1a
......@@ -7,14 +7,14 @@
:data="tableData"
stripe border
style="width: 100%"
:default-sort = "{prop: 'role', order: 'descending'}"
:default-sort = "{prop: 'role', order: 'ascending'}"
>
<template slot="empty">
<div class="empty">
<img src="@/assets/images/project/empty.png">
<div class="p1">暂无数据展示</div>
<div class="p2">抱歉，你还未添加相关数据，快去添加吧</div>
<div class="btn btn_primary h36 w102" @click="opennew" v-if="isDisabled == false">新增联系人</div>
<div class="btn btn_primary h36 w102" @click="opennew" v-if="isDisableds == false">新增联系人</div>
</div>
</template>
<el-table-column
......@@ -78,7 +78,7 @@
</el-table-column>
</el-table>
<div class="bottems">
<div class="btn btn_primary h28" @click="opennew" v-if="total>0 && isDisabled == false" ><div class="img img1" ></div>新增联系人</div>
<div class="btn btn_primary h28" @click="opennew" v-if="total>0 && isDisableds == false" ><div class="img img1" ></div>新增联系人</div>
<el-pagination v-if="total>searchParam.pageSize"
background
:page-size="searchParam.pageSize"
......@@ -162,7 +162,7 @@
total:0,
projectname:this.$route.query.projectname,
queryParam:[],
isDisabled:this.isDisabled,
isDisableds:this.isDisabled,
}
},
created(){
......@@ -170,7 +170,7 @@
},
methods:{
getDetail(item){
if(this.isDisabled == true){
if(this.isDisableds == true){
return this.$message.warning("您无权限进行操作")
}
......
dsk-operate-ui/src/views/project/projectList/component/xgqy.vue
View file @ 1f21ae1a
......@@ -11,20 +11,20 @@
<el-input type="text" placeholder="输入关键词查询" clearable v-model="searchParam.companyName"></el-input>
<div class="btn" @click="handleCurrentChange(1)">搜索</div>
</div>
<div class="btn btn_primary h32 b3" @click="opennew" v-if="isDisabled == false"><div class="img img1"></div>添加相关企业</div>
<div class="btn btn_primary h32 b3" @click="opennew" v-if="isDisableds == false"><div class="img img1"></div>添加相关企业</div>
</div>
<div class="document tables">
<el-table
:data="tableData.rows"
style="width: 100%"
:default-sort = "{prop: 'depth', order: 'descending'}"
:default-sort = "{prop: 'depth', order: 'ascending'}"
>
<template slot="empty">
<div class="empty">
<img src="@/assets/images/project/empty.png">
<div class="p1">抱歉，没找到相关数据</div>
<div class="p2">建议调整关键词或添加相关企业，重新搜索</div>
<div class="btn btn_primary h36 w102" @click="opennew" v-if="isDisabled==false">新增相关企业</div>
<div class="btn btn_primary h36 w102" @click="opennew" v-if="isDisableds==false">新增相关企业</div>
</div>
</template>
<el-table-column
......@@ -51,7 +51,7 @@
label="负责人"
width="">
</el-table-column>
<el-table-column v-if="isDisabled == false"
<el-table-column v-if="isDisableds == false"
prop="name"
label=""
align="right"
......@@ -186,7 +186,7 @@
companyName:'',
},
ondel:-1,
isDisabled:this.isDisabled,
isDisableds:this.isDisabled,
showlist:false,
companData:[],
}
......
dsk-operate-ui/src/views/project/projectList/component/zlwd.vue
View file @ 1f21ae1a
......@@ -10,7 +10,8 @@
<div class="btn" @click="handleCurrentChange(1)">搜索</div>
</div>
<!--<div class="btn btn_primary h32 b2" @click="getUP" v-if="fileDatas.total>0"><div class="img img2"></div>上传</div>-->
<el-upload
<div class="btn btn_primary h32 b2" v-if="fileDatas.total>0"><div class="img img2"></div><el-upload
class="upload-demo"
:action="action"
:on-change="handleFileListChange"
......@@ -20,9 +21,9 @@
accept=".word,.pdf.excel,.xlsx,.doc,.docx"
:headers="headers"
:show-file-list="false"
:on-success="onSuccess">
<div class="btn btn_primary h32 b2" v-if="fileDatas.total>0"><div class="img img2"></div>上传</div>
</el-upload>
:on-success="onSuccess"
:key='keys'>上传</el-upload></div>
</div>
<div class="filepath" v-if="filename"><font @click="getall">全部</font> / <span> <img class="img" src="@/assets/images/folder.png">{{filename}}</span></div>
<div class="uploadbox" v-if="isupload">
......@@ -60,15 +61,15 @@
<el-table
:data="fileDatas.rows"
style="width: 100%"
:default-sort = "{prop: 'creatTime', order: 'descending'}"
:default-sort = "{prop: 'creatTime', order: 'ascending'}"
>
<template slot="empty">
<div class="empty">
<img src="@/assets/images/project/empty.png">
<div class="p1">抱歉，没找到相关数据</div>
<div class="p2">建议调整关键词或筛选条件，重新搜索</div>
<!--<div v-if="isDisabled==false" class="btn btn_primary h36 w102" @click="getUP">上传文档</div>-->
<div v-if="isDisabled==false" class="btn btn_primary h36 w102"> <el-upload
<!--<div v-if="isDisableds==false" class="btn btn_primary h36 w102" @click="getUP">上传文档</div>-->
<div v-if="isDisableds==false" class="btn btn_primary h36 w102"> <el-upload
class="upload-demo"
:action="action"
:on-change="handleFileListChange"
......@@ -116,7 +117,7 @@
<template slot-scope="scope">
<div class="hoverbtn">
<div class="xz" @click="downnlod(scope.row)">下载</div>
<div class="sc" v-if="isDisabled == false" @click="del(scope.row.filePath)">删除</div>
<div class="sc" v-if="isDisableds == false" @click="del(scope.row.filePath)">删除</div>
</div>
</template>
</el-table-column>
......@@ -178,7 +179,8 @@
fileDatas:[],
filename:'',
ondel:"",
isDisabled:this.isDisabled,
isDisableds:this.isDisabled,
keys:1,
}
},
created(){
......@@ -221,7 +223,7 @@
}
},
getUP(){
if(this.isDisabled==true)
if(this.isDisableds==true)
return false
this.isupload=true
this.$nextTick(() => {
......@@ -261,6 +263,7 @@
_this.getList()
_this.$message.success('上传成功！')
_this.isupload = false
_this.keys++;
},3000)
}
......
dsk-operate-ui/src/views/radar/BidRecord/details.vue
View file @ 1f21ae1a
......@@ -39,14 +39,12 @@
<div class="content main5">
<div class="common-title">参投列表</div>
<div class="common-title">投标人列表</div>
<div class="table-item">
<el-table
:data="tableData"
element-loading-text="Loading"
border
highlight-current-row
>
<el-table-column label="序号" width="80">
<template slot-scope="scope">
......@@ -54,9 +52,9 @@
</template>
</el-table-column>
<el-table-column label="项目名称" >
<el-table-column label="企业名称" >
<template slot-scope="scope">
<router-link v-if="scope.row.id" :to="'/company/' + encodeStr(scope.row.id) + '/?index=true'" tag="a" class="list-titel-a blue" v-html="scope.row.name"></router-link>
<router-link :to="scope.row.uipId?'/enterprise/' + encodeStr(scope.row.uipId) :'/company/' + encodeStr(scope.row.companyId) " tag="a" class="list-titel-a blue" v-html="scope.row.companyName"></router-link>
</template>
</el-table-column>
......@@ -66,13 +64,19 @@
</template>
</el-table-column>
<!-- <el-table-column label="工期" width="182" >
<template slot-scope="scope">
{{ scope.row.tenderOffer||'--'}}
</template>
</el-table-column> -->
</el-table>
<div class="pagination clearfix" v-show="total>10">`
<!-- <div class="pagination clearfix" v-show="total>10">`
<el-pagination background :page-size="pageSize" :current-page="pageNum"
@current-change="handleCurrentChange" layout="prev, pager, next" :total="total">
</el-pagination>
</div>
</div> -->
</div>
</div>
......@@ -82,7 +86,7 @@
<img v-if="showimg" src="@/assets/images/bxpro/original1.png">
<img v-else src="@/assets/images/bxpro/original.png">
<span>
<a :href="textList.url">原文链接</a>
<a :href="textList.url" target="_blank">原文链接</a>
</span>
</div>
......@@ -129,7 +133,10 @@
}).then(res => {
// console.log(res);
this.textList = res.data;
console.log(this.textList);
if(this.textList.companys){
this.textList.companys=JSON.parse(this.textList.companys);
this.tableData = this.textList.companys;
}
}).catch(error => {
......@@ -151,15 +158,15 @@
pageNum: this.pageNum,
pageSize: this.pageSize
}
api.tenderPage(data).then(res => {
// console.log(res);
this.tableData = res.rows;
this.total = res.total;
console.log(this.tableData);
// api.tenderPage(data).then(res => {
// // console.log(res);
// this.tableData = res.rows;
// this.total = res.total;
// console.log(this.tableData);
}).catch(error => {
// }).catch(error => {
});
// });
}
}
......
dsk-operate-ui/src/views/radar/Bidding/details.vue
View file @ 1f21ae1a
......@@ -25,8 +25,7 @@
<p class="list-content-text">
<span>招采单位：</span>
<span v-if="textList.tenderee">
<router-link v-if="textList.uipId" :to="'/enterprise/' + encodeStr(textList.uipId) + '/?index=true'" tag="a" class="list-titel-a blue" v-html="textList.tenderee"></router-link>
<router-link v-else :to="'/company/' + encodeStr(textList.tendereeId) + '/?index=true'" tag="a" class="list-titel-a blue" v-html="textList.tenderee"></router-link>
<router-link :to="scope.row.uipId?'/enterprise/' + encodeStr(scope.row.uipId) :'/company/' + encodeStr(scope.row.tendereeId) " tag="a" class="list-titel-a blue" v-html="scope.row.tenderee"></router-link>
</span>
<span v-else>--</span>
</p>
......
dsk-operate-ui/src/views/radar/Establishment/details.vue
View file @ 1f21ae1a
......@@ -48,7 +48,10 @@
<div class="main3-box">
<p>
<label class="label">项目法人</label>
<span>{{textList.companyName||'--'}}</span>
<span>
<router-link v-if="textList.companyName" :to="scope.row.uipId?'/enterprise/' + encodeStr(scope.row.uipId) :'/company/' + encodeStr(scope.row.companyId) " tag="a" class="list-titel-a blue" v-html="scope.row.companyName"></router-link>
<span v-else>--</span>
</span>
<label class="label">总投资（万元）</label>
<span>{{textList.money||'--'}}</span>
</p>
......
dsk-operate-ui/src/views/radar/Tender/details.vue
View file @ 1f21ae1a
......@@ -42,28 +42,28 @@
</p>
</div>
<div class="list-content">
<p class="list-content-text">
<div class="list-content" v-if="textList.projectAmount||textList.contact">
<p class="list-content-text" v-if="textList.projectAmount">
<span>预算金款：</span>
<span v-if="textList.projectAmount">{{textList.projectAmount}}万元</span>
<span v-else>--</span>
</p>
<p class="list-content-text">
<p class="list-content-text" v-if="textList.contact">
<span>联系方式：</span>
<span >招采单位 {{textList.contact}}{{textList.contactTel}}</span>
</p>
</div>
<div class="list-content">
<p class="list-content-text">
<div class="list-content" v-if="textList.issueTime||textList.overTime||textList.dataSource">
<p class="list-content-text" v-if="textList.issueTime">
<span>发布时间：</span>
<span >{{textList.issueTime||'--'}}</span>
</p>
<p class="list-content-text">
<p class="list-content-text" v-if="textList.overTime">
<span>报名截止日期：</span>
<span >{{textList.overTime||'--'}}</span>
</p>
<p class="list-content-text">
<p class="list-content-text" v-if="textList.dataSource">
<span>来源网站：</span>
<span >{{textList.dataSource||'--'}}</span>
</p>
......
dsk-operate-ui/src/views/radar/bxprozbgg/details.vue
View file @ 1f21ae1a
......@@ -178,8 +178,7 @@
<div class="main3-box">
<p>
<label class="label">招标人</label>
<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>
<router-link :to="scope.row.uipId?'/enterprise/' + encodeStr(scope.row.uipId) :'/company/' + encodeStr(scope.row.tendereeId) " tag="a" class="list-titel-a blue" v-html="scope.row.tenderee"></router-link>
<label class="label">代理机构</label>
<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>
......
dsk-operate-ui/src/views/radar/components/BidRecord/index.vue
View file @ 1f21ae1a
<template>
<div>
<div class="content">
<div class="content_item">
<div class="content_item content_item_padding0">
<div class="label">项目名称</div>
<div class="content_right">
<el-input class="ename_input"
......@@ -35,7 +35,7 @@
></el-cascader>
</div>
<el-dropdown @command="punishDatehandleCommand" trigger="click" class="el-dropdown-land" ref="punishDateShowPopper" :hide-on-click="false" >
<el-dropdown @command="punishDatehandleCommand" trigger="click" placement="bottom-start" class="el-dropdown-land" ref="punishDateShowPopper" :hide-on-click="false" >
<span class="el-dropdown-link" :class="punishDateValue ? 'color_text' : ''" >
发布时间{{ punishDateValue ? " 1项" : ""}}
<i class="el-icon-caret-bottom"></i>
......@@ -69,7 +69,7 @@
</div>
</el-dropdown>
<el-dropdown @command="tenderDatehandleCommand" class="el-dropdown-land" trigger="click" ref="tenderDateShowPopper" :hide-on-click="false" >
<el-dropdown @command="tenderDatehandleCommand" class="el-dropdown-land" placement="bottom-start" trigger="click" ref="tenderDateShowPopper" :hide-on-click="false" >
<span class="el-dropdown-link" :class="tenderDateValue ? 'color_text' : ''" >开标时间{{ tenderDateValue ? " 1项" : ""}}<i class="el-icon-caret-bottom"></i>
</span>
......@@ -145,7 +145,7 @@
</span>
</div>
<div class="list-content" v-if="item.tenderTime||item.source||item.punishDate">
<div class="list-content list-content1" v-if="item.tenderTime||item.source||item.punishDate">
<p class="list-content-text" v-if="item.tenderTime">
<span>开标时间：</span>
......@@ -853,10 +853,11 @@ export default {
.content{
padding: 0px 16px;
padding-top: 16px;
border-radius: 4px 4px 4px 4px;
background: #FFFFFF;
.content_item{
padding-top: 12px;
padding-top: 20px;
display: flex;
align-items: center;
.label{
......@@ -991,7 +992,7 @@ export default {
}
}
.content-label{
margin-top: 12px;
margin-top: 8px;
.list-label{
background: #F3F3FF;
color: #8491E8;
......@@ -1011,11 +1012,10 @@ export default {
align-items: center;
.list-content-text{
margin-top: 7px;
display: flex;
justify-content: start;
align-items: center;
margin-right: 27px;
margin-right: 32px;
font-size: 14px;
span:first-child{
......@@ -1055,6 +1055,9 @@ export default {
}
}
.list-content1{
margin-top: 12px;
}
}
......
dsk-operate-ui/src/views/radar/components/Bidding/index.vue
View file @ 1f21ae1a
<template>
<div>
<div class="content">
<div class="content_item">
<div class="content_item content_item_padding0">
<div class="label">项目名称</div>
<div class="content_right">
<el-input class="ename_input"
......@@ -71,7 +71,7 @@
</el-option>
</el-select>
</div>
<el-dropdown @command="planTenderAmounthandleCommand" class="el-dropdown-land" trigger="click" ref="planTenderAmountShowPopper" :hide-on-click="false">
<el-dropdown @command="planTenderAmounthandleCommand" class="el-dropdown-land" placement="bottom-start" trigger="click" ref="planTenderAmountShowPopper" :hide-on-click="false">
<span class="el-dropdown-link" :class="jskBidPlanDto.startPlanTenderAmount ||jskBidPlanDto.endPlanTenderAmount ? 'color_text': ''">
合同预估金额{{jskBidPlanDto.startPlanTenderAmount ||jskBidPlanDto.endPlanTenderAmount? " 1项": ""}}<i class="el-icon-caret-bottom"></i>
</span>
......@@ -192,7 +192,7 @@
</div>
<div class="list-content" v-if="item.issueTime||item.planTenderDateStart||item.sourceName">
<div class="list-content list-content1" v-if="item.issueTime||item.planTenderDateStart||item.sourceName">
<p class="list-content-text" v-if="item.issueTime">
<span>发布时间：</span>
<span >{{item.issueTime||'--'}}</span>
......@@ -208,7 +208,7 @@
</div>
<div class="list-content list-addree" v-if="item.projectScale">
<div class="list-content list-addree" v-if="item.projectScale">
<p class="list-content-text">
<span class="content-text-gc">工程规模：</span>
<span class="content-text-p" v-html="item.projectScale"></span>
......@@ -599,10 +599,11 @@ export default {
<style lang="scss" scoped>
.content{
padding: 0px 16px;
padding-top: 16px;
border-radius: 4px 4px 4px 4px;
background: #FFFFFF;
.content_item{
padding-top: 12px;
padding-top: 20px;
display: flex;
align-items: center;
.label{
......@@ -737,14 +738,14 @@ export default {
}
}
.content-label{
margin-top: 12px;
margin-top: 8px;
.list-label{
background: #F3F3FF;
color: #8491E8;
border-radius: 1px 1px 1px 1px;
padding: 3px 7px;
font-size: 12px;
margin-right: 16px;
margin-right: 8px;
}
.list-label-wl{
......@@ -760,17 +761,16 @@ export default {
.list-content{
margin-top: 8px;
margin-top: 12px;
display: flex;
justify-content: start;
align-items: center;
.list-content-text{
margin-top: 7px;
display: flex;
justify-content: start;
align-items:flex-start ;
margin-right: 27px;
margin-right: 32px;
font-size: 14px;
span:first-child{
......@@ -803,9 +803,9 @@ export default {
width: auto;
background: #F3F4F5;
display: inline-flex;
margin-top: 12px;
margin-top: 16px;
.list-content-text{
margin-top: 0px;
margin-left: 16px;
span{
line-height: 30px!important;
}
......@@ -817,6 +817,9 @@ export default {
}
}
.list-content1{
margin-top: 8px;
}
}
.bottomlist-list:hover{
......
dsk-operate-ui/src/views/radar/components/Establishment/index.vue
View file @ 1f21ae1a
<template>
<div>
<div class="content">
<div class="content_item">
<div class="content_item content_item_padding0">
<div class="label">项目名称</div>
<div class="content_right">
<el-input class="ename_input"
......@@ -69,7 +69,7 @@
</span>
<el-cascader ref="address" class="cascader-region" v-model="addressType" :options="addressList" :props="props" @change="domicileChange" collapse-tags clearable></el-cascader>
</div>
<el-dropdown @command="moneyhandleCommand" class="el-dropdown-land" trigger="click" ref="moneyShowPopper" :hide-on-click="false">
<el-dropdown @command="moneyhandleCommand" class="el-dropdown-land" placement="bottom-start" trigger="click" ref="moneyShowPopper" :hide-on-click="false">
<span class="el-dropdown-link" :class=" establishmentDto.startMoney || establishmentDto.endMoney? 'color_text' : ''">
总投资{{establishmentDto.startMoney || establishmentDto.endMoney? " 1项": ""}}<i class="el-icon-caret-bottom"></i>
</span>
......@@ -111,7 +111,7 @@
</el-option>
</el-select>
</div>
<el-dropdown @command="planStartTimehandleCommand" class="el-dropdown-land" trigger="click" ref="planStartTimeShowPopper":hide-on-click="false">
<el-dropdown @command="planStartTimehandleCommand" placement="bottom-start" class="el-dropdown-land" trigger="click" ref="planStartTimeShowPopper":hide-on-click="false">
<span class="el-dropdown-link" :class="planStartTimeValue ? 'color_text' : ''">
计划开工时间{{ planStartTimeValue ? " 1项" : ""}}<i class="el-icon-caret-bottom"></i>
</span>
......@@ -133,7 +133,7 @@
</el-dropdown-menu>
</div>
</el-dropdown>
<el-dropdown @command="planEndTimehandleCommand" class="el-dropdown-land" trigger="click" ref="planEndTimeShowPopper" :hide-on-click="false">
<el-dropdown @command="planEndTimehandleCommand" placement="bottom-start" class="el-dropdown-land" trigger="click" ref="planEndTimeShowPopper" :hide-on-click="false">
<span class="el-dropdown-link" :class="planEndTimeValue ? 'color_text' : ''">
计划完工日期{{ planEndTimeValue ? " 1项" : ""}}<i class="el-icon-caret-bottom"></i>
</span>
......@@ -1129,10 +1129,11 @@
.content{
padding: 0px 16px;
padding-top: 16px;
border-radius: 4px 4px 4px 4px;
background: #FFFFFF;
.content_item{
padding-top: 12px;
padding-top: 20px;
display: flex;
align-items: center;
.label{
......@@ -1267,7 +1268,8 @@
}
}
.content-label{
margin-top: 12px;
margin-top: 8px;
margin-bottom: 2px;
.list-label{
background: #F3F3FF;
color: #8491E8;
......
dsk-operate-ui/src/views/radar/components/Land/index.vue
View file @ 1f21ae1a
<template>
<div>
<div class="content">
<div class="content_item">
<div class="content_item content_item_padding0">
<div class="label">项目名称</div>
<div class="content_right">
<el-input class="ename_input"
......@@ -51,7 +51,7 @@
</el-select>
</div>
<el-dropdown @command="handleCommand" class="el-dropdown-land" trigger="click" ref="popper" :hide-on-click="false">
<el-dropdown @command="handleCommand" class="el-dropdown-land" placement="bottom-start" trigger="click" ref="popper" :hide-on-click="false">
<span class="el-dropdown-link" :class="landMarketDto.startAcreage || landMarketDto.endAcreage? 'color_text': ''">
出让面积{{landMarketDto.startAcreage || landMarketDto.endAcreage? " 1项": ""}}<i class="el-icon-caret-bottom"></i>
</span>
......@@ -85,7 +85,7 @@
</el-dropdown-menu>
</el-dropdown>
<div class="select-popper">
<el-popover placement="bottom" v-model="showIpt" trigger="click">
<el-popover v-model="showIpt" placement="bottom-start" trigger="click">
<div class="jabph_popper_box jabph_popper_box1" style="position: relative">
<div class="jabph_popper_wrap">
最小
......@@ -114,7 +114,7 @@
<div class="content_item">
<div class="label">成交信息</div>
<div class="content_right">
<el-dropdown @command="transactionPricehandleCommand" class="el-dropdown-land" trigger="click" ref="transactionPriceShowPopper" :hide-on-click="false">
<el-dropdown @command="transactionPricehandleCommand" class="el-dropdown-land" placement="bottom-start" trigger="click" ref="transactionPriceShowPopper" :hide-on-click="false">
<span class="el-dropdown-link" :class="landMarketDto.startTransactionPrice ||landMarketDto.endTransactionPrice ? 'color_text': ''">
成交金额{{landMarketDto.startTransactionPrice ||landMarketDto.endTransactionPrice? " 1项": ""}}<i class="el-icon-caret-bottom"></i>
</span>
......@@ -147,7 +147,7 @@
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<el-dropdown @command="contractSignTimehandleCommand" class="el-dropdown-land" trigger="click" ref="contractSignTimeShowPopper" :hide-on-click="false">
<el-dropdown @command="contractSignTimehandleCommand" class="el-dropdown-land" placement="bottom-start" trigger="click" ref="contractSignTimeShowPopper" :hide-on-click="false">
<span class="el-dropdown-link" :class="contractSignTimeValue ? 'color_text' : ''">
签订日期{{ contractSignTimeValue ? " 1项" : ""}}<i class="el-icon-caret-bottom"></i>
</span>
......@@ -932,10 +932,11 @@
<style lang="scss" scoped>
.content{
padding: 0px 16px;
padding-top: 16px;
border-radius: 4px 4px 4px 4px;
background: #FFFFFF;
.content_item{
padding-top: 12px;
padding-top: 20px;
display: flex;
align-items: center;
.label{
......@@ -1060,6 +1061,7 @@
font-size: 16px;
font-weight: 700;
color: #3D3D3D;
margin-bottom: 4px;
line-height: 19px;
.list-titel-a{
text-decoration: none;
......@@ -1070,7 +1072,7 @@
}
}
.content-label{
margin-top: 7px;
margin-top: 5px;
.list-label{
background: #F3F3FF;
color: #8491E8;
......@@ -1094,7 +1096,7 @@
display: flex;
justify-content: start;
align-items: center;
margin-right: 27px;
margin-right: 32px;
font-size: 14px;
span:first-child{
......@@ -1121,7 +1123,7 @@
width: auto;
background: #F3F4F5;
display: inline-flex;
margin-top: 7px;
margin-top: 8px;
.list-content-text{
margin-top: 0px;
span{
......
dsk-operate-ui/src/views/radar/components/Tender/Select.vue
View file @ 1f21ae1a
......@@ -11,6 +11,7 @@
multiple
filterable
:filter-method="filterMethod"
placement="bottom-start"
v-el-select-loadmore="loadMore(rangeNumber)"
@change="selectChange"
@visible-change="visibleChange" >
......
dsk-operate-ui/src/views/radar/components/Tender/index.vue
View file @ 1f21ae1a
<template>
<div>
<div class="content">
<div class="content_item">
<div class="content_item content_item_padding0">
<div class="label">项目名称</div>
<div class="content_right">
<el-input class="ename_input" v-model="keyword"
......@@ -63,7 +63,7 @@
<el-cascader ref="address" class="cascader-region" v-model="addressType" :options="addressList":props="props" @change="domicileChange" collapse-tags clearable>
</el-cascader>
</div>
<el-dropdown @command="punishDatehandleCommand" trigger="click" class="el-dropdown-land" ref="punishDateShowPopper":hide-on-click="false">
<el-dropdown @command="punishDatehandleCommand" trigger="click" placement="bottom-start" class="el-dropdown-land" ref="punishDateShowPopper":hide-on-click="false">
<span class="el-dropdown-link" :class="punishDateValue ? 'color_text' : ''">发布时间{{ punishDateValue ? " 1项" : ""}}
<i class="el-icon-caret-bottom"></i>
</span>
......@@ -106,7 +106,7 @@
</el-option>
</el-select>
</div>
<el-dropdown @command="bidMoneyhandleCommand" class="el-dropdown-land" trigger="click" ref="bidMoneyShowPopper":hide-on-click="false">
<el-dropdown @command="bidMoneyhandleCommand" placement="bottom-start" class="el-dropdown-land" trigger="click" ref="bidMoneyShowPopper":hide-on-click="false">
<span class="el-dropdown-link" :class=" jskBidQueryDto.startBidMoney || jskBidQueryDto.endBidMoney? 'color_text' : ''">
预算金额{{jskBidQueryDto.startBidMoney || jskBidQueryDto.endBidMoney? " 1项": ""}}
<i class="el-icon-caret-bottom"></i>
......@@ -209,7 +209,7 @@
</span>
</div>
<div class="list-content" v-if="item.companyName||item.agency">
<div class="list-content list-content1" v-if="item.companyName||item.agency">
<p class="list-content-text" v-if="item.companyName">
<span>招采单位：</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>
......@@ -1107,11 +1107,12 @@
<style lang="scss" scoped>
.content {
padding: 0px 16px;
padding-top: 16px;
border-radius: 4px 4px 4px 4px;
background: #FFFFFF;
.content_item {
padding-top: 12px;
padding-top: 20px;
display: flex;
align-items: center;
......@@ -1272,7 +1273,7 @@
background: #F3F3FF;
color: #8491E8;
border-radius: 1px 1px 1px 1px;
margin-right: 12px;
margin-right: 8px;
padding: 3px 7px;
font-size: 12px;
......@@ -1291,17 +1292,15 @@
.list-content {
margin-top: 3px;
margin-top:8px;
display: flex;
justify-content: start;
align-items: center;
.list-content-text {
margin-top: 7px;
display: flex;
justify-content: start;
align-items: center;
margin-right: 27px;
margin-right: 32px;
font-size: 14px;
span:first-child {
......@@ -1326,6 +1325,9 @@
}
.list-content1{
margin-top: 12px;
}
}
......
dsk-operate-ui/src/views/radar/components/bxprozbgg/index.vue
View file @ 1f21ae1a
......@@ -446,7 +446,7 @@
</template>
</template>
</el-table-column>
<el-table-column prop="zj" label="招标人" width="312" >
<el-table-column prop="zj" label="招标人" width="280" >
<template slot-scope="scope">
<router-link :to="'/company/'+encodeStr(scope.row.tendereeId) " tag="a" class="list-titel-a" v-html="scope.row.tenderee"></router-link>
</template>
......
dsk-operate-ui/src/views/radar/debtProject/details.vue
View file @ 1f21ae1a
......@@ -136,14 +136,14 @@
<div class="main4-box">
<label class="label">项目主体</label>
<span>
<router-link v-if="textList.projectEntity" :to="'/company/' + encodeStr(textList.projectEntityId) + '/?index=true'" tag="a" class=" blue" v-html="textList.projectEntity"></router-link>
<router-link v-if="textList.projectEntity" :to="scope.row.projectEntityUipId?'/enterprise/' + encodeStr(scope.row.projectEntityUipId) :'/company/' + encodeStr(scope.row.projectEntityId) " tag="a" class="list-titel-a blue" v-html="scope.row.projectEntity"></router-link>
<template v-else>--</template>
</span>
<label class="label">主管部门</label>
<span>{{textList.chargeDepartment||'--'}}</span>
<label class="label">实施单位</label>
<span>
<router-link v-if="textList.piu" :to="'/company/' + encodeStr(textList.piuId) + '/?index=true'" tag="a" class=" blue" v-html="textList.piu"></router-link>
<router-link v-if="textList.piu" :to="scope.row.piuUipId?'/enterprise/' + encodeStr(scope.row.piuUipId) :'/company/' + encodeStr(scope.row.piuId) " tag="a" class="list-titel-a blue" v-html="scope.row.piu"></router-link>
<template v-else>--</template>
</span>
</div>
......
dsk-system/src/main/java/com/dsk/system/dskService/EnterpriseService.java
View file @ 1f21ae1a
......@@ -254,4 +254,11 @@ public class EnterpriseService {
Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/bondCreditRating", BeanUtil.beanToMap(body, false, false));
return BeanUtil.toBean(map, R.class);
}
public R getUipIdByCid(List<Integer> body) throws Exception {
if (CollectionUtils.isEmpty(body)) return R.ok();
HashMap<String, Object> paramMap = new HashMap<>();
paramMap.put("ids", body);
Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/getUipIdByCid", paramMap);
return BeanUtil.toBean(map, R.class);
}
}
dsk-system/src/main/java/com/dsk/system/service/impl/SpecialPurposeBondsServiceImpl.java
View file @ 1f21ae1a
......@@ -16,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.stereotype.Service;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
......@@ -98,7 +99,21 @@ public class SpecialPurposeBondsServiceImpl implements SpecialPurposeBondsServic
@Override
public AjaxResult bondStatistics(SpecialPurposeBondsDto dto) {
// todo 临时处理 待还原
Map<String, Object> map = dskOpenApiUtil.requestBody("/specialPurposeBonds/bond/statistics", BeanUtil.beanToMap(dto, false, false));
Integer code = MapUtils.getInteger(map, "code", 300);
if (code.equals(HttpStatus.OK.value())) {
List<Object> list = CommonUtils.assertAsArray(MapUtils.getObject(map, "data", ""));
Iterator<Object> it = list.iterator();
while (it.hasNext()) {
Map<String, Object> informationMap = (Map<String, Object>)it.next();
// 专项债用于项目规模
Integer count = MapUtils.getInteger(informationMap, "count",0);
if (count.equals(0)) {
it.remove();
}
}
}
return BeanUtil.toBean(map, AjaxResult.class);
}
......
dsk-system/src/main/resources/mapper/business/BusinessInfoMapper.xml
View file @ 1f21ae1a
......@@ -101,16 +101,24 @@
LEFT JOIN business_user bu on bu.business_id = i.id
LEFT JOIN sys_user u on u.user_id = f.user_id
<where>
<if test="userId != null">
and bu.user_id = #{userId}
</if>
<if test="projectType != null and projectType != ''">
and i.project_type in
<foreach collection="projectType" item="projectType" open="(" separator="," close=")">
#{projectType}
</foreach>
</if>
<if test="minAmount != null and minAmount != '' and maxAmount != minAmount">
<if test="minAmount != null and minAmount != '' and minAmount != 0 and maxAmount != minAmount">
and i.investment_amount &gt;= #{minAmount}
</if>
<if test="maxAmount != null and maxAmount != '' and maxAmount != minAmount">
<if test="minAmount == 0 and maxAmount != minAmount">
and ((i.investment_amount &gt;= #{minAmount}
and i.investment_amount &lt; #{maxAmount})
or i.investment_amount is null)
</if>
<if test="maxAmount != null and maxAmount != '' and maxAmount != minAmount and minAmount != 0">
and i.investment_amount &lt; #{maxAmount}
</if>
<if test="minAmount != null and minAmount != '' and maxAmount != null and maxAmount != '' and maxAmount == minAmount">
......@@ -128,9 +136,6 @@
<if test="ownerCompany != null and ownerCompany != ''">
or i.construction_unit like concat('%',#{ownerCompany},'%')
</if>
<if test="userId != null">
and bu.user_id = #{userId}
</if>
<if test="others != null">
and bu.user_id != #{others} and i.is_private = 1
</if>
......@@ -332,12 +337,12 @@
<if test="buildProperty != null">build_property = #{buildProperty},</if>
<if test="planCompleteTime != null">plan_complete_time = #{planCompleteTime},</if>
<if test="projectDetails != null">project_details = #{projectDetails},</if>
<if test="provinceName != null">province_name = #{provinceName},</if>
<if test="provinceId != null">province_id = #{provinceId},</if>
<if test="cityName != null">city_name = #{cityName},</if>
<if test="cityId != null">city_id = #{cityId},</if>
<if test="districtName != null">district_name = #{districtName},</if>
<if test="districtId != null">district_id = #{districtId},</if>
province_name = #{provinceName},
province_id = #{provinceId},
city_name = #{cityName},
city_id = #{cityId},
district_name = #{districtName},
district_id = #{districtId},
<if test="projectType != null">project_type = #{projectType},</if>
<if test="projectCategory != null">project_category = #{projectCategory},</if>
<if test="isPrivate != null">is_private = #{isPrivate},</if>
......
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