Commit 6b92900a authored by Administrator's avatar Administrator

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

parents 36a81a8e c6b7ef7e
......@@ -1220,10 +1220,6 @@
top: 56px;
z-index: 9;
}
.el-table__fixed-header-wrapper {
z-index: 9;
}
.el-table__fixed-header-wrapper{
position: sticky;
z-index: 9;
......
......@@ -75,10 +75,10 @@
projectName:'',// 项目名称
companyId:'',//企业id
ownerCompany:'',//业主单位
projectStage:'',//项目阶段
projectType:'',//项目类型
projectCategory:'',//项目类别
investmentAmount:'',//投资估算
projectStage:null,//项目阶段
projectType:null,//项目类型
projectCategory:null,//项目类别
investmentAmount:null,//投资估算
isPrivate:0,//可见范围(0 仅自己可见,1 他人可见)
},
rules:{
......@@ -169,10 +169,10 @@
projectName:'',// 项目名称
companyId:'',//企业id
ownerCompany:'',//业主单位
projectStage:'',//项目阶段
projectType:'',//项目类型
projectCategory:'',//项目类别
investmentAmount:'',//投资估算
projectStage:null,//项目阶段
projectType:null,//项目类型
projectCategory:null,//项目类别
investmentAmount:null,//投资估算
isPrivate:0,//可见范围(0 仅自己可见,1 他人可见)
},
this.showlist = false
......
......@@ -340,7 +340,7 @@
getXMSL(){
getXMSL(this.id).then(result=> {
this.xmjd = result.data.projectStage
this.xmjd = !result.data.projectStage?'待添加':result.data.projectStage
if(result.data.labelList == null || result.data.labelList == "" || result.data.labelList == undefined){
this.tipslit = []
}else {
......
......@@ -600,6 +600,7 @@ export default {
font-size: 16px;
font-weight: 700;
line-height: 23px;
padding-right: 190px;
.people{
padding-left: 10px;
color: #4f4f4f;
......
......@@ -76,8 +76,8 @@ public interface BusinessInfoMapper extends BaseMapper<BusinessInfo>
public int deleteBusinessInfoById(Long id);
/**
* 批量删除项目详情
*
* 批量删除项目
* 项目关联的其他所有表数据一并删除
* @param ids 需要删除的数据主键集合
* @return 结果
*/
......
......@@ -228,15 +228,17 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
}
/**
* 批量删除项目详情
*
* 批量删除项目
* 项目关联的其他所有表数据一并删除
* @param ids 需要删除的项目详情主键
* @return 结果
*/
@Override
@Transactional
public int deleteBusinessInfoByIds(Long[] ids) {
//删除项目详情,用户关联项目,项目工作代办,项目联系人,项目跟进记录,项目标签,项目相关企业
return businessInfoMapper.deleteBusinessInfoByIds(ids);
//TODO 删除项目上传的文件
}
/**
......
......@@ -373,7 +373,15 @@
</delete>
<delete id="deleteBusinessInfoByIds" parameterType="Long">
delete from business_info where id in
delete i,b,co,f,l,r,u
from business_info i
left join business_backlog b on b.business_id = i.id
left join business_contacts co on co.business_id = i.id
left join business_follow_record f on f.business_id = i.id
left join business_label l on l.business_id = i.id
left join business_relate_company r on r.business_id = i.id
left join business_user u on u.business_id = i.id
where i.id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
......
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