diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/controller/CusFollowController.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/controller/CusFollowController.java index 0ba09cc..09b2f60 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/controller/CusFollowController.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/controller/CusFollowController.java @@ -86,7 +86,7 @@ public class CusFollowController extends BaseController /** * 新增客户跟进记录 */ - @PreAuthorize("@ss.hasPermi('cus:follow:add')") + @PreAuthorize("@ss.hasPermi('cus:main:follow')") @Log(title = "客户跟进记录", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody CusFollow cusFollow) { @@ -104,7 +104,7 @@ public class CusFollowController extends BaseController /** * 修改客户跟进记录 */ - @PreAuthorize("@ss.hasPermi('cus:follow:edit')") + @PreAuthorize("@ss.hasPermi('cus:main:follow')") @Log(title = "客户跟进记录", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody CusFollow cusFollow) { @@ -125,7 +125,7 @@ public class CusFollowController extends BaseController /** * 删除客户跟进记录 */ - @PreAuthorize("@ss.hasPermi('cus:follow:remove')") + @PreAuthorize("@ss.hasPermi('cus:main:follow:del')") @Log(title = "客户跟进记录", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable String[] ids) { diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/controller/CusMainController.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/controller/CusMainController.java index 571ba05..b9a6013 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/controller/CusMainController.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/controller/CusMainController.java @@ -137,6 +137,7 @@ public class CusMainController extends BaseController { * @author PQZ * @date 14:29 2025/11/19 **/ + @PreAuthorize("@ss.hasPermi('cus:main:import')") @Log(title = "客户信息导入", businessType = BusinessType.IMPORT) @PostMapping("/importCus") public AjaxResult importCusAndContacts(@RequestParam("file") MultipartFile file) throws IOException { @@ -146,27 +147,9 @@ public class CusMainController extends BaseController { return cusImportService.importCusAndContacts(file); } - /** - * 公海客户信息导入 - * - * @param file {@link MultipartFile} - * @return com.ruoyi.common.core.domain.AjaxResult - * @author PQZ - * @date 14:40 2025/11/24 - **/ - @Log(title = "公海客户信息导入", businessType = BusinessType.IMPORT) - @PostMapping("/importCusSeas") - public AjaxResult importCusSeasAndContacts(@RequestParam("file") MultipartFile file) throws IOException { - if (file.isEmpty()) { - return AjaxResult.error("上传文件不能为空"); - } - return cusImportService.importCusSeasAndContacts(file); - } - /** * 获取客户信息详细信息--编辑 */ - @PreAuthorize("@ss.hasPermi('cus:main:query')") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") String id) { return success(cusMainService.getDataById(id)); @@ -175,7 +158,6 @@ public class CusMainController extends BaseController { /** * 获取客户信息详细信息---只读面板-默认接口 */ - @PreAuthorize("@ss.hasPermi('cus:main:query')") @GetMapping(value = "/viewData") public AjaxResult viewData(String id,Boolean seas) { return success(cusMainService.viewData(id,seas)); @@ -198,6 +180,7 @@ public class CusMainController extends BaseController { /** * 更新客户标签 */ + @PreAuthorize("@ss.hasPermi('cus:main:add')") @PostMapping("/setLabels") public AjaxResult setLabels(@RequestBody MainVO cusMainVO) { CusMain cusMain = new CusMain(); @@ -225,6 +208,7 @@ public class CusMainController extends BaseController { /** * 更新是否星标客户 */ + @PreAuthorize("@ss.hasPermi('cus:main:add')") @PostMapping("/setIfStar") public AjaxResult setIfStar(@RequestBody CusMain cusMain) { cusMainService.updateById(cusMain); @@ -280,6 +264,7 @@ public class CusMainController extends BaseController { /** * 转入公海 */ + @PreAuthorize("@ss.hasPermi('cus:main:move')") @PostMapping("/moveToSeas") public AjaxResult moveToSeas(@RequestBody CusMain cusMain){ SysUser sysUser = SecurityUtils.getLoginUser().getUser(); @@ -301,8 +286,9 @@ public class CusMainController extends BaseController { } /** - * 更新客户管理人员信息 + * 移交客户 */ + @PreAuthorize("@ss.hasPermi('cus:main:change')") @Log(title = "客户管理信息", businessType = BusinessType.UPDATE) @PutMapping("/updateUser") public AjaxResult updateUser(@RequestBody CusMain cusMain) { diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/controller/CusMainSeasController.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/controller/CusMainSeasController.java index 0056857..49a62e7 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/controller/CusMainSeasController.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/controller/CusMainSeasController.java @@ -1,5 +1,6 @@ package com.ruoyi.cus.controller; +import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -31,6 +32,7 @@ import com.ruoyi.common.enums.BusinessType; import com.ruoyi.cus.domain.CusMainSeas; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.core.page.TableDataInfo; +import org.springframework.web.multipart.MultipartFile; /** * 公海客户信息Controller @@ -57,6 +59,8 @@ public class CusMainSeasController extends BaseController { private ICusContactsService cusContactsService; @Autowired private ICusBankService cusBankService; + @Autowired + private ICusImportService cusImportService; /** * 查询公海客户信息列表 @@ -88,7 +92,6 @@ public class CusMainSeasController extends BaseController { /** * 获取公海客户信息详细信息 */ - @PreAuthorize("@ss.hasPermi('cus:seas:query')") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") String id) { @@ -98,7 +101,6 @@ public class CusMainSeasController extends BaseController { /** * 新增公海客户信息 */ - @PreAuthorize("@ss.hasPermi('cus:seas:add')") @Log(title = "公海客户信息", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody CusMainSeas cusMainSeas) @@ -109,7 +111,6 @@ public class CusMainSeasController extends BaseController { /** * 修改公海客户信息 */ - @PreAuthorize("@ss.hasPermi('cus:seas:edit')") @Log(title = "公海客户信息", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody CusMainSeas cusMainSeas) @@ -150,6 +151,7 @@ public class CusMainSeasController extends BaseController { /** * 转入公海 */ + @PreAuthorize("@ss.hasPermi('cus:seas:move')") @PostMapping("/moveToMain") public AjaxResult moveToMain(@RequestBody CusMainSeas cusMainSeas){ SysUser sysUser = SecurityUtils.getLoginUser().getUser(); @@ -169,4 +171,22 @@ public class CusMainSeasController extends BaseController { cusMainSeasService.deleteCus(cusMainSeas.getId()); return success(); } + + /** + * 公海客户信息导入 + * + * @param file {@link MultipartFile} + * @return com.ruoyi.common.core.domain.AjaxResult + * @author PQZ + * @date 14:40 2025/11/24 + **/ + @PreAuthorize("@ss.hasPermi('cus:seas:import')") + @Log(title = "公海客户信息导入", businessType = BusinessType.IMPORT) + @PostMapping("/importCusSeas") + public AjaxResult importCusSeasAndContacts(@RequestParam("file") MultipartFile file) throws IOException { + if (file.isEmpty()) { + return AjaxResult.error("上传文件不能为空"); + } + return cusImportService.importCusSeasAndContacts(file); + } } diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/utils/CodeGenerator.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/utils/CodeGenerator.java index 603e301..bd379ae 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/utils/CodeGenerator.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/utils/CodeGenerator.java @@ -28,7 +28,7 @@ public class CodeGenerator { /** * 自增序号位数(不足补0) */ - private static final int SEQ_LENGTH = 3; + private static final int SEQ_LENGTH = 4; /** * 每日最大序号(3位最大为999) diff --git a/dl_vue/src/views/cus/axis/timeLine.vue b/dl_vue/src/views/cus/axis/timeLine.vue index 389413d..7f32f8c 100644 --- a/dl_vue/src/views/cus/axis/timeLine.vue +++ b/dl_vue/src/views/cus/axis/timeLine.vue @@ -35,7 +35,7 @@ - + 新建跟进 diff --git a/dl_vue/src/views/cus/bank/bankList.vue b/dl_vue/src/views/cus/bank/bankList.vue index 42648d2..c430c32 100644 --- a/dl_vue/src/views/cus/bank/bankList.vue +++ b/dl_vue/src/views/cus/bank/bankList.vue @@ -8,7 +8,7 @@ icon="el-icon-plus" size="mini" @click="handleAdd" - v-hasPermi="['cus:bank:add']" + v-hasPermi="['cus:main:add']" >新增 @@ -34,14 +34,14 @@ type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" - v-hasPermi="['cus:bank:edit']" + v-hasPermi="['cus:main:add']" >修改 删除 diff --git a/dl_vue/src/views/cus/contacts/editForm.vue b/dl_vue/src/views/cus/contacts/editForm.vue index 9b82fb9..82de033 100644 --- a/dl_vue/src/views/cus/contacts/editForm.vue +++ b/dl_vue/src/views/cus/contacts/editForm.vue @@ -141,8 +141,7 @@ export default { { required: true, message: '请输入联系人姓名', trigger: 'blur' } ], email: [ - { required: true, message: '请输入邮箱', trigger: 'blur' }, - { type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change']} + { required: true, message: '请输入邮箱', trigger: 'blur' } ] } } diff --git a/dl_vue/src/views/cus/follow/followList.vue b/dl_vue/src/views/cus/follow/followList.vue index b64c599..3dcb19c 100644 --- a/dl_vue/src/views/cus/follow/followList.vue +++ b/dl_vue/src/views/cus/follow/followList.vue @@ -103,6 +103,7 @@ size="mini" type="text" icon="el-icon-circle-check" + v-hasPermi="['cus:main:follow']" @click.stop="handleComplete(scope.row,true)" >完成 取消完成 @@ -117,6 +119,7 @@ size="mini" type="text" icon="el-icon-delete" + v-hasPermi="['cus:main:follow:del']" @click.stop="handleDelete(scope.row)" >删除 diff --git a/dl_vue/src/views/cus/main/index.vue b/dl_vue/src/views/cus/main/index.vue index d3c5029..fe9bdb3 100644 --- a/dl_vue/src/views/cus/main/index.vue +++ b/dl_vue/src/views/cus/main/index.vue @@ -71,6 +71,7 @@ icon="el-icon-upload2" size="mini" @click="handleImport" + v-hasPermi="['cus:main:import']" >导入 @@ -136,7 +137,7 @@ - +
修改 发邮件 @@ -236,11 +238,9 @@ 更多 - 新建跟进 - 移交客户 - 转入公海 - 删除 - + 新建跟进 + 移交客户 + 转入公海 diff --git a/dl_vue/src/views/cus/main/viewForm.vue b/dl_vue/src/views/cus/main/viewForm.vue index 799240a..3a65321 100644 --- a/dl_vue/src/views/cus/main/viewForm.vue +++ b/dl_vue/src/views/cus/main/viewForm.vue @@ -48,7 +48,7 @@ > {{ tag.name }} - +
@@ -83,24 +83,23 @@
- + 编辑 - - 写邮件 + + 写邮件 - + 新建跟进 - + 更多操作 - 转入公海 - 移出公海 - 移交客户 - 删除 + 转入公海 + 移出公海 + 移交客户
@@ -150,7 +149,7 @@ class="contact-search" />
-
+
@@ -170,7 +169,7 @@ -
+
diff --git a/dl_vue/src/views/cus/seas/index.vue b/dl_vue/src/views/cus/seas/index.vue index 9fb7f5b..9c5960e 100644 --- a/dl_vue/src/views/cus/seas/index.vue +++ b/dl_vue/src/views/cus/seas/index.vue @@ -49,6 +49,7 @@ icon="el-icon-upload2" size="mini" @click="handleImport" + v-hasPermi="['cus:seas:import']" >导入 @@ -199,21 +200,15 @@ {{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }} - + @@ -302,7 +297,7 @@ export default { // 设置上传的请求头部 headers: { Authorization: 'Bearer ' + getToken() }, // 上传的地址 - url: process.env.VUE_APP_BASE_API + '/cus/main/importCusSeas' + url: process.env.VUE_APP_BASE_API + '/cus/seas/importCusSeas' }, }; },