Skip to content

D
dsk-cr20g
Commit 3ebfaa05 authored by dengguangman's avatar dengguangman
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents ab9c880f f23e14eb
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 993 additions and 396 deletions
dsk-admin/src/main/java/com/dsk/web/controller/business/BusinessFileController.java
View file @ 3ebfaa05
...@@ -19,6 +19,7 @@ import javax.servlet.http.HttpServletRequest; ...@@ -19,6 +19,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
...@@ -68,6 +69,8 @@ public class BusinessFileController extends BaseController { ...@@ -68,6 +69,8 @@ public class BusinessFileController extends BaseController {
List<BusinessFileVo> allFileName = FileUtils.getAllFileNames(filePath.getFilePath()); List<BusinessFileVo> allFileName = FileUtils.getAllFileNames(filePath.getFilePath());
allFiles = allFileName.stream().filter(p -> p.getFilePath().contains(filePath.getKeyword())).collect(Collectors.toList()); 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); return getDataTable(allFiles);
} }
......
dsk-admin/src/main/java/com/dsk/web/controller/customer/CustomerController.java
View file @ 3ebfaa05
...@@ -97,6 +97,27 @@ public class CustomerController extends BaseController { ...@@ -97,6 +97,27 @@ public class CustomerController extends BaseController {
Map<String, Object> map = opportunityRadarService.enterpriseByName(customer.getCompanyName()); Map<String, Object> map = opportunityRadarService.enterpriseByName(customer.getCompanyName());
if (!ObjectUtils.isEmpty(map.get("data"))) { if (!ObjectUtils.isEmpty(map.get("data"))) {
customer.setCompanyId(MapUtil.getInt(BeanUtil.beanToMap(map.get("data")), "jskEid")); 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) { } catch (Exception e) {
logger.debug("获取企业id错误！error：{}", e.getMessage()); logger.debug("获取企业id错误！error：{}", e.getMessage());
......
dsk-common/src/main/java/com/dsk/common/core/domain/entity/BusinessFileVo.java
View file @ 3ebfaa05
...@@ -15,6 +15,6 @@ public class BusinessFileVo { ...@@ -15,6 +15,6 @@ public class BusinessFileVo {
public BusinessFileVo(String filePath, String creatTime) { public BusinessFileVo(String filePath, String creatTime) {
this.filePath = filePath; this.filePath = filePath;
this.creatTime = creatTime; this.creatTime = creatTime == null ? "" : creatTime;
} }
} }
dsk-common/src/main/java/com/dsk/common/dtos/JskBidPlanDto.java
View file @ 3ebfaa05
...@@ -2,6 +2,8 @@ package com.dsk.common.dtos; ...@@ -2,6 +2,8 @@ package com.dsk.common.dtos;
import lombok.Data; import lombok.Data;
import java.util.Date;
/** /**
* 组合查询参数 * 组合查询参数
* @author Administrator * @author Administrator
...@@ -48,13 +50,16 @@ public class JskBidPlanDto { ...@@ -48,13 +50,16 @@ public class JskBidPlanDto {
String projectCapitalSource; String projectCapitalSource;
//发布时间 //发布时间
String issueTime; String issueTime;
//发布时间开始
Date startIssueTime;
//发布时间结束
Date endIssueTime;
//计划发布开始时间 //计划发布开始时间
String planTenderDateStart; String planTenderDateStart;
//计划发布截止时间 //计划发布截止时间
String planTenderDateEnd; String planTenderDateEnd;
//来源网站 //来源网站
String sourceName; String sourceName;
/** /**
* 修改时间 * 修改时间
*/ */
......
dsk-operate-ui/src/api/enterpriseData/enterpriseData.js
View file @ 3ebfaa05
...@@ -60,8 +60,16 @@ let enterprisePage= function enterprisePage(param) { ...@@ -60,8 +60,16 @@ let enterprisePage= function enterprisePage(param) {
data: param data: param
}) })
} }
// 甲方详情-公司概要
let infoHeader= function infoHeader(param) {
return request({
url: '/enterprise/infoHeader',
method: 'post',
data: param
})
}
export default {aptitudeCode,personCert,searchDic,regionWebList,uipGroupData,uipSerach,claim,enterprisePage} export default {aptitudeCode,personCert,searchDic,regionWebList,uipGroupData,uipSerach,claim,enterprisePage,infoHeader}
\ No newline at end of file \ No newline at end of file
dsk-operate-ui/src/api/radar/radar.js
View file @ 3ebfaa05
...@@ -188,7 +188,14 @@ let tenderPage = function tenderPage(param) { ...@@ -188,7 +188,14 @@ let tenderPage = function tenderPage(param) {
}) })
} }
// 批量获取城投企业id
let getUipIdByCid = function getUipIdByCid(param) {
return request({
url: '/enterprise/getUipIdByCid',
method: 'post',
data: param
})
}
export default { export default {
importData, importData,
...@@ -213,5 +220,6 @@ export default { ...@@ -213,5 +220,6 @@ export default {
bidNoticeDetail, bidNoticeDetail,
jskBidTenderPage, jskBidTenderPage,
tenderDetail, tenderDetail,
tenderPage tenderPage,
getUipIdByCid
} }
\ No newline at end of file
dsk-operate-ui/src/assets/styles/public.css
View file @ 3ebfaa05
...@@ -541,10 +541,10 @@ select { ...@@ -541,10 +541,10 @@ select {
border-radius: 2px 2px 2px 2px; border-radius: 2px 2px 2px 2px;
cursor: pointer; cursor: pointer;
text-align: center; text-align: center;
color: #ffffff; font-size: 14px;
margin-left: 8px; margin-left: 16px;
margin-right: 32px; margin-right: 24px;
width: 115px; padding: 0px 8px;
height: 34px; height: 34px;
line-height: 34px; line-height: 34px;
border: 1px solid #0081FF; border: 1px solid #0081FF;
...@@ -755,12 +755,12 @@ select { ...@@ -755,12 +755,12 @@ select {
} }
.checkbox .el-checkbox__label { .checkbox .el-checkbox__label {
padding-left: 8px; padding-left: 6px;
color: #232323; color: #232323;
} }
.checkbox .checkbox-content .checkbox-content-qx { .checkbox .checkbox-content .checkbox-content-qx {
margin-right: 30px; margin-right: 24px;
} }
.toolbar-right-search { .toolbar-right-search {
...@@ -790,43 +790,40 @@ select { ...@@ -790,43 +790,40 @@ select {
border-top-right-radius: 0; border-top-right-radius: 0;
border-bottom-right-radius: 0; border-bottom-right-radius: 0;
border-right: none; border-right: none;
height: 32px; height: 30px;
line-height: 32px; line-height: 30px;
} }
.toolbar-right-search .el-input-group__append { .toolbar-right-search .el-input-group__append {
padding: 0; padding: 0;
} }
.toolbar-right-search .result-search {
height: 32px;
line-height: 32px;
}
.toolbar-right-search .toolbar-right-search .el-input .el-input__inner { .toolbar-right-search .toolbar-right-search .el-input .el-input__inner {
border-top-right-radius: 0; border-top-right-radius: 0;
border-bottom-right-radius: 0; border-bottom-right-radius: 0;
border-right: none; border-right: none;
height: 32px; height: 30px;
line-height: 32px; line-height: 30px;
} }
.toolbar-right-search .result-search { .toolbar-right-search .result-search {
width: 80px; width: 59px;
height: 32px; height: 30px;
background: #0081FF;
border-top-right-radius: 2px; border-top-right-radius: 2px;
border-bottom-right-radius: 2px; border-bottom-right-radius: 2px;
text-align: center; text-align: center;
line-height: 32px; line-height: 30px;
padding: 0; padding: 0;
cursor: pointer; cursor: pointer;
color: #fff; color: #0081FF;
background: #F5F5F5;
border: 1px solid #D9D9D9;
border-left: none;
} }
.toolbar-right-search .result-search:hover {
background: #0074E5;
}
.info-list { .info-list {
display: flex; display: flex;
...@@ -834,16 +831,28 @@ select { ...@@ -834,16 +831,28 @@ select {
margin: auto; margin: auto;
background: #fff; background: #fff;
padding: 24px 0px; padding: 24px 0px;
border-bottom: 1px solid #EFEFEF; /* border-bottom: 1px solid #EFEFEF; */
position: relative;
/* cursor: pointer; */ /* cursor: pointer; */
} }
.info-list .solid{
position: absolute;
padding: 0 16px;
bottom: 0px;
width: 100%;
}
.info-list .solid p{
width: 100%;
height: 1px;
background-color: #EFEFEF;
}
.info-list:hover { .info-list:hover {
background: #F5FAFF; background: #F5FAFF;
} }
.info-list .info-list-left { .info-list .info-list-left {
width: 128px; padding: 0px 16px;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: flex-start; align-items: flex-start;
...@@ -854,8 +863,8 @@ select { ...@@ -854,8 +863,8 @@ select {
} }
.info-list-left img { .info-list-left img {
width: 96px; width: 72px;
height: 96px; height: 72px;
} }
.info-list-left .list-left-titel { .info-list-left .list-left-titel {
...@@ -873,6 +882,7 @@ select { ...@@ -873,6 +882,7 @@ select {
display: flex; display: flex;
align-items: center; align-items: center;
line-height: 18px; line-height: 18px;
font-size: 14px;
/* cursor: pointer; */ /* cursor: pointer; */
} }
...@@ -1157,6 +1167,11 @@ select { ...@@ -1157,6 +1167,11 @@ select {
.table-item .el-table td { .table-item .el-table td {
font-size: 13px; font-size: 13px;
} }
.table-item-jf .el-table tr,
.table-item-jf .el-table td {
font-size: 13px;
}
.table-item-jf1 { .table-item-jf1 {
padding: 0px 16px; padding: 0px 16px;
......
dsk-operate-ui/src/layout/components/TagsView/index.vue
View file @ 3ebfaa05
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<svg :class="isActive(tag)?'tags-icon tags-icon-active':'tags-icon'" aria-hidden="true"> <svg :class="isActive(tag)?'tags-icon tags-icon-active':'tags-icon'" aria-hidden="true">
<use :xlink:href="iconName(tag)" /> <use :xlink:href="iconName(tag)" />
</svg> </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)" /> <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'" /> <i :class="index!=visitedViews.length-1 && index != isActiveIndex() && index != isActiveIndex()-1?'tags-item-line':'tags-item-line item-color'" />
</router-link> </router-link>
......
dsk-operate-ui/src/store/modules/user.js
View file @ 3ebfaa05
...@@ -62,7 +62,7 @@ const user = { ...@@ -62,7 +62,7 @@ const user = {
} else { } else {
commit('SET_ROLES', ['ROLE_DEFAULT']) commit('SET_ROLES', ['ROLE_DEFAULT'])
} }
commit('SET_NAME', user.userName) commit('SET_NAME', user.nickName)
commit('SET_AVATAR', avatar) commit('SET_AVATAR', avatar)
commit('SET_USERID', user.userId) commit('SET_USERID', user.userId)
resolve(res) resolve(res)
......
dsk-operate-ui/src/utils/request.js
View file @ 3ebfaa05
...@@ -88,7 +88,7 @@ service.interceptors.response.use(res => { ...@@ -88,7 +88,7 @@ service.interceptors.response.use(res => {
}); });
} }
return Promise.reject('无效的会话，或者会话已过期，请重新登录。') return Promise.reject('无效的会话，或者会话已过期，请重新登录。')
} else if (code === 500) { }/* else if (code === 500) {
Message({ message: msg, type: 'error' }) Message({ message: msg, type: 'error' })
return Promise.reject(new Error(msg)) return Promise.reject(new Error(msg))
} else if (code === 601) { } else if (code === 601) {
...@@ -97,19 +97,19 @@ service.interceptors.response.use(res => { ...@@ -97,19 +97,19 @@ service.interceptors.response.use(res => {
} else if (code !== 200) { } else if (code !== 200) {
Notification.error({ title: msg }) Notification.error({ title: msg })
return Promise.reject('error') return Promise.reject('error')
} else { }*/ else {
return res.data return res.data
} }
},error => { },error => {
console.log('err' + error) console.log('err' + error)
let { message } = error; let { message } = error;
if (message == "Network Error") { /*if (message == "Network Error") {
message = "后端接口连接异常"; message = "后端接口连接异常";
} else if (message.includes("timeout")) { } else if (message.includes("timeout")) {
message = "系统接口请求超时"; message = "系统接口请求超时";
} else if (message.includes("Request failed with status code")) { } else if (message.includes("Request failed with status code")) {
message = "系统接口" + message.substr(message.length - 3) + "异常"; message = "系统接口" + message.substr(message.length - 3) + "异常";
} }*/
if(message=='数据正在处理，请勿重复提交'){ //重复提交，提示样式特殊处理 if(message=='数据正在处理，请勿重复提交'){ //重复提交，提示样式特殊处理
Message({ message: message, type: 'warning', duration: 5 * 1000 }) Message({ message: message, type: 'warning', duration: 5 * 1000 })
}else{ }else{
......
dsk-operate-ui/src/views/custom/customList/index.vue
View file @ 3ebfaa05
...@@ -151,7 +151,7 @@ ...@@ -151,7 +151,7 @@
prop="address" prop="address"
label="企业母公司" width="268"> label="企业母公司" width="268">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="wordprimary">{{scope.row.superCompany || '--'}}</div> <div class="">{{scope.row.superCompany || '--'}}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :key="keys" <el-table-column :key="keys"
...@@ -365,6 +365,9 @@ export default { ...@@ -365,6 +365,9 @@ export default {
let customerId = row.customerId let customerId = row.customerId
let companyId = row.companyId let companyId = row.companyId
let path = type let path = type
if(companyId == null){
path = 'business'
}
this.$router.push({path:'/enterprise/'+encodeStr(companyId),query:{customerId:customerId,path:path}}) this.$router.push({path:'/enterprise/'+encodeStr(companyId),query:{customerId:customerId,path:path}})
}, },
clearname(value){ clearname(value){
......
dsk-operate-ui/src/views/custom/trends/index.vue
View file @ 3ebfaa05
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<!--</div>--> <!--</div>-->
<div class="app-container"> <div class="app-container">
<gjjl types="gjdt" :data="datas" isDisabled=true></gjjl> <gjjl types="gjdt" isDisabled=true></gjjl>
</div> </div>
</div> </div>
</template> </template>
......
dsk-operate-ui/src/views/detail/party-a/business/component/info.vue
View file @ 3ebfaa05
...@@ -3,19 +3,19 @@ ...@@ -3,19 +3,19 @@
<div class="company-box"> <div class="company-box">
<div class="company-nav flex-box"> <div class="company-nav flex-box">
<div class="company-left"> <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 <span
:class="companyInfo.nameSimple&&companyInfo.nameSimple.length<3?'conenctLogo textOne bg'+companyInfo.nameSimple.length:'conenctLogo textTwo bg'+companyInfo.nameSimple.length" :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> v-html="companyInfo.nameSimple"></span>
<img :src="require('@/assets/images/detail/overview/logo@2x.png')" :alt="companyInfo.companyName" :title="companyInfo.companyName" v-else> <img :src="require('@/assets/images/detail/overview/logo@2x.png')" :alt="companyInfo.companyName" :title="companyInfo.companyName" v-else>
</div> </div>
<div class="company-title"> <div class="company-title">
<div class="company-name"> <div class="company-name">
{{companyInfo.companyName || ''}} {{companyInfo && companyInfo.companyName || '--'}}
</div> </div>
<div class="company-tag"> <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 <el-popover
placement="bottom-start" placement="bottom-start"
popper-class="enterpriseLabel-item" popper-class="enterpriseLabel-item"
...@@ -26,18 +26,18 @@ ...@@ -26,18 +26,18 @@
</ul> </ul>
</el-popover> </el-popover>
</div> </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>
</div> </div>
<div class="company-info"> <div class="company-info">
<div class="info-item flex-box"> <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 && 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.creditCode || '--'}}</span></div>
</div> </div>
<div class="info-item flex-box"> <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 && 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.addressDetail || '--'}}</span></div>
</div> </div>
</div> </div>
</div> </div>
......
dsk-operate-ui/src/views/detail/party-a/business/index.vue
View file @ 3ebfaa05
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<template v-if="isInfo"> <template v-if="isInfo">
<!-- 企业信息 --> <!-- 企业信息 -->
<div class="view-content"> <div class="view-content">
<Info :companyInfo="companyInfo" /> <Info :companyInfo="iscompanyInfo" />
</div> </div>
<!-- 基本信息 --> <!-- 基本信息 -->
<div class="view-content"> <div class="view-content">
...@@ -95,12 +95,13 @@ export default { ...@@ -95,12 +95,13 @@ export default {
} }
],//局级大客户 ],//局级大客户
creditLevellist: [],//资信等级 creditLevellist: [],//资信等级
} },
iscompanyInfo:{}
} }
}, },
created() { created() {
this.handleQuery()
this.infos = this.customerInfo this.infos = this.customerInfo
this.iscompanyInfo = this.companyInfo ? this.companyInfo : {}
}, },
mounted(){ mounted(){
this.customerInfos() this.customerInfos()
...@@ -133,6 +134,7 @@ export default { ...@@ -133,6 +134,7 @@ export default {
customerInfos(){ customerInfos(){
customerInfo(this.customerIds).then(res=>{ customerInfo(this.customerIds).then(res=>{
this.infos = res.data this.infos = res.data
this.handleQuery()
}) })
}, },
focusNowedits(e){ focusNowedits(e){
......
dsk-operate-ui/src/views/detail/party-a/component/Header.vue
View file @ 3ebfaa05
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
</el-breadcrumb> </el-breadcrumb>
</div>--> </div>-->
<div class="flex-box part-header"> <div class="flex-box part-header">
<img class="header-logo" :src="companyInfo.logoUrl || require('@/assets/images/detail/company_logo.png')"> <img class="header-logo" :src="companyInfo && companyInfo.logoUrl || require('@/assets/images/detail/company_logo.png')">
{{companyInfo.companyName || '--'}} {{companyInfo && companyInfo.companyName || '--'}}
</div> </div>
</div> </div>
</template> </template>
......
dsk-operate-ui/src/views/detail/party-a/component/Sidebar.vue
View file @ 3ebfaa05
...@@ -16,16 +16,15 @@ ...@@ -16,16 +16,15 @@
class="detail-menu" class="detail-menu"
@open="handleOpen"> @open="handleOpen">
<template v-for="(item, index) in sideRoute"> <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"> <template slot="title">
<span>{{item.title}}</span> <span>{{item.title}}</span>
</template> </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-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> </el-submenu>
<template v-else> <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>
</template> </template>
</el-menu> </el-menu>
</div> </div>
...@@ -46,6 +45,14 @@ export default { ...@@ -46,6 +45,14 @@ export default {
customerId: { customerId: {
type: String, type: String,
default: '' default: ''
},
isCompany: {
type: Boolean,
default: true
},
isCustomer: {
type: Boolean,
default: false
} }
}, },
data() { data() {
...@@ -106,6 +113,15 @@ export default { ...@@ -106,6 +113,15 @@ export default {
'decisionMaking', 'decisionMaking',
'gjjl' 'gjjl'
], ],
companys:[
'企业概要',
'财务简析',
'项目商机',
'业务往来',
'城投分析',
'风险信息',
],
uniqueOpened:false,
searchIndex: '' searchIndex: ''
} }
}, },
...@@ -171,7 +187,16 @@ export default { ...@@ -171,7 +187,16 @@ export default {
}, },
isCustomerId(name){ isCustomerId(name){
if(this.customer.indexOf(name) != -1){ 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 true
} }
return false return false
......
dsk-operate-ui/src/views/detail/party-a/cooperate/index.vue
View file @ 3ebfaa05
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
width="604px"> width="604px">
<div class="poptitle"> <div class="poptitle">
<img src="@/assets/images/economies/icon.png"> <img src="@/assets/images/economies/icon.png">
<span>{{ companyInfo.companyName }}</span> <span>{{ companyInfo && companyInfo.companyName || customerInfo.companyName }}</span>
</div> </div>
<div class="addhzqk_from"> <div class="addhzqk_from">
<el-form :model="addParam" :rules="rules" ref="addParam" size="small" label-width="70px"> <el-form :model="addParam" :rules="rules" ref="addParam" size="small" label-width="70px">
...@@ -244,6 +244,10 @@ export default { ...@@ -244,6 +244,10 @@ export default {
getDictType('project_category').then(result=>{ getDictType('project_category').then(result=>{
this.projectCategory = result.code == 200 ? result.data:[] this.projectCategory = result.code == 200 ? result.data:[]
}) })
//项目状态
getDictType('project_status_type').then(result=>{
this.status = result.code == 200 ? result.data:[]
})
}, },
computed: { computed: {
...@@ -344,7 +348,6 @@ export default { ...@@ -344,7 +348,6 @@ export default {
value:res.data[i].dictValue value:res.data[i].dictValue
}) })
} }
this.status = res.data
} }
}) })
}, },
......
dsk-operate-ui/src/views/detail/party-a/dealings/custom.vue
View file @ 3ebfaa05
...@@ -44,7 +44,6 @@ ...@@ -44,7 +44,6 @@
import mixin from '../mixins/mixin' import mixin from '../mixins/mixin'
import { clientPage } from '@/api/detail/party-a/dealings' import { clientPage } from '@/api/detail/party-a/dealings'
import ClientDetail from './component/customDetail' import ClientDetail from './component/customDetail'
import auth from "@/plugins/auth";
export default { export default {
name: 'Custom', name: 'Custom',
props: ['companyId'], props: ['companyId'],
......
dsk-operate-ui/src/views/detail/party-a/dealings/supplier.vue
View file @ 3ebfaa05
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
@sort-change="sortChange" @sort-change="sortChange"
> >
<template slot="companyName" slot-scope="scope"> <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> <div v-else v-html="scope.row.companyName || '--'"></div>
</template> </template>
<template slot="projectAllName" slot-scope="scope"> <template slot="projectAllName" slot-scope="scope">
......
dsk-operate-ui/src/views/detail/party-a/decisionMaking/index.vue
View file @ 3ebfaa05
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
width="464px"> width="464px">
<div class="poptitle"> <div class="poptitle">
<img src="@/assets/images/economies/icon.png"> <img src="@/assets/images/economies/icon.png">
<span>{{ companyInfo.companyName }}</span> <span>{{ companyInfo && companyInfo.companyName || customerInfo.companyName }}</span>
</div> </div>
<el-form :model="addRorm" :rules="addRules" ref="addRorm" class="popform" label-width="90px"> <el-form :model="addRorm" :rules="addRules" ref="addRorm" class="popform" label-width="90px">
<el-form-item label="姓名：" prop="name"> <el-form-item label="姓名：" prop="name">
...@@ -81,7 +81,7 @@ export default { ...@@ -81,7 +81,7 @@ export default {
components: { components: {
Tables Tables
}, },
props: ['customerIds','companyInfo'], props: ['customerIds','companyInfo','customerInfo'],
data() { data() {
return { return {
ifEmpty:false, ifEmpty:false,
......
dsk-operate-ui/src/views/detail/party-a/overview/component/bidding.vue
View file @ 3ebfaa05
...@@ -31,9 +31,9 @@ ...@@ -31,9 +31,9 @@
</div> </div>
<div class="zbph-account">招标动态 <div class="zbph-account">招标动态
<div class="labels"> <div class="labels">
<div :class="{'on':datatype==3}" @click="getDT(3)">近七天</div> <div :class="{'on':datatype==3}" @click="getDT(3)">近7天</div>
<div :class="{'on':datatype==2}" @click="getDT(2)">近三十天</div> <div :class="{'on':datatype==2}" @click="getDT(2)">近30天</div>
<div :class="{'on':datatype==1}" @click="getDT(1)">近五年</div> <div :class="{'on':datatype==1}" @click="getDT(1)">近5年</div>
</div> </div>
</div> </div>
<div id="myEcharts" style="width: 100%;height:250px; margin: 0 auto;"></div> <div id="myEcharts" style="width: 100%;height:250px; margin: 0 auto;"></div>
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
prop="companyName" prop="companyName"
label="公司名称"> label="公司名称">
<template slot-scope="scope"> <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> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -117,7 +117,7 @@ export default { ...@@ -117,7 +117,7 @@ export default {
methods: { methods: {
async handleBid(){ async handleBid(){
let res = await bidDataGroup({cid: this.companyId, spanId: this.datatype}) 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 let {totalCount, lastYearCount, bidAmount} = res.data
this.dataAll = {totalCount, lastYearCount, bidAmount} this.dataAll = {totalCount, lastYearCount, bidAmount}
this.dtdata=res.data.groupCount.map(item=>{ this.dtdata=res.data.groupCount.map(item=>{
...@@ -163,7 +163,7 @@ export default { ...@@ -163,7 +163,7 @@ export default {
grid:{ grid:{
left:'1', left:'1',
top:'8%', top:'8%',
right:'2%', right:'5%',
bottom:'8%', bottom:'8%',
containLabel: true containLabel: true
}, },
......
dsk-operate-ui/src/views/detail/party-a/overview/component/busclue.vue
View file @ 3ebfaa05
...@@ -78,7 +78,7 @@ export default { ...@@ -78,7 +78,7 @@ export default {
methods: { methods: {
async handleQuery(){ async handleQuery(){
let res = await projectTenderDataGroup({cid: this.companyId, type: this.activeIndex}) 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) let data = res.data, totalVal = data.map(item => item.value).reduce((prev, cur) => prev + cur)
this.viewData = data.map(item => { this.viewData = data.map(item => {
let it = {name:item.name, value:item.value, percent:parseFloat(Number(Number(item.value)/Number(totalVal)*100).toFixed(2))+'%'} 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 { ...@@ -164,7 +164,9 @@ export default {
}, },
watch: { watch: {
statistic(newVal, oldVal) { statistic(newVal, oldVal) {
this.handleStatistic() if(newVal){
this.handleStatistic()
}
} }
} }
} }
......
dsk-operate-ui/src/views/detail/party-a/overview/component/infoheader.vue
View file @ 3ebfaa05
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
</div> </div>
<div class="company-title"> <div class="company-title">
<div class="company-name"> <div class="company-name">
{{companyInfo.companyName || ''}} {{companyInfo.companyName || '--'}}
</div> </div>
<div class="company-tag"> <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.historyNames && companyInfo.historyNames.length>0">
...@@ -306,7 +306,9 @@ export default { ...@@ -306,7 +306,9 @@ export default {
this.getClaimStatus() //获取企业认领状态 this.getClaimStatus() //获取企业认领状态
}, },
statistic(newVal, oldVal) { statistic(newVal, oldVal) {
this.handleStatistic() if(newVal){
this.handleStatistic()
}
} }
} }
} }
......
dsk-operate-ui/src/views/detail/party-a/overview/component/operations.vue
View file @ 3ebfaa05
...@@ -73,7 +73,7 @@ export default { ...@@ -73,7 +73,7 @@ export default {
async handleQuery() { async handleQuery() {
let res = await bondCreditRating({cid: this.companyId}) let res = await bondCreditRating({cid: this.companyId})
if(res.code==200){ if(res.code==200){
this.operList = res.data this.operList = res.data || []
this.$nextTick(() => { this.$nextTick(() => {
this.companySwiper() this.companySwiper()
}) })
......
dsk-operate-ui/src/views/detail/party-a/overview/component/risk.vue
View file @ 3ebfaa05
...@@ -195,7 +195,9 @@ export default { ...@@ -195,7 +195,9 @@ export default {
}, },
watch: { watch: {
statistic(newVal, oldVal) { statistic(newVal, oldVal) {
this.handView() if(newVal){
this.handView()
}
} }
} }
} }
......
dsk-operate-ui/src/views/enterpriseData/components/Owner/index.vue
View file @ 3ebfaa05
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
</div> </div>
</div> </div>
<div class="content_item"> <div class="content_item">
<div class="label" style="margin-right: 12px;">城投业务类型</div> <div class="label" style="margin-right: 28px;">城投业务类型</div>
<div class="content_right "> <div class="content_right ">
<div class="checkbox"> <div class="checkbox">
<div class="checkbox-content"> <div class="checkbox-content">
...@@ -132,7 +132,13 @@ ...@@ -132,7 +132,13 @@
<p>共有{{total}}条</p> <p>共有{{total}}条</p>
<p> <p>
<img src="@/assets/images/EXCEL.png" alt=""> <img src="@/assets/images/EXCEL.png" alt="">
<span>导出EXCEL</span> <el-popover
placement="top-end"
width="200"
trigger="hover"
content="功能正在开发中">
<span class="excel" slot="reference">导出EXCEL</span>
</el-popover>
</p> </p>
</div> </div>
...@@ -143,22 +149,27 @@ ...@@ -143,22 +149,27 @@
<div class="item-jf-text">建议调整关键词或筛选条件，重新搜索！</div> <div class="item-jf-text">建议调整关键词或筛选条件，重新搜索！</div>
</div> </div>
<div class=" table-item-jf" v-if="tableData.length>0"> <div class=" table-item-jf" v-if="tableData.length>0">
<el-table :data="tableData" :header-cell-style="{ background:'#F0F3FA'}" element-loading-text="Loading" border highlight-current-row> <el-table :data="tableData" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}" class="table-item1" element-loading-text="Loading" border highlight-current-row>
<el-table-column type="index" label="序号" fixed width="60"> <el-table-column type="index" label="序号" fixed width="60">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{(pageNum - 1) *20 + scope.$index + 1}}</span> <span>{{(pageNum - 1) *20 + scope.$index + 1}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="公司名称" fixed width="430" > <el-table-column label="公司名称" fixed width="380" >
<template slot-scope="scope"> <template slot-scope="scope">
<div class="renling"> <div class="renling">
<router-link :to="`/enterprise/${encodeStr(scope.row.companyId)}`" tag="a" class="list-titel-a" v-html="scope.row.companyName" ></router-link> <router-link :to="`/enterprise/${encodeStr(scope.row.companyId)}`" tag="a" class="list-titel-a" v-html="scope.row.companyName" ></router-link>
<div class="renling-btn"> <div class="renling-btn" @click="claimbtn(scope.row)" >
<img src="@/assets/images/owner/renling1.png" alt=""> <p v-if="scope.row.claimStatus" class="renling-img-true">
</p>
<p v-else class="renling-img-false">
</p>
<span v-if="scope.row.claimStatus" class="renling-hui"> <span v-if="scope.row.claimStatus" class="renling-hui">
已认领 已认领
</span> </span>
<span v-else class="renling-hei" @click="claimbtn(scope.row)" > <span v-else class="renling-hei">
认领 认领
</span> </span>
</div> </div>
...@@ -167,7 +178,7 @@ ...@@ -167,7 +178,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="区域" width="120"> <el-table-column label="区域" width="160">
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.province}} {{scope.row.province}}
<template v-if="scope.row.city"> <template v-if="scope.row.city">
...@@ -452,8 +463,8 @@ ...@@ -452,8 +463,8 @@
width="244px"> width="244px">
<span>认领成功，是否完善客户信息？</span> <span>认领成功，是否完善客户信息？</span>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<span class="dialog-footer-btn1" type="primary" > <span class="dialog-footer-btn1" type="primary" @click="claimopen(companyId,customerId)" >
<router-link :to="'/enterprise/'+encodeStr(companyId)+'?customerId='+customerId+'&path=business' " tag="a" class="list-titel-a">立即完善</router-link> 立即完善
</span> </span>
<span class="dialog-footer-btn2" @click="search(pageNum, pageSize)">稍后</span> <span class="dialog-footer-btn2" @click="search(pageNum, pageSize)">稍后</span>
</div> </div>
...@@ -776,30 +787,46 @@ export default { ...@@ -776,30 +787,46 @@ export default {
}, },
claimbtn(item){ claimbtn(item){
this.companyId=item.companyId; this.companyId=item.companyId;
var params={ var info={};
companyId:item.companyId, api.infoHeader({companyId:this.companyId}).then(res=>{
uipId:item.uipId,
companyName:item.companyName.replace(/<font color='red'>/g,'').replace(/<\/font>/g,''),
// creditLevel:item.bratingSubjectLevel,
// legalPerson:item.legalPerson,
// registerCapital:item.registerCapital,
// provinceId:item.provinceId,
// cityId:item.cityId,
// districtId:item.districtId,
// registerAddress:item.registerAddress,
// creditCode:item.creditCode,
}
api.claim(params).then(res=>{
// console.log(res) // console.log(res)
if (res.code==200) { info=res.data;
this.dialogVisible=true; let params={
this.customerId=res.data.customerId; companyId:item.companyId,
} uipId:item.uipId,
companyName:item.companyName.replace(/<font color='red'>/g,'').replace(/<\/font>/g,''),
creditLevel:info.bratingSubjectLevel,
legalPerson:info.corporatePerson,
registerCapital:info.regCapital,
provinceId:info.provinceId,
cityId:info.cityId,
districtId:info.districtCode,
registerAddress:info.provinceName+info.cityName+info.districtName,
creditCode:info.creditCode,
}
api.claim(params).then(res1=>{
// console.log(res)
if (res1.code==200) {
this.dialogVisible=true;
this.customerId=res1.data.customerId;
}
}).catch(error=>{
});
}).catch(error=>{ }).catch(error=>{
}); });
},
claimopen(companyId,customerId){
this.$router.push({
path: '/enterprise/'+encodeStr(companyId),
query: {
'customerId': customerId,
'path':'business'
} ,
})
this.dialogVisible=false;
}, },
search(pageNum, pageSize,exportFlag) { search(pageNum, pageSize,exportFlag) {
this.dialogVisible=false; this.dialogVisible=false;
...@@ -935,7 +962,7 @@ export default { ...@@ -935,7 +962,7 @@ export default {
border-radius: 4px 4px 4px 4px; border-radius: 4px 4px 4px 4px;
background: #FFFFFF; background: #FFFFFF;
.content_item{ .content_item{
padding-top:24px; padding-top:20px;
display: flex; display: flex;
align-items: center; align-items: center;
.label{ .label{
...@@ -952,6 +979,9 @@ export default { ...@@ -952,6 +979,9 @@ export default {
::v-deep .el-input-group__append{ ::v-deep .el-input-group__append{
cursor: pointer; cursor: pointer;
padding: 0px; padding: 0px;
border-radius:2px;
border-top-left-radius: 0;
border-bottom-left-radius: 0;
.btn-search{ .btn-search{
width: 70px; width: 70px;
color: #0081ff; color: #0081ff;
...@@ -1077,6 +1107,9 @@ export default { ...@@ -1077,6 +1107,9 @@ export default {
width: 18px; width: 18px;
height: 18px; height: 18px;
} }
.excel{
cursor: pointer;
}
} }
} }
...@@ -1133,32 +1166,56 @@ export default { ...@@ -1133,32 +1166,56 @@ export default {
.renling-btn{ .renling-btn{
display: flex; display: flex;
align-items: center; align-items: center;
img{ cursor: pointer;
.renling-img-true{
width: 16px; width: 16px;
height: 16px; height: 16px;
margin-right: 8px; margin-right: 8px;
background-image: url('../../../../assets/images/owner/renling1.png');
background-size: 100% 100%;
background-repeat: no-repeat;
} }
.renling-img-false{
width: 16px;
height: 16px;
margin-right: 8px;
background-image: url('../../../../assets/images/owner/renling2.png');
background-size: 100% 100%;
background-repeat: no-repeat;
}
.renling-hui{ .renling-hui{
font-size: 12px; font-size: 13px;
font-weight: 400; font-weight: 400;
color: rgba(35,35,35,0.4); color: rgba(35,35,35,0.4);
} }
.renling-hei{ .renling-hei{
cursor: pointer; font-size: 13px;
font-size: 12px;
font-weight: 400; font-weight: 400;
color: #3D3D3D; color: #3D3D3D;
} }
.renling-hei:hover{
}
.renling-btn:hover{
.renling-hei{
color: #0081FF; color: #0081FF;
} }
} }
} }
} }
.table-item1{
::v-deep .el-table__body-wrapper{
color: #232323;
}
}
.table-item-jf1{ .table-item-jf1{
border-top:1px solid #EFEFEF; border-top:1px solid #EFEFEF;
} }
.pagination{ .pagination{
padding: 14px ; padding: 14px ;
......
dsk-operate-ui/src/views/enterpriseData/components/SearchEnterprise/index.vue
View file @ 3ebfaa05
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div> <div>
<div class="content"> <div class="content">
<div class="content_item"> <div class="content_item content_item_padding0">
<div class="content_right item_ckquery_list"> <div class="content_right item_ckquery_list">
<el-input class="ename_input" placeholder="请输入关键字，如企业名称、统一社会信用代码等" v-model="ename" @input="projectNamebtn('ename',ename,'关键字:')"> <el-input class="ename_input" placeholder="请输入关键字，如企业名称、统一社会信用代码等" v-model="ename" @input="projectNamebtn('ename',ename,'关键字:')">
<div slot="append" class="btn-search" @click="search">搜索</div> <div slot="append" class="btn-search" @click="search">搜索</div>
...@@ -415,7 +415,7 @@ ...@@ -415,7 +415,7 @@
</div> </div>
</div> </div>
<div class="content_item content_item_nopadding "> <div class="content_item content_item_padding0">
<div class="search-new" > <div class="search-new" >
<span @click="search()">查询</span> <span @click="search()">查询</span>
<span @click="reset()">重置</span> <span @click="reset()">重置</span>
...@@ -441,7 +441,7 @@ ...@@ -441,7 +441,7 @@
</el-popover> </el-popover>
<div class="toolbar-right-search"> <div class="toolbar-right-search">
<el-input placeholder="请输入企业名称关键词" class="toolbar-right_input" v-model="resultEname"> <el-input placeholder="请输入企业名称关键词" class="toolbar-right_input" v-model="resultEname">
<div slot="append" class="result-search" @click="search()">过滤企业</div> <div slot="append" class="result-search" @click="search()">搜索</div>
</el-input> </el-input>
</div> </div>
</div> </div>
...@@ -449,7 +449,13 @@ ...@@ -449,7 +449,13 @@
<p>共有{{total}}条</p> <p>共有{{total}}条</p>
<p> <p>
<img src="@/assets/images/EXCEL.png" alt=""> <img src="@/assets/images/EXCEL.png" alt="">
<span>导出EXCEL</span> <el-popover
placement="top-end"
width="200"
trigger="hover"
content="功能正在开发中">
<span class="excel" slot="reference">导出EXCEL</span>
</el-popover>
</p> </p>
</div> </div>
...@@ -472,9 +478,9 @@ ...@@ -472,9 +478,9 @@
</router-link> </router-link>
</p> </p>
<p class="card-right-title card-right-title1" :ref="'labels'+item.id" :style="{padding: '10px 0px 8px 0px',height: '40px'}"> <p class="card-right-title card-right-title1" :ref="'labels'+item.id" :style="{padding: '16px 0px 12px 0px'}">
<span :ref="'cardRightTitle1span'+item.id" > <span :ref="'cardRightTitle1span'+item.id" >
<span class="positive positive1" v-if="item.businessStatus" style="margin-right: 3px !important;">{{item.businessStatus}}</span> <span class="positive positive1" v-if="item.businessStatus" >{{item.businessStatus}}</span>
<template v-for="(itemLabels,indexLabels) in item.labels"> <template v-for="(itemLabels,indexLabels) in item.labels">
<span class="positive positive1" :style="{'background':itemLabels.bgColor,'color':itemLabels.fontColor}">{{ itemLabels.labelName }} <template v-if="itemLabels.num>1">{{itemLabels.num}}</template></span> <span class="positive positive1" :style="{'background':itemLabels.bgColor,'color':itemLabels.fontColor}">{{ itemLabels.labelName }} <template v-if="itemLabels.num>1">{{itemLabels.num}}</template></span>
</template> </template>
...@@ -503,7 +509,7 @@ ...@@ -503,7 +509,7 @@
</p> </p>
<p class="card-right-title" style="padding-top: 10px ;"> <p class="card-right-title" style="padding-top: 8px ;">
<template v-if="item.aptitudeCountNew!=null"> <template v-if="item.aptitudeCountNew!=null">
<span class="right-title-grey">资质资格：</span> <span class="right-title-grey">资质资格：</span>
<router-link :to="toEnterprise(item.jskEid,'')" target="_blank" > <router-link :to="toEnterprise(item.jskEid,'')" target="_blank" >
...@@ -559,6 +565,9 @@ ...@@ -559,6 +565,9 @@
<span class="right-title-grey" style="width: 984px;" v-html="item.formerName"></span> <span class="right-title-grey" style="width: 984px;" v-html="item.formerName"></span>
</p> </p>
</div> </div>
<div class="solid">
<p></p>
</div>
</li> </li>
</ul> </ul>
<div class="pagination clearfix" v-show="total>0"> <div class="pagination clearfix" v-show="total>0">
...@@ -2819,10 +2828,11 @@ ...@@ -2819,10 +2828,11 @@
<style lang="scss" scoped> <style lang="scss" scoped>
.content{ .content{
padding: 0px 16px; padding: 0px 16px;
padding-top: 16px;
border-radius: 4px 4px 4px 4px; border-radius: 4px 4px 4px 4px;
background: #FFFFFF; background: #FFFFFF;
.content_item{ .content_item{
padding-top: 12px; padding-top: 20px;
display: flex; display: flex;
align-items: center; align-items: center;
.label{ .label{
...@@ -2948,7 +2958,7 @@ ...@@ -2948,7 +2958,7 @@
.content_right{ .content_right{
width: 1400px; width: 1400px;
.select-popper{ .select-popper{
margin-bottom: 8px; margin-bottom: 20px;
} }
} }
} }
...@@ -2963,8 +2973,9 @@ ...@@ -2963,8 +2973,9 @@
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
margin: 0px 16px;
margin-top: 12px; margin-top: 12px;
padding: 16px ; padding: 16px 0px ;
border-bottom: 1px solid #EFEFEF; border-bottom: 1px solid #EFEFEF;
.title-right{ .title-right{
...@@ -2987,6 +2998,9 @@ ...@@ -2987,6 +2998,9 @@
width: 18px; width: 18px;
height: 18px; height: 18px;
} }
.excel{
cursor: pointer;
}
} }
} }
...@@ -2994,111 +3008,7 @@ ...@@ -2994,111 +3008,7 @@
padding-bottom: 0px; padding-bottom: 0px;
} }
.bottomlist-list{
padding: 16px;
font-size: 14px;
border-bottom: 1px solid #EFEFEF;
padding-bottom: 14px;
.list-titel{
font-size: 16px;
font-weight: 700;
color: #3D3D3D;
line-height: 19px;
.list-titel-a{
text-decoration: none;
color:#3D3D3D;
}
a:hover, a:visited, a:link, a:active{
color:#3D3D3D;
}
}
.content-label{
margin-top: 12px;
.list-label{
background: #F3F3FF;
color: #8491E8;
border-radius: 1px 1px 1px 1px;
padding: 3px 7px;
font-size: 12px;
margin-right: 16px;
}
.list-label-wl{
background: #e8f7f0;
color: #38c8bf;
}
.list-label-lx{
background: #e4f3fd;
color: #41a1fd;
}
}
.list-content{
margin-top: 8px;
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;
font-size: 14px;
span:first-child{
font-weight: 400;
color: rgba(35,35,35,0.4);
line-height: 15px
}
span:last-child{
font-weight: 400;
color: rgba(35,35,35,0.8);
line-height: 15px
}
.content-text-gc{
width: 72px;
}
.content-text-p{
width: 1200px;
}
.blue{
color: #0081FF !important;
cursor: pointer;
}
}
}
.list-addree{
width: auto;
background: #F3F4F5;
display: inline-flex;
margin-top: 7px;
.list-content-text{
margin-top: 0px;
span{
line-height: 30px!important;
}
}
img{
width: 14px;
margin: 0 8px;
}
}
}
.bottomlist-list:hover{
background: #F6F9FC;
cursor: pointer;
}
.pagination{ .pagination{
padding: 14px ; padding: 14px ;
...@@ -3112,7 +3022,6 @@ ...@@ -3112,7 +3022,6 @@
} }
.positive1{ .positive1{
padding: 0 8px !important; padding: 0 8px !important;
margin-bottom: 8px;
margin-right: 7px !important; margin-right: 7px !important;
} }
.positive-gdbq{ .positive-gdbq{
......
dsk-operate-ui/src/views/enterpriseData/index.vue
View file @ 3ebfaa05
...@@ -9,9 +9,10 @@ ...@@ -9,9 +9,10 @@
<p>{{itme.value}}</p> <p>{{itme.value}}</p>
</div> </div>
</div> </div>
<p class="solid"></p>
</div> </div>
</div> </div>
<p class="solid"></p>
</div> </div>
<!-- 查业主单位 --> <!-- 查业主单位 -->
<Owner v-if="personnelHerf=='Owner'" /> <Owner v-if="personnelHerf=='Owner'" />
...@@ -72,6 +73,7 @@ ...@@ -72,6 +73,7 @@
.content{ .content{
padding: 0px 16px; padding: 0px 16px;
background: #FFFFFF; background: #FFFFFF;
position: relative;
} }
...@@ -122,12 +124,12 @@ ...@@ -122,12 +124,12 @@
margin-right: 6px; margin-right: 6px;
} }
.app-container .combined-title .title-right .solid { .app-container .content .solid {
width: 100%; width: 100%;
height: 1px; height: 1px;
background-color: #EEEEEE; background-color: #EEEEEE;
position: absolute; position: absolute;
bottom: -1px; bottom: 1px;
left: 0; left: 0;
z-index: 1; z-index: 1;
} }
...@@ -148,12 +150,13 @@ ...@@ -148,12 +150,13 @@
font-size: 16px; font-size: 16px;
text-align: center; text-align: center;
margin-right: 32px; margin-right: 32px;
line-height: 40px;
} }
.tab div p { .tab div p {
display: inline-block; display: inline-block;
padding: 0px; padding: 0px;
padding-bottom: 16px;
} }
......
dsk-operate-ui/src/views/macro/economies/component/localEconomy.vue
View file @ 3ebfaa05
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
<el-table-column prop="govDebtRateWild" label="债务率-宽口径（%）" sortable width="170" :formatter="formatStatus"/> <el-table-column prop="govDebtRateWild" label="债务率-宽口径（%）" sortable width="170" :formatter="formatStatus"/>
</el-table> </el-table>
</div> </div>
<div class="pagination-box"> <div class="pagination-box" v-if="show_page && tableDataTotal>pageSize">
<el-pagination background :current-page="pageIndex" :page-size="pageSize" :total="tableDataTotal" layout="prev, pager, next, jumper" @current-change="handleCurrentChange" @size-change="handleSizeChange" /> <el-pagination background :current-page="pageIndex" :page-size="pageSize" :total="tableDataTotal" layout="prev, pager, next, jumper" @current-change="handleCurrentChange" @size-change="handleSizeChange" />
</div> </div>
</div> </div>
...@@ -73,6 +73,8 @@ export default { ...@@ -73,6 +73,8 @@ export default {
pageIndex: 1, pageIndex: 1,
pageSize: 20, pageSize: 20,
tableDataTotal: 0, tableDataTotal: 0,
show_page:true,
MaxPage:500
} }
}, },
watch: { watch: {
...@@ -124,8 +126,17 @@ export default { ...@@ -124,8 +126,17 @@ export default {
}, },
// 跳转指定页数 // 跳转指定页数
handleCurrentChange(val) { handleCurrentChange(val) {
this.pageIndex = val if(this.MaxPage<val){
this.getData() this.show_page = false
this.$nextTick(() => {
this.pageIndex = 1
this.$message.warning(`对不起，最多只能访问${this.MaxPage}页`)
this.show_page = true
})
}else {
this.pageIndex = val
this.getData()
}
}, },
formatStatus: function(row, column, cellValue) { formatStatus: function(row, column, cellValue) {
return cellValue? cellValue : '-' return cellValue? cellValue : '-'
......
dsk-operate-ui/src/views/macro/enterprises/index.vue
View file @ 3ebfaa05
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
<div class="p2">建议调整关键词或筛选条件，重新搜索</div> <div class="p2">建议调整关键词或筛选条件，重新搜索</div>
</div> </div>
</div> </div>
<div class="pagination-box" v-if="tableDataTotal>pageSize"> <div class="pagination-box" v-if="show_page && tableDataTotal>pageSize">
<el-pagination background :current-page="pageIndex" :page-size="pageSize" :total="tableDataTotal" layout="prev, pager, next, jumper" @current-change="handleCurrentChange" @size-change="handleSizeChange" /> <el-pagination background :current-page="pageIndex" :page-size="pageSize" :total="tableDataTotal" layout="prev, pager, next, jumper" @current-change="handleCurrentChange" @size-change="handleSizeChange" />
</div> </div>
</div> </div>
...@@ -107,7 +107,9 @@ export default { ...@@ -107,7 +107,9 @@ export default {
aptitudeCodeList:[], aptitudeCodeList:[],
aptitudeType:'', aptitudeType:'',
province:'', province:'',
provinceId:'' provinceId:'',
show_page:true,
MaxPage:500
} }
}, },
created() { created() {
...@@ -168,14 +170,23 @@ export default { ...@@ -168,14 +170,23 @@ export default {
}, },
// 重置页数 // 重置页数
handleSizeChange(val) { handleSizeChange(val) {
this.pageIndex = 1 // this.pageIndex = 1
this.pageSize = val // this.pageSize = val
this.querySubmit() // this.querySubmit()
}, },
// 跳转指定页数 // 跳转指定页数
handleCurrentChange(val) { handleCurrentChange(val) {
this.pageIndex = val if(this.MaxPage<val){
this.querySubmit() this.show_page = false
this.$nextTick(() => {
this.pageIndex = 1
this.$message.warning(`对不起，最多只能访问${this.MaxPage}页`)
this.show_page = true
})
}else {
this.pageIndex = val
this.querySubmit()
}
}, },
handleChange(){ handleChange(){
// console.log(this.queryParams.codeStr) // console.log(this.queryParams.codeStr)
......
dsk-operate-ui/src/views/macro/financing/index.vue
View file @ 3ebfaa05
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<div class="flex-box">项目明细</div> <div class="flex-box">项目明细</div>
<div class="flex-box query-ability"> <div class="flex-box query-ability">
<span class="flex-box">共 {{tableDataTotal}} 条</span> <span class="flex-box">共 {{tableDataTotal}} 条</span>
<span class="flex-box"><img src="@/assets/images/ability_excel.png">导出EXCEL</span> <span class="flex-box" @click="handleMessage"><img src="@/assets/images/ability_excel.png">导出EXCEL</span>
</div> </div>
</div> </div>
<div class="table-item"> <div class="table-item">
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
<div class="pagination-box"> <div class="pagination-box" v-if="show_page && tableDataTotal>pageSize">
<el-pagination background :current-page="pageIndex" :page-size="pageSize" :total="tableDataTotal" layout="prev, pager, next, jumper" @current-change="handleCurrentChange" @size-change="handleSizeChange" /> <el-pagination background :current-page="pageIndex" :page-size="pageSize" :total="tableDataTotal" layout="prev, pager, next, jumper" @current-change="handleCurrentChange" @size-change="handleSizeChange" />
</div> </div>
...@@ -88,7 +88,9 @@ export default { ...@@ -88,7 +88,9 @@ export default {
tableLoading: false, tableLoading: false,
pageIndex: 1, pageIndex: 1,
pageSize: 10, pageSize: 10,
tableDataTotal: 0 tableDataTotal: 0,
show_page:true,
MaxPage:1000
} }
}, },
created() { created() {
...@@ -269,8 +271,17 @@ export default { ...@@ -269,8 +271,17 @@ export default {
}, },
// 跳转指定页数 // 跳转指定页数
handleCurrentChange(val) { handleCurrentChange(val) {
this.pageIndex = val if(this.MaxPage<val){
this.getData() this.show_page = false
this.$nextTick(() => {
this.pageIndex = 1
this.$message.warning(`对不起，最多只能访问${this.MaxPage}页`)
this.show_page = true
})
}else {
this.pageIndex = val
this.getData()
}
}, },
sortChange1({ column, prop, order }){ sortChange1({ column, prop, order }){
this.tableParams.field = prop; this.tableParams.field = prop;
...@@ -285,6 +296,12 @@ export default { ...@@ -285,6 +296,12 @@ export default {
this.pageIndex=1; this.pageIndex=1;
this.getData() this.getData()
}, },
handleMessage(){
this.$message({
message: '功能正在开发中',
type: 'warning'
});
}
} }
} }
</script> </script>
......
dsk-operate-ui/src/views/macro/nationalEconomies/component/qgjjdq.vue
View file @ 3ebfaa05
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
<!--<template slot-scope="scope">--> <!--<template slot-scope="scope">-->
<!--<router-link to="/purchaserDetail" target="_blank" tag="a" class="a-link">{{ scope.row.zbwj }}</router-link>--> <!--<router-link to="/purchaserDetail" target="_blank" tag="a" class="a-link">{{ scope.row.zbwj }}</router-link>-->
<!--</template>--> <!--</template>-->
<div class="pagination-box" v-if="tableDataTotal>pageSize"> <div class="pagination-box" v-if="show_page && tableDataTotal>pageSize">
<el-pagination background :current-page="pageIndex" :page-size="pageSize" :total="tableDataTotal" layout="prev, pager, next, jumper" @current-change="handleCurrentChange" @size-change="handleSizeChange" /> <el-pagination background :current-page="pageIndex" :page-size="pageSize" :total="tableDataTotal" layout="prev, pager, next, jumper" @current-change="handleCurrentChange" @size-change="handleSizeChange" />
</div> </div>
<economies-detail ref="economiesDetail" /> <economies-detail ref="economiesDetail" />
...@@ -133,6 +133,7 @@ ...@@ -133,6 +133,7 @@
props: { props: {
value: 'id', value: 'id',
multiple: true, multiple: true,
expandTrigger: 'hover'
}, },
addressList: [], addressList: [],
tableData: [], tableData: [],
...@@ -140,6 +141,8 @@ ...@@ -140,6 +141,8 @@
pageIndex: 1, pageIndex: 1,
pageSize: 20, pageSize: 20,
tableDataTotal: null, tableDataTotal: null,
show_page:true,
MaxPage:500
} }
}, },
created() { created() {
...@@ -274,8 +277,17 @@ ...@@ -274,8 +277,17 @@
}, },
// 跳转指定页数 // 跳转指定页数
handleCurrentChange(val) { handleCurrentChange(val) {
this.pageIndex = val if(this.MaxPage<val){
this.querySubmit() this.show_page = false
this.$nextTick(() => {
this.pageIndex = 1
this.$message.warning(`对不起，最多只能访问${this.MaxPage}页`)
this.show_page = true
})
}else {
this.pageIndex = val
this.querySubmit()
}
}, },
formatStatus: function(row, column, cellValue) { formatStatus: function(row, column, cellValue) {
return cellValue? cellValue : '-' return cellValue? cellValue : '-'
...@@ -321,6 +333,7 @@ ...@@ -321,6 +333,7 @@
width: 110px; width: 110px;
} }
::v-deep .el-cascader{ ::v-deep .el-cascader{
width: 220px;
.el-cascader__tags{ .el-cascader__tags{
flex-wrap: inherit; flex-wrap: inherit;
.el-tag{ .el-tag{
......
dsk-operate-ui/src/views/macro/urban/index.vue
View file @ 3ebfaa05
...@@ -152,7 +152,6 @@ ...@@ -152,7 +152,6 @@
border border
fit fit
highlight-current-row highlight-current-row
:default-sort = "{prop: 'bratingSubjectLevel', order: 'descending'}"
> >
<el-table-column label="序号" width="60" align="left" fixed> <el-table-column label="序号" width="60" align="left" fixed>
<template slot-scope="scope">{{ pageIndex * pageSize - pageSize + scope.$index + 1 }}</template> <template slot-scope="scope">{{ pageIndex * pageSize - pageSize + scope.$index + 1 }}</template>
...@@ -175,7 +174,7 @@ ...@@ -175,7 +174,7 @@
<el-table-column prop="biddingCount" label="招标数量" :formatter="formatStatus" sortable="custom" width="110" align="right"/> <el-table-column prop="biddingCount" label="招标数量" :formatter="formatStatus" sortable="custom" width="110" align="right"/>
<el-table-column prop="landInfoCount" label="城投拿地" :formatter="formatStatus" sortable="custom" width="100" align="right"/> <el-table-column prop="landInfoCount" label="城投拿地" :formatter="formatStatus" sortable="custom" width="100" align="right"/>
<el-table-column prop="supplierCount" label="供应商" :formatter="formatStatus" sortable="custom" width="100" align="right"/> <el-table-column prop="supplierCount" label="供应商" :formatter="formatStatus" sortable="custom" width="100" align="right"/>
<el-table-column prop="bratingSubjectLevel" label="主体评级" :formatter="formatStatus" sortable="custom" width="110" /> <!--<el-table-column prop="bratingSubjectLevel" label="主体评级" :formatter="formatStatus" sortable="custom" width="110" />-->
<el-table-column prop="bondBalance" label="债券余额（亿元）" :formatter="formatStatus" sortable="custom" width="140" align="right"/> <el-table-column prop="bondBalance" label="债券余额（亿元）" :formatter="formatStatus" sortable="custom" width="140" align="right"/>
<el-table-column prop="uipExecutiveLevel" label="行政级别" :formatter="formatStatus" width="110" /> <el-table-column prop="uipExecutiveLevel" label="行政级别" :formatter="formatStatus" width="110" />
<el-table-column prop="shareholderBg" label="股东背景" :formatter="formatStatus" width="110" /> <el-table-column prop="shareholderBg" label="股东背景" :formatter="formatStatus" width="110" />
...@@ -238,7 +237,7 @@ ...@@ -238,7 +237,7 @@
<div class="p2">建议调整关键词或筛选条件，重新搜索</div> <div class="p2">建议调整关键词或筛选条件，重新搜索</div>
</div> </div>
</div> </div>
<div class="pagination-box" v-if="tableDataTotal>pageSize"> <div class="pagination-box" v-if="show_page && tableDataTotal>pageSize">
<el-pagination background :current-page="pageIndex" :page-size="pageSize" :total="tableDataTotal" layout="prev, pager, next, jumper" @current-change="handleCurrentChange" @size-change="handleSizeChange" /> <el-pagination background :current-page="pageIndex" :page-size="pageSize" :total="tableDataTotal" layout="prev, pager, next, jumper" @current-change="handleCurrentChange" @size-change="handleSizeChange" />
</div> </div>
</div> </div>
...@@ -296,6 +295,8 @@ export default { ...@@ -296,6 +295,8 @@ export default {
claimVisible:false, claimVisible:false,
customerId:'', customerId:'',
companyId:'', companyId:'',
show_page:true,
MaxPage:500
} }
}, },
watch:{ watch:{
...@@ -459,8 +460,17 @@ export default { ...@@ -459,8 +460,17 @@ export default {
}, },
// 跳转指定页数 // 跳转指定页数
handleCurrentChange(val) { handleCurrentChange(val) {
this.pageIndex = val if(this.MaxPage<val){
this.querySubmit() this.show_page = false
this.$nextTick(() => {
this.pageIndex = 1
this.$message.warning(`对不起，最多只能访问${this.MaxPage}页`)
this.show_page = true
})
}else {
this.pageIndex = val
this.querySubmit()
}
}, },
handleSearch(event){ handleSearch(event){
// this.searchState=!this.searchState; // this.searchState=!this.searchState;
......
dsk-operate-ui/src/views/project/projectList/component/gjjl.vue
View file @ 3ebfaa05
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<div class="cardtitles" v-if="showtype != 'projectgjdt'">跟进记录</div> <div class="cardtitles" v-if="showtype != 'projectgjdt'">跟进记录</div>
<div style="height: 24px" v-if="showtype == 'projectgjdt'"></div> <div style="height: 24px" v-if="showtype == 'projectgjdt'"></div>
<div class="records"> <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"> <div class="default" v-if="isEdit == false" @click="getEdit">
<img src="@/assets/images/project/add_3.png"> <img src="@/assets/images/project/add_3.png">
<div>新建一条跟进记录，如:周五上午预约客户上门拜访</div> <div>新建一条跟进记录，如:周五上午预约客户上门拜访</div>
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
<div class="rec_time"> <div class="rec_time">
<i class="el-icon-time"></i> <i class="el-icon-time"></i>
<div>{{item.creatTime}}</div> <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 src="@/assets/images/edit.png">第一期不做编辑-->
<img @click="delRecord(item.id)" src="@/assets/images/delete.png"> <img @click="delRecord(item.id)" src="@/assets/images/delete.png">
</div> </div>
...@@ -146,7 +146,7 @@ ...@@ -146,7 +146,7 @@
default: 0 default: 0
}, },
datas:[],//数据源 datas:[],//数据源
isDisabled:false, isDisabled:true,
}, },
name: 'gjjl', name: 'gjjl',
data(){ data(){
...@@ -173,7 +173,7 @@ ...@@ -173,7 +173,7 @@
projectId:this.detailId ? this.detailId : parseInt(this.$route.query.id),//项目详情id projectId:this.detailId ? this.detailId : parseInt(this.$route.query.id),//项目详情id
userId:this.$store.state.user.userId,//当前用户id userId:this.$store.state.user.userId,//当前用户id
projectList:[],//关联项目 projectList:[],//关联项目
isDisabled:this.isDisabled, isDisableds:this.isDisabled,
} }
}, },
computed: { computed: {
...@@ -186,7 +186,7 @@ ...@@ -186,7 +186,7 @@
this.showtype = this.types this.showtype = this.types
//客户管理跟进动态 //客户管理跟进动态
if(this.showtype == 'gjdt'){ if(this.showtype == 'gjdt'){
this.isDisabled = false this.isDisableds = false
getUserList().then(result=>{ getUserList().then(result=>{
this.glqylist = result.data this.glqylist = result.data
}) })
...@@ -198,7 +198,7 @@ ...@@ -198,7 +198,7 @@
} }
//项目管理跟进动态 //项目管理跟进动态
if(this.showtype == 'projectgjdt'){ if(this.showtype == 'projectgjdt'){
this.isDisabled = false this.isDisableds = false
this.projectId = null//项目id暂时清空，必须手选id this.projectId = null//项目id暂时清空，必须手选id
relateProject(this.userId).then(res=>{ relateProject(this.userId).then(res=>{
this.projectList = res.data this.projectList = res.data
......
dsk-operate-ui/src/views/project/projectList/component/gzdb.vue
View file @ 3ebfaa05
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<el-card class="box-card noborder"> <el-card class="box-card noborder">
<div class="cardtitles">工作待办</div> <div class="cardtitles">工作待办</div>
<div class="records"> <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"> <div class="default" v-if="isEdit == false" @click="getEdit">
<img src="@/assets/images/project/add_3.png"> <img src="@/assets/images/project/add_3.png">
<div>新建一条工作代办，如:周五上午预约客户上门拜访</div> <div>新建一条工作代办，如:周五上午预约客户上门拜访</div>
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
{{item.state == 2?"已完成":"未完成"}} {{item.state == 2?"已完成":"未完成"}}
<i class="el-icon-caret-bottom"></i> <i class="el-icon-caret-bottom"></i>
</span> </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="1"></el-option>
<el-option label="已完成" value="2"></el-option> <el-option label="已完成" value="2"></el-option>
</el-select> </el-select>
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
}, },
datalist:[], datalist:[],
yqnum:0,//已逾期数量 yqnum:0,//已逾期数量
isDisabled:this.isDisabled, isDisableds:this.isDisabled,
} }
}, },
created(){ created(){
......
dsk-operate-ui/src/views/project/projectList/component/jsnr.vue
View file @ 3ebfaa05
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<div class="con"> <div class="con">
<span>总投资额（万元） ：</span> <span>总投资额（万元） ：</span>
<div class="inputxt" id="inputxt1"> <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> <el-input placeholder="待添加" v-model="investmentAmount" @input="number"></el-input>
<div class="flex"> <div class="flex">
<div class="btnsmall btn_primary h28" style="width: 56px" @click="changes({'investmentAmount':investmentAmount})">确定</div> <div class="btnsmall btn_primary h28" style="width: 56px" @click="changes({'investmentAmount':investmentAmount})">确定</div>
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<div class="con i"> <div class="con i">
<span>资金来源 ：</span> <span>资金来源 ：</span>
<div class="inputxt" id="inputxt2"> <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> <el-input placeholder="待添加" v-model="amountSource"></el-input>
<div class="flex"> <div class="flex">
<div class="btnsmall btn_primary h28" @click="changes({'amountSource':amountSource})" style="width: 56px">确定</div> <div class="btnsmall btn_primary h28" @click="changes({'amountSource':amountSource})" style="width: 56px">确定</div>
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
<div class="con"> <div class="con">
<span>建设性质 ：</span> <span>建设性质 ：</span>
<div class="inputxt" id="inputxt3"> <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> <el-input placeholder="待添加" v-model="buildProperty"></el-input>
<div class="flex"> <div class="flex">
<div class="btnsmall btn_primary h28" @click="changes({'buildProperty':buildProperty})" style="width: 56px">确定</div> <div class="btnsmall btn_primary h28" @click="changes({'buildProperty':buildProperty})" style="width: 56px">确定</div>
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
<span>计划招标 ：</span> <span>计划招标 ：</span>
<div class="inputime"> <div class="inputime">
<div class="flex" style=""> <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" v-model="planBidTime"
type="date" type="date"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
<span>计划开工 ：</span> <span>计划开工 ：</span>
<div class="inputime"> <div class="inputime">
<div class="flex" style="opacity: 0;height: 0"> <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" v-model="planStartTime"
type="date" type="date"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
<span>计划竣工 ：</span> <span>计划竣工 ：</span>
<div class="inputime"> <div class="inputime">
<div class="flex" style="opacity: 0;height: 0"> <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" v-model="planCompleteTime"
type="date" type="date"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
<el-card class="box-card noborder"> <el-card class="box-card noborder">
<div class="cardtitles">项目概况与建设规模</div> <div class="cardtitles">项目概况与建设规模</div>
<div class="baseinfo" > <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 btns" v-if="nowedit == 9">
<div class="flex"> <div class="flex">
<div class="btnsmall btn_primary h28" @click="changes({'projectDetails':projectDetails})" style="width: 56px">确定</div> <div class="btnsmall btn_primary h28" @click="changes({'projectDetails':projectDetails})" style="width: 56px">确定</div>
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
<div class="con"> <div class="con">
<span>评标办法 ：</span> <span>评标办法 ：</span>
<div class="inputxt" id="inputxt4"> <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> <el-input placeholder="待添加" v-model="evaluationBidWay"></el-input>
<div class="flex"> <div class="flex">
<div class="btnsmall btn_primary h28" @click="changes({'evaluationBidWay':evaluationBidWay})" style="width: 56px">确定</div> <div class="btnsmall btn_primary h28" @click="changes({'evaluationBidWay':evaluationBidWay})" style="width: 56px">确定</div>
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
<span>开标时间 ：</span> <span>开标时间 ：</span>
<div class="inputime"> <div class="inputime">
<div class="flex" style="opacity: 0;height: 0"> <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" v-model="bidOpenTime"
type="date" type="date"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
...@@ -141,7 +141,7 @@ ...@@ -141,7 +141,7 @@
<div class="con"> <div class="con">
<span>保证金缴纳 ：</span> <span>保证金缴纳 ：</span>
<div class="inputxt" id="inputxt5"> <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> <el-input placeholder="待添加" v-model="earnestMoneyPay"></el-input>
<div class="flex"> <div class="flex">
<div class="btnsmall btn_primary h28" @click="changes({'earnestMoneyPay':earnestMoneyPay})" style="width: 56px">确定</div> <div class="btnsmall btn_primary h28" @click="changes({'earnestMoneyPay':earnestMoneyPay})" style="width: 56px">确定</div>
...@@ -154,7 +154,7 @@ ...@@ -154,7 +154,7 @@
<div class="con i"> <div class="con i">
<span>保证金金额（万元） ：</span> <span>保证金金额（万元） ：</span>
<div class="inputxt" id="inputxt6"> <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> <el-input placeholder="待添加" @input="number1" v-model="earnestMoney"></el-input>
<div class="flex"> <div class="flex">
<div class="btnsmall btn_primary h28" @click="changes({'earnestMoney':earnestMoney})" style="width: 56px">确定</div> <div class="btnsmall btn_primary h28" @click="changes({'earnestMoney':earnestMoney})" style="width: 56px">确定</div>
...@@ -169,7 +169,7 @@ ...@@ -169,7 +169,7 @@
<div class="con"> <div class="con">
<span>开标地点 ：</span> <span>开标地点 ：</span>
<div class="inputxt" id="inputxt7"> <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> <el-input placeholder="待添加" v-model="bidOpenPlace"></el-input>
<div class="flex"> <div class="flex">
<div class="btnsmall btn_primary h28" @click="changes({'bidOpenPlace':bidOpenPlace})" style="width: 56px">确定</div> <div class="btnsmall btn_primary h28" @click="changes({'bidOpenPlace':bidOpenPlace})" style="width: 56px">确定</div>
...@@ -182,7 +182,7 @@ ...@@ -182,7 +182,7 @@
<div class="con i"> <div class="con i">
<span>评标委员会 ：</span> <span>评标委员会 ：</span>
<div class="inputxt" id="inputxt8"> <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> <el-input placeholder="待添加" v-model="evaluationBidCouncil"></el-input>
<div class="flex"> <div class="flex">
<div class="btnsmall btn_primary h28" @click="changes({'evaluationBidCouncil':evaluationBidCouncil})" style="width: 56px">确定</div> <div class="btnsmall btn_primary h28" @click="changes({'evaluationBidCouncil':evaluationBidCouncil})" style="width: 56px">确定</div>
...@@ -229,14 +229,14 @@ ...@@ -229,14 +229,14 @@
earnestMoney: '',//保证金金额 earnestMoney: '',//保证金金额
earnestMoneyPay: '',//保证金缴纳 earnestMoneyPay: '',//保证金缴纳
evaluationBidCouncil: '',//评标委员会 evaluationBidCouncil: '',//评标委员会
isDisabled:this.isDisabled, isDisableds:this.isDisabled,
} }
}, },
watch:{ watch:{
}, },
mounted(){ mounted(){
document.getElementById('jsnr').addEventListener('mouseup',(e) => { document.getElementById('jsnr').addEventListener('mouseup',(e) => {
if(this.isDisabled == true) if(this.isDisableds == true)
return false return false
let j = 0 let j = 0
for(var i=1;i<=9;i++){ for(var i=1;i<=9;i++){
...@@ -309,7 +309,7 @@ ...@@ -309,7 +309,7 @@
changes(str){ changes(str){
let param = str let param = str
param.id = this.id param.id = this.id
if(this.isDisabled == true) if(this.isDisableds == true)
return false return false
editXMNR(param).then(result=>{ editXMNR(param).then(result=>{
if(result.code == 200){ if(result.code == 200){
......
dsk-operate-ui/src/views/project/projectList/component/lxr.vue
View file @ 3ebfaa05
...@@ -7,14 +7,14 @@ ...@@ -7,14 +7,14 @@
:data="tableData" :data="tableData"
stripe border stripe border
style="width: 100%" style="width: 100%"
:default-sort = "{prop: 'role', order: 'descending'}" :default-sort = "{prop: 'role', order: 'ascending'}"
> >
<template slot="empty"> <template slot="empty">
<div class="empty"> <div class="empty">
<img src="@/assets/images/project/empty.png"> <img src="@/assets/images/project/empty.png">
<div class="p1">暂无数据展示</div> <div class="p1">暂无数据展示</div>
<div class="p2">抱歉，你还未添加相关数据，快去添加吧</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> </div>
</template> </template>
<el-table-column <el-table-column
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="bottems"> <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" <el-pagination v-if="total>searchParam.pageSize"
background background
:page-size="searchParam.pageSize" :page-size="searchParam.pageSize"
...@@ -162,7 +162,7 @@ ...@@ -162,7 +162,7 @@
total:0, total:0,
projectname:this.$route.query.projectname, projectname:this.$route.query.projectname,
queryParam:[], queryParam:[],
isDisabled:this.isDisabled, isDisableds:this.isDisabled,
} }
}, },
created(){ created(){
...@@ -170,7 +170,7 @@ ...@@ -170,7 +170,7 @@
}, },
methods:{ methods:{
getDetail(item){ getDetail(item){
if(this.isDisabled == true){ if(this.isDisableds == true){
return this.$message.warning("您无权限进行操作") return this.$message.warning("您无权限进行操作")
} }
......
dsk-operate-ui/src/views/project/projectList/component/xgqy.vue
View file @ 3ebfaa05
...@@ -11,20 +11,20 @@ ...@@ -11,20 +11,20 @@
<el-input type="text" placeholder="输入关键词查询" clearable v-model="searchParam.companyName"></el-input> <el-input type="text" placeholder="输入关键词查询" clearable v-model="searchParam.companyName"></el-input>
<div class="btn" @click="handleCurrentChange(1)">搜索</div> <div class="btn" @click="handleCurrentChange(1)">搜索</div>
</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>
<div class="document tables"> <div class="document tables">
<el-table <el-table
:data="tableData.rows" :data="tableData.rows"
style="width: 100%" style="width: 100%"
:default-sort = "{prop: 'depth', order: 'descending'}" :default-sort = "{prop: 'depth', order: 'ascending'}"
> >
<template slot="empty"> <template slot="empty">
<div class="empty"> <div class="empty">
<img src="@/assets/images/project/empty.png"> <img src="@/assets/images/project/empty.png">
<div class="p1">抱歉，没找到相关数据</div> <div class="p1">抱歉，没找到相关数据</div>
<div class="p2">建议调整关键词或添加相关企业，重新搜索</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> </div>
</template> </template>
<el-table-column <el-table-column
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
label="负责人" label="负责人"
width=""> width="">
</el-table-column> </el-table-column>
<el-table-column v-if="isDisabled == false" <el-table-column v-if="isDisableds == false"
prop="name" prop="name"
label="" label=""
align="right" align="right"
...@@ -186,7 +186,7 @@ ...@@ -186,7 +186,7 @@
companyName:'', companyName:'',
}, },
ondel:-1, ondel:-1,
isDisabled:this.isDisabled, isDisableds:this.isDisabled,
showlist:false, showlist:false,
companData:[], companData:[],
} }
......
dsk-operate-ui/src/views/project/projectList/component/zlwd.vue
View file @ 3ebfaa05
...@@ -10,7 +10,8 @@ ...@@ -10,7 +10,8 @@
<div class="btn" @click="handleCurrentChange(1)">搜索</div> <div class="btn" @click="handleCurrentChange(1)">搜索</div>
</div> </div>
<!--<div class="btn btn_primary h32 b2" @click="getUP" v-if="fileDatas.total>0"><div class="img img2"></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" class="upload-demo"
:action="action" :action="action"
:on-change="handleFileListChange" :on-change="handleFileListChange"
...@@ -20,9 +21,9 @@ ...@@ -20,9 +21,9 @@
accept=".word,.pdf.excel,.xlsx,.doc,.docx" accept=".word,.pdf.excel,.xlsx,.doc,.docx"
:headers="headers" :headers="headers"
:show-file-list="false" :show-file-list="false"
:on-success="onSuccess"> :on-success="onSuccess"
<div class="btn btn_primary h32 b2" v-if="fileDatas.total>0"><div class="img img2"></div>上传</div> :key='keys'>上传</el-upload></div>
</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="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"> <div class="uploadbox" v-if="isupload">
...@@ -60,15 +61,15 @@ ...@@ -60,15 +61,15 @@
<el-table <el-table
:data="fileDatas.rows" :data="fileDatas.rows"
style="width: 100%" style="width: 100%"
:default-sort = "{prop: 'creatTime', order: 'descending'}" :default-sort = "{prop: 'creatTime', order: 'ascending'}"
> >
<template slot="empty"> <template slot="empty">
<div class="empty"> <div class="empty">
<img src="@/assets/images/project/empty.png"> <img src="@/assets/images/project/empty.png">
<div class="p1">抱歉，没找到相关数据</div> <div class="p1">抱歉，没找到相关数据</div>
<div class="p2">建议调整关键词或筛选条件，重新搜索</div> <div class="p2">建议调整关键词或筛选条件，重新搜索</div>
<!--<div v-if="isDisabled==false" class="btn btn_primary h36 w102" @click="getUP">上传文档</div>--> <!--<div v-if="isDisableds==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"> <el-upload
class="upload-demo" class="upload-demo"
:action="action" :action="action"
:on-change="handleFileListChange" :on-change="handleFileListChange"
...@@ -116,7 +117,7 @@ ...@@ -116,7 +117,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<div class="hoverbtn"> <div class="hoverbtn">
<div class="xz" @click="downnlod(scope.row)">下载</div> <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> </div>
</template> </template>
</el-table-column> </el-table-column>
...@@ -178,7 +179,8 @@ ...@@ -178,7 +179,8 @@
fileDatas:[], fileDatas:[],
filename:'', filename:'',
ondel:"", ondel:"",
isDisabled:this.isDisabled, isDisableds:this.isDisabled,
keys:1,
} }
}, },
created(){ created(){
...@@ -221,7 +223,7 @@ ...@@ -221,7 +223,7 @@
} }
}, },
getUP(){ getUP(){
if(this.isDisabled==true) if(this.isDisableds==true)
return false return false
this.isupload=true this.isupload=true
this.$nextTick(() => { this.$nextTick(() => {
...@@ -261,6 +263,7 @@ ...@@ -261,6 +263,7 @@
_this.getList() _this.getList()
_this.$message.success('上传成功！') _this.$message.success('上传成功！')
_this.isupload = false _this.isupload = false
_this.keys++;
},3000) },3000)
} }
......
dsk-operate-ui/src/views/project/projectList/detail.vue
View file @ 3ebfaa05
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<div class="titles"> <div class="titles">
<img src="@/assets/images/project/headimg.png" class="headimg"> <img src="@/assets/images/project/headimg.png" class="headimg">
<strong class="text">{{ProjectData.projectName}}</strong> <strong class="text">{{ProjectData.projectName}}</strong>
<div class="protypes i1" v-if="isDisabled == false"> <div class="protypes" :class="{'i1':ProjectData.status == 0,'i2':ProjectData.status == 1,'i3':ProjectData.status == 2}" v-if="isDisabled == false">
<span v-for="(item,index) in projectStatus"><i v-if="ProjectData.status == item.dictValue">{{item.dictLabel}}</i></span> <span v-for="(item,index) in projectStatus"><i v-if="ProjectData.status == item.dictValue">{{item.dictLabel}}</i></span>
<el-select class="sels" v-model="ProjectData.status" @change="editXMSL({status:ProjectData.status})"> <el-select class="sels" v-model="ProjectData.status" @change="editXMSL({status:ProjectData.status})">
<el-option v-for="(item,index) in projectStatus" :key="index" :label="item.dictLabel" :value="item.dictValue"></el-option> <el-option v-for="(item,index) in projectStatus" :key="index" :label="item.dictLabel" :value="item.dictValue"></el-option>
......
dsk-operate-ui/src/views/project/projectList/index.vue
View file @ 3ebfaa05
...@@ -99,9 +99,9 @@ ...@@ -99,9 +99,9 @@
<div class="titles">项目明细 <div class="titles">项目明细
<div class="dc"> <div class="dc">
<div class="total">共{{total}}条</div> <div class="total">共{{total}}条</div>
<el-tooltip class="item" effect="dark" content="功能正在开发中" placement="top"> <!--<el-tooltip class="item" effect="dark" content="功能正在开发中" placement="top">-->
<div class="btn-export"><img src="@/assets/images/EXCEL.png">导出EXCEL</div> <div class="btn-export" @click="dc"><img src="@/assets/images/EXCEL.png">导出EXCEL</div>
</el-tooltip> <!--</el-tooltip>-->
</div> </div>
</div> </div>
<div class="tables" v-if="total == 0"> <div class="tables" v-if="total == 0">
...@@ -261,6 +261,9 @@ export default { ...@@ -261,6 +261,9 @@ export default {
}) })
}, },
methods: { methods: {
dc(){
this.$message.warning('功能正在开发中')
},
deldetail(index){ deldetail(index){
this.ondel = index this.ondel = index
}, },
......
dsk-operate-ui/src/views/radar/Bidding/details.vue
View file @ 3ebfaa05
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<p class="list-content-text"> <p class="list-content-text">
<span>招采单位：</span> <span>招采单位：</span>
<span v-if="textList.tenderee"> <span v-if="textList.tenderee">
<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> <router-link :to="textList.uipId?'/enterprise/' + encodeStr(textList.uipId) :'/company/' + encodeStr(textList.tendereeId) " tag="a" class="list-titel-a blue" v-html="textList.tenderee"></router-link>
</span> </span>
<span v-else>--</span> <span v-else>--</span>
</p> </p>
......
dsk-operate-ui/src/views/radar/Establishment/details.vue
View file @ 3ebfaa05
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
<p> <p>
<label class="label">项目法人</label> <label class="label">项目法人</label>
<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> <router-link v-if="textList.companyName" :to="textList.uipId?'/enterprise/' + encodeStr(textList.uipId) :'/company/' + encodeStr(textList.companyId) " tag="a" class="list-titel-a blue" v-html="textList.companyName"></router-link>
<span v-else>--</span> <span v-else>--</span>
</span> </span>
<label class="label">总投资（万元）</label> <label class="label">总投资（万元）</label>
......
dsk-operate-ui/src/views/radar/bxprozbgg/details.vue
View file @ 3ebfaa05
...@@ -93,7 +93,14 @@ ...@@ -93,7 +93,14 @@
</p> </p>
<p> <p>
<label class="label">计划工期</label> <label class="label">计划工期</label>
<span>{{textList.projectDuration||'--'}}</span> <span>
<template v-if="textList.projectDuration">
{{textList.projectDuration}}天
</template>
<template v-else>
'--'
</template>
</span>
<label class="label">项目属地</label> <label class="label">项目属地</label>
<span> <span>
{{textList.province}} {{textList.province}}
...@@ -178,7 +185,7 @@ ...@@ -178,7 +185,7 @@
<div class="main3-box"> <div class="main3-box">
<p> <p>
<label class="label">招标人</label> <label class="label">招标人</label>
<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> <router-link :to="textList.uipId?'/enterprise/' + encodeStr(textList.uipId) :'/company/' + encodeStr(textList.tendereeId) " tag="a" class="list-titel-a blue" v-html="textList.tenderee"></router-link>
<label class="label">代理机构</label> <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> <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> <span v-else class="color2">{{textList.agency||'--'}}</span>
......
dsk-operate-ui/src/views/radar/components/BidRecord/index.vue
View file @ 3ebfaa05
...@@ -124,7 +124,13 @@ ...@@ -124,7 +124,13 @@
<p>共有{{total}}条</p> <p>共有{{total}}条</p>
<p> <p>
<img src="@/assets/images/EXCEL.png" alt=""> <img src="@/assets/images/EXCEL.png" alt="">
<span>导出EXCEL</span> <el-popover
placement="top-end"
width="200"
trigger="hover"
content="功能正在开发中">
<span class="excel" slot="reference">导出EXCEL</span>
</el-popover>
</p> </p>
</div> </div>
...@@ -966,6 +972,9 @@ export default { ...@@ -966,6 +972,9 @@ export default {
width: 18px; width: 18px;
height: 18px; height: 18px;
} }
.excel{
cursor: pointer;
}
} }
} }
......
dsk-operate-ui/src/views/radar/components/Establishment/index.vue
View file @ 3ebfaa05
...@@ -180,7 +180,13 @@ ...@@ -180,7 +180,13 @@
<p>共有{{total}}条</p> <p>共有{{total}}条</p>
<p> <p>
<img src="@/assets/images/EXCEL.png" alt=""> <img src="@/assets/images/EXCEL.png" alt="">
<span>导出EXCEL</span> <el-popover
placement="top-end"
width="200"
trigger="hover"
content="功能正在开发中">
<span class="excel" slot="reference">导出EXCEL</span>
</el-popover>
</p> </p>
</div> </div>
...@@ -211,7 +217,9 @@ ...@@ -211,7 +217,9 @@
<div class="list-content"> <div class="list-content">
<p class="list-content-text" v-if="item.companyName"> <p class="list-content-text" v-if="item.companyName">
<span>项目业主：</span> <span>项目业主：</span>
<span><router-link :to="`/company/${encodeStr(item.companyId)}/`" tag="a" class="list-titel-a blue" v-html="item.companyName" ></router-link></span> <span class="blue" @click="getUipIdByCid(item.companyId)" v-html="item.companyName">
</span>
</p> </p>
...@@ -1071,6 +1079,21 @@ ...@@ -1071,6 +1079,21 @@
this.searchDic(); this.searchDic();
}, },
getUipIdByCid(companyId){
var params=[companyId]
api.getUipIdByCid(params).then(res=>{
if (res.code==200) {
if(res.data&&res.data.length>0&&res.data[0].uipId){
this.$router.push({path: '/enterprise/'+this.encodeStr(res.data[0].uipId)})
}else{
this.$router.push({path: '/company/'+this.encodeStr(res.data[0].companyId)})
}
}
}).catch(error=>{
});
},
ckhasValue(param){ ckhasValue(param){
var ckhasValue; var ckhasValue;
if(param){ if(param){
...@@ -1242,6 +1265,9 @@ ...@@ -1242,6 +1265,9 @@
width: 18px; width: 18px;
height: 18px; height: 18px;
} }
.excel{
cursor: pointer;
}
} }
} }
......
dsk-operate-ui/src/views/radar/components/Land/index.vue
View file @ 3ebfaa05
...@@ -219,7 +219,13 @@ ...@@ -219,7 +219,13 @@
<p>共有{{total}}条</p> <p>共有{{total}}条</p>
<p> <p>
<img src="@/assets/images/EXCEL.png" alt=""> <img src="@/assets/images/EXCEL.png" alt="">
<span>导出EXCEL</span> <el-popover
placement="top-end"
width="200"
trigger="hover"
content="功能正在开发中">
<span class="excel" slot="reference">导出EXCEL</span>
</el-popover>
</p> </p>
</div> </div>
...@@ -239,8 +245,8 @@ ...@@ -239,8 +245,8 @@
<div class="list-content" v-if="item.companyName||item.transactionPrice||item.acreage||item.acreage"> <div class="list-content" v-if="item.companyName||item.transactionPrice||item.acreage||item.acreage">
<p class="list-content-text" v-if="item.companyName"> <p class="list-content-text" v-if="item.companyName">
<span>受让人：</span> <span>受让人：</span>
<span > <span class="blue" @click="getUipIdByCid(item.companyId)" v-html="item.companyName">
<router-link :to="'/company/' + encodeStr(item.companyId) + '/?index=true'" tag="a" class="list-titel-a blue" v-html="item.companyName"></router-link>
</span> </span>
</p> </p>
...@@ -920,6 +926,21 @@ ...@@ -920,6 +926,21 @@
this.init(); this.init();
this.$emit("reset"); this.$emit("reset");
}, },
getUipIdByCid(companyId){
var params=[companyId]
api.getUipIdByCid(params).then(res=>{
if (res.code==200) {
if(res.data&&res.data.length>0&&res.data[0].uipId){
this.$router.push({path: '/enterprise/'+this.encodeStr(res.data[0].uipId)})
}else{
this.$router.push({path: '/company/'+this.encodeStr(res.data[0].companyId)})
}
}
}).catch(error=>{
});
},
init() { init() {
this.search(); this.search();
this.addressListfn(); this.addressListfn();
...@@ -1045,6 +1066,9 @@ ...@@ -1045,6 +1066,9 @@
width: 18px; width: 18px;
height: 18px; height: 18px;
} }
.excel{
cursor: pointer;
}
} }
} }
......
dsk-operate-ui/src/views/radar/components/Tender/index.vue
View file @ 3ebfaa05
...@@ -180,7 +180,14 @@ ...@@ -180,7 +180,14 @@
<p>共有{{total}}条</p> <p>共有{{total}}条</p>
<p> <p>
<img src="@/assets/images/EXCEL.png" alt=""> <img src="@/assets/images/EXCEL.png" alt="">
<span>导出EXCEL</span> <el-popover
placement="top-end"
width="200"
trigger="hover"
content="功能正在开发中">
<span class="excel" slot="reference">导出EXCEL</span>
</el-popover>
</p> </p>
</div> </div>
<div class="table-item-jf1" v-if="tableData.length==0"> <div class="table-item-jf1" v-if="tableData.length==0">
...@@ -212,13 +219,13 @@ ...@@ -212,13 +219,13 @@
<div class="list-content list-content1" 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"> <p class="list-content-text" v-if="item.companyName">
<span>招采单位：</span> <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> <span class="blue" @click="getUipIdByCid(item.jskEid)" v-html="item.companyName">
<span v-else class="blue" v-html="item.companyName"></span> </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>
<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 class="blue" @click="getUipIdByCid(item.agencyId)" v-html="item.agency">
<span v-else class="blue" v-html="item.agency"></span> </span>
</p> </p>
</div> </div>
...@@ -1101,6 +1108,21 @@ ...@@ -1101,6 +1108,21 @@
} }
} }
}, },
getUipIdByCid(companyId){
var params=[companyId]
api.getUipIdByCid(params).then(res=>{
if (res.code==200) {
if(res.data&&res.data.length>0&&res.data[0].uipId){
this.$router.push({path: '/enterprise/'+this.encodeStr(res.data[0].uipId)})
}else{
this.$router.push({path: '/company/'+this.encodeStr(res.data[0].companyId)})
}
}
}).catch(error=>{
});
},
}, },
}; };
</script> </script>
...@@ -1233,6 +1255,9 @@ ...@@ -1233,6 +1255,9 @@
width: 18px; width: 18px;
height: 18px; height: 18px;
} }
.excel{
cursor: pointer;
}
} }
.bottomlist-content { .bottomlist-content {
......
dsk-operate-ui/src/views/radar/components/bxprozbgg/index.vue
View file @ 3ebfaa05
...@@ -336,7 +336,13 @@ ...@@ -336,7 +336,13 @@
<p>共有{{total}}条</p> <p>共有{{total}}条</p>
<p> <p>
<img src="@/assets/images/EXCEL.png" alt=""> <img src="@/assets/images/EXCEL.png" alt="">
<span>导出EXCEL</span> <el-popover
placement="top-end"
width="200"
trigger="hover"
content="功能正在开发中">
<span class="excel" slot="reference">导出EXCEL</span>
</el-popover>
</p> </p>
</div> </div>
...@@ -448,7 +454,9 @@ ...@@ -448,7 +454,9 @@
</el-table-column> </el-table-column>
<el-table-column prop="zj" label="招标人" width="280" > <el-table-column prop="zj" label="招标人" width="280" >
<template slot-scope="scope"> <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> <span class="list-titel-a" @click="getUipIdByCid(scope.row.tendereeId)" v-html="scope.row.tenderee">
</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -1673,6 +1681,21 @@ ...@@ -1673,6 +1681,21 @@
} }
}); });
}, },
getUipIdByCid(companyId){
var params=[companyId]
api.getUipIdByCid(params).then(res=>{
if (res.code==200) {
if(res.data&&res.data.length>0&&res.data[0].uipId){
this.$router.push({path: '/enterprise/'+this.encodeStr(res.data[0].uipId)})
}else{
this.$router.push({path: '/company/'+this.encodeStr(res.data[0].companyId)})
}
}
}).catch(error=>{
});
},
exportData(row,name) { exportData(row,name) {
let params={ let params={
fromUrl:document.referrer, fromUrl:document.referrer,
...@@ -1987,6 +2010,9 @@ ...@@ -1987,6 +2010,9 @@
width: 18px; width: 18px;
height: 18px; height: 18px;
} }
.excel{
cursor: pointer;
}
} }
} }
...@@ -1994,6 +2020,7 @@ ...@@ -1994,6 +2020,7 @@
padding:0px 16px; padding:0px 16px;
.list-titel-a{ .list-titel-a{
color:#0081FF; color:#0081FF;
cursor: pointer;
} }
.bxpro_list_money{ .bxpro_list_money{
li{ li{
......
dsk-operate-ui/src/views/radar/components/debtProject/index.vue
View file @ 3ebfaa05
...@@ -94,7 +94,13 @@ ...@@ -94,7 +94,13 @@
<p>共有{{total}}条</p> <p>共有{{total}}条</p>
<p> <p>
<img src="@/assets/images/EXCEL.png" alt=""> <img src="@/assets/images/EXCEL.png" alt="">
<span>导出EXCEL</span> <el-popover
placement="top-end"
width="200"
trigger="hover"
content="功能正在开发中">
<span class="excel" slot="reference">导出EXCEL</span>
</el-popover>
</p> </p>
</div> </div>
<div class="table-item-jf1" v-if="tableData.length==0"> <div class="table-item-jf1" v-if="tableData.length==0">
...@@ -105,7 +111,7 @@ ...@@ -105,7 +111,7 @@
<ul class="bottomlist-content" v-if="tableData.length>0"> <ul class="bottomlist-content" v-if="tableData.length>0">
<li class="bottomlist-list" v-for="item in tableData"> <li class="bottomlist-list" v-for="item in tableData">
<p class="list-titel"> <p class="list-titel">
<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" v-if="item.domicile"> <div class="content-label" v-if="item.domicile">
...@@ -133,15 +139,17 @@ ...@@ -133,15 +139,17 @@
<div class="list-content"> <div class="list-content">
<p class="list-content-text" v-if="item.projectEntity"> <p class="list-content-text" v-if="item.projectEntity">
<span>项目主体：</span> <span>项目主体：</span>
<span v-html="item.projectEntity"></span> <span v-html="item.projectEntity" class="blue" @click="getUipIdByCid(item.projectEntityId)"></span>
</p> </p>
<p class="list-content-text" v-if="item.chargeDepartment"> <p class="list-content-text" v-if="item.chargeDepartment">
<span>主管部门：</span> <span>主管部门：</span>
<span v-html="item.chargeDepartment"></span> <span v-html="item.chargeDepartment" >
</span>
</p> </p>
<p class="list-content-text" v-if="item.piu"> <p class="list-content-text" v-if="item.piu" >
<span>实施单位：</span> <span>实施单位：</span>
<span v-html="item.piu"></span> <span v-html="item.piu" class="blue" @click="getUipIdByCid(item.piuId)"></span>
</p> </p>
</div> </div>
</li> </li>
...@@ -539,6 +547,21 @@ ...@@ -539,6 +547,21 @@
} }
return this.hasValue; return this.hasValue;
}, },
getUipIdByCid(companyId){
var params=[companyId]
api.getUipIdByCid(params).then(res=>{
if (res.code==200) {
if(res.data&&res.data.length>0&&res.data[0].uipId){
this.$router.push({path: '/enterprise/'+this.encodeStr(res.data[0].uipId)})
}else{
this.$router.push({path: '/company/'+this.encodeStr(res.data[0].companyId)})
}
}
}).catch(error=>{
});
},
reset(){ reset(){
Object.assign(this.$data, this.$options.data.call(this)); //重置data Object.assign(this.$data, this.$options.data.call(this)); //重置data
this.init(); this.init();
...@@ -665,6 +688,9 @@ ...@@ -665,6 +688,9 @@
width: 18px; width: 18px;
height: 18px; height: 18px;
} }
.excel{
cursor: pointer;
}
} }
.bottomlist-content{ .bottomlist-content{
......
dsk-operate-ui/src/views/radar/debtProject/details.vue
View file @ 3ebfaa05
...@@ -136,14 +136,14 @@ ...@@ -136,14 +136,14 @@
<div class="main4-box"> <div class="main4-box">
<label class="label">项目主体</label> <label class="label">项目主体</label>
<span> <span>
<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> <router-link v-if="textList.projectEntity" :to="textList.projectEntityUipId?'/enterprise/' + encodeStr(textList.projectEntityUipId) :'/company/' + encodeStr(textList.projectEntityId) " tag="a" class="list-titel-a blue" v-html="textList.projectEntity"></router-link>
<template v-else>--</template> <template v-else>--</template>
</span> </span>
<label class="label">主管部门</label> <label class="label">主管部门</label>
<span>{{textList.chargeDepartment||'--'}}</span> <span>{{textList.chargeDepartment||'--'}}</span>
<label class="label">实施单位</label> <label class="label">实施单位</label>
<span> <span>
<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> <router-link v-if="textList.piu" :to="textList.piuUipId?'/enterprise/' + encodeStr(textList.piuUipId) :'/company/' + encodeStr(textList.piuId) " tag="a" class="list-titel-a blue" v-html="textList.piu"></router-link>
<template v-else>--</template> <template v-else>--</template>
</span> </span>
</div> </div>
......
dsk-system/src/main/java/com/dsk/system/dskService/EnterpriseBussinessService.java
View file @ 3ebfaa05
...@@ -68,18 +68,25 @@ public class EnterpriseBussinessService { ...@@ -68,18 +68,25 @@ public class EnterpriseBussinessService {
contentParam.put("data_type", "kaibiao"); contentParam.put("data_type", "kaibiao");
contentParam.put("filter_type", 2); contentParam.put("filter_type", 2);
contentParam.put("strategy_id", mongoContentId); contentParam.put("strategy_id", mongoContentId);
Map<String, Object> contentMap = dskOpenApiUtil.requestBody("/mongocontent/v1/cjb/mongo_content", contentParam); Map<String, Object> contentMap = null;
try {
contentMap = dskOpenApiUtil.requestBody("/mongocontent/v1/cjb/mongo_content", contentParam);
log.info("contentData:{}", JSONUtil.toJsonStr(contentMap));
} catch (Exception e) {
data.put("content", e.getMessage());
map.put("data", data);
return BeanUtil.toBean(map, R.class);
}
log.info("contentData:{}", JSONUtil.toJsonStr(contentMap));
Map contentData = MapUtils.getMap(contentMap, "data", null); Map contentData = MapUtils.getMap(contentMap, "data", null);
if (200 != MapUtils.getInteger(contentMap, "code", 300)) { if (200 != MapUtils.getInteger(contentMap, "code", 300)) {
data.put("content", JSONUtil.toJsonStr(contentMap));
map.put("data", data);
return BeanUtil.toBean(map, R.class); return BeanUtil.toBean(map, R.class);
} }
String htmlContent = MapUtils.getString(contentData, "htmlContent"); data.put("content", MapUtils.getString(contentData, "htmlContent"));
data.put("content", htmlContent);
map.put("data", data); 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 @ 3ebfaa05
...@@ -131,21 +131,27 @@ public class EnterpriseProjectService { ...@@ -131,21 +131,27 @@ public class EnterpriseProjectService {
} }
HashMap<String, Object> contentParam = new HashMap<>(); HashMap<String, Object> contentParam = new HashMap<>();
contentParam.put("data_type", "bid_plan"); contentParam.put("data_type", "zhaobiao_new");
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", contentParam); Map<String, Object> contentMap = null;
try {
log.info("contentData:{}", JSONUtil.toJsonStr(contentMap)); contentMap = dskOpenApiUtil.requestBody("/mongocontent/v1/cjb/mongo_content", contentParam);
log.info("contentData:{}", JSONUtil.toJsonStr(contentMap));
} catch (Exception e) {
data.put("content", e.getMessage());
map.put("data", data);
return BeanUtil.toBean(map, R.class);
}
Map contentData = MapUtils.getMap(contentMap, "data", null); Map contentData = MapUtils.getMap(contentMap, "data", null);
if (200 != MapUtils.getInteger(contentMap, "code", 300)) { if (200 != MapUtils.getInteger(contentMap, "code", 300)) {
data.put("content", JSONUtil.toJsonStr(contentMap));
map.put("data", data);
return BeanUtil.toBean(map, R.class); return BeanUtil.toBean(map, R.class);
} }
String htmlContent = MapUtils.getString(contentData, "htmlContent"); data.put("content", MapUtils.getString(contentData, "htmlContent"));
data.put("content", htmlContent);
map.put("data", data); map.put("data", data);
return BeanUtil.toBean(map, R.class); return BeanUtil.toBean(map, R.class);
......
dsk-system/src/main/resources/mapper/business/BusinessInfoMapper.xml
View file @ 3ebfaa05
...@@ -101,16 +101,24 @@ ...@@ -101,16 +101,24 @@
LEFT JOIN business_user bu on bu.business_id = i.id LEFT JOIN business_user bu on bu.business_id = i.id
LEFT JOIN sys_user u on u.user_id = f.user_id LEFT JOIN sys_user u on u.user_id = f.user_id
<where> <where>
<if test="userId != null">
and bu.user_id = #{userId}
</if>
<if test="projectType != null and projectType != ''"> <if test="projectType != null and projectType != ''">
and i.project_type in and i.project_type in
<foreach collection="projectType" item="projectType" open="(" separator="," close=")"> <foreach collection="projectType" item="projectType" open="(" separator="," close=")">
#{projectType} #{projectType}
</foreach> </foreach>
</if> </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} and i.investment_amount &gt;= #{minAmount}
</if> </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} and i.investment_amount &lt; #{maxAmount}
</if> </if>
<if test="minAmount != null and minAmount != '' and maxAmount != null and maxAmount != '' and maxAmount == minAmount"> <if test="minAmount != null and minAmount != '' and maxAmount != null and maxAmount != '' and maxAmount == minAmount">
...@@ -128,9 +136,6 @@ ...@@ -128,9 +136,6 @@
<if test="ownerCompany != null and ownerCompany != ''"> <if test="ownerCompany != null and ownerCompany != ''">
or i.construction_unit like concat('%',#{ownerCompany},'%') or i.construction_unit like concat('%',#{ownerCompany},'%')
</if> </if>
<if test="userId != null">
and bu.user_id = #{userId}
</if>
<if test="others != null"> <if test="others != null">
and bu.user_id != #{others} and i.is_private = 1 and bu.user_id != #{others} and i.is_private = 1
</if> </if>
...@@ -332,12 +337,12 @@ ...@@ -332,12 +337,12 @@
<if test="buildProperty != null">build_property = #{buildProperty},</if> <if test="buildProperty != null">build_property = #{buildProperty},</if>
<if test="planCompleteTime != null">plan_complete_time = #{planCompleteTime},</if> <if test="planCompleteTime != null">plan_complete_time = #{planCompleteTime},</if>
<if test="projectDetails != null">project_details = #{projectDetails},</if> <if test="projectDetails != null">project_details = #{projectDetails},</if>
<if test="provinceName != null">province_name = #{provinceName},</if> province_name = #{provinceName},
<if test="provinceId != null">province_id = #{provinceId},</if> province_id = #{provinceId},
<if test="cityName != null">city_name = #{cityName},</if> city_name = #{cityName},
<if test="cityId != null">city_id = #{cityId},</if> city_id = #{cityId},
<if test="districtName != null">district_name = #{districtName},</if> district_name = #{districtName},
<if test="districtId != null">district_id = #{districtId},</if> district_id = #{districtId},
<if test="projectType != null">project_type = #{projectType},</if> <if test="projectType != null">project_type = #{projectType},</if>
<if test="projectCategory != null">project_category = #{projectCategory},</if> <if test="projectCategory != null">project_category = #{projectCategory},</if>
<if test="isPrivate != null">is_private = #{isPrivate},</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