Merge branch 'master' of http://114.55.243.137:6688/dianliang/dl_crm_system

2025-11-27 16:02:59 +08:00 · 2025-11-27 16:02:59 +08:00 · 638ba63b94
commit 638ba63b94
parent 1ea43c0fa4 2fe99b7e9e
19 changed files with 81 additions and 47 deletions
--- 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
@ -18,6 +18,7 @@ import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.cus.domain.CusMainSeas;
+import com.ruoyi.cus.domain.CusManager;
 import com.ruoyi.cus.domain.CusTimeAxis;
 import com.ruoyi.cus.service.*;
 import com.ruoyi.cus.vo.CusMainVO;
@ -299,4 +300,22 @@ public class CusMainController extends BaseController {
        return success();
    }

+    /**
+     * 更新客户管理人员信息
+     */
+    @Log(title = "客户管理信息", businessType = BusinessType.UPDATE)
+    @PutMapping("/updateUser")
+    public AjaxResult updateUser(@RequestBody CusMain cusMain) {
+        SysUser sysUser = SecurityUtils.getLoginUser().getUser();
+        CusMain oldData = cusMainService.getById(cusMain.getId());
+        cusMainService.updateById(cusMain);
+        //时间轴信息
+        CusTimeAxis cusTimeAxis = new CusTimeAxis();
+        cusTimeAxis.setBusiMaxCatg("客户");
+        cusTimeAxis.setBusiCatg("修改");
+        cusTimeAxis.setContent("移交客户，操作人:"+sysUser.getNickName()+",原业务员："+oldData.getUserName()+"，新业务员："+cusMain.getUserName());
+        cusTimeAxis.setCusId(cusMain.getId());
+        cusTimeAxisService.saveNewTimeAxis(cusTimeAxis);
+        return success();
+    }
 }
--- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/controller/CusManagerController.java
+++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/controller/CusManagerController.java
@ -86,15 +86,6 @@ public class CusManagerController extends BaseController
        return toAjax(cusManagerService.save(cusManager));
    }

-    /**
-     * 更新客户管理人员信息
-     */
-    @Log(title = "客户管理信息", businessType = BusinessType.UPDATE)
-    @PutMapping("/updateUser")
-    public AjaxResult updateUser(@RequestBody CusManager cusManager) {
-        cusManagerService.updateByCusId(cusManager);
-        return success();
-    }

    /**
     * 删除客户管理信息
--- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/service/impl/CusMainServiceImpl.java
+++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/service/impl/CusMainServiceImpl.java
@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.base.domain.BaseCountry;
 import com.ruoyi.base.service.IBaseCountryService;
+import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.core.domain.DlBaseEntity;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginUser;
@ -66,6 +67,7 @@ public class CusMainServiceImpl extends ServiceImpl<CusMainMapper,CusMain>  impl
    private DateTimeUtil dateTimeUtil;

    @Override
+    @DataScope(deptAlias = "cm", userAlias = "cm")
    public IPage<MainVO> queryListPage(MainVO pageReqVO, Page<CusMain> page) {
        IPage<MainVO> list = cusMainMapper.queryListPage(pageReqVO, page);
        list.getRecords().forEach(item->{
--- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
+++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
@ -37,10 +37,8 @@ public class SysDeptController extends BaseController
    /**
     * 获取部门列表
     */
-    @PreAuthorize("@ss.hasPermi('system:dept:list')")
    @GetMapping("/list")
-    public AjaxResult list(SysDept dept)
-    {
+    public AjaxResult list(SysDept dept) {
        List<SysDept> depts = deptService.selectDeptList(dept);
        return success(depts);
    }
--- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
+++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
@ -40,7 +40,6 @@ public class SysDictDataController extends BaseController
    @Autowired
    private ISysDictTypeService dictTypeService;

-    @PreAuthorize("@ss.hasPermi('system:dict:list')")
    @GetMapping("/list")
    public TableDataInfo list(SysDictData dictData)
    {
--- a/dl_admin/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/dl_admin/ruoyi-admin/src/main/resources/application-druid.yml
@ -6,9 +6,9 @@ spring:
        druid:
            # 主库数据源
            master:
-                url: jdbc:mysql://8.220.74.244:3306/dl_crm_system?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                username: crm
-                password: Aa123456.
+                url: jdbc:mysql://rm-bp1msd0a4kq4t7a66lo.mysql.rds.aliyuncs.com:3306/dl_crm_system?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                username: csd_rw
+                password: Csd2025#123
            # 从库数据源
            slave:
                # 从数据源开关/默认关闭
--- a/dl_admin/ruoyi-admin/src/main/resources/mapper/cus/CusMainMapper.xml
+++ b/dl_admin/ruoyi-admin/src/main/resources/mapper/cus/CusMainMapper.xml
@ -82,6 +82,7 @@
        <if test="entity.cusType!=null and entity.cusType!=''">
            AND cm.cus_type = #{entity.cusType}
        </if>
+        ${entity.params.dataScope}
        GROUP BY
        cm.id
        ORDER BY
--- a/dl_admin/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
+++ b/dl_admin/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
@ -2,6 +2,8 @@ package com.ruoyi.framework.aspectj;

 import java.util.ArrayList;
 import java.util.List;
+
+import com.ruoyi.common.core.domain.DlBaseEntity;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
@ -161,11 +163,14 @@ public class DataScopeAspect
        if (StringUtils.isNotBlank(sqlString.toString()))
        {
            Object params = joinPoint.getArgs()[0];
-            if (StringUtils.isNotNull(params) && params instanceof BaseEntity)
-            {
+            if (StringUtils.isNotNull(params) && params instanceof BaseEntity) {
                BaseEntity baseEntity = (BaseEntity) params;
                baseEntity.getParams().put(DATA_SCOPE, " AND (" + sqlString.substring(4) + ")");
            }
+            if (StringUtils.isNotNull(params) && params instanceof DlBaseEntity) {
+                DlBaseEntity baseEntity = (DlBaseEntity) params;
+                baseEntity.getParams().put(DATA_SCOPE, " AND (" + sqlString.substring(4) + ")");
+            }
        }
    }

--- a/dl_vue/src/api/cus/main.js
+++ b/dl_vue/src/api/cus/main.js
@ -98,3 +98,13 @@ export function getOtherInfo(query) {
    params: query
  })
 }
+
+
+// 更新客户管理人员信息
+export function updateUser(data) {
+  return request({
+    url: '/cus/main/updateUser',
+    method: 'put',
+    data: data
+  })
+}
--- a/dl_vue/src/api/cus/manager.js
+++ b/dl_vue/src/api/cus/manager.js
@ -26,15 +26,6 @@ export function addManager(data) {
  })
 }

-// 更新客户管理人员信息
-export function updateUser(data) {
-  return request({
-    url: '/cus/manager/updateUser',
-    method: 'put',
-    data: data
-  })
-}
-
 // 删除客户管理信息
 export function delManager(id) {
  return request({
--- a/dl_vue/src/assets/logo/logo-icon.png
+++ b/dl_vue/src/assets/logo/logo-icon.png
--- a/dl_vue/src/assets/logo/logo.png
+++ b/dl_vue/src/assets/logo/logo.png
--- a/dl_vue/src/layout/components/Sidebar/Logo.vue
+++ b/dl_vue/src/layout/components/Sidebar/Logo.vue
@ -2,12 +2,12 @@
  <div class="sidebar-logo-container" :class="{'collapse':collapse}" :style="{ backgroundColor: sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground }">
    <transition name="sidebarLogoFade">
      <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
-        <img v-if="logo" :src="logo" class="sidebar-logo" />
-        <h1 v-else class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>
+        <img v-if="logo" :src="logoImgIcon" class="sidebar-logo-icon" />
+        <!--        <h1 v-else class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>-->
      </router-link>
      <router-link v-else key="expand" class="sidebar-logo-link" to="/">
        <img v-if="logo" :src="logo" class="sidebar-logo" />
-        <h1 class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>
+        <!--        <h1 class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>-->
      </router-link>
    </transition>
  </div>
@ -15,6 +15,7 @@

 <script>
 import logoImg from '@/assets/logo/logo.png'
+import logoImgIcon from '@/assets/logo/logo-icon.png'
 import variables from '@/assets/styles/variables.scss'

 export default {
@ -35,6 +36,7 @@ export default {
  },
  data() {
    return {
+      logoImgIcon:logoImgIcon,
      title: process.env.VUE_APP_TITLE,
      logo: logoImg
    }
@ -55,8 +57,8 @@ export default {
 .sidebar-logo-container {
  position: relative;
  width: 100%;
-  height: 50px;
-  line-height: 50px;
+  height: 60px;
+  line-height: 70px;
  background: #2b2f3a;
  text-align: center;
  overflow: hidden;
@ -66,6 +68,12 @@ export default {
    width: 100%;

    & .sidebar-logo {
+      width: 155px;
+      height: auto;
+      vertical-align: middle;
+      margin-right: 12px;
+    }
+    & .sidebar-logo-icon {
      width: 32px;
      height: 32px;
      vertical-align: middle;
--- a/dl_vue/src/views/cus/follow/followList.vue
+++ b/dl_vue/src/views/cus/follow/followList.vue
@ -103,21 +103,21 @@
            size="mini"
            type="text"
            icon="el-icon-circle-check"
-            @click="handleComplete(scope.row,true)"
+            @click.stop="handleComplete(scope.row,true)"
          >完成</el-button>
          <el-button
            v-else
            size="mini"
            type="text"
            icon="el-icon-circle-close"
-            @click="handleComplete(scope.row,false)"
+            @click.stop="handleComplete(scope.row,false)"
          >取消完成</el-button>
          <el-divider direction="vertical"></el-divider>
          <el-button
            size="mini"
            type="text"
            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
+            @click.stop="handleDelete(scope.row)"
          >删除</el-button>
        </template>
      </el-table-column>
--- a/dl_vue/src/views/cus/main/drawForm.vue
+++ b/dl_vue/src/views/cus/main/drawForm.vue
@ -539,7 +539,6 @@ export default {
    submitForm() {
      this.$refs["form"].validate(valid => {
        if (valid) {
-          this.loading=true
          let dataObj = JSON.parse(JSON.stringify(this.formData))
          //操作联系人数据
          if(dataObj.contact.length>0){
@ -555,6 +554,7 @@ export default {
            this.$message.warning("请至少添加一个联系人")
            return
          }
+          this.loading=true
          addMain(dataObj).then(response => {
            if(response.code==200){
              this.$message.success("新增成功");
--- a/dl_vue/src/views/cus/main/index.vue
+++ b/dl_vue/src/views/cus/main/index.vue
@ -86,7 +86,7 @@
          </span>
        </template>
      </el-table-column>
-      <el-table-column fixed label="客户名称" align="center" prop="fullName" width="130">
+      <el-table-column fixed label="客户名称" align="center" prop="fullName" width="200">
        <template slot-scope="scope">
          <el-tooltip :content="scope.row.fullName" placement="top" effect="dark">
            <div class="text-ellipsis-single">{{ scope.row.fullName }}</div>
@ -286,7 +286,7 @@

 <script>
 import { listMain, getMain, delMain, addMain, updateMain ,setIfStar,moveToSeas} from '@/api/cus/main'
-import { updateUser} from '@/api/cus/manager'
+import { updateUser} from '@/api/cus/main'
 import DrawForm from './drawForm'
 import { getToken } from '@/utils/auth'
 import FollowForm from '../follow/followForm'
@ -545,7 +545,7 @@ export default {
     */
    chooseUserFun(userList){
      let dataObj = {
-        cusId: this.cusMain.id,
+        id: this.cusMain.id,
        userId: userList[0].userId,
        userName: userList[0].nickName
      }
@ -626,5 +626,10 @@ export default {
 .el-tag {
  border: 1px solid transparent !important;
 }
+
+::v-deep body .el-table__fixed-right, body .el-table__fixed-left {
+  z-index: 10;
+  background-color: #fff;
+}
 </style>

--- a/dl_vue/src/views/cus/main/newForm.vue
+++ b/dl_vue/src/views/cus/main/newForm.vue
@ -972,7 +972,6 @@ export default {
      // 保存逻辑
      this.$refs['form'].validate(valid => {
        if (valid) {
-          this.loading=true
          let dataObj = JSON.parse(JSON.stringify(this.formData))
          //操作联系人数据
          if(dataObj.contact.length>0){
@ -988,6 +987,7 @@ export default {
            this.$message.warning("请至少添加一个联系人")
            return
          }
+          this.loading=true
          addMain(dataObj).then(response => {
            if(response.code==200){
              this.$message.success("操作成功");
--- a/dl_vue/src/views/cus/main/viewForm.vue
+++ b/dl_vue/src/views/cus/main/viewForm.vue
@ -221,7 +221,7 @@
 </template>

 <script>
-import { updateUser} from '@/api/cus/manager'
+import { updateUser} from '@/api/cus/main'
 import {  delMain,moveToSeas} from "@/api/cus/main";
 import {  delSeas,moveToMain} from "@/api/cus/seas";
 import {  delContacts } from "@/api/cus/contacts";
@ -410,11 +410,11 @@ export default {
    moveToMain(){
      let that = this
      this.$modal.confirm('是否确认将编号为"' + this.mainInfo.cusMain.cusCode + '"的客户移出公海？').then(function() {
-        moveToMain({ id:this.id}).then((resp) => {
+        moveToMain({ id:that.id}).then((resp) => {
          if(resp.code==200){
            that.$modal.msgSuccess('操作成功')
            setTimeout(()=>{
-              this.closeAndBack()
+              that.closeAndBack()
            },500)
          }else{
            that.$message.error(resp.msg)
@ -428,11 +428,11 @@ export default {
    moveToSeasFun(){
      let that = this
      this.$modal.confirm('是否确认将编号为"' + this.mainInfo.cusMain.cusCode + '"的客户移入公海？').then(function() {
-        moveToSeas({ id:this.id}).then((resp) => {
+        moveToSeas({ id:that.id}).then((resp) => {
          if(resp.code==200){
            that.$modal.msgSuccess('操作成功')
            setTimeout(()=>{
-              this.closeAndBack()
+              that.closeAndBack()
            },500)
          }else{
            that.$message.error(resp.msg)
@ -498,7 +498,7 @@ export default {
     */
    chooseUserFun(userList){
      let dataObj = {
-        cusId: this.id,
+        id: this.id,
        userId: userList[0].userId,
        userName: userList[0].nickName
      }
--- a/dl_vue/src/views/cus/seas/index.vue
+++ b/dl_vue/src/views/cus/seas/index.vue
@ -73,7 +73,7 @@
          </span>
        </template>
      </el-table-column>
-      <el-table-column fixed label="客户名称" align="center" prop="fullName" width="130">
+      <el-table-column fixed label="客户名称" align="center" prop="fullName" width="200">
        <template slot-scope="scope">
          <el-tooltip :content="scope.row.fullName" placement="top" effect="dark">
            <div class="text-ellipsis-single">{{ scope.row.fullName }}</div>
@ -474,4 +474,9 @@ export default {
 .el-tag {
  border: 1px solid transparent !important;
 }
+
+::v-deep body .el-table__fixed-right, body .el-table__fixed-left {
+  z-index: 10;
+  background-color: #fff;
+}
 </style>