From 030ddab9f5923de3f05eb730a15c56182cd1b44c Mon Sep 17 00:00:00 2001 From: Vinjor Date: Mon, 30 Jun 2025 14:52:34 +0800 Subject: [PATCH] 1 --- .../busi/controller/BusiProdController.java | 12 ++ .../controller/BusiRelationController.java | 125 +++++++++++++ .../com/ruoyi/busi/domain/BusiRelation.java | 43 +++++ .../busi/mapper/BusiProdRandomMapper.java | 10 + .../ruoyi/busi/mapper/BusiRelationMapper.java | 23 +++ .../busi/service/IBusiProdRandomService.java | 10 + .../busi/service/IBusiRelationService.java | 28 +++ .../impl/BusiProdRandomServiceImpl.java | 14 ++ .../service/impl/BusiRelationServiceImpl.java | 44 +++++ .../java/com/ruoyi/busi/vo/ProdNewVO.java | 6 + .../java/com/ruoyi/busi/vo/RelationVO.java | 12 ++ .../mapper/busi/BusiProdNewMapper.xml | 8 +- .../mapper/busi/BusiProdRandomMapper.xml | 10 + .../mapper/busi/BusiRelationMapper.xml | 39 ++++ .../resources/mapper/system/SysUserMapper.xml | 2 +- dl_vue/src/api/busi/prod.js | 9 + dl_vue/src/api/busi/relation.js | 44 +++++ dl_vue/src/views/busi/prod/index.vue | 92 ++++++++-- dl_vue/src/views/busi/prod/prodForm.vue | 2 + .../src/views/system/user/selectAllUser.vue | 172 ++++++++++++++++++ 20 files changed, 687 insertions(+), 18 deletions(-) create mode 100644 dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiRelationController.java create mode 100644 dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiRelation.java create mode 100644 dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/mapper/BusiRelationMapper.java create mode 100644 dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiRelationService.java create mode 100644 dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiRelationServiceImpl.java create mode 100644 dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/vo/RelationVO.java create mode 100644 dl_admin/ruoyi-admin/src/main/resources/mapper/busi/BusiRelationMapper.xml create mode 100644 dl_vue/src/api/busi/relation.js create mode 100644 dl_vue/src/views/system/user/selectAllUser.vue diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiProdController.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiProdController.java index b1a2b74..5fa3bad 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiProdController.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiProdController.java @@ -178,4 +178,16 @@ public class BusiProdController extends BaseController prodRandomService.saveBatch(randomList); return success(); } + + /** + * 删除产品关联的随机产品 + * @author vinjor-M + * @date 9:38 2025/6/30 + * @return com.ruoyi.common.core.domain.AjaxResult + **/ + @PostMapping("/delProdRandom") + public AjaxResult delProdRandom(@RequestBody ProdRandomVO randomVO){ + prodRandomService.delProdRandom(randomVO.getProdId(),randomVO.getRandomId(),randomVO.getTenantId()); + return success(); + } } diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiRelationController.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiRelationController.java new file mode 100644 index 0000000..13eb083 --- /dev/null +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiRelationController.java @@ -0,0 +1,125 @@ +package com.ruoyi.busi.controller; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.busi.vo.RelationVO; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.busi.domain.BusiRelation; +import com.ruoyi.busi.service.IBusiRelationService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 产品、新闻等与员工关系Controller + * + * @author vinjor-m + * @date 2025-06-30 + */ +@RestController +@RequestMapping("/busi/relation") +public class BusiRelationController extends BaseController +{ + @Autowired + private IBusiRelationService busiRelationService; + + /** + * 查询产品、新闻等与员工关系列表 + */ + @PreAuthorize("@ss.hasPermi('busi:relation:list')") + @GetMapping("/list") + public AjaxResult list(BusiRelation busiRelation, + @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) + { + Page page = new Page<>(pageNum, pageSize); + IPage list = busiRelationService.queryListPage(busiRelation,page); + return success(list); + } + + /** + * 导出产品、新闻等与员工关系列表 + */ + @PreAuthorize("@ss.hasPermi('busi:relation:export')") + @Log(title = "产品、新闻等与员工关系", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, BusiRelation busiRelation) + { + List list = busiRelationService.list(); + ExcelUtil util = new ExcelUtil(BusiRelation.class); + util.exportExcel(response, list, "产品、新闻等与员工关系数据"); + } + + /** + * 获取产品、新闻等与员工关系详细信息 + */ + @PreAuthorize("@ss.hasPermi('busi:relation:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") String id) + { + return success(busiRelationService.getById(id)); + } + + /** + * 新增产品、新闻等与员工关系 + */ + @PreAuthorize("@ss.hasPermi('busi:relation:add')") + @Log(title = "产品、新闻等与员工关系", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody RelationVO busiRelation) + { + List userIdList = Arrays.asList(busiRelation.getLeaderId().split(",")); + List busiRelationList = new ArrayList<>(); + userIdList.forEach(item->{ + BusiRelation relation = new BusiRelation(); + relation.setUserId(item); + relation.setProdId(busiRelation.getProdId()); + relation.setTenantId(busiRelation.getTenantId()); + busiRelationList.add(relation); + }); + //先删除原来的负责人 + busiRelationService.deleteByProdId(busiRelation.getProdId(),busiRelation.getTenantId()); + busiRelationService.saveBatch(busiRelationList); + return success(); + } + + /** + * 修改产品、新闻等与员工关系 + */ + @PreAuthorize("@ss.hasPermi('busi:relation:edit')") + @Log(title = "产品、新闻等与员工关系", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BusiRelation busiRelation) + { + return toAjax(busiRelationService.updateById(busiRelation)); + } + + /** + * 删除产品、新闻等与员工关系 + */ + @PreAuthorize("@ss.hasPermi('busi:relation:remove')") + @Log(title = "产品、新闻等与员工关系", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable String[] ids) + { + List list = new ArrayList<>(Arrays.asList(ids)); + return toAjax(busiRelationService.removeByIds(list)); + } +} diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiRelation.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiRelation.java new file mode 100644 index 0000000..f85af2f --- /dev/null +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiRelation.java @@ -0,0 +1,43 @@ +package com.ruoyi.busi.domain; + +import com.ruoyi.common.annotation.Excel; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.*; +import com.ruoyi.common.core.domain.DlBaseEntity; + +/** + * 产品、新闻等与员工关系对象 dl_busi_relation + * + * @author vinjor-m + * @date 2025-06-30 + */ +@TableName("dl_busi_relation") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class BusiRelation extends DlBaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + @TableId(type = IdType.ASSIGN_UUID) + private String id; + + /** 用户id */ + @Excel(name = "用户id") + private String userId; + + /** 产品、新闻id */ + @Excel(name = "产品、新闻id") + private String prodId; + + /** 站点唯一编码（租户id） */ + @Excel(name = "站点唯一编码", readConverterExp = "租=户id") + private String tenantId; + +} diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/mapper/BusiProdRandomMapper.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/mapper/BusiProdRandomMapper.java index c2572cd..35335e2 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/mapper/BusiProdRandomMapper.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/mapper/BusiProdRandomMapper.java @@ -27,4 +27,14 @@ public interface BusiProdRandomMapper extends BaseMapper * @return java.util.List **/ List selectRandomList(@Param("map") BusiProdRandom prodRandom); + /** + * 删除产品关联的随机产品 + * + * @param prodId 产品id + * @param randomId 随机产品id + * @param tenantId 租户id + * @author vinjor-M + * @date 9:40 2025/6/30 + **/ + Integer deleteProdRandom(@Param("prodId") String prodId,@Param("randomId") String randomId, @Param("tenantId") String tenantId); } diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/mapper/BusiRelationMapper.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/mapper/BusiRelationMapper.java new file mode 100644 index 0000000..aa77c1e --- /dev/null +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/mapper/BusiRelationMapper.java @@ -0,0 +1,23 @@ +package com.ruoyi.busi.mapper; + +import java.util.List; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.busi.domain.BusiRelation; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 产品、新闻等与员工关系Mapper接口 + * + * @author vinjor-m + * @date 2025-06-30 + */ +@Mapper +public interface BusiRelationMapper extends BaseMapper +{ + IPage queryListPage(@Param("entity") BusiRelation entity, Page page); + + Integer deleteByProdId(@Param("prodId")String prodId,@Param("tenantId")String tenantId); +} diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiProdRandomService.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiProdRandomService.java index 7d265cf..f02de05 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiProdRandomService.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiProdRandomService.java @@ -24,4 +24,14 @@ public interface IBusiProdRandomService extends IService * @return java.util.List **/ List randomList(BusiProdRandom prodRandom); + + /** + * 删除产品关联的随机产品 + * @author vinjor-M + * @date 9:40 2025/6/30 + * @param prodId 产品id + * @param randomId 随机产品id + * @param tenantId 租户id + **/ + void delProdRandom(String prodId, String randomId, String tenantId); } diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiRelationService.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiRelationService.java new file mode 100644 index 0000000..f671cb3 --- /dev/null +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiRelationService.java @@ -0,0 +1,28 @@ +package com.ruoyi.busi.service; + +import java.util.List; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.busi.domain.BusiRelation; + +/** + * 产品、新闻等与员工关系Service接口 + * + * @author vinjor-m + * @date 2025-06-30 + */ +public interface IBusiRelationService extends IService +{ + IPage queryListPage(BusiRelation pageReqVO, Page page); + + /** + * 删除某产品的负责人 + * @author vinjor-M + * @date 13:48 2025/6/30 + * @param prodId TODO + * @param tenantId TODO + * @return java.lang.Integer + **/ + Integer deleteByProdId(String prodId,String tenantId); +} diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiProdRandomServiceImpl.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiProdRandomServiceImpl.java index 0a9463e..193e086 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiProdRandomServiceImpl.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiProdRandomServiceImpl.java @@ -41,4 +41,18 @@ public class BusiProdRandomServiceImpl extends ServiceImpl randomList(BusiProdRandom prodRandom) { return busiProdRandomMapper.selectRandomList(prodRandom); } + + /** + * 删除产品关联的随机产品 + * + * @param prodId 产品id + * @param randomId 随机产品id + * @param tenantId 租户id + * @author vinjor-M + * @date 9:40 2025/6/30 + **/ + @Override + public void delProdRandom(String prodId, String randomId, String tenantId) { + busiProdRandomMapper.deleteProdRandom(prodId,randomId,tenantId); + } } diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiRelationServiceImpl.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiRelationServiceImpl.java new file mode 100644 index 0000000..22dfe51 --- /dev/null +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiRelationServiceImpl.java @@ -0,0 +1,44 @@ +package com.ruoyi.busi.service.impl; + +import java.util.List; +import com.ruoyi.common.utils.DateUtils; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.busi.mapper.BusiRelationMapper; +import com.ruoyi.busi.domain.BusiRelation; +import com.ruoyi.busi.service.IBusiRelationService; + +/** + * 产品、新闻等与员工关系Service业务层处理 + * + * @author vinjor-m + * @date 2025-06-30 + */ +@Service +public class BusiRelationServiceImpl extends ServiceImpl implements IBusiRelationService +{ + @Autowired + private BusiRelationMapper busiRelationMapper; + + @Override + public IPage queryListPage(BusiRelation pageReqVO, Page page) { + return busiRelationMapper.queryListPage(pageReqVO, page); + } + + /** + * 删除某产品的负责人 + * + * @param prodId TODO + * @param tenantId TODO + * @return java.lang.Integer + * @author vinjor-M + * @date 13:48 2025/6/30 + **/ + @Override + public Integer deleteByProdId(String prodId, String tenantId) { + return busiRelationMapper.deleteByProdId(prodId,tenantId); + } +} diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/vo/ProdNewVO.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/vo/ProdNewVO.java index 4cc4ab6..2255a51 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/vo/ProdNewVO.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/vo/ProdNewVO.java @@ -30,6 +30,12 @@ public class ProdNewVO extends BusiProdNew { @Excel(name = "产品发布者") private String userName; + /** 产品负责人-多个英文逗号隔开 */ + @Excel(name = "产品负责人") + private String leaderName; + /** 产品负责人id-多个英文逗号隔开 */ + private String leaderId; + /** 随机产品数量 */ private Integer randomNum; diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/vo/RelationVO.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/vo/RelationVO.java new file mode 100644 index 0000000..65e29cc --- /dev/null +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/vo/RelationVO.java @@ -0,0 +1,12 @@ +package com.ruoyi.busi.vo; + +import com.ruoyi.busi.domain.BusiRelation; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@EqualsAndHashCode(callSuper = true) +@Data +public class RelationVO extends BusiRelation { + /** 产品负责人id-多个英文逗号隔开 */ + private String leaderId; +} diff --git a/dl_admin/ruoyi-admin/src/main/resources/mapper/busi/BusiProdNewMapper.xml b/dl_admin/ruoyi-admin/src/main/resources/mapper/busi/BusiProdNewMapper.xml index 678c48d..d5857e9 100644 --- a/dl_admin/ruoyi-admin/src/main/resources/mapper/busi/BusiProdNewMapper.xml +++ b/dl_admin/ruoyi-admin/src/main/resources/mapper/busi/BusiProdNewMapper.xml @@ -30,6 +30,8 @@ + + @@ -62,13 +64,17 @@ su.nick_name AS user_name, dbc.catg_name AS catg_name, COUNT( dbpr.random_id ) AS randomNum, - 0 AS flag + 0 AS flag, + GROUP_CONCAT(dbr.user_id SEPARATOR ', ') AS leaderId, + GROUP_CONCAT(su_temp.nick_name SEPARATOR ', ') AS leaderName FROM dl_busi_prod_new product LEFT JOIN sys_user su ON product.creator = su.user_id LEFT JOIN dl_busi_category dbc ON product.catg_id = dbc.id LEFT JOIN dl_busi_prod_random dbpr ON product.id = dbpr.prod_id AND dbpr.del_flag = '0' + LEFT JOIN dl_busi_relation dbr ON product.id = dbr.prod_id AND dbr.del_flag = '0' + LEFT JOIN sys_user su_temp ON dbr.user_id = su_temp.user_id product.del_flag = '0' AND product.tenant_id = #{entity.tenantId} diff --git a/dl_admin/ruoyi-admin/src/main/resources/mapper/busi/BusiProdRandomMapper.xml b/dl_admin/ruoyi-admin/src/main/resources/mapper/busi/BusiProdRandomMapper.xml index 83aff10..488cf83 100644 --- a/dl_admin/ruoyi-admin/src/main/resources/mapper/busi/BusiProdRandomMapper.xml +++ b/dl_admin/ruoyi-admin/src/main/resources/mapper/busi/BusiProdRandomMapper.xml @@ -42,4 +42,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ORDER BY dbpn.sort DESC + + + DELETE + FROM + dl_busi_prod_random + WHERE + prod_id = #{prodId} + AND random_id = #{randomId} + AND tenant_id = #{tenantId} + \ No newline at end of file diff --git a/dl_admin/ruoyi-admin/src/main/resources/mapper/busi/BusiRelationMapper.xml b/dl_admin/ruoyi-admin/src/main/resources/mapper/busi/BusiRelationMapper.xml new file mode 100644 index 0000000..826d4d6 --- /dev/null +++ b/dl_admin/ruoyi-admin/src/main/resources/mapper/busi/BusiRelationMapper.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + select id, user_id, prod_id, tenant_id, creator, create_time, updater, update_time, del_flag from dl_busi_relation + + + DELETE + FROM + dl_busi_relation + WHERE + prod_id = #{prodId} + AND tenant_id = #{tenantId} + + + + \ No newline at end of file diff --git a/dl_admin/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/dl_admin/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml index 9433697..2e81ba0 100644 --- a/dl_admin/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/dl_admin/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -68,7 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND u.user_id = #{userId} - AND u.user_name like concat('%', #{userName}, '%') + AND (u.nick_name like concat('%', #{userName}, '%') OR u.user_name like concat('%', #{userName}, '%')) AND u.status = #{status} diff --git a/dl_vue/src/api/busi/prod.js b/dl_vue/src/api/busi/prod.js index f7f4a75..ce11b34 100644 --- a/dl_vue/src/api/busi/prod.js +++ b/dl_vue/src/api/busi/prod.js @@ -69,3 +69,12 @@ export function saveRandom(data) { data: data }) } + +// 删除关联产品 +export function delProdRandom(data) { + return request({ + url: '/busi/prod/delProdRandom', + method: 'post', + data: data + }) +} diff --git a/dl_vue/src/api/busi/relation.js b/dl_vue/src/api/busi/relation.js new file mode 100644 index 0000000..a5782e5 --- /dev/null +++ b/dl_vue/src/api/busi/relation.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询产品、新闻等与员工关系列表 +export function listRelation(query) { + return request({ + url: '/busi/relation/list', + method: 'get', + params: query + }) +} + +// 查询产品、新闻等与员工关系详细 +export function getRelation(id) { + return request({ + url: '/busi/relation/' + id, + method: 'get' + }) +} + +// 新增产品、新闻等与员工关系 +export function addRelation(data) { + return request({ + url: '/busi/relation', + method: 'post', + data: data + }) +} + +// 修改产品、新闻等与员工关系 +export function updateRelation(data) { + return request({ + url: '/busi/relation', + method: 'put', + data: data + }) +} + +// 删除产品、新闻等与员工关系 +export function delRelation(id) { + return request({ + url: '/busi/relation/' + id, + method: 'delete' + }) +} diff --git a/dl_vue/src/views/busi/prod/index.vue b/dl_vue/src/views/busi/prod/index.vue index eeb444a..0e1584f 100644 --- a/dl_vue/src/views/busi/prod/index.vue +++ b/dl_vue/src/views/busi/prod/index.vue @@ -71,7 +71,8 @@ - + + - + + @@ -137,13 +146,13 @@ @click="handleUpdate(scope.row)" v-hasPermi="['busi:prod:edit']" >修改 - 删除 + + 更多 + + 删除 + 分配负责人 + + @@ -184,7 +193,7 @@ size="mini" type="text" icon="el-icon-delete" - @click="handleDelete(scope.row)" + @click="handleDeleteRandom(scope.row)" >删除 @@ -219,15 +228,19 @@ 取 消 + + diff --git a/dl_vue/src/views/busi/prod/prodForm.vue b/dl_vue/src/views/busi/prod/prodForm.vue index f184638..ee8ee60 100644 --- a/dl_vue/src/views/busi/prod/prodForm.vue +++ b/dl_vue/src/views/busi/prod/prodForm.vue @@ -157,6 +157,8 @@ export default { getProdInfo(id){ getProdNew(id).then(response => { this.form= response.data + this.form.id=null + this.initData() }) }, /** diff --git a/dl_vue/src/views/system/user/selectAllUser.vue b/dl_vue/src/views/system/user/selectAllUser.vue new file mode 100644 index 0000000..194c1ca --- /dev/null +++ b/dl_vue/src/views/system/user/selectAllUser.vue @@ -0,0 +1,172 @@ + + +