Skip to content

D
dsk-cr20g
Commit f4b85b14 authored by huangjie's avatar huangjie
Browse files
Options

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

parents e8a00019 36553a86
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 154 additions and 72 deletions
dsk-operate-ui/src/layout/components/TagsView/index.vue
View file @ f4b85b14
...@@ -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/utils/request.js
View file @ f4b85b14
...@@ -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/detail/party-a/business/component/info.vue
View file @ f4b85b14
...@@ -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 @ f4b85b14
...@@ -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,14 @@ export default { ...@@ -95,12 +95,14 @@ export default {
} }
],//局级大客户 ],//局级大客户
creditLevellist: [],//资信等级 creditLevellist: [],//资信等级
} },
iscompanyInfo:{}
} }
}, },
created() { created() {
this.handleQuery() this.handleQuery()
this.infos = this.customerInfo this.infos = this.customerInfo
this.iscompanyInfo = this.companyInfo ? this.companyInfo : {}
}, },
mounted(){ mounted(){
this.customerInfos() this.customerInfos()
......
dsk-operate-ui/src/views/detail/party-a/component/Header.vue
View file @ f4b85b14
...@@ -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 @ f4b85b14
...@@ -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 @ f4b85b14
...@@ -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">
......
dsk-operate-ui/src/views/detail/party-a/dealings/custom.vue
View file @ f4b85b14
...@@ -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 @ f4b85b14
...@@ -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 @ f4b85b14
...@@ -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 @ f4b85b14
...@@ -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
......
dsk-system/src/main/java/com/dsk/system/service/impl/SpecialPurposeBondsServiceImpl.java
View file @ f4b85b14
...@@ -16,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -16,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -98,7 +99,21 @@ public class SpecialPurposeBondsServiceImpl implements SpecialPurposeBondsServic ...@@ -98,7 +99,21 @@ public class SpecialPurposeBondsServiceImpl implements SpecialPurposeBondsServic
@Override @Override
public AjaxResult bondStatistics(SpecialPurposeBondsDto dto) { public AjaxResult bondStatistics(SpecialPurposeBondsDto dto) {
// todo 临时处理 待还原
Map<String, Object> map = dskOpenApiUtil.requestBody("/specialPurposeBonds/bond/statistics", BeanUtil.beanToMap(dto, false, false)); Map<String, Object> map = dskOpenApiUtil.requestBody("/specialPurposeBonds/bond/statistics", BeanUtil.beanToMap(dto, false, false));
Integer code = MapUtils.getInteger(map, "code", 300);
if (code.equals(HttpStatus.OK.value())) {
List<Object> list = CommonUtils.assertAsArray(MapUtils.getObject(map, "data", ""));
Iterator<Object> it = list.iterator();
while (it.hasNext()) {
Map<String, Object> informationMap = (Map<String, Object>)it.next();
// 专项债用于项目规模
Integer count = MapUtils.getInteger(informationMap, "count",0);
if (count.equals(0)) {
it.remove();
}
}
}
return BeanUtil.toBean(map, AjaxResult.class); return BeanUtil.toBean(map, AjaxResult.class);
} }
......
dsk-system/src/main/resources/mapper/business/BusinessInfoMapper.xml
View file @ f4b85b14
...@@ -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>
......
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