Skip to content

D
dsk-cr20g
Commit f7ca5734 authored by Administrator's avatar Administrator
Browse files
Options

Merge remote-tracking branch 'origin/dev20230707' into dev20230707

parents b89588b1 307272c0
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 214 additions and 191 deletions
dsk-admin/src/main/resources/application-pre.yml
View file @ f7ca5734
......@@ -9,12 +9,12 @@ shuzhihua:
# 实例演示开关
demoEnabled: true
# 文件路径 示例（ Windows配置D:/dsk/uploadPath，Linux配置 /home/server/dsk-operate-sys/uploadPath）
# profile: D:/dsk-operate-sys/uploadPath/
# profile: D:/dsk-operate-sys/uploadPath/
profile: /home/server/dsk-operate-sys/uploadPath/
# 获取ip地址开关
addressEnabled: false
# 验证码类型 math 数组计算 char 字符验证
captchaType: math
captchaType: char
# 开发环境配置
server:
......@@ -56,9 +56,9 @@ spring:
druid:
# 主库数据源
master:
url: jdbc:mysql://47.104.91.229:3306/dsk-operate-sys?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
url: jdbc:mysql://192.168.0.79:3306/dsk-operate-sys?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: dev
password: zfTFIJjaN#6xB83r
password: 8AXjjCHZ666!
# 从库数据源
# slave:
# # 从数据源开关/默认关闭
......@@ -113,15 +113,15 @@ spring:
messages:
# 国际化资源文件路径
basename: i18n/messages
# profiles:
# active: druid
# profiles:
# active: druid
# 文件上传
servlet:
multipart:
# 单个文件大小
max-file-size: 10MB
# 设置总上传的文件大小
max-request-size: 20MB
multipart:
# 单个文件大小
max-file-size: 10MB
# 设置总上传的文件大小
max-request-size: 20MB
# 服务模块
devtools:
restart:
......@@ -130,7 +130,8 @@ spring:
# redis 配置
redis:
# 地址
host: 47.104.91.229
# host: 139.9.157.49
host: 192.168.0.79
# 端口，默认为6379
port: 6379
# 数据库索引
......@@ -152,12 +153,12 @@ spring:
# token配置
token:
# 令牌自定义标识
header: Authorization
# 令牌密钥
secret: abcdefghijklmnopqrstuvwxyz
# 令牌有效期（默认30分钟）
expireTime: 240
# 令牌自定义标识
header: Authorization
# 令牌密钥
secret: abcdefghijklmnopqrstuvwxyz
# 令牌有效期（默认30分钟）
expireTime: 240
#mybatis:
......@@ -194,10 +195,10 @@ xss:
dsk:
open:
# endPoint: 120.27.13.145:8865
# accessKeyId: aec7b3ff2y2q8x6t49a7e2c463ce21912
# accessKeySecret: ee8a53c7ea04eb3ac311406c8f56f95b
# protocol: http
# endPoint: 120.27.13.145:8865
# accessKeyId: aec7b3ff2y2q8x6t49a7e2c463ce21912
# accessKeySecret: ee8a53c7ea04eb3ac311406c8f56f95b
# protocol: http
endPoint: openapi.jiansheku.com
accessKeyId: aec7b3ff2y2q8x6t49a7e2c463ce21912
accessKeySecret: ee8a53c7ea04eb3ac311406c8f56f95b
......
dsk-operate-ui/src/views/detail/party-a/dealings/component/supplierDetail.vue
View file @ f7ca5734
<template>
<div class="client-details">
<el-dialog
<el-drawer
:visible.sync="drawer"
size="80%"
:title="title"
custom-class="client-dialog"
size="60%"
custom-class="client-drawer"
:with-header="false"
@closed="cancel">
<head-detail-form
:title="title"
:form-data="formData"
:query-params="queryParams"
:total="data.total"
:total="tableDataTotal"
:amountTotal="amountTotal"
@handle-search="handleSearch"
/>
......@@ -19,18 +19,25 @@
:tableLoading="tableLoading"
:tableData="tableData"
:forData="forData"
:tableDataTotal="data.total"
:tableDataTotal="tableDataTotal"
:queryParams="queryParams"
@handle-current-change="handleCurrentChange"
style="margin: 12px;"
>
<template slot="sourceType" slot-scope="scope">
<template slot="projectAllName" slot-scope="scope">
<div class="flex-box">
<div class="a-link" @click="linkTo(scope)" v-if="scope.row.sourceId&&scope.row.sourceType=='中标业绩'" v-html="scope.row.sourceType" style="cursor: pointer"></div>
<span v-else v-html="scope.row.sourceType || '--'"></span>
<img class="tip-img" src="@/assets/images/detail/ico_pdf.png" v-if="scope.row.snapshootPic" @click="handlePic(scope.row.snapshootPic, true)"/>
<div class="a-link" @click="linkTo(scope)" v-if="scope.row.id&&scope.row.projectAllName" v-html="scope.row.projectAllName" style="cursor: pointer"></div> <span v-else v-html="scope.row.projectAllName || '--'"></span>
</div>
</template>
<template slot="province" slot-scope="scope">
{{scope.row.province}}{{`${scope.row.city?'-'+scope.row.city:''}`}}
</template>
<template slot="lowerRate" slot-scope="scope">
<span>{{scope.row.lowerRate ? scope.row.lowerRate+'%' : '--'}}</span>
</template>
</tables>
</el-dialog>
</el-drawer>
</div>
</template>
......@@ -53,21 +60,22 @@ export default {
return {
drawer: false,
queryParams: {
companyId: this.data.companyId,
cid: this.companyId,
cid: this.data.companyId,
unitId: this.companyId,
pageNum: 1,
pageSize: 20
},
formData: [
{ type: 6, fieldName: 'money', value: '', placeholder: '合同金额', startMoney: 'amountMin', endMoney: 'amountMax' },
{ type: 3, fieldName: 'keys', value: '', placeholder: '输入合作项目/工程名称查询', options: [], width: 260},
],
forData: [
{label: '项目名称', prop: 'projectName', fixed: true},
{label: '公布时间', prop: 'time', width: '100'},
{label: '本次合同金额（万元）', prop: 'amount', width: '160'},
{label: '项目类型', prop: 'projectType', width: '130'},
{label: '数据来源', prop: 'sourceType', width: '90', slot: true}
{label: '合作项目/工程名称', prop: 'projectAllName', width: '720', fixed: true, slot: true},
{label: '项目/工程金额（万元）', prop: 'winBidAmount', width: '160'},
{label: '合作时间', prop: 'winBidTime', width: '100'},
{label: '项目地区', prop: 'province', width: '160', slot: true},
{label: '项目类型', prop: 'boundType', width: '130'},
{label: '工期（天）', prop: 'period', width: '90'},
{label: '下浮率', prop: 'lowerRate', width: '90', slot: true}
],
//列表
tableLoading:false,
......@@ -100,7 +108,7 @@ export default {
},
linkTo(scope){
this.drawer = false
this.$router.push(`/biddetail/${scope.row.sourceId}`)
this.$router.push(`/biddetail/${scope.row.id}`)
},
cancel() {
this.$emit('cancel')
......@@ -111,27 +119,8 @@ export default {
<style lang="scss" scoped>
.client-details {
::v-deep .client-dialog{
width: 80%;
min-width: 900px;
::v-deep .client-drawer{
background: #FFFFFF;
.el-dialog__body{
padding-top: 0;
}
.fixed-table{
.el-table__header-wrapper,.el-table__fixed-header-wrapper{
top: 0;
}
}
.el-dialog__header{
border-bottom: 1px solid #E1E1E1;
}
.el-dialog__title{
font-size: 16px;
color: #232323;
font-weight: bold;
margin-right: 4px;
}
}
.tip-img{
width: 14px;
......
dsk-operate-ui/src/views/detail/party-a/dealings/custom.vue
View file @ f7ca5734
......@@ -84,7 +84,6 @@ export default {
},
methods: {
async handleQuery(params) {
this.isSkeleton = true;
this.tableLoading = true
let param = params?params:this.queryParams
let res = await clientPage(param)
......
dsk-operate-ui/src/views/detail/party-a/dealings/supplier.vue
View file @ f7ca5734
......@@ -84,7 +84,6 @@ export default {
},
methods: {
async handleQuery(params) {
this.isSkeleton = true;
this.tableLoading = true
let param = params?params:this.queryParams
let res = await supplierPage(param)
......
dsk-operate-ui/src/views/detail/party-a/overview/component/infoheader.vue
View file @ f7ca5734
......@@ -98,14 +98,14 @@
<div class="swiper-containers swiper-info" :style="graphList.length<=6?'margin-left:0px; width: 100%;':''">
<ul class="swiper-wrapper">
<li class="swiper-slide" v-if="statistic.combineMember">
<div class="flex-box" >
<div class="flex-box" @click="linkTo(statistic.combineMember)">
<img src="@/assets/images/detail/overview/company_ssjt.png" alt="所属集团" title="所属集团" class="swiper-img">
<div class="swiper-item">
<span class="swiper-name">
所属集团-{{statistic.combineMember.companyName}}
</span>
<div >
<span >集团成员：</span><i class="num" @click="linkTo(statistic.combineMember)">{{statistic.combineMember.memberNum}}</i>
<span >集团成员：</span><i class="num" >{{statistic.combineMember.memberNum}}</i>
</div>
</div>
</div>
......
dsk-system/src/main/java/com/dsk/system/domain/customer/dto/CustomerFollowRecordSearchDto.java
View file @ f7ca5734
......@@ -4,7 +4,6 @@ import com.dsk.common.core.domain.BaseEntity;
import lombok.Data;
import java.io.Serializable;
import java.util.Map;
/**
* 客户跟进记录筛选对象
......@@ -23,4 +22,12 @@ public class CustomerFollowRecordSearchDto extends BaseEntity implements Seriali
* 用户id
*/
private Long userId;
/**
* 开始时间
*/
private String startTime;
/**
* 结束时间
*/
private String endTime;
}
dsk-system/src/main/java/com/dsk/system/mapper/CustomerFollowRecordMapper.java
View file @ f7ca5734
......@@ -19,7 +19,7 @@ import java.util.List;
@Mapper
public interface CustomerFollowRecordMapper extends BaseMapper<CustomerFollowRecord> {
List<CustomerFollowRecordListVo> selectAuthList(@Param("dto") CustomerFollowRecordSearchDto dto);
List<CustomerFollowRecordListVo> selectAuthList(CustomerFollowRecordSearchDto dto);
}
dsk-system/src/main/resources/mapper/system/customer/CustomerFollowRecordMapper.xml
View file @ f7ca5734
......@@ -16,10 +16,12 @@
join sys_user u on u.user_id = cfr.user_id
left join sys_dept d on d.dept_id = u.dept_id
<where>
<if test="dto.userId != null "> and cfr.user_id = #{dto.userId} </if>
<if test="dto.customerId != null and dto.customerId != '' "> and cfr.customer_id = #{dto.customerId} </if>
<if test="userId != null "> and cfr.user_id = #{userId} </if>
<if test="customerId != null and customerId != '' "> and cfr.customer_id = #{customerId} </if>
<if test="startTime != null and startTime != '' "> and cfr.visit_time &gt;= #{startTime} </if>
<if test="endTime != null and endTime != '' "> and cfr.visit_time &lt;= #{endTime} </if>
<!-- 数据范围过滤 -->
<if test="dto.params.dataScope != null and dto.params.dataScope != '' "> ${dto.params.dataScope} </if>
<if test="params.dataScope != null and params.dataScope != '' "> ${params.dataScope} </if>
</where>
order by cfr.create_time desc
</select>
......
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