Skip to content

D
dsk-cr20g
Commit 16fb72f8 authored by 远方不远's avatar 远方不远
Browse files
Options

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

parents 0e041fb4 de62c298
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 481 additions and 170 deletions
dsk-admin/src/main/java/com/dsk/web/controller/dsk/EnterpriseController.java
View file @ 16fb72f8
...@@ -45,12 +45,6 @@ public class EnterpriseController { ...@@ -45,12 +45,6 @@ public class EnterpriseController {
return enterpriseService.bidDataGroup(vo); return enterpriseService.bidDataGroup(vo);
} }
@ApiOperation(value = "供应商列表（建设库）")
@PostMapping(value = "supplierPage")
public R supplierPage(@RequestBody @Valid EnterpriseSupplierPageBody vo) throws Exception {
return enterpriseService.supplierPage(vo);
}
@ApiOperation(value = "甲方业绩数据（openApi）") @ApiOperation(value = "甲方业绩数据（openApi）")
@PostMapping(value = "projectTenderDataGroup") @PostMapping(value = "projectTenderDataGroup")
public R projectTenderDataGroup(@RequestBody @Valid EnterpriseProjectTenderDataGroupBody vo) throws Exception { public R projectTenderDataGroup(@RequestBody @Valid EnterpriseProjectTenderDataGroupBody vo) throws Exception {
...@@ -75,30 +69,6 @@ public class EnterpriseController { ...@@ -75,30 +69,6 @@ public class EnterpriseController {
return enterpriseService.affiliates(vo); return enterpriseService.affiliates(vo);
} }
@ApiOperation(value = "招标公告列表（建设库）")
@PostMapping(value = "bidNoticePage")
public R bidNoticePage(@RequestBody @Valid EnterpriseBidNoticePageBody vo) throws Exception {
return enterpriseService.bidNoticePage(vo);
}
@ApiOperation(value = "招标公告省份（建设库）")
@PostMapping(value = "bidNoticeProvince")
public R bidNoticeProvince(@RequestBody @Valid EnterpriseBidNoticePageBody vo) throws Exception {
return enterpriseService.bidNoticeProvince(vo);
}
@ApiOperation(value = "招标公告信息类型（建设库）")
@PostMapping(value = "bidNoticeTenderStage")
public R bidNoticeTenderStage(@RequestBody @Valid EnterpriseBidNoticePageBody vo) throws Exception {
return enterpriseService.bidNoticeTenderStage(vo);
}
@ApiOperation(value = "招标公告详情（建设库）")
@PostMapping(value = "bidNoticeDeatil")
public R bidNoticeDeatil(@RequestBody @Valid EnterpriseBidNoticeDetailBody vo) throws Exception {
return enterpriseService.bidNoticeDeatil(vo);
}
@ApiOperation(value = "企业动态列表（建设库）") @ApiOperation(value = "企业动态列表（建设库）")
@PostMapping(value = "dynamicPage") @PostMapping(value = "dynamicPage")
public TableDataInfo dynamicPage(@RequestBody @Valid EnterpriseDynamicPageBody vo) throws Exception { public TableDataInfo dynamicPage(@RequestBody @Valid EnterpriseDynamicPageBody vo) throws Exception {
...@@ -129,4 +99,10 @@ public class EnterpriseController { ...@@ -129,4 +99,10 @@ public class EnterpriseController {
return enterpriseService.bestStockPage(vo); return enterpriseService.bestStockPage(vo);
} }
@ApiOperation(value = "财务简析（openApi）")
@PostMapping(value = "financial")
public R financial(@RequestBody @Valid EnterpriseFinancialBody vo) throws Exception {
return enterpriseService.financial(vo);
}
} }
dsk-admin/src/main/java/com/dsk/web/controller/search/controller/CompanySearchController.java
View file @ 16fb72f8
...@@ -26,7 +26,7 @@ public class CompanySearchController { ...@@ -26,7 +26,7 @@ public class CompanySearchController {
*/ */
@RequestMapping("/index") @RequestMapping("/index")
public AjaxResult landMarketPage(@RequestBody ComposeQueryDto compose) { public AjaxResult landMarketPage(@RequestBody ComposeQueryDto compose) {
return opportunityRadarService.enterprisePage(compose); return opportunityRadarService.enterpriseIndex(compose);
} }
/* /*
...@@ -36,4 +36,12 @@ public class CompanySearchController { ...@@ -36,4 +36,12 @@ public class CompanySearchController {
public AjaxResult findByName(@PathVariable String keyword) { public AjaxResult findByName(@PathVariable String keyword) {
return opportunityRadarService.enterpriseByName(keyword); return opportunityRadarService.enterpriseByName(keyword);
} }
/*
* 完全匹配企业名称
*/
@GetMapping("/page")
public AjaxResult page(@RequestBody ComposeQueryDto compose) {
return opportunityRadarService.enterprisePage(compose);
}
} }
dsk-admin/src/main/java/com/dsk/web/controller/search/service/BusinessOpportunityRadarService.java
View file @ 16fb72f8
...@@ -18,10 +18,12 @@ public interface BusinessOpportunityRadarService { ...@@ -18,10 +18,12 @@ public interface BusinessOpportunityRadarService {
AjaxResult landMarketPage(ComposeQueryDto compose); AjaxResult landMarketPage(ComposeQueryDto compose);
AjaxResult establishmentPage(ComposeQueryDto compose); AjaxResult establishmentPage(ComposeQueryDto compose);
AjaxResult enterprisePage(ComposeQueryDto compose); AjaxResult enterpriseIndex(ComposeQueryDto compose);
AjaxResult enterpriseByName(String keyword); AjaxResult enterpriseByName(String keyword);
AjaxResult enterprisePage(ComposeQueryDto compose);
AjaxResult bondProjectPage(ComposeQueryDto compose); AjaxResult bondProjectPage(ComposeQueryDto compose);
AjaxResult jskBidPlanPage(ComposeQueryDto compose); AjaxResult jskBidPlanPage(ComposeQueryDto compose);
......
dsk-admin/src/main/java/com/dsk/web/controller/search/service/impl/BusinessOpportunityRadarServiceImpl.java
View file @ 16fb72f8
...@@ -51,11 +51,18 @@ public class BusinessOpportunityRadarServiceImpl implements BusinessOpportunityR ...@@ -51,11 +51,18 @@ public class BusinessOpportunityRadarServiceImpl implements BusinessOpportunityR
} }
@Override @Override
public AjaxResult enterprisePage(ComposeQueryDto compose) { public AjaxResult enterpriseIndex(ComposeQueryDto compose) {
Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/index", BeanUtil.beanToMap(compose, false, false)); Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/index", BeanUtil.beanToMap(compose, false, false));
return BeanUtil.toBean(map, AjaxResult.class); return BeanUtil.toBean(map, AjaxResult.class);
} }
@Override
public AjaxResult enterprisePage(ComposeQueryDto compose) {
Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/page", BeanUtil.beanToMap(compose, false, false));
return BeanUtil.toBean(map, AjaxResult.class);
}
@Override @Override
public AjaxResult enterpriseByName(String keyword){ public AjaxResult enterpriseByName(String keyword){
Map<String,Object> params = new HashMap<>(); Map<String,Object> params = new HashMap<>();
......
dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseFinancialBody.java 0 → 100644
View file @ 16fb72f8
package com.dsk.common.core.domain.model;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.ToString;
import javax.validation.constraints.NotNull;
@Data
@ToString
@NoArgsConstructor
@EqualsAndHashCode(callSuper = false)
public class EnterpriseFinancialBody
{
/**
* 企业id
*/
@NotNull(message = "企业id不能为空")
private Integer cid;
}
dsk-common/src/main/java/com/dsk/common/utils/DskOpenApiUtil.java
View file @ 16fb72f8
...@@ -32,7 +32,8 @@ public class DskOpenApiUtil { ...@@ -32,7 +32,8 @@ public class DskOpenApiUtil {
} }
public Map<String,Object> requestBodyLocal(String path, Map<String, Object> bodyMap){ public Map<String,Object> requestBodyLocal(String path, Map<String, Object> bodyMap){
return JSONUtil.toBean(HttpUtil.post("http://127.0.0.1:8766"+path, JSONUtil.toJsonStr(bodyMap)), JSONConfig.create().setIgnoreNullValue(true), Map.class); String post = HttpUtil.post("http://127.0.0.1:8766" + path, JSONUtil.toJsonStr(bodyMap));
return CommonUtils.assertAsMap(CommonUtils.parseJSON(post));
} }
public Map<String,Object> requestBodyWithHeader(String path, Map<String, Object> bodyMap, Map<String, String> headerMap){ public Map<String,Object> requestBodyWithHeader(String path, Map<String, Object> bodyMap, Map<String, String> headerMap){
......
dsk-operate-ui/src/assets/styles/project.scss
View file @ 16fb72f8
...@@ -82,12 +82,6 @@ ...@@ -82,12 +82,6 @@
&:hover{ &:hover{
background: #F3F4F5; background: #F3F4F5;
} }
.txt{
padding-left: 8px;
opacity: 0.4;
display: inline-block;
width: 100%;
}
.el-input{ .el-input{
margin-right: 8px; margin-right: 8px;
.el-input__inner{ .el-input__inner{
...@@ -100,67 +94,100 @@ ...@@ -100,67 +94,100 @@
text-indent: 8px; text-indent: 8px;
} }
} }
.el-date-editor--date{
.el-input__prefix{
display: none;
}
}
&.i{
.el-input{
.el-input__inner{
width: 100px;
}
}
}
}
.txt{
padding-left: 8px;
color: rgba(35,35,35,0.4);
display: inline-block;
width: 100%;
} }
width: 438px; width: 438px;
&.i{ &.i{
width: auto; width: auto;
} }
.tipinput{ .inputime{
display: inline-block; display: inline-block;
margin-top: 1px; width: 184px;
width: calc(100% - 116px); height: 28px;
.el-input{ border-radius: 2px;
float: left; line-height: 28px;
margin-right: 8px; cursor: pointer;
width: 70px; >span{
margin-bottom: 10px; padding-left: 8px;
.el-input__inner{
width: 70px;
height: 24px;
background: #F3F4F5;
border-radius: 2px;
padding: 0;
text-indent: 14px;
border: 0;
}
} }
.addbtn{ .el-icon-caret-bottom{
float: left; color: rgba(35,35,32,0.4);
width: 20px; margin-left: 4px;
height: 20px;
background: url("../../assets/images/project/add.png") no-repeat center center;
background-size: 100%;
display: inline-block;
margin-left: 8px;
margin-top: 2px;
&:hover{
background: url("../../assets/images/project/add_1.png") no-repeat center center;
}
} }
.tips{ }
float: left; }
height: 24px; }
line-height: 24px; .tipinput{
padding: 0 14px; display: inline-block;
font-size: 14px; margin-top: 1px;
color: #0081FF; width: calc(100% - 116px);
background: #E4F3FD; .el-input{
margin-right: 8px; float: left;
margin-bottom: 5px; margin-right: 8px;
img{ width: 70px;
margin-left: 8px; margin-bottom: 10px;
margin-top: 4px; .el-input__inner{
float: right; width: 70px;
width: 16px; height: 24px;
display: none; background: #F3F4F5;
cursor: pointer; border-radius: 2px;
} padding: 0;
&:hover{ text-indent: 14px;
background: #DCEAF3; border: 0;
img{ }
display: block; }
} .addbtn{
} float: left;
width: 20px;
height: 20px;
background: url("../../assets/images/project/add.png") no-repeat center center;
background-size: 100%;
display: inline-block;
margin-left: 8px;
margin-top: 2px;
&:hover{
background: url("../../assets/images/project/add_1.png") no-repeat center center;
}
}
.tips{
float: left;
height: 24px;
line-height: 24px;
padding: 0 14px;
font-size: 14px;
color: #0081FF;
background: #E4F3FD;
margin-right: 8px;
margin-bottom: 5px;
img{
margin-left: 8px;
margin-top: 4px;
float: right;
width: 16px;
display: none;
cursor: pointer;
}
&:hover{
background: #DCEAF3;
img{
display: block;
} }
} }
} }
...@@ -543,7 +570,7 @@ ...@@ -543,7 +570,7 @@
.el-input__prefix{ .el-input__prefix{
left: 8px; left: 8px;
top: 4px; top: -2px;
} }
.el-input__suffix{ .el-input__suffix{
height: 32px; height: 32px;
...@@ -673,6 +700,15 @@ ...@@ -673,6 +700,15 @@
text-align: center; text-align: center;
display: inline-block; display: inline-block;
margin-left: 10px; margin-left: 10px;
&.on{
background: #FF3C3C;
color: #FF3C3C;
}
&:hover{
border: 1px solid #FF3C3C;
color: #FF3C3C;
background: #FFEBEB;
}
} }
} }
.tasklist{ .tasklist{
...@@ -701,6 +737,21 @@ ...@@ -701,6 +737,21 @@
border-radius: 4px; border-radius: 4px;
right: 16px; right: 16px;
top: 30px; top: 30px;
padding: 8px 12px;
line-height: 16px;
box-sizing: border-box;
&.on{
background: #D3F0E8;
.color_text{
color: #0CBC6D;
}
}
.select-popper{
margin: 0;
}
.el-icon-caret-bottom{
color:rgba(35,35,35,0.4) ;
}
} }
} }
} }
......
dsk-operate-ui/src/views/project/projectList/component/gzdb.vue
View file @ 16fb72f8
...@@ -28,16 +28,36 @@ ...@@ -28,16 +28,36 @@
</div> </div>
</div> </div>
</div> </div>
<div class="tasktitle"><strong>我的任务</strong><span>4条已逾期</span></div> <div class="tasktitle"><strong>我的任务</strong><span>4条已逾期</span><!--<span class="on">4条已逾期</span>--></div>
<div class="tasklist"> <div class="tasklist">
<div class="task_name">周二拜访交通局李主任</div> <div class="task_name">周二拜访交通局李主任</div>
<div class="task_con"><span>发起时间：2023-01-24</span><span>关联客户：<font class="wordprimary">重庆市交通局</font></span><span>完成时间：2023-0.-03</span></div> <div class="task_con"><span>发起时间：2023-01-24</span><span>关联客户：<font class="wordprimary">重庆市交通局</font></span><span>完成时间：2023-0.-03</span></div>
<div class="select">未完成</div> <div class="select" :class="{'on':status == 1}">
<div class="select-popper">
<span class="color_text">
{{status == 0?"未完成":"已完成"}}
<i class="el-icon-caret-bottom"></i>
</span>
<el-select placeholder="请选择" v-model="status" class="select-multiple">
<el-option label="未完成" value="0"></el-option>
<el-option label="已完成" value="1"></el-option>
</el-select>
</div></div>
</div> </div>
<div class="tasklist"> <div class="tasklist">
<div class="task_name">周二拜访交通局李主任</div> <div class="task_name">周二拜访交通局李主任</div>
<div class="task_con"><span>发起时间：2023-01-24</span><span>关联客户：<font class="wordprimary">重庆市交通局</font></span><span>完成时间：2023-0.-03</span></div> <div class="task_con"><span>发起时间：2023-01-24</span><span>关联客户：<font class="wordprimary">重庆市交通局</font></span><span>完成时间：2023-0.-03</span></div>
<div class="select">未完成</div> <div class="select" :class="{'on':status == 1}">
<div class="select-popper">
<span class="color_text">
{{status == 0?"未完成":"已完成"}}
<i class="el-icon-caret-bottom"></i>
</span>
<el-select placeholder="请选择" v-model="status" class="select-multiple">
<el-option label="未完成" value="0"></el-option>
<el-option label="已完成" value="1"></el-option>
</el-select>
</div></div>
</div> </div>
</div> </div>
</el-card> </el-card>
...@@ -46,12 +66,14 @@ ...@@ -46,12 +66,14 @@
<script> <script>
import "@/assets/styles/project.scss" import "@/assets/styles/project.scss"
import "@/assets/styles/public.css"
export default { export default {
name: 'gjjl', name: 'gjjl',
data(){ data(){
return{ return{
isEdit:false, isEdit:false,
value:'' value:'',
status:0,
} }
}, },
methods:{ methods:{
......
dsk-operate-ui/src/views/project/projectList/component/jsnr.vue
View file @ 16fb72f8
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<span>总投资额（万元） ：</span> <span>总投资额（万元） ：</span>
<div class="inputxt"> <div class="inputxt">
<div class="flex" v-if="nowedit == 1"> <div class="flex" v-if="nowedit == 1">
<el-input placeholder="待添加"></el-input> <el-input placeholder="待添加" v-model="money" @input="number"></el-input>
<div class="flex"> <div class="flex">
<div class="btnsmall btn_primary h28" style="width: 56px">确定</div> <div class="btnsmall btn_primary h28" style="width: 56px">确定</div>
<div class="cancels h28" @click="nowedit = -1" style="">取消</div> <div class="cancels h28" @click="nowedit = -1" style="">取消</div>
...@@ -48,8 +48,46 @@ ...@@ -48,8 +48,46 @@
</div> </div>
<div class="con i"> <div class="con i">
<span>计划招标 ：</span> <span>计划招标 ：</span>
<div class="inputxt"> <div class="inputime">
<span class="txt">待添加</span> <div class="flex" style="opacity: 0;height: 0">
<el-date-picker v-if="nowedit == 11" showWordLimit="true"
v-model="value1"
type="date"
value-format="yyyy-MM-dd"
placeholder="待添加" @change="nowedit = -1">
</el-date-picker>
</div>
<span :class="{'txt':!value1}" @click="nowedit = 11">{{value1||"待添加"}}<i class="el-icon-caret-bottom"></i></span>
</div>
</div>
</div>
<div class="row">
<div class="con">
<span>计划开工 ：</span>
<div class="inputime">
<div class="flex" style="opacity: 0;height: 0">
<el-date-picker v-if="nowedit == 12" showWordLimit="true"
v-model="value1"
type="date"
value-format="yyyy-MM-dd"
placeholder="待添加" @change="nowedit = -1">
</el-date-picker>
</div>
<span :class="{'txt':!value1}" @click="nowedit = 12">{{value1||"待添加"}}<i class="el-icon-caret-bottom"></i></span>
</div>
</div>
<div class="con i">
<span>计划竣工 ：</span>
<div class="inputime">
<div class="flex" style="opacity: 0;height: 0">
<el-date-picker v-if="nowedit == 13" showWordLimit="true"
v-model="value1"
type="date"
value-format="yyyy-MM-dd"
placeholder="待添加" @change="nowedit = -1">
</el-date-picker>
</div>
<span :class="{'txt':!value1}" @click="nowedit = 13">{{value1||"待添加"}}<i class="el-icon-caret-bottom"></i></span>
</div> </div>
</div> </div>
</div> </div>
...@@ -86,8 +124,16 @@ ...@@ -86,8 +124,16 @@
</div> </div>
<div class="con i"> <div class="con i">
<span>开标时间 ：</span> <span>开标时间 ：</span>
<div class="inputxt"> <div class="inputime">
<span class="txt">待添加</span> <div class="flex" style="opacity: 0;height: 0">
<el-date-picker v-if="nowedit == 14" showWordLimit="true"
v-model="value1"
type="date"
value-format="yyyy-MM-dd"
placeholder="待添加" @change="nowedit = -1">
</el-date-picker>
</div>
<span :class="{'txt':!value1}" @click="nowedit = 14">{{value1||"待添加"}}<i class="el-icon-caret-bottom"></i></span>
</div> </div>
</div> </div>
</div> </div>
...@@ -160,9 +206,23 @@ ...@@ -160,9 +206,23 @@
return{ return{
textarea:"", textarea:"",
nowedit:-1,//当前正在编辑的文本 nowedit:-1,//当前正在编辑的文本
value1:'',
money:'',
} }
}, },
watch:{
// nowedit(oldvalue,newvalue){
// if (newvalue == 13){
// this.$ref.newvalue13.=true
// }
// }
},
methods:{ methods:{
//输入数字
number(value){
console.log(value)
this.money = value.replace(/^\D*(\d*(?:\.\d{0,6})?).*$/g, '$1')//输入6位小数
},
} }
} }
</script> </script>
......
dsk-operate-ui/src/views/project/projectList/component/lxr.vue
View file @ 16fb72f8
...@@ -80,33 +80,27 @@ ...@@ -80,33 +80,27 @@
<span>重庆市轨道交通3号线二期工程4标段施工总承包</span> <span>重庆市轨道交通3号线二期工程4标段施工总承包</span>
</div> </div>
<el-form class="popform" label-width="137px"> <el-form class="popform" label-width="137px">
<div class="row"> <el-form-item label="联系人姓名：" class="row">
<span class="left">联系人姓名：</span>
<el-input type="text" placeholder="请输入"></el-input> <el-input type="text" placeholder="请输入"></el-input>
</div> </el-form-item>
<div class="row"> <el-form-item label="联系人角色：" class="row">
<span class="left">联系人角色：</span>
<el-select placeholder="请选择"> <el-select placeholder="请选择">
<el-option label="cccc" value="11"></el-option> <el-option label="cccc" value="11"></el-option>
<el-option label="cccc" value="121"></el-option> <el-option label="cccc" value="121"></el-option>
</el-select> </el-select>
</div> </el-form-item>
<div class="row"> <el-form-item label="联系人职位：" class="row">
<span class="left">联系人职位：</span>
<el-input type="text" placeholder="请输入"></el-input> <el-input type="text" placeholder="请输入"></el-input>
</div> </el-form-item>
<div class="row"> <el-form-item label="联系人公司/机关：" class="row">
<span class="left">联系人公司/机关：</span>
<el-input type="text" placeholder="请输入"></el-input> <el-input type="text" placeholder="请输入"></el-input>
</div> </el-form-item>
<div class="row"> <el-form-item label="内部维护人：" class="row">
<span class="left">内部维护人：</span>
<el-input type="text" placeholder="请输入"></el-input> <el-input type="text" placeholder="请输入"></el-input>
</div> </el-form-item>
<div class="row"> <el-form-item label="联系方式：" class="row">
<span class="left">联系方式：</span>
<el-input type="text" placeholder="请输入"></el-input> <el-input type="text" placeholder="请输入"></el-input>
</div> </el-form-item>
<div class="popbot"> <div class="popbot">
<div class="btn btn_cancel h32" @click="cancel">返回</div> <div class="btn btn_cancel h32" @click="cancel">返回</div>
<div class="btn btn_primary h32">保存</div> <div class="btn btn_primary h32">保存</div>
......
dsk-operate-ui/src/views/project/projectList/component/xgqy.vue
View file @ 16fb72f8
...@@ -104,43 +104,37 @@ ...@@ -104,43 +104,37 @@
<img src="@/assets/images/economies/icon.png"> <img src="@/assets/images/economies/icon.png">
<span>新建相关企业-{{types==1?"业主单位":""}}{{types==2?"合作伙伴":""}}{{types==3?"竞争对手":""}}</span> <span>新建相关企业-{{types==1?"业主单位":""}}{{types==2?"合作伙伴":""}}{{types==3?"竞争对手":""}}</span>
</div> </div>
<el-form class="popform i" label-width="85px"> <el-form class="popform i" label-width="85px" :rules="rules" ref="ruleForm" >
<div class="row"> <el-form-item label="企业名称：" prop="projectName" class="row">
<span class="left"><i>*</i>企业名称：</span>
<el-input type="text" placeholder="请输入"></el-input> <el-input type="text" placeholder="请输入"></el-input>
</div> </el-form-item>
<div class="row" v-if="types == 1"> <el-form-item v-if="types == 1" label="对接深度：" class="row">
<span class="left">对接深度：</span>
<el-select placeholder="请选择"> <el-select placeholder="请选择">
<el-option label="cccc" value="11"></el-option> <el-option label="cccc" value="11"></el-option>
<el-option label="cccc" value="121"></el-option> <el-option label="cccc" value="121"></el-option>
</el-select> </el-select>
</div> </el-form-item>
<div class="row" v-if="types == 2"> <el-form-item v-if="types == 2" label="合作阶段：" class="row">
<span class="left">合作阶段：</span>
<el-select placeholder="请选择"> <el-select placeholder="请选择">
<el-option label="cccc" value="11"></el-option> <el-option label="cccc" value="11"></el-option>
<el-option label="cccc" value="121"></el-option> <el-option label="cccc" value="121"></el-option>
</el-select> </el-select>
</div> </el-form-item>
<div class="row" v-if="types == 3"> <el-form-item v-if="types == 3" label="竞争力度：" prop="projectName" class="row">
<span class="left">竞争力度：</span>
<el-select placeholder="请选择"> <el-select placeholder="请选择">
<el-option label="cccc" value="11"></el-option> <el-option label="cccc" value="11"></el-option>
<el-option label="cccc" value="121"></el-option> <el-option label="cccc" value="121"></el-option>
</el-select> </el-select>
</div> </el-form-item>
<div class="row"> <el-form-item label="企业角色：" prop="projectName" class="row">
<span class="left">企业角色：</span>
<el-select placeholder="请选择"> <el-select placeholder="请选择">
<el-option label="cccc" value="11"></el-option> <el-option label="cccc" value="11"></el-option>
<el-option label="cccc" value="121"></el-option> <el-option label="cccc" value="121"></el-option>
</el-select> </el-select>
</div> </el-form-item>
<div class="row"> <el-form-item label="负责人：" class="row">
<span class="left">负责人：</span>
<el-input type="text" placeholder="请输入"></el-input> <el-input type="text" placeholder="请输入"></el-input>
</div> </el-form-item>
<div class="popbot"> <div class="popbot">
<div class="btn btn_cancel h32" @click="cancel">返回</div> <div class="btn btn_cancel h32" @click="cancel">返回</div>
<div class="btn btn_primary h32">添加</div> <div class="btn btn_primary h32">添加</div>
...@@ -182,7 +176,12 @@ ...@@ -182,7 +176,12 @@
name: '王小虎', name: '王小虎',
address: '上海市普陀区金沙江路 1516 弄' address: '上海市普陀区金沙江路 1516 弄'
} }
] ],
rules:{
projectName:[{ required: true, message: '请输入非空格字符！', trigger: 'blur' },],
ownerCompany:[{ required: true, message: '请输入非空格字符！', trigger: 'blur' },],
},
} }
}, },
methods:{ methods:{
......
dsk-operate-ui/src/views/project/projectList/component/xmsl.vue
View file @ 16fb72f8
...@@ -20,7 +20,16 @@ ...@@ -20,7 +20,16 @@
</div> </div>
<div class="con i"> <div class="con i">
<span>项目阶段 ：</span> <span>项目阶段 ：</span>
<div class="inputxt"><span class="txt">待添加</span></div>
<div class="select-popper " >
<span class="color_text" :class="{'txt':xmjd == '待添加'}">
{{xmjd}}
<i class="el-icon-caret-bottom"></i>
</span>
<el-select v-model="xmjd" class="select-multiple" placeholder="请选择">
<el-option v-for="(item,index) in projectStage" :key="index" :label="item.dictLabel" :value="item.dictValue"></el-option>
</el-select>
</div>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
...@@ -159,6 +168,7 @@ ...@@ -159,6 +168,7 @@
<script> <script>
import "@/assets/styles/project.scss" import "@/assets/styles/project.scss"
import {getDictType,} from '@/api/main'
export default { export default {
name: 'xmsl', name: 'xmsl',
data(){ data(){
...@@ -166,8 +176,17 @@ ...@@ -166,8 +176,17 @@
nowedit:-1,//当前正在编辑的文本 nowedit:-1,//当前正在编辑的文本
tipslit:[],//项目标签 tipslit:[],//项目标签
tipsvalue:"",//标签填写内容 tipsvalue:"",//标签填写内容
xmjd:'待添加',
projectStage:[],//项目阶段
} }
}, },
created(){
//项目阶段
getDictType('project_stage_type').then(result=>{
this.projectStage = result.code == 200 ? result.data:[]
})
},
methods:{ methods:{
//验证电话号码 //验证电话号码
isphone(value){ isphone(value){
......
dsk-operate-ui/src/views/project/projectList/index.vue
View file @ 16fb72f8
...@@ -147,6 +147,7 @@ ...@@ -147,6 +147,7 @@
<script> <script>
import "@/assets/styles/project.scss" import "@/assets/styles/project.scss"
import "@/assets/styles/public.css"
import prvinceTree from '@/assets/json/provinceTree' import prvinceTree from '@/assets/json/provinceTree'
import {getProjectlist} from '@/api/project/project' import {getProjectlist} from '@/api/project/project'
import {getDictType,} from '@/api/main' import {getDictType,} from '@/api/main'
...@@ -207,7 +208,7 @@ export default { ...@@ -207,7 +208,7 @@ export default {
}, },
created() { created() {
this.prvinceTree() this.prvinceTree()
// this.getList(1) this.getList(1)
//项目阶段 //项目阶段
getDictType('project_stage_type').then(result=>{ getDictType('project_stage_type').then(result=>{
this.projectStage = result.code == 200 ? result.data:[] this.projectStage = result.code == 200 ? result.data:[]
...@@ -225,6 +226,8 @@ export default { ...@@ -225,6 +226,8 @@ export default {
//获取商机列表 //获取商机列表
getList(pageNum){ getList(pageNum){
this.searchParam.pageNum = pageNum this.searchParam.pageNum = pageNum
console.log(this.searchParam)
return false
getProjectlist(this.searchParam).then(result=>{ getProjectlist(this.searchParam).then(result=>{
console.log(result) console.log(result)
}) })
...@@ -288,9 +291,6 @@ export default { ...@@ -288,9 +291,6 @@ export default {
let Id = '111' let Id = '111'
this.$router.push({ path: '/project/projectList/detail', query: Id }); this.$router.push({ path: '/project/projectList/detail', query: Id });
}, },
getxmdq(){
console.log(888)
},
handleClick(){ handleClick(){
}, },
......
dsk-system/src/main/java/com/dsk/system/dskService/EnterpriseService.java
View file @ 16fb72f8
...@@ -123,4 +123,9 @@ public class EnterpriseService { ...@@ -123,4 +123,9 @@ public class EnterpriseService {
Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/bestStockPage", BeanUtil.beanToMap(body, false, false)); Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/bestStockPage", BeanUtil.beanToMap(body, false, false));
return dskOpenApiUtil.responsePage(map); return dskOpenApiUtil.responsePage(map);
} }
public R financial(EnterpriseFinancialBody body) throws Exception {
Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/financial", BeanUtil.beanToMap(body, false, false));
return BeanUtil.toBean(map, R.class);
}
} }
dsk-system/src/main/java/com/dsk/system/service/impl/BusinessInfoServiceImpl.java
View file @ 16fb72f8
...@@ -112,8 +112,8 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService { ...@@ -112,8 +112,8 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
int addBusiness = businessInfoMapper.insertBusinessInfo(businessInfo); int addBusiness = businessInfoMapper.insertBusinessInfo(businessInfo);
if (addBusiness > 0) { if (addBusiness > 0) {
//获取登陆用户的部门id //获取登陆用户的部门id
// Long deptId = SecurityUtils.getLoginUser().getDeptId(); Long deptId = SecurityUtils.getLoginUser().getDeptId();
Long deptId = 100l; // Long deptId = 100l;
//新增用户-项目关系信息 //新增用户-项目关系信息
int addbusinessUser = businessUserMapper.insertBusinessUser(new BusinessUser(businessInfo.getId(), deptId.intValue(), dto.getUserId(), 1)); int addbusinessUser = businessUserMapper.insertBusinessUser(new BusinessUser(businessInfo.getId(), deptId.intValue(), dto.getUserId(), 1));
//新增项目-关联企业信息 //新增项目-关联企业信息
......
dsk-system/src/main/resources/mapper/business/BusinessInfoMapper.xml
View file @ 16fb72f8
...@@ -262,10 +262,10 @@ ...@@ -262,10 +262,10 @@
<select id="selectCustomerBusinessList" resultType="com.dsk.system.domain.customer.vo.CustomerBusinessListVo"> <select id="selectCustomerBusinessList" resultType="com.dsk.system.domain.customer.vo.CustomerBusinessListVo">
select select
bi.id, bi.project_name, pi.investment_amount, pi.project_stage, pi.status bi.id, bi.project_name, bi.investment_amount, bi.project_stage, bi.status
from business_info bi from business_info bi
left join business_user bu on bi.id = bu.business_id left join business_user bu on bi.id = bu.business_id
where bi.customer_id = #{customerId} and (bu.user_id = #{userId} or bi.is_private = 1)) where bi.customer_id = #{customerId} and (bu.user_id = #{userId} or bi.is_private = 1)
<if test="projectStage != null and projectStage != '' "> and bi.project_stage = #{projectStage}</if> <if test="projectStage != null and projectStage != '' "> and bi.project_stage = #{projectStage}</if>
<if test="status != null "> and bi.status = #{status}</if> <if test="status != null "> and bi.status = #{status}</if>
order by bi.create_time desc order by bi.create_time desc
......
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