Skip to content

D
dsk-cr20g
Commit 3016cfb9 authored by danfuman's avatar danfuman
Browse files
Options

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

parents a5eb5a82 12f684ba
Hide whitespace changes
Inline Side-by-side
Showing with 215 additions and 74 deletions
dsk-common/src/main/java/com/dsk/common/constant/CacheConstants.java
View file @ 3016cfb9
......@@ -41,4 +41,9 @@ public class CacheConstants
* 登录账户密码错误次数 redis key
*/
public static final String PWD_ERR_CNT_KEY = "pwd_err_cnt:";
/**
* 查甲方 菜单选线
*/
public static final String DATA_UIPGROUPDATA = "data:uipGroupData";
}
dsk-common/src/main/java/com/dsk/common/core/domain/entity/BusinessFollowRecord.java
View file @ 3016cfb9
......@@ -70,8 +70,8 @@ public class BusinessFollowRecord extends BaseEntity
private String visitWay;
/** 创建时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
@Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm")
private Date creatTime;
public String getProjectName() {
......
dsk-operate-ui/src/api/common.js
View file @ 3016cfb9
......@@ -8,3 +8,12 @@ export const idRemark = (data) => {
data: data
})
}
// 认领用户
export const claim= function claim(param) {
return request({
url: '/customer/claim',
method: 'post',
data: param
})
}
dsk-operate-ui/src/views/custom/overview/index.vue
View file @ 3016cfb9
......@@ -171,8 +171,24 @@ export default {
this.initChart()
this.getDT(1)
})
window.addEventListener("resize", this.resizeEcharts);
},
beforeDestroy(){
window.removeEventListener("resize", this. resizeEcharts);
},
activated() {
this.resizeEcharts()
},
methods: {
resizeEcharts (){
const self = this
setTimeout(function(){ //图表跟随页面大小变化宽度
self.myChart.resize()
self.myChart1.resize()
self.myChart2.resize()
self.myChart3.resize()
}, 10)
},
initChart(){
//客户级别
this.option = {
......
dsk-operate-ui/src/views/detail/party-a/component/HeadForm.vue
View file @ 3016cfb9
......@@ -35,7 +35,7 @@
<!-- 输入框 -->
<template v-if="form.type==3">
<div class="cooperate-name">
<el-input clearable @focus="clickFocus('focus'+i)" @blur="clickFocus('focus'+i)" v-model="form.value" :placeholder="form.placeholder"></el-input>
<el-input clearable @clear="changeSelect" @focus="clickFocus('focus'+i)" @blur="clickFocus('focus'+i)" v-model="form.value" :placeholder="form.placeholder"></el-input>
<span :id="'focus'+i" @click="changeSelect">搜索</span>
</div>
</template>
......
dsk-operate-ui/src/views/detail/party-a/decisionMaking/index.vue
View file @ 3016cfb9
......@@ -39,9 +39,9 @@
width="464px">
<div class="poptitle">
<img src="@/assets/images/economies/icon.png">
<span>重庆市轨道交通3号线二期工程4标段施工总承包</span>
<span>{{ companyInfo.companyName }}</span>
</div>
<el-form :model="addRorm" :rules="addRules" ref="addRorm" class="popform" label-width="75px">
<el-form :model="addRorm" :rules="addRules" ref="addRorm" class="popform" label-width="90px">
<el-form-item label="姓名：" prop="name">
<el-input v-model="addRorm.name" placeholder="请输入"></el-input>
</el-form-item>
......@@ -81,7 +81,7 @@ export default {
components: {
Tables
},
props: ['customerIds'],
props: ['customerIds','companyInfo'],
data() {
return {
ifEmpty:false,
......@@ -100,7 +100,7 @@ export default {
{label: '备注', prop: 'remark'},
],
addRorm: {
customerId:'f25219e73249eea0d9fddc5c7f04f97f',
customerId:this.customerIds,
name:'',
role:'',
workUnit:'',
......
dsk-operate-ui/src/views/detail/party-a/index.vue
View file @ 3016cfb9
......@@ -48,7 +48,7 @@
<!-- 合作情况 -->
<Cooperate v-if="currentPath.pathName=='cooperate'" :customer-ids="customerId" />
<!-- 决策链条 -->
<DecisionMaking v-if="currentPath.pathName=='decisionMaking'" :customer-ids="customerId" />
<DecisionMaking v-if="currentPath.pathName=='decisionMaking'" :customer-ids="customerId" :companyInfo="companyInfo" />
<!-- 跟进记录 -->
<Gjjl v-if="currentPath.pathName=='gjjl'" types="gjdt" :customer-ids="customerId" />
</template>
......
dsk-operate-ui/src/views/detail/party-a/opport/administrative.vue
View file @ 3016cfb9
......@@ -17,11 +17,14 @@
:queryParams="queryParams"
@handle-current-change="handleCurrentChange"
>
<template slot="deciWritName" slot-scope="scope">
<div v-html="scope.row.deciWritName"></div>
</template>
<template slot="content" slot-scope="scope">
<span :class="[isOverHiddenFlag(scope.data.width, showList, scope.index, 0, scope.row.content)?'cell-span':'']" :style="{'-webkit-line-clamp': 2}">
{{ scope.row.content }}
<div :class="[isOverHiddenFlag(scope.data.width, showList, scope.index, 0, scope.row.content)?'cell-span':'']" :style="{'-webkit-line-clamp': 2}">
<div v-html="scope.row.content"></div>
<span v-if="isOverHiddenFlag(scope.data.width, showList, scope.index, 0, scope.row.content)" @click="changeShowAll(scope.index, 0)">...<span style="color: #0081FF;">展开</span></span>
</span>
</div>
</template>
</tables>
......@@ -48,13 +51,13 @@ export default {
{label: '许可决定日期', prop: 'deciTime', width: '100'},
{label: '决定文书号', prop: 'deciWritNo', width: '200'},
{label: '许可编号', prop: 'permitNo', width: '100'},
{label: '决定文书名称', prop: 'deciWritName', width: '190'},
{label: '决定文书名称', prop: 'deciWritName', width: '190', slot: true},
{label: '许可内容', prop: 'content', width: '300', slot: true},
{label: '有效期自', prop: 'valiBegin', width: '100'},
{label: '有效期至', prop: 'valiEnd', width: '100'},
{label: '行政许可类别', prop: 'permitType', width: '100'},
{label: '许可机关', prop: 'office', width: '180'},
{label: '行政许可机关统一社会信用代码', prop: 'xxx', width: '200'},
{label: '行政许可机关统一社会信用代码', prop: 'officeCreditCode', width: '200'},
{label: '数据来源单位', prop: 'dataSourceOffice', width: '110'},
{label: '数据来源单位统一社会信用代码', prop: 'dataSourceOfficeCreditCode', width: '200'},
{label: '来源', prop: 'dataSource', width: '80'}
......@@ -81,7 +84,12 @@ export default {
let res = await creditXzxkPage(param)
this.tableLoading = false
if(res.code==200){
this.tableData = res.rows
if(res.rows&&res.rows.length>0){
this.tableData = res.rows.map(item => {
item.smallContent = item.content.replace(/<.*?>/ig,"")
return item
})
}
}
this.tableDataTotal = res.total
},
......@@ -92,14 +100,29 @@ export default {
})
},
isOverHiddenFlag(data, showList, row, column, value) {
if(value && String(value).length > this.getLenth(data)) {
if(value && this.getByteLen(value) > 88) {
return !showList.some(item => item.row==row&&item.column==column)
}else {
return false
}
},
getLenth(data) {
return Math.floor(data / 12) * 5
/*getLenth(data) {
return Math.floor(data / 6) * 2 //宽度（300） / 一个字符的宽度（6） * 行数（2）
},*/
getByteLen(val) {
var len = 0
for (var i = 0; i < val.length; i++) {
var a = val.charAt(i)
if (a.match(/[^\x00-\xff]/ig) != null){
len += 2
}else{
len += 1
}
}
/*if(val.match(/ /g)){
len =len+Math.floor(val.match(/ /g).length/2)
}*/
return len
}
}
}
......
dsk-operate-ui/src/views/detail/party-a/overview/component/infoheader.vue
View file @ 3016cfb9
......@@ -65,7 +65,7 @@
</div>
</div>
<div class="company-menu">
<el-button @click="handleClaim" v-if="ifClaim" class="hasClaim" v-loading="claimLoading"><i class="el-ico-claim" alt="已认领" title="已认领"></i> 已认领</el-button>
<el-button @click="handleClaim" v-if="ifClaim==1" class="hasClaim" v-loading="claimLoading"><i class="el-ico-claim" alt="已认领" title="已认领"></i> 已认领</el-button>
<el-button @click="handleClaim" v-else class="claim" v-loading="claimLoading"><i class="el-ico-claim" alt="认领客户" title="认领客户"></i> 认领客户</el-button>
</div>
......@@ -121,6 +121,19 @@
</div>
<!-- 分条件：滚动与不滚动 -->
</div>
<el-dialog
title=""
:visible.sync="dialogVisible"
:modal="false"
custom-class='dialog-renlin'
:show-close="false"
width="244px">
<span>认领成功，是否完善客户信息？</span>
<div slot="footer" class="dialog-footer">
<span class="dialog-footer-btn1" type="primary" @click="renlin()">立即完善</span>
<span class="dialog-footer-btn2" @click="renHide()">稍后</span>
</div>
</el-dialog>
</div>
</template>
......@@ -128,6 +141,7 @@
import { changePath } from '@/assets/js/common'
var Swiper = require('@/assets/lib/swiper/swiper-bundle.min.js')
import "@/assets/lib/swiper/swiper-bundle.css"
import { claim } from "@/api/common"
export default {
name: 'Infoheader',
props: ['companyId', 'companyInfo', 'statistic'],
......@@ -136,7 +150,7 @@ export default {
newStatic: null,
labelList: [], //企业标签
claimLoading: false,
ifClaim: false, //是否认领
ifClaim: 0, //是否认领
showMore: false,
showState: false,
graphList: [
......@@ -151,6 +165,7 @@ export default {
//风险扫描
labelArr:['失信联合惩戒企业','司法纠纷','注销'], //负向经营状态
enterpriseLabel:[],//企业标签
dialogVisible: false
}
},
created() {
......@@ -163,16 +178,18 @@ export default {
methods: {
//认领
async handleClaim(){
let _this = this
_this.claimLoading = true
setTimeout(function (){
_this.claimLoading = false
_this.$confirm(`认领成功，是否完善客户信息`, '提示', {
type: 'warning'
}).then(async () => {
console.log('操作跳转！')
})
}, 1000)
if(this.companyInfo.uipId){
this.claimLoading = true
let param = {companyId:this.companyId, uipId:this.companyInfo.uipId, companyName:this.companyInfo.companyName}
let res = await claim(param)
this.tableLoading = false
if(res.code==200){
this.dialogVisible=true
this.ifClaim = true
}
}else{
this.$message.warning('对不起，当前不能认领')
}
},
companySwiper(){
new Swiper('.swiper-info', {
......@@ -208,8 +225,8 @@ export default {
this.companySwiper() //swiper滚动板块
},
//获取认领状态
async getClaimStatus(){
this.ifClaim = false
getClaimStatus(){
this.ifClaim = this.companyInfo.regCapital
},
handleWidth(){
if(this.companyInfo.introduction){
......@@ -261,6 +278,14 @@ export default {
if(it.id==302 && it.val){
changePath(this, 'administrative')
}
},
renlin(){
this.dialogVisible=false;
// this.$router.push({path:'/home',query: {id:'1'}})
// 跳转地址
},
renHide(){
this.dialogVisible=false;
}
},
watch: {
......@@ -619,4 +644,47 @@ export default {
margin-left: 4px;
}
}
::v-deep .dialog-renlin{
margin-top:40vh !important;
.el-dialog__body{
padding: 0;
text-align: center;
padding-bottom: 24px;
}
.el-dialog__footer{
padding: 0px;
padding-bottom: 24px;
.dialog-footer{
display: inline-flex;
align-items: center;
justify-content: center;
width: 100%;
.dialog-footer-btn1{
cursor: pointer;
width: 72px;
height: 28px;
background: #0081FF;
border-radius: 2px 2px 2px 2px;
font-size: 12px;
font-weight: 400;
color: #FFFFFF;
line-height: 28px;
text-align: center;
margin-right: 8px;
}
.dialog-footer-btn2{
cursor: pointer;
width: 72px;
height: 28px;
border-radius: 2px 2px 2px 2px;
border: 1px solid #CCCCCC;
line-height: 28px;
text-align: center;
font-size: 12px;
font-weight: 400;
color: rgba(35,35,35,0.8);
}
}
}
}
</style>
dsk-operate-ui/src/views/detail/party-a/riskInformation/punish.vue
View file @ 3016cfb9
......@@ -51,9 +51,9 @@ export default {
},
forData: [
{label: '处罚原因', prop: 'punishReason', width: '508', slot: true, fixed: true},
{label: '决定日期', prop: 'punishBegin', width: '95'},
{label: '决定日期', prop: 'punishBegin', width: '105'},
{label: '处罚结果', prop: 'punishResult', width: '264'},
{label: '处罚文书号', prop: 'fileNum', width: '200'},
{label: '处罚文书号', prop: 'fileNum', width: '240'},
{label: '处罚机关', prop: 'office', width: '264'},
{label: '处罚结束日期', prop: 'punishEnd', width: '100'},
],
......
dsk-operate-ui/src/views/detail/party-a/urbanLnvestment/sameRegion.vue
View file @ 3016cfb9
......@@ -123,8 +123,8 @@ export default {
data() {
return {
queryParams: {
provinceId: '',
cityId: '',
provinceIds: [],
cityIds: [],
uipExecutiveLevel: '',
uipBusinessType: [],
bratingSubjectLevel: [],
......@@ -192,10 +192,23 @@ export default {
tableDataTotal:0,
}
},
watch:{
searchState:{
handler(newVal, olVal) {
if (newVal) {
setTimeout(() => {
document.addEventListener('click', this.handleSearch1);
}, 0);
} else {
document.removeEventListener('click', this.handleSearch1);
}
}
}
},
created() {
if(this.companyInfo){
this.queryParams.provinceId = this.companyInfo.provinceId
this.queryParams.cityId = this.companyInfo.cityId
this.queryParams.provinceIds.push(this.companyInfo.provinceId)
this.queryParams.cityIds.push(this.companyInfo.cityId)
this.handleQuery()
this.getScreen()
}
......
dsk-operate-ui/src/views/detail/party-b/index.vue
View file @ 3016cfb9
......@@ -22,7 +22,7 @@ export default {
if (this.$route.params.id) { // 获取companyId
this.loading = true
// this.src = `https://pre-plug.jiansheku.com/enterprise/${this.$route.params.id}?secretId=${this.secretId}`
this.src = `http://192.168.60.30:3300/enterprise/${this.$route.params.id}?secretId=${this.secretId}`
this.src = `http://192.168.60.30:3300/enterprise/${this.$route.params.id}`
}
},
mounted() {
......
dsk-operate-ui/src/views/project/overview/index.vue
View file @ 3016cfb9
......@@ -30,7 +30,7 @@
</div>
</div>
</el-card>
<el-card class="box-card noborder">
<el-card class="box-card noborder" id="charts">
<div class="cardtitles i">项目经营分析
<div class="labels">
<div :class="{'on':datatype==1}" @click="getDT(1)">周</div>
......@@ -222,6 +222,13 @@ export default {
item.createTime = this.gettime(item.createTime)
item.nextVisitTime = this.gettime(item.nextVisitTime)
})
window.addEventListener("resize", this.resizeEcharts);
},
beforeDestroy(){
window.removeEventListener("resize", this. resizeEcharts);
},
activated() {
this.resizeEcharts()
},
methods: {
getDT(type){
......@@ -298,6 +305,12 @@ export default {
}
this.initDT(datas,labels)
},
resizeEcharts (){
const self = this
setTimeout(function(){
self.myChart.resize()
}, 10)
},
initDT(datas,labels){
this.chartDom = document.getElementById("xmjyfx")
this.myChart = echarts.init(this.chartDom)
......@@ -436,6 +449,11 @@ export default {
]
}
this.option && this.myChart.setOption(this.option)
let _this = this
// document.getElementById('charts').onresize = function () {
// _this.myChart.resize() ; // 如果有多个图标变动，可写多个
//
// }
},
gettime(time){
if(time == null || time == "")
......
dsk-system/src/main/java/com/dsk/system/dskService/EnterpriseService.java
View file @ 3016cfb9
......@@ -5,9 +5,11 @@ import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.json.JSONUtil;
import com.dsk.acc.openapi.client.util.CommonUtils;
import com.dsk.common.constant.CacheConstants;
import com.dsk.common.core.domain.R;
import com.dsk.common.core.domain.model.*;
import com.dsk.common.core.page.TableDataInfo;
import com.dsk.common.core.redis.RedisCache;
import com.dsk.common.utils.DskOpenApiUtil;
import com.dsk.common.utils.EncodeIdUtil;
import com.dsk.system.domain.customer.vo.CustomerStatusListVo;
......@@ -23,6 +25,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
/**
* @ClassName enterpriseService
......@@ -42,12 +45,16 @@ public class EnterpriseService {
@Autowired
ICustomerService iCustomerService;
@Autowired
private RedisCache redisCache;
public R infoHeader(EnterpriseInfoHeaderBody body) throws Exception {
Map<String, Object> companyMap = dskOpenApiUtil.requestBody("/api/jsk/enterprise/infoHeader", BeanUtil.beanToMap(body, false, false));
Integer companyCode = MapUtils.getInteger(companyMap, "code", 300);
if (200 != companyCode) throw new RuntimeException();
Map companyData = MapUtils.getMap(companyMap, "data", null);
companyData.put("claimStatus", 0);
companyData.put("uipId", null);
Map<String, Object> uipMap = dskOpenApiUtil.requestBody("/operate/enterprise/financial", BeanUtil.beanToMap(body, false, false));
Integer uipCode = MapUtils.getInteger(uipMap, "code", 300);
......@@ -55,10 +62,12 @@ public class EnterpriseService {
Map uipData = MapUtils.getMap(uipMap, "data", new HashMap<>());
String uipId = MapUtils.getString(uipData, "uipId", null);
if (ObjectUtil.isEmpty(uipId)) {
return R.ok(companyData);
}
companyData.put("uipId", uipId);
ArrayList<String> uipIds = new ArrayList<>();
uipIds.add(uipId);
List<CustomerStatusListVo> claimStatusList = iCustomerService.selectStatusList(uipIds);
......@@ -80,13 +89,6 @@ public class EnterpriseService {
return BeanUtil.toBean(map, R.class);
}
public R supplierPage(EnterpriseSupplierPageBody body) throws Exception {
Map<String, String> headerMap = new HashMap<>();
headerMap.put("Api-Version", "1.0");
Map<String, Object> map = dskOpenApiUtil.requestBodyWithHeader("/api/jsk/enterpriseBusiness/selectPageSupplierInfo", BeanUtil.beanToMap(body, false, false), headerMap);
return BeanUtil.toBean(map, R.class);
}
public R projectTenderDataGroup(EnterpriseProjectTenderDataGroupBody body) throws Exception {
Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/projectTenderDataGroup", BeanUtil.beanToMap(body, false, false));
return BeanUtil.toBean(map, R.class);
......@@ -108,34 +110,6 @@ public class EnterpriseService {
return dskOpenApiUtil.responsePage(map);
}
public R bidNoticePage(EnterpriseBidNoticePageBody body) throws Exception {
Map<String, String> headerMap = new HashMap<>();
headerMap.put("Api-Version", "1.0");
Map<String, Object> map = dskOpenApiUtil.requestBodyWithHeader("/api/jsk/enterpriseBusiness/selectPageBidNoticeInfo", BeanUtil.beanToMap(body, false, false), headerMap);
return BeanUtil.toBean(map, R.class);
}
public R bidNoticeProvince(EnterpriseBidNoticePageBody body) throws Exception {
Map<String, String> headerMap = new HashMap<>();
headerMap.put("Api-Version", "1.0");
Map<String, Object> map = dskOpenApiUtil.requestBodyWithHeader("/api/jsk/enterpriseBusiness/selectBidProvinceByCompanyId", BeanUtil.beanToMap(body, false, false), headerMap);
return BeanUtil.toBean(map, R.class);
}
public R bidNoticeTenderStage(EnterpriseBidNoticePageBody body) throws Exception {
Map<String, String> headerMap = new HashMap<>();
headerMap.put("Api-Version", "1.0");
Map<String, Object> map = dskOpenApiUtil.requestBodyWithHeader("/api/jsk/enterpriseBusiness/selectTenderStageByCompanyId", BeanUtil.beanToMap(body, false, false), headerMap);
return BeanUtil.toBean(map, R.class);
}
public R bidNoticeDeatil(EnterpriseBidNoticeDetailBody body) throws Exception {
Map<String, String> headerMap = new HashMap<>();
headerMap.put("Api-Version", "1.0");
Map<String, Object> map = dskOpenApiUtil.requestBodyWithHeader("/api/jsk/enterpriseBusiness/bid/detail", BeanUtil.beanToMap(body, false, false), headerMap);
return BeanUtil.toBean(map, R.class);
}
public TableDataInfo dynamicPage(EnterpriseDynamicPageBody body) throws Exception {
Map<String, Object> map = dskOpenApiUtil.requestBody("/api/jsk/enterprise/dynamic", BeanUtil.beanToMap(body, false, false));
return dskOpenApiUtil.responsePage(map);
......@@ -210,7 +184,21 @@ public class EnterpriseService {
}
public R uipGroupData() throws Exception {
String redisKey = CacheConstants.DATA_UIPGROUPDATA;
Map<String, Object> cacheMap = redisCache.getCacheMap(redisKey);
if (MapUtils.isNotEmpty(cacheMap)) {
return R.ok(cacheMap);
}
Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/uipGroupData", new HashMap<>());
Integer code = MapUtils.getInteger(map, "code", 300);
if (200 != code) throw new RuntimeException();
Map data = MapUtils.getMap(map, "data", null);
redisCache.setCacheMap(redisKey, data);
redisCache.expire(redisKey, 24, TimeUnit.HOURS);
return BeanUtil.toBean(map, R.class);
}
......
dsk-system/src/main/resources/mapper/business/BusinessInfoMapper.xml
View file @ 3016cfb9
......@@ -266,6 +266,7 @@
<if test="createTime != null">create_time,</if>
<if test="updateTime != null">update_time,</if>
<if test="status != null">status,</if>
<if test="customerId != null">customer_id,</if>
<if test="evaluationBidWay != null">evaluation_bid_way,</if>
<if test="bidOpenTime != null">bid_open_time,</if>
<if test="bidOpenPlace != null">bid_open_place,</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