* 小程序变更

ruoyi-admin/src/main/java/com/ruoyi/web/controller/cp/CpsMeetingUsrController.java

@@ -34,7 +34,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * cps_meeting_usr与会人员信息Controller
+ * cps_usr_wechat微信用户Controller
  *
  * @author ruoyi
  * @date 2024-08-18
@@ -81,7 +81,7 @@ public class CpsMeetingUsrController extends BaseController {
     }
 
     /**
-     * 查询cps_meeting_usr与会人员信息列表
+     * 查询cps_usr_wechat微信用户列表
      */
     @GetMapping("/list")
     public TableDataInfo list(CpsMeetingUsr cpsMeetingUsr) {
@@ -91,18 +91,18 @@ public class CpsMeetingUsrController extends BaseController {
     }
 
     /**
-     * 导出cps_meeting_usr与会人员信息列表
+     * 导出cps_usr_wechat微信用户列表
      */
-    @Log(title = "cps_meeting_usr与会人员信息", businessType = BusinessType.EXPORT)
+    @Log(title = "cps_usr_wechat微信用户", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, CpsMeetingUsr cpsMeetingUsr) {
         List<CpsMeetingUsr> list = cpsMeetingUsrService.selectCpsMeetingUsrList(cpsMeetingUsr);
         ExcelUtil<CpsMeetingUsr> util = new ExcelUtil<CpsMeetingUsr>(CpsMeetingUsr.class);
-        util.exportExcel(response, list, "cps_meeting_usr与会人员信息数据");
+        util.exportExcel(response, list, "cps_usr_wechat微信用户数据");
     }
 
     /**
-     * 获取cps_meeting_usr与会人员信息详细信息
+     * 获取cps_usr_wechat微信用户详细信息
      */
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
@@ -110,9 +110,9 @@ public class CpsMeetingUsrController extends BaseController {
     }
 
     /**
-     * 新增cps_meeting_usr与会人员信息
+     * 新增cps_usr_wechat微信用户
      */
-    @Log(title = "cps_meeting_usr与会人员信息", businessType = BusinessType.INSERT)
+    @Log(title = "cps_usr_wechat微信用户", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody CpsMeetingUsr cpsMeetingUsr) {
         return toAjax(cpsMeetingUsrService.insertCpsMeetingUsr(cpsMeetingUsr));
@@ -126,18 +126,18 @@ public class CpsMeetingUsrController extends BaseController {
     }
 
     /**
-     * 修改cps_meeting_usr与会人员信息
+     * 修改cps_usr_wechat微信用户
      */
-    @Log(title = "cps_meeting_usr与会人员信息", businessType = BusinessType.UPDATE)
+    @Log(title = "cps_usr_wechat微信用户", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody CpsMeetingUsr cpsMeetingUsr) {
         return toAjax(cpsMeetingUsrService.updateCpsMeetingUsr(cpsMeetingUsr));
     }
 
     /**
-     * 删除cps_meeting_usr与会人员信息
+     * 删除cps_usr_wechat微信用户
      */
-    @Log(title = "cps_meeting_usr与会人员信息", businessType = BusinessType.DELETE)
+    @Log(title = "cps_usr_wechat微信用户", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(cpsMeetingUsrService.deleteCpsMeetingUsrByIds(ids));

ruoyi-admin/src/main/java/com/ruoyi/web/controller/cp/CpsUsrApplyController.java

@@ -0,0 +1,101 @@
+package com.ruoyi.web.controller.cp;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+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.system.domain.CpsUsrApply;
+import com.ruoyi.system.service.ICpsUsrApplyService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * cps_usr_apply与会申请Controller
+ *
+ * @author ruoyi
+ * @date 2024-09-03
+ */
+@RestController
+@RequestMapping("/cp/usrApply")
+public class CpsUsrApplyController extends BaseController
+{
+    @Autowired
+    private ICpsUsrApplyService cpsUsrApplyService;
+
+    /**
+     * 查询cps_usr_apply与会申请列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(CpsUsrApply cpsUsrApply)
+    {
+        startPage();
+        List<CpsUsrApply> list = cpsUsrApplyService.selectCpsUsrApplyList(cpsUsrApply);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出cps_usr_apply与会申请列表
+     */
+    @Log(title = "cps_usr_apply与会申请", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CpsUsrApply cpsUsrApply)
+    {
+        List<CpsUsrApply> list = cpsUsrApplyService.selectCpsUsrApplyList(cpsUsrApply);
+        ExcelUtil<CpsUsrApply> util = new ExcelUtil<CpsUsrApply>(CpsUsrApply.class);
+        util.exportExcel(response, list, "cps_usr_apply与会申请数据");
+    }
+
+    /**
+     * 获取cps_usr_apply与会申请详细信息
+     */
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(cpsUsrApplyService.selectCpsUsrApplyById(id));
+    }
+
+    /**
+     * 新增cps_usr_apply与会申请
+     */
+    @Log(title = "cps_usr_apply与会申请", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CpsUsrApply cpsUsrApply)
+    {
+        cpsUsrApply.setCreateTime(DateUtils.getNowDate());
+        return toAjax(cpsUsrApplyService.insertCpsUsrApply(cpsUsrApply));
+    }
+
+    /**
+     * 修改cps_usr_apply与会申请
+     */
+    @Log(title = "cps_usr_apply与会申请", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CpsUsrApply cpsUsrApply)
+    {
+        return toAjax(cpsUsrApplyService.updateCpsUsrApply(cpsUsrApply));
+    }
+
+    /**
+     * 删除cps_usr_apply与会申请
+     */
+    @Log(title = "cps_usr_apply与会申请", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(cpsUsrApplyService.deleteCpsUsrApplyByIds(ids));
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/CpsMeetingUsr.java

@@ -6,7 +6,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
 /**
- * cps_meeting_usr与会人员信息对象 cps_meeting_usr
+ * cps_usr_wechat微信用户对象 cps_meeting_usr
  *
  * @author ruoyi
  * @date 2024-08-18

ruoyi-system/src/main/java/com/ruoyi/system/domain/CpsUsrApply.java

@@ -0,0 +1,221 @@
+package com.ruoyi.system.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * cps_usr_apply与会申请对象 cps_usr_apply
+ * 
+ * @author ruoyi
+ * @date 2024-09-03
+ */
+public class CpsUsrApply extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long id;
+
+    /** 参会人 */
+    @Excel(name = "参会人")
+    private String usrName;
+
+    /** 联系电话 */
+    @Excel(name = "联系电话")
+    private String tel;
+
+    /** 参会人单位 */
+    @Excel(name = "参会人单位")
+    private String orgUnitName;
+
+    /** 参会人职务 */
+    @Excel(name = "参会人职务")
+    private String uniLevle;
+
+    /** 邮箱信息 */
+    @Excel(name = "邮箱信息")
+    private String email;
+
+    /** 参会人角色 */
+    @Excel(name = "参会人角色")
+    private String usrType;
+
+    /** 现场调研 */
+    @Excel(name = "现场调研")
+    private String conferenceFlag;
+
+    /** 关联会场报名信息，针对现场调研的报名信息 */
+    private Long conferenceRel;
+
+    /** 申请类型 */
+    @Excel(name = "申请类型")
+    private String applyType;
+
+    /** 审核状态 */
+    @Excel(name = "审核状态")
+    private String reviewState;
+
+    /** 审核不通过原因 */
+    @Excel(name = "审核不通过原因")
+    private String reviewMsg;
+
+    /** 微信用户主键 */
+    private Long usrWechatId;
+
+    /** 与会内容 */
+    @Excel(name = "与会内容")
+    private Long contentId;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setUsrName(String usrName) 
+    {
+        this.usrName = usrName;
+    }
+
+    public String getUsrName() 
+    {
+        return usrName;
+    }
+    public void setTel(String tel) 
+    {
+        this.tel = tel;
+    }
+
+    public String getTel() 
+    {
+        return tel;
+    }
+    public void setOrgUnitName(String orgUnitName) 
+    {
+        this.orgUnitName = orgUnitName;
+    }
+
+    public String getOrgUnitName() 
+    {
+        return orgUnitName;
+    }
+    public void setUniLevle(String uniLevle) 
+    {
+        this.uniLevle = uniLevle;
+    }
+
+    public String getUniLevle() 
+    {
+        return uniLevle;
+    }
+    public void setEmail(String email) 
+    {
+        this.email = email;
+    }
+
+    public String getEmail() 
+    {
+        return email;
+    }
+    public void setUsrType(String usrType) 
+    {
+        this.usrType = usrType;
+    }
+
+    public String getUsrType() 
+    {
+        return usrType;
+    }
+    public void setConferenceFlag(String conferenceFlag) 
+    {
+        this.conferenceFlag = conferenceFlag;
+    }
+
+    public String getConferenceFlag() 
+    {
+        return conferenceFlag;
+    }
+    public void setConferenceRel(Long conferenceRel) 
+    {
+        this.conferenceRel = conferenceRel;
+    }
+
+    public Long getConferenceRel() 
+    {
+        return conferenceRel;
+    }
+    public void setApplyType(String applyType) 
+    {
+        this.applyType = applyType;
+    }
+
+    public String getApplyType() 
+    {
+        return applyType;
+    }
+    public void setReviewState(String reviewState) 
+    {
+        this.reviewState = reviewState;
+    }
+
+    public String getReviewState() 
+    {
+        return reviewState;
+    }
+    public void setReviewMsg(String reviewMsg) 
+    {
+        this.reviewMsg = reviewMsg;
+    }
+
+    public String getReviewMsg() 
+    {
+        return reviewMsg;
+    }
+    public void setUsrWechatId(Long usrWechatId) 
+    {
+        this.usrWechatId = usrWechatId;
+    }
+
+    public Long getUsrWechatId() 
+    {
+        return usrWechatId;
+    }
+    public void setContentId(Long contentId) 
+    {
+        this.contentId = contentId;
+    }
+
+    public Long getContentId() 
+    {
+        return contentId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("usrName", getUsrName())
+            .append("tel", getTel())
+            .append("orgUnitName", getOrgUnitName())
+            .append("uniLevle", getUniLevle())
+            .append("email", getEmail())
+            .append("usrType", getUsrType())
+            .append("conferenceFlag", getConferenceFlag())
+            .append("conferenceRel", getConferenceRel())
+            .append("applyType", getApplyType())
+            .append("reviewState", getReviewState())
+            .append("reviewMsg", getReviewMsg())
+            .append("usrWechatId", getUsrWechatId())
+            .append("contentId", getContentId())
+            .append("updateTime", getUpdateTime())
+            .append("createTime", getCreateTime())
+            .append("createBy", getCreateBy())
+            .append("updateBy", getUpdateBy())
+            .toString();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/CpsMeetingUsrMapper.java

@@ -7,55 +7,55 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
 /**
- * cps_meeting_usr与会人员信息Mapper接口
+ * cps_usr_wechat微信用户Mapper接口
  *
  * @author ruoyi
  * @date 2024-08-18
  */
 public interface CpsMeetingUsrMapper {
     /**
-     * 查询cps_meeting_usr与会人员信息
+     * 查询cps_usr_wechat微信用户
      *
-     * @param id cps_meeting_usr与会人员信息主键
-     * @return cps_meeting_usr与会人员信息
+     * @param id cps_usr_wechat微信用户主键
+     * @return cps_usr_wechat微信用户
      */
     public CpsMeetingUsr selectCpsMeetingUsrById(Long id);
 
     CpsMeetingUsr selectCpsMeetingUsrByOpenId(String openId);
     /**
-     * 查询cps_meeting_usr与会人员信息列表
+     * 查询cps_usr_wechat微信用户列表
      *
-     * @param cpsMeetingUsr cps_meeting_usr与会人员信息
-     * @return cps_meeting_usr与会人员信息集合
+     * @param cpsMeetingUsr cps_usr_wechat微信用户
+     * @return cps_usr_wechat微信用户集合
      */
     public List<CpsMeetingUsr> selectCpsMeetingUsrList(CpsMeetingUsr cpsMeetingUsr);
 
     /**
-     * 新增cps_meeting_usr与会人员信息
+     * 新增cps_usr_wechat微信用户
      *
-     * @param cpsMeetingUsr cps_meeting_usr与会人员信息
+     * @param cpsMeetingUsr cps_usr_wechat微信用户
      * @return 结果
      */
     public int insertCpsMeetingUsr(CpsMeetingUsr cpsMeetingUsr);
 
     /**
-     * 修改cps_meeting_usr与会人员信息
+     * 修改cps_usr_wechat微信用户
      *
-     * @param cpsMeetingUsr cps_meeting_usr与会人员信息
+     * @param cpsMeetingUsr cps_usr_wechat微信用户
      * @return 结果
      */
     public int updateCpsMeetingUsr(CpsMeetingUsr cpsMeetingUsr);
 
     /**
-     * 删除cps_meeting_usr与会人员信息
+     * 删除cps_usr_wechat微信用户
      *
-     * @param id cps_meeting_usr与会人员信息主键
+     * @param id cps_usr_wechat微信用户主键
      * @return 结果
      */
     public int deleteCpsMeetingUsrById(Long id);
 
     /**
-     * 批量删除cps_meeting_usr与会人员信息
+     * 批量删除cps_usr_wechat微信用户
      *
      * @param ids 需要删除的数据主键集合
      * @return 结果

ruoyi-system/src/main/java/com/ruoyi/system/mapper/CpsUsrApplyMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import com.ruoyi.system.domain.CpsUsrApply;
+
+/**
+ * cps_usr_apply与会申请Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2024-09-03
+ */
+public interface CpsUsrApplyMapper 
+{
+    /**
+     * 查询cps_usr_apply与会申请
+     * 
+     * @param id cps_usr_apply与会申请主键
+     * @return cps_usr_apply与会申请
+     */
+    public CpsUsrApply selectCpsUsrApplyById(Long id);
+
+    /**
+     * 查询cps_usr_apply与会申请列表
+     * 
+     * @param cpsUsrApply cps_usr_apply与会申请
+     * @return cps_usr_apply与会申请集合
+     */
+    public List<CpsUsrApply> selectCpsUsrApplyList(CpsUsrApply cpsUsrApply);
+
+    /**
+     * 新增cps_usr_apply与会申请
+     * 
+     * @param cpsUsrApply cps_usr_apply与会申请
+     * @return 结果
+     */
+    public int insertCpsUsrApply(CpsUsrApply cpsUsrApply);
+
+    /**
+     * 修改cps_usr_apply与会申请
+     * 
+     * @param cpsUsrApply cps_usr_apply与会申请
+     * @return 结果
+     */
+    public int updateCpsUsrApply(CpsUsrApply cpsUsrApply);
+
+    /**
+     * 删除cps_usr_apply与会申请
+     * 
+     * @param id cps_usr_apply与会申请主键
+     * @return 结果
+     */
+    public int deleteCpsUsrApplyById(Long id);
+
+    /**
+     * 批量删除cps_usr_apply与会申请
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCpsUsrApplyByIds(Long[] ids);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/ICpsMeetingUsrService.java

@@ -8,56 +8,56 @@ import com.ruoyi.system.domain.CpsMeetingUsr;
 import java.util.List;
 
 /**
- * cps_meeting_usr与会人员信息Service接口
+ * cps_usr_wechat微信用户Service接口
  *
  * @author ruoyi
  * @date 2024-08-18
  */
 public interface ICpsMeetingUsrService {
     /**
-     * 查询cps_meeting_usr与会人员信息
+     * 查询cps_usr_wechat微信用户
      *
-     * @param id cps_meeting_usr与会人员信息主键
-     * @return cps_meeting_usr与会人员信息
+     * @param id cps_usr_wechat微信用户主键
+     * @return cps_usr_wechat微信用户
      */
     public CpsMeetingUsr selectCpsMeetingUsrById(Long id);
 
     /**
-     * 查询cps_meeting_usr与会人员信息列表
+     * 查询cps_usr_wechat微信用户列表
      *
-     * @param cpsMeetingUsr cps_meeting_usr与会人员信息
-     * @return cps_meeting_usr与会人员信息集合
+     * @param cpsMeetingUsr cps_usr_wechat微信用户
+     * @return cps_usr_wechat微信用户集合
      */
     public List<CpsMeetingUsr> selectCpsMeetingUsrList(CpsMeetingUsr cpsMeetingUsr);
 
     /**
-     * 新增cps_meeting_usr与会人员信息
+     * 新增cps_usr_wechat微信用户
      *
-     * @param cpsMeetingUsr cps_meeting_usr与会人员信息
+     * @param cpsMeetingUsr cps_usr_wechat微信用户
      * @return 结果
      */
     public int insertCpsMeetingUsr(CpsMeetingUsr cpsMeetingUsr);
 
     /**
-     * 修改cps_meeting_usr与会人员信息
+     * 修改cps_usr_wechat微信用户
      *
-     * @param cpsMeetingUsr cps_meeting_usr与会人员信息
+     * @param cpsMeetingUsr cps_usr_wechat微信用户
      * @return 结果
      */
     public int updateCpsMeetingUsr(CpsMeetingUsr cpsMeetingUsr);
 
     /**
-     * 批量删除cps_meeting_usr与会人员信息
+     * 批量删除cps_usr_wechat微信用户
      *
-     * @param ids 需要删除的cps_meeting_usr与会人员信息主键集合
+     * @param ids 需要删除的cps_usr_wechat微信用户主键集合
      * @return 结果
      */
     public int deleteCpsMeetingUsrByIds(Long[] ids);
 
     /**
-     * 删除cps_meeting_usr与会人员信息信息
+     * 删除cps_usr_wechat微信用户信息
      *
-     * @param id cps_meeting_usr与会人员信息主键
+     * @param id cps_usr_wechat微信用户主键
      * @return 结果
      */
     public int deleteCpsMeetingUsrById(Long id);

ruoyi-system/src/main/java/com/ruoyi/system/service/ICpsUsrApplyService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.system.service;
+
+import java.util.List;
+import com.ruoyi.system.domain.CpsUsrApply;
+
+/**
+ * cps_usr_apply与会申请Service接口
+ * 
+ * @author ruoyi
+ * @date 2024-09-03
+ */
+public interface ICpsUsrApplyService 
+{
+    /**
+     * 查询cps_usr_apply与会申请
+     * 
+     * @param id cps_usr_apply与会申请主键
+     * @return cps_usr_apply与会申请
+     */
+    public CpsUsrApply selectCpsUsrApplyById(Long id);
+
+    /**
+     * 查询cps_usr_apply与会申请列表
+     * 
+     * @param cpsUsrApply cps_usr_apply与会申请
+     * @return cps_usr_apply与会申请集合
+     */
+    public List<CpsUsrApply> selectCpsUsrApplyList(CpsUsrApply cpsUsrApply);
+
+    /**
+     * 新增cps_usr_apply与会申请
+     * 
+     * @param cpsUsrApply cps_usr_apply与会申请
+     * @return 结果
+     */
+    public int insertCpsUsrApply(CpsUsrApply cpsUsrApply);
+
+    /**
+     * 修改cps_usr_apply与会申请
+     * 
+     * @param cpsUsrApply cps_usr_apply与会申请
+     * @return 结果
+     */
+    public int updateCpsUsrApply(CpsUsrApply cpsUsrApply);
+
+    /**
+     * 批量删除cps_usr_apply与会申请
+     * 
+     * @param ids 需要删除的cps_usr_apply与会申请主键集合
+     * @return 结果
+     */
+    public int deleteCpsUsrApplyByIds(Long[] ids);
+
+    /**
+     * 删除cps_usr_apply与会申请信息
+     * 
+     * @param id cps_usr_apply与会申请主键
+     * @return 结果
+     */
+    public int deleteCpsUsrApplyById(Long id);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CpsMeetingUsrServiceImpl.java

@@ -15,7 +15,7 @@ import org.springframework.stereotype.Service;
 import java.util.List;
 
 /**
- * cps_meeting_usr与会人员信息Service业务层处理
+ * cps_usr_wechat微信用户Service业务层处理
  *
  * @author ruoyi
  * @date 2024-08-18
@@ -29,10 +29,10 @@ public class CpsMeetingUsrServiceImpl implements ICpsMeetingUsrService {
     private CpsMeetingEnterpriseTripInfoMapper cpsMeetingTripService;
 
     /**
-     * 查询cps_meeting_usr与会人员信息
+     * 查询cps_usr_wechat微信用户
      *
-     * @param id cps_meeting_usr与会人员信息主键
-     * @return cps_meeting_usr与会人员信息
+     * @param id cps_usr_wechat微信用户主键
+     * @return cps_usr_wechat微信用户
      */
     @Override
     public CpsMeetingUsr selectCpsMeetingUsrById(Long id) {
@@ -40,10 +40,10 @@ public class CpsMeetingUsrServiceImpl implements ICpsMeetingUsrService {
     }
 
     /**
-     * 查询cps_meeting_usr与会人员信息列表
+     * 查询cps_usr_wechat微信用户列表
      *
-     * @param cpsMeetingUsr cps_meeting_usr与会人员信息
-     * @return cps_meeting_usr与会人员信息
+     * @param cpsMeetingUsr cps_usr_wechat微信用户
+     * @return cps_usr_wechat微信用户
      */
     @Override
     public List<CpsMeetingUsr> selectCpsMeetingUsrList(CpsMeetingUsr cpsMeetingUsr) {
@@ -51,9 +51,9 @@ public class CpsMeetingUsrServiceImpl implements ICpsMeetingUsrService {
     }
 
     /**
-     * 新增cps_meeting_usr与会人员信息
+     * 新增cps_usr_wechat微信用户
      *
-     * @param cpsMeetingUsr cps_meeting_usr与会人员信息
+     * @param cpsMeetingUsr cps_usr_wechat微信用户
      * @return 结果
      */
     @Override
@@ -63,9 +63,9 @@ public class CpsMeetingUsrServiceImpl implements ICpsMeetingUsrService {
     }
 
     /**
-     * 修改cps_meeting_usr与会人员信息
+     * 修改cps_usr_wechat微信用户
      *
-     * @param cpsMeetingUsr cps_meeting_usr与会人员信息
+     * @param cpsMeetingUsr cps_usr_wechat微信用户
      * @return 结果
      */
     @Override
@@ -75,9 +75,9 @@ public class CpsMeetingUsrServiceImpl implements ICpsMeetingUsrService {
     }
 
     /**
-     * 批量删除cps_meeting_usr与会人员信息
+     * 批量删除cps_usr_wechat微信用户
      *
-     * @param ids 需要删除的cps_meeting_usr与会人员信息主键
+     * @param ids 需要删除的cps_usr_wechat微信用户主键
      * @return 结果
      */
     @Override
@@ -86,9 +86,9 @@ public class CpsMeetingUsrServiceImpl implements ICpsMeetingUsrService {
     }
 
     /**
-     * 删除cps_meeting_usr与会人员信息信息
+     * 删除cps_usr_wechat微信用户信息
      *
-     * @param id cps_meeting_usr与会人员信息主键
+     * @param id cps_usr_wechat微信用户主键
      * @return 结果
      */
     @Override

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CpsUsrApplyServiceImpl.java

@@ -0,0 +1,96 @@
+package com.ruoyi.system.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.system.mapper.CpsUsrApplyMapper;
+import com.ruoyi.system.domain.CpsUsrApply;
+import com.ruoyi.system.service.ICpsUsrApplyService;
+
+/**
+ * cps_usr_apply与会申请Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2024-09-03
+ */
+@Service
+public class CpsUsrApplyServiceImpl implements ICpsUsrApplyService 
+{
+    @Autowired
+    private CpsUsrApplyMapper cpsUsrApplyMapper;
+
+    /**
+     * 查询cps_usr_apply与会申请
+     * 
+     * @param id cps_usr_apply与会申请主键
+     * @return cps_usr_apply与会申请
+     */
+    @Override
+    public CpsUsrApply selectCpsUsrApplyById(Long id)
+    {
+        return cpsUsrApplyMapper.selectCpsUsrApplyById(id);
+    }
+
+    /**
+     * 查询cps_usr_apply与会申请列表
+     * 
+     * @param cpsUsrApply cps_usr_apply与会申请
+     * @return cps_usr_apply与会申请
+     */
+    @Override
+    public List<CpsUsrApply> selectCpsUsrApplyList(CpsUsrApply cpsUsrApply)
+    {
+        return cpsUsrApplyMapper.selectCpsUsrApplyList(cpsUsrApply);
+    }
+
+    /**
+     * 新增cps_usr_apply与会申请
+     * 
+     * @param cpsUsrApply cps_usr_apply与会申请
+     * @return 结果
+     */
+    @Override
+    public int insertCpsUsrApply(CpsUsrApply cpsUsrApply)
+    {
+        cpsUsrApply.setCreateTime(DateUtils.getNowDate());
+        return cpsUsrApplyMapper.insertCpsUsrApply(cpsUsrApply);
+    }
+
+    /**
+     * 修改cps_usr_apply与会申请
+     * 
+     * @param cpsUsrApply cps_usr_apply与会申请
+     * @return 结果
+     */
+    @Override
+    public int updateCpsUsrApply(CpsUsrApply cpsUsrApply)
+    {
+        cpsUsrApply.setUpdateTime(DateUtils.getNowDate());
+        return cpsUsrApplyMapper.updateCpsUsrApply(cpsUsrApply);
+    }
+
+    /**
+     * 批量删除cps_usr_apply与会申请
+     * 
+     * @param ids 需要删除的cps_usr_apply与会申请主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCpsUsrApplyByIds(Long[] ids)
+    {
+        return cpsUsrApplyMapper.deleteCpsUsrApplyByIds(ids);
+    }
+
+    /**
+     * 删除cps_usr_apply与会申请信息
+     * 
+     * @param id cps_usr_apply与会申请主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCpsUsrApplyById(Long id)
+    {
+        return cpsUsrApplyMapper.deleteCpsUsrApplyById(id);
+    }
+}

ruoyi-system/src/main/resources/mapper/cp/CpsMeetingUsrMapper.xml

@@ -9,8 +9,6 @@
         <result property="usrName" column="usr_name"/>
         <result property="tel" column="tel"/>
         <result property="openId" column="open_id"/>
-        <result property="enterpriseId" column="enterprise_id"/>
-        <result property="tripId" column="trip_id"/>
         <result property="sex" column="sex"/>
         <result property="updateTime" column="update_time"/>
         <result property="createTime" column="create_time"/>
@@ -23,19 +21,13 @@
                usr_name,
                usr.tel,
                open_id,
-               usr.enterprise_id,
-               usr.trip_id,
-               trip.trip_name,
                usr.sex,
                avatar_url,
-               enterprise.enterprise_name,
                usr.update_time,
                usr.create_time,
                usr.create_by,
                usr.update_by
-        FROM cps_meeting_usr usr
-                 LEFT JOIN cps_meeting_enterprise enterprise ON usr.enterprise_id = enterprise.id
-                 LEFT JOIN cps_meeting_enterprise_trip_info trip ON usr.trip_id = trip.id
+        FROM cps_usr_wechat usr
     </sql>
 
     <select id="selectCpsMeetingUsrList" parameterType="com.ruoyi.system.domain.CpsMeetingUsr"
@@ -46,8 +38,6 @@
             <if test="sex != null  and sex != ''">and usr.sex = #{sex}</if>
             <if test="tel != null  and tel != ''">and usr.tel = #{tel}</if>
             <if test="openId != null  and openId != ''">and open_id = #{openId}</if>
-            <if test="enterpriseId != null ">and usr.enterprise_id = #{enterpriseId}</if>
-            <if test="tripId != null ">and usr.trip_id = #{tripId}</if>
         </where>
     </select>
 
@@ -64,13 +54,11 @@
 
     <insert id="insertCpsMeetingUsr" parameterType="com.ruoyi.system.domain.CpsMeetingUsr" useGeneratedKeys="true"
             keyProperty="id">
-        insert into cps_meeting_usr
+        insert into cps_usr_wechat
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="usrName != null">usr_name,</if>
             <if test="tel != null">tel,</if>
             <if test="openId != null">open_id,</if>
-            <if test="enterpriseId != null">enterprise_id,</if>
-            <if test="tripId != null">trip_id,</if>
             <if test="avatarUrl != null">avatar_url,</if>
             <if test="sex != null">sex,</if>
             <if test="updateTime != null">update_time,</if>
@@ -82,8 +70,6 @@
             <if test="usrName != null">#{usrName},</if>
             <if test="tel != null">#{tel},</if>
             <if test="openId != null">#{openId},</if>
-            <if test="enterpriseId != null">#{enterpriseId},</if>
-            <if test="tripId != null">#{tripId},</if>
             <if test="avatarUrl != null">#{avatarUrl},</if>
             <if test="sex != null">#{sex},</if>
             <if test="updateTime != null">#{updateTime},</if>
@@ -94,13 +80,11 @@
     </insert>
 
     <update id="updateCpsMeetingUsr" parameterType="com.ruoyi.system.domain.CpsMeetingUsr">
-        update cps_meeting_usr
+        update cps_usr_wechat
         <trim prefix="SET" suffixOverrides=",">
             <if test="usrName != null">usr_name = #{usrName},</if>
             <if test="tel != null">tel = #{tel},</if>
             <if test="openId != null">open_id = #{openId},</if>
-            <if test="enterpriseId != null">enterprise_id = #{enterpriseId},</if>
-            <if test="tripId != null">trip_id = #{tripId},</if>
             <if test="avatarUrl != null">avatar_url = #{avatarUrl},</if>
             <if test="sex != null">sex = #{sex},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
@@ -113,12 +97,12 @@
 
     <delete id="deleteCpsMeetingUsrById" parameterType="Long">
         delete
-        from cps_meeting_usr
+        from cps_usr_wechat
         where id = #{id}
     </delete>
 
     <delete id="deleteCpsMeetingUsrByIds" parameterType="String">
-        delete from cps_meeting_usr where id in
+        delete from cps_usr_wechat where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
@@ -126,7 +110,7 @@
     <select id="exitUser" resultType="java.lang.Integer">
         -- 判断是否存在openid的数据
         select count(1)
-        from cps_meeting_usr
+        from cps_usr_wechat
         where tel = #{tel}
     </select>
 
@@ -137,13 +121,11 @@
     </select>
 
     <update id="updateCpsMeetingUsrByTel" parameterType="com.ruoyi.system.domain.CpsMeetingUsr">
-        update cps_meeting_usr
+        update cps_usr_wechat
         <trim prefix="SET" suffixOverrides=",">
             <if test="usrName != null">usr_name = #{usrName},</if>
             <if test="tel != null">tel = #{tel},</if>
             <if test="openId != null">open_id = #{openId},</if>
-            <if test="enterpriseId != null">enterprise_id = #{enterpriseId},</if>
-            <if test="tripId != null">trip_id = #{tripId},</if>
             <if test="avatarUrl != null">avatar_url = #{avatarUrl},</if>
             <if test="sex != null">sex = #{sex},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>

ruoyi-system/src/main/resources/mapper/cp/CpsUsrApplyMapper.xml

@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper.CpsUsrApplyMapper">
+
+    <resultMap type="com.ruoyi.system.domain.CpsUsrApply" id="CpsUsrApplyResult">
+        <result property="id"    column="id"    />
+        <result property="usrName"    column="usr_name"    />
+        <result property="tel"    column="tel"    />
+        <result property="orgUnitName"    column="org_unit_name"    />
+        <result property="uniLevle"    column="uni_levle"    />
+        <result property="email"    column="email"    />
+        <result property="usrType"    column="usr_type"    />
+        <result property="conferenceFlag"    column="conference_flag"    />
+        <result property="conferenceRel"    column="conference_rel"    />
+        <result property="applyType"    column="apply_type"    />
+        <result property="reviewState"    column="review_state"    />
+        <result property="reviewMsg"    column="review_msg"    />
+        <result property="usrWechatId"    column="usr_wechat_id"    />
+        <result property="contentId"    column="content_id"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="updateBy"    column="update_by"    />
+    </resultMap>
+
+    <sql id="selectCpsUsrApplyVo">
+        select id, usr_name, tel, org_unit_name, uni_levle, email, usr_type, conference_flag, conference_rel, apply_type, review_state, review_msg, usr_wechat_id, content_id, update_time, create_time, create_by, update_by from cps_usr_apply
+    </sql>
+
+    <select id="selectCpsUsrApplyList" parameterType="com.ruoyi.system.domain.CpsUsrApply" resultMap="CpsUsrApplyResult">
+        <include refid="selectCpsUsrApplyVo"/>
+        <where>
+            <if test="usrName != null  and usrName != ''"> and usr_name like concat('%', #{usrName}, '%')</if>
+            <if test="tel != null  and tel != ''"> and tel = #{tel}</if>
+            <if test="orgUnitName != null  and orgUnitName != ''"> and org_unit_name like concat('%', #{orgUnitName}, '%')</if>
+            <if test="uniLevle != null  and uniLevle != ''"> and uni_levle = #{uniLevle}</if>
+            <if test="usrType != null  and usrType != ''"> and usr_type = #{usrType}</if>
+            <if test="conferenceFlag != null  and conferenceFlag != ''"> and conference_flag = #{conferenceFlag}</if>
+            <if test="applyType != null  and applyType != ''"> and apply_type = #{applyType}</if>
+            <if test="reviewState != null  and reviewState != ''"> and review_state = #{reviewState}</if>
+        </where>
+    </select>
+
+    <select id="selectCpsUsrApplyById" parameterType="Long" resultMap="CpsUsrApplyResult">
+        <include refid="selectCpsUsrApplyVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertCpsUsrApply" parameterType="com.ruoyi.system.domain.CpsUsrApply" useGeneratedKeys="true" keyProperty="id">
+        insert into cps_usr_apply
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="usrName != null">usr_name,</if>
+            <if test="tel != null">tel,</if>
+            <if test="orgUnitName != null">org_unit_name,</if>
+            <if test="uniLevle != null">uni_levle,</if>
+            <if test="email != null">email,</if>
+            <if test="usrType != null">usr_type,</if>
+            <if test="conferenceFlag != null">conference_flag,</if>
+            <if test="conferenceRel != null">conference_rel,</if>
+            <if test="applyType != null">apply_type,</if>
+            <if test="reviewState != null">review_state,</if>
+            <if test="reviewMsg != null">review_msg,</if>
+            <if test="usrWechatId != null">usr_wechat_id,</if>
+            <if test="contentId != null">content_id,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="updateBy != null">update_by,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="usrName != null">#{usrName},</if>
+            <if test="tel != null">#{tel},</if>
+            <if test="orgUnitName != null">#{orgUnitName},</if>
+            <if test="uniLevle != null">#{uniLevle},</if>
+            <if test="email != null">#{email},</if>
+            <if test="usrType != null">#{usrType},</if>
+            <if test="conferenceFlag != null">#{conferenceFlag},</if>
+            <if test="conferenceRel != null">#{conferenceRel},</if>
+            <if test="applyType != null">#{applyType},</if>
+            <if test="reviewState != null">#{reviewState},</if>
+            <if test="reviewMsg != null">#{reviewMsg},</if>
+            <if test="usrWechatId != null">#{usrWechatId},</if>
+            <if test="contentId != null">#{contentId},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCpsUsrApply" parameterType="com.ruoyi.system.domain.CpsUsrApply">
+        update cps_usr_apply
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="usrName != null">usr_name = #{usrName},</if>
+            <if test="tel != null">tel = #{tel},</if>
+            <if test="orgUnitName != null">org_unit_name = #{orgUnitName},</if>
+            <if test="uniLevle != null">uni_levle = #{uniLevle},</if>
+            <if test="email != null">email = #{email},</if>
+            <if test="usrType != null">usr_type = #{usrType},</if>
+            <if test="conferenceFlag != null">conference_flag = #{conferenceFlag},</if>
+            <if test="conferenceRel != null">conference_rel = #{conferenceRel},</if>
+            <if test="applyType != null">apply_type = #{applyType},</if>
+            <if test="reviewState != null">review_state = #{reviewState},</if>
+            <if test="reviewMsg != null">review_msg = #{reviewMsg},</if>
+            <if test="usrWechatId != null">usr_wechat_id = #{usrWechatId},</if>
+            <if test="contentId != null">content_id = #{contentId},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteCpsUsrApplyById" parameterType="Long">
+        delete from cps_usr_apply where id = #{id}
+    </delete>
+
+    <delete id="deleteCpsUsrApplyByIds" parameterType="String">
+        delete from cps_usr_apply where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

ruoyi-ui/.env.development

@@ -7,6 +7,6 @@ ENV = 'development'
 # 若依管理系统/开发环境
 VUE_APP_BASE_API = '/dev-api'
 
-VUE_APP_BASE_URL = 'http://127.0.0.1:8080/tfc'
+VUE_APP_BASE_URL = 'http://127.0.0.1:18080/tfc'
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

ruoyi-ui/src/api/cp/usr.js

@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 
-// 查询cps_meeting_usr与会人员信息列表
+// 查询cps_usr_wechat微信用户列表
 export function listUsr(query) {
   return request({
     url: '/cp/usr/list',
@@ -9,7 +9,7 @@ export function listUsr(query) {
   })
 }
 
-// 查询cps_meeting_usr与会人员信息详细
+// 查询cps_usr_wechat微信用户详细
 export function getUsr(id) {
   return request({
     url: '/cp/usr/' + id,
@@ -17,7 +17,7 @@ export function getUsr(id) {
   })
 }
 
-// 新增cps_meeting_usr与会人员信息
+// 新增cps_usr_wechat微信用户
 export function addUsr(data) {
   return request({
     url: '/cp/usr',
@@ -26,7 +26,7 @@ export function addUsr(data) {
   })
 }
 
-// 修改cps_meeting_usr与会人员信息
+// 修改cps_usr_wechat微信用户
 export function updateUsr(data) {
   return request({
     url: '/cp/usr',
@@ -35,7 +35,7 @@ export function updateUsr(data) {
   })
 }
 
-// 删除cps_meeting_usr与会人员信息
+// 删除cps_usr_wechat微信用户
 export function delUsr(id) {
   return request({
     url: '/cp/usr/' + id,

ruoyi-ui/src/api/cp/usrApply.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询cps_usr_apply与会申请列表
+export function listUsrApply(query) {
+  return request({
+    url: '/cp/usrApply/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询cps_usr_apply与会申请详细
+export function getUsrApply(id) {
+  return request({
+    url: '/cp/usrApply/' + id,
+    method: 'get'
+  })
+}
+
+// 新增cps_usr_apply与会申请
+export function addUsrApply(data) {
+  return request({
+    url: '/cp/usrApply',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改cps_usr_apply与会申请
+export function updateUsrApply(data) {
+  return request({
+    url: '/cp/usrApply',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除cps_usr_apply与会申请
+export function delUsrApply(id) {
+  return request({
+    url: '/cp/usrApply/' + id,
+    method: 'delete'
+  })
+}

ruoyi-ui/src/views/cp/contentInfo/index.vue

@@ -33,7 +33,6 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['cp:contentIfon:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -44,7 +43,6 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['cp:contentIfon:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -55,7 +53,6 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['cp:contentIfon:remove']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -65,7 +62,6 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['cp:contentIfon:export']"
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -92,14 +88,12 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['cp:contentIfon:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['cp:contentIfon:remove']"
           >删除</el-button>
         </template>
       </el-table-column>

ruoyi-ui/src/views/cp/enterprise/index.vue

@@ -31,7 +31,6 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['cp:enterprise:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -42,7 +41,6 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['cp:enterprise:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -53,7 +51,6 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['cp:enterprise:remove']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -63,7 +60,6 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['cp:enterprise:export']"
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -83,14 +79,12 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['cp:enterprise:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['cp:enterprise:remove']"
           >删除</el-button>
         </template>
       </el-table-column>

ruoyi-ui/src/views/cp/enterpriseTripInfo/index.vue

@@ -31,7 +31,6 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['cp:enterpriseTripInfo:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -42,7 +41,6 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['cp:enterpriseTripInfo:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -53,7 +51,6 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['cp:enterpriseTripInfo:remove']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -63,7 +60,6 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['cp:enterpriseTripInfo:export']"
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -90,14 +86,12 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['cp:enterpriseTripInfo:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['cp:enterpriseTripInfo:remove']"
           >删除</el-button>
         </template>
       </el-table-column>

ruoyi-ui/src/views/cp/fileInfo/index.vue

@@ -25,7 +25,6 @@
             icon="el-icon-plus"
             size="mini"
             @click="handleAdd"
-            v-hasPermi="['cp:fileInfo:add']"
         >新增
         </el-button>
       </el-col>
@@ -37,7 +36,6 @@
             size="mini"
             :disabled="single"
             @click="handleUpdate"
-            v-hasPermi="['cp:fileInfo:edit']"
         >修改
         </el-button>
       </el-col>
@@ -49,7 +47,6 @@
             size="mini"
             :disabled="multiple"
             @click="handleDelete"
-            v-hasPermi="['cp:fileInfo:remove']"
         >删除
         </el-button>
       </el-col>
@@ -60,7 +57,6 @@
             icon="el-icon-download"
             size="mini"
             @click="handleExport"
-            v-hasPermi="['cp:fileInfo:export']"
         >导出
         </el-button>
       </el-col>
@@ -85,7 +81,6 @@
               type="text"
               icon="el-icon-edit"
               @click="handleUpdate(scope.row)"
-              v-hasPermi="['cp:fileInfo:edit']"
           >修改
           </el-button>
           <el-button
@@ -93,7 +88,6 @@
               type="text"
               icon="el-icon-delete"
               @click="handleDelete(scope.row)"
-              v-hasPermi="['cp:fileInfo:remove']"
           >删除
           </el-button>
         </template>

ruoyi-ui/src/views/cp/msg/index.vue

@@ -23,7 +23,6 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['cp:msg:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -34,7 +33,6 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['cp:msg:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -45,7 +43,6 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['cp:msg:remove']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -55,7 +52,6 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['cp:msg:export']"
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -73,19 +69,17 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['cp:msg:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['cp:msg:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"

ruoyi-ui/src/views/cp/usr/index.vue

@@ -41,7 +41,6 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['cp:usr:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -52,7 +51,6 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['cp:usr:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -63,7 +61,6 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['cp:usr:remove']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -73,7 +70,6 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['cp:usr:export']"
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -100,14 +96,12 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['cp:usr:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['cp:usr:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
@@ -121,7 +115,7 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改cps_meeting_usr与会人员信息对话框 -->
+    <!-- 添加或修改cps_usr_wechat微信用户对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="用户名" prop="usrName">
@@ -180,7 +174,7 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      // cps_meeting_usr与会人员信息表格数据
+      // cps_usr_wechat微信用户表格数据
       usrList: [],
       // 弹出层标题
       title: "",
@@ -205,7 +199,7 @@ export default {
     this.getList();
   },
   methods: {
-    /** 查询cps_meeting_usr与会人员信息列表 */
+    /** 查询cps_usr_wechat微信用户列表 */
     getList() {
       this.loading = true;
       listUsr(this.queryParams).then(response => {
@@ -257,7 +251,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加cps_meeting_usr与会人员信息";
+      this.title = "添加cps_usr_wechat微信用户";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -266,7 +260,7 @@ export default {
       getUsr(id).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改cps_meeting_usr与会人员信息";
+        this.title = "修改cps_usr_wechat微信用户";
       });
     },
     /** 提交按钮 */
@@ -292,7 +286,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除cps_meeting_usr与会人员信息编号为"' + ids + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除cps_usr_wechat微信用户编号为"' + ids + '"的数据项？').then(function() {
         return delUsr(ids);
       }).then(() => {
         this.getList();

ruoyi-ui/src/views/cp/usrApply/index.vue

@@ -0,0 +1,502 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
+      <el-form-item label="参会人" prop="usrName">
+        <el-input
+            v-model="queryParams.usrName"
+            placeholder="请输入参会人"
+            clearable
+            @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="联系电话" prop="tel">
+        <el-input
+            v-model="queryParams.tel"
+            placeholder="请输入联系电话"
+            clearable
+            @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="参会人单位" prop="orgUnitName">
+        <el-input
+            v-model="queryParams.orgUnitName"
+            placeholder="请输入参会人单位"
+            clearable
+            @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="参会人职务" prop="uniLevle">
+        <el-input
+            v-model="queryParams.uniLevle"
+            placeholder="请输入参会人职务"
+            clearable
+            @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="参会人角色" prop="usrType">
+        <el-select v-model="queryParams.usrType" placeholder="请选择参会人角色" clearable>
+          <el-option
+              v-for="dict in dict.type.met_usr_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="现场调研" prop="conferenceFlag">
+        <el-select v-model="queryParams.conferenceFlag" placeholder="请选择现场调研" clearable>
+          <el-option
+              v-for="dict in dict.type.sys_yes_no"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="申请类型" prop="applyType">
+        <el-select v-model="queryParams.applyType" placeholder="请选择申请类型" clearable>
+          <el-option
+              v-for="dict in dict.type.apply_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="审核状态" prop="reviewState">
+        <el-select v-model="queryParams.reviewState" placeholder="请选择审核状态" clearable>
+          <el-option
+              v-for="dict in dict.type.review_state"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+            type="primary"
+            plain
+            icon="el-icon-plus"
+            size="mini"
+            @click="handleAdd"
+        >新增
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+            type="success"
+            plain
+            icon="el-icon-edit"
+            size="mini"
+            :disabled="single"
+            @click="handleUpdate"
+        >修改
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+            type="danger"
+            plain
+            icon="el-icon-delete"
+            size="mini"
+            :disabled="multiple"
+            @click="handleDelete"
+        >删除
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+            type="warning"
+            plain
+            icon="el-icon-download"
+            size="mini"
+            @click="handleExport"
+        >导出
+        </el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="usrApplyList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="主键" align="center" prop="id" />
+      <el-table-column label="参会人" align="center" prop="usrName" />
+      <el-table-column label="联系电话" align="center" prop="tel" />
+      <el-table-column label="参会人单位" align="center" prop="orgUnitName" />
+      <el-table-column label="参会人职务" align="center" prop="uniLevle" />
+      <el-table-column label="邮箱信息" align="center" prop="email" />
+      <el-table-column label="参会人角色" align="center" prop="usrType">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.met_usr_type" :value="scope.row.usrType" />
+        </template>
+      </el-table-column>
+      <el-table-column label="现场调研" align="center" prop="conferenceFlag">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.conferenceFlag" />
+        </template>
+      </el-table-column>
+      <el-table-column label="申请类型" align="center" prop="applyType">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.apply_type" :value="scope.row.applyType" />
+        </template>
+      </el-table-column>
+      <el-table-column label="审核状态" align="center" prop="reviewState">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.review_state" :value="scope.row.reviewState" />
+        </template>
+      </el-table-column>
+      <el-table-column label="审核不通过原因" align="center" prop="reviewMsg" />
+      <el-table-column label="与会内容" align="center" prop="contentId" />
+      <el-table-column label="创建时间" align="center" prop="updateTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="修改时间" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-edit"
+              @click="handleUpdate(scope.row)"
+          >修改
+          </el-button>
+          <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-delete"
+              @click="handleDelete(scope.row)"
+          >删除
+          </el-button>
+          <el-dropdown @command="(comd)=>handleCommand(comd, scope.row)">
+            <span class="el-dropdown-link">
+              更多<i class="el-icon-arrow-down el-icon--right"></i>
+            </span>
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item icon="el-icon-check" command="pass">通过</el-dropdown-item>
+              <el-dropdown-item icon="el-icon-close" command="reject">拒绝</el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+    />
+
+    <!-- 添加或修改cps_usr_apply与会申请对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-form-item label="参会人" prop="usrName">
+          <el-input v-model="form.usrName" placeholder="请输入参会人" />
+        </el-form-item>
+        <el-form-item label="联系电话" prop="tel">
+          <el-input v-model="form.tel" placeholder="请输入联系电话" />
+        </el-form-item>
+        <el-form-item label="参会人单位" prop="orgUnitName">
+          <el-input v-model="form.orgUnitName" placeholder="请输入参会人单位" />
+        </el-form-item>
+        <el-form-item label="参会人职务" prop="uniLevle">
+          <el-input v-model="form.uniLevle" placeholder="请输入参会人职务" />
+        </el-form-item>
+        <el-form-item label="邮箱信息" prop="email">
+          <el-input v-model="form.email" placeholder="请输入邮箱信息" />
+        </el-form-item>
+        <el-form-item label="参会人角色" prop="usrType">
+          <el-radio-group v-model="form.usrType">
+            <el-radio
+                v-for="dict in dict.type.met_usr_type"
+                :key="dict.value"
+                :label="dict.value"
+            >{{ dict.label }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="现场调研" prop="conferenceFlag">
+          <el-radio-group v-model="form.conferenceFlag">
+            <el-radio
+                v-for="dict in dict.type.sys_yes_no"
+                :key="dict.value"
+                :label="dict.value"
+            >{{ dict.label }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="申请类型" prop="applyType">
+          <el-select v-model="form.applyType" placeholder="请选择申请类型">
+            <el-option
+                v-for="dict in dict.type.apply_type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="审核状态" prop="reviewState">
+          <el-radio-group v-model="form.reviewState">
+            <el-radio
+                v-for="dict in dict.type.review_state"
+                :key="dict.value"
+                :label="dict.value"
+            >{{ dict.label }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="审核不通过原因" prop="reviewMsg">
+          <el-input v-model="form.reviewMsg" type="textarea" rows="3" placeholder="请输入审核不通过原因" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+    <el-dialog title="拒绝用户参会申请" :visible.sync="openReject" width="700px" append-to-body>
+      <el-form ref="rejectForm" :model="form" :rules="rules" label-width="120px">
+        <el-form-item label="审核状态" prop="reviewState">
+          <el-radio-group v-model="form.reviewState" :disabled="true">
+            <el-radio
+                v-for="dict in dict.type.review_state"
+                :key="dict.value"
+                :label="dict.value"
+            >{{ dict.label }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="审核不通过原因" prop="reviewMsg">
+          <el-input v-model="form.reviewMsg" type="textarea" rows="3" placeholder="请输入审核不通过原因" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="rejectSubmitForm">确 定</el-button>
+        <el-button @click="rejectCancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { addUsrApply, delUsrApply, getUsrApply, listUsrApply, updateUsrApply } from '@/api/cp/usrApply';
+
+export default {
+  name: 'UsrApply',
+  dicts: ['apply_type', 'sys_yes_no', 'review_state', 'met_usr_type'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // cps_usr_apply与会申请表格数据
+      usrApplyList: [],
+      // 弹出层标题
+      title: '',
+      // 是否显示弹出层
+      open: false,
+      openReject: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        usrName: null,
+        tel: null,
+        orgUnitName: null,
+        uniLevle: null,
+        usrType: null,
+        conferenceFlag: null,
+        applyType: null,
+        reviewState: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {},
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    handleCommand(comd, row) {
+      switch (comd) {
+        case 'pass':
+          this.handlePass(row);
+          break;
+        case 'reject':
+          this.handleReject(row);
+          break;
+        default:
+          break;
+      }
+    },
+    rejectSubmitForm() {
+      this.$refs.rejectForm.validate(valid => {
+        if (valid) {
+          updateUsrApply(this.form).then(response => {
+            this.$modal.msgSuccess('审核完成');
+            this.openReject = false;
+            this.getList();
+          });
+        }
+      });
+    },
+    rejectCancel() {
+      this.openReject = false;
+      this.reset();
+    },
+
+    handlePass(row) {
+      updateUsrApply({
+        id: row.id,
+        reviewState: '0',
+        reviewMsg: '通过'
+      }).then(response => {
+        this.$modal.msgSuccess('审核完成');
+        this.openReject = false;
+        this.getList();
+      });
+    },
+    handleReject(row) {
+      this.reset();
+      const id = row.id || this.ids;
+      getUsrApply(id).then(response => {
+        this.form = response.data;
+        this.openReject = true;
+        this.form.reviewState = '1';
+      });
+    },
+    /** 查询cps_usr_apply与会申请列表 */
+    getList() {
+      this.loading = true;
+      listUsrApply(this.queryParams).then(response => {
+        this.usrApplyList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        usrName: null,
+        tel: null,
+        orgUnitName: null,
+        uniLevle: null,
+        email: null,
+        usrType: null,
+        conferenceFlag: null,
+        conferenceRel: null,
+        applyType: null,
+        reviewState: null,
+        reviewMsg: null,
+        usrWechatId: null,
+        contentId: null,
+        updateTime: null,
+        createTime: null,
+        createBy: null,
+        updateBy: null,
+      };
+      this.resetForm('form');
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm('queryForm');
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = '添加cps_usr_apply与会申请';
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids;
+      getUsrApply(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = '修改cps_usr_apply与会申请';
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs['form'].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateUsrApply(this.form).then(response => {
+              this.$modal.msgSuccess('修改成功');
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addUsrApply(this.form).then(response => {
+              this.$modal.msgSuccess('新增成功');
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除cps_usr_apply与会申请编号为"' + ids + '"的数据项？').then(function () {
+        return delUsrApply(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess('删除成功');
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('cp/usrApply/export', {
+        ...this.queryParams,
+      }, `usrApply_${new Date().getTime()}.xlsx`);
+    },
+  },
+};
+</script>

ruoyi-ui/src/views/cp/viewcfg/index.vue

@@ -59,7 +59,6 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['cp:viewcfg:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -70,7 +69,6 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['cp:viewcfg:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -81,7 +79,6 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['cp:viewcfg:remove']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -91,7 +88,6 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['cp:viewcfg:export']"
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -138,14 +134,12 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['cp:viewcfg:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['cp:viewcfg:remove']"
           >删除</el-button>
         </template>
       </el-table-column>