提交代码

yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/WxMenuConfig.java

@@ -24,6 +24,10 @@ public class WxMenuConfig extends BaseEntity
     @Excel(name = "项目主键")
     private Long projectId;
 
+    /** 项目主键 */
+    @Excel(name = "项目名称")
+    private String projectName;
+
     /** 菜单名称 */
     @Excel(name = "菜单名称")
     private String menuName;
@@ -146,6 +150,14 @@ public class WxMenuConfig extends BaseEntity
         this.wxMenuConfigRoleList = wxMenuConfigRoleList;
     }
 
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/WxMenuConfigRole.java

@@ -5,6 +5,8 @@ import com.yanzhu.common.core.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.List;
+
 /**
  * 菜单配置角色对象 wx_menu_config_role
  * 
@@ -23,6 +25,9 @@ public class WxMenuConfigRole extends BaseEntity
     @Excel(name = "角色主键")
     private Long roleId;
 
+    /** 角色名称 */
+    private String roleName;
+
     /** 用户主键 */
     @Excel(name = "用户主键")
     private Long userId;
@@ -55,6 +60,14 @@ public class WxMenuConfigRole extends BaseEntity
         return userId;
     }
 
+    public String getRoleName() {
+        return roleName;
+    }
+
+    public void setRoleName(String roleName) {
+        this.roleName = roleName;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/WxMenuConfigRoleMapper.java

@@ -2,6 +2,7 @@ package com.yanzhu.manage.mapper;
 
 import java.util.List;
 import com.yanzhu.manage.domain.WxMenuConfigRole;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 菜单配置角色Mapper接口
@@ -27,6 +28,13 @@ public interface WxMenuConfigRoleMapper
      */
     public List<WxMenuConfigRole> selectWxMenuConfigRoleList(WxMenuConfigRole wxMenuConfigRole);
 
+    /**
+     * 查询菜单配置角色列表
+     * @param smcIds
+     * @return
+     */
+    public List<WxMenuConfigRole> findgRoleListBySmcIds(@Param("smcIds")List<Long> smcIds);
+
     /**
      * 新增菜单配置角色
      *

yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/WxMenuConfigMapper.xml

@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="WxMenuConfig" id="WxMenuConfigResult">
         <result property="id"    column="id"    />
         <result property="projectId"    column="project_id"    />
+        <result property="projectName"    column="project_name"    />
         <result property="menuName"    column="menu_name"    />
         <result property="menuIdenti"    column="menu_identi"    />
         <result property="menuImg"    column="menu_img"    />
@@ -28,16 +29,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectWxMenuConfigVo">
-        select id, project_id, menu_name, menu_identi, menu_img, menu_url, del_flag, menu_sort, create_time, menu_type from wx_menu_config
+        select mc.id, mc.project_id, pi.project_name, mc.menu_name, mc.menu_identi, mc.menu_img, mc.menu_url, mc.del_flag, mc.menu_sort, mc.create_time, mc.menu_type from wx_menu_config mc
+        left join pro_project_info pi on pi.id = mc.project_id
     </sql>
 
     <select id="selectWxMenuConfigList" parameterType="WxMenuConfig" resultMap="WxMenuConfigResult">
         <include refid="selectWxMenuConfigVo"/>
-        <where>  
+        <where>
-            <if test="projectId != null "> and project_id = #{projectId}</if>
+            <if test="projectId != null "> and mc.project_id = #{projectId}</if>
-            <if test="menuName != null  and menuName != ''"> and menu_name like concat('%', #{menuName}, '%')</if>
+            <if test="activeProjectId != null "> and mc.project_id = #{activeProjectId}</if>
-            <if test="menuType != null  and menuType != ''"> and menu_type = #{menuType}</if>
+            <if test="menuName != null  and menuName != ''"> and mc.menu_name like concat('%', #{menuName}, '%')</if>
+            <if test="menuType != null  and menuType != ''"> and mc.menu_type = #{menuType}</if>
         </where>
+        order by mc.menu_sort
     </select>
     
     <select id="selectWxMenuConfigById" parameterType="Long" resultMap="WxMenuConfigWxMenuConfigRoleResult">

yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/WxMenuConfigRoleMapper.xml

@@ -7,6 +7,7 @@
     <resultMap type="WxMenuConfigRole" id="WxMenuConfigRoleResult">
         <result property="smcid"    column="smcid"    />
         <result property="roleId"    column="role_id"    />
+        <result property="roleName"    column="role_name"    />
         <result property="userId"    column="user_id"    />
     </resultMap>
 
@@ -23,6 +24,15 @@
         </where>
     </select>
 
+    <select id="findgRoleListBySmcIds" parameterType="WxMenuConfigRole" resultMap="WxMenuConfigRoleResult">
+        select mcr.smcid, mcr.role_id, sr.role_name, mcr.user_id from wx_menu_config_role mcr
+        left join sys_role sr on sr.role_id = mcr.role_id
+        where mcr.smcid in
+        <foreach collection="smcIds" item="smcId" open="(" separator="," close=")">
+            #{smcId}
+        </foreach>
+    </select>
+
     <select id="selectWxMenuConfigRoleBySmcid" parameterType="Long" resultMap="WxMenuConfigRoleResult">
         <include refid="selectWxMenuConfigRoleVo"/>
         where smcid = #{smcid}

yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysRoleMapper.xml

@@ -85,7 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		r.status, r.del_flag, r.create_time, r.remark
 		from sys_role r
 		left join sys_role_dept rd on rd.role_id = r.role_id
-		where r.del_flag = '0' and rd.dept_id = ${deptId}
+		where r.del_flag = '0' and (rd.dept_id = ${deptId} or FIND_IN_SET(rd.dept_id,(select ancestors from sys_dept where del_flag='0' and dept_id=${deptId})))
 		order by r.role_sort
 	</select>
 

yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/WxMenuConfigController.java

@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * 菜单配置Controller
@@ -36,6 +37,9 @@ public class WxMenuConfigController extends BaseController
     public TableDataInfo list(WxMenuConfig wxMenuConfig)
     {
         startPage();
+        if(Objects.nonNull(wxMenuConfig.getMenuType()) && Objects.equals(wxMenuConfig.getMenuType(),"all")){
+            wxMenuConfig.setMenuType(null);
+        }
         List<WxMenuConfig> list = wxMenuConfigService.selectWxMenuConfigList(wxMenuConfig);
         return getDataTable(list);
     }
@@ -85,6 +89,17 @@ public class WxMenuConfigController extends BaseController
         return toAjax(wxMenuConfigService.updateWxMenuConfig(wxMenuConfig));
     }
 
+    /**
+     * 修改菜单配置
+     */
+    @RequiresPermissions("manage:wxMenuConfig:edit")
+    @Log(title = "菜单配置", businessType = BusinessType.UPDATE)
+    @PostMapping("/editStatus")
+    public AjaxResult editStatus(@RequestBody WxMenuConfig wxMenuConfig)
+    {
+        return toAjax(wxMenuConfigService.updateWxMenuConfigStatus(wxMenuConfig));
+    }
+
     /**
      * 删除菜单配置
      */

yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IWxMenuConfigService.java

@@ -43,6 +43,14 @@ public interface IWxMenuConfigService
      */
     public int updateWxMenuConfig(WxMenuConfig wxMenuConfig);
 
+    /**
+     * 修改菜单配置
+     *
+     * @param wxMenuConfig 菜单配置
+     * @return 结果
+     */
+    public int updateWxMenuConfigStatus(WxMenuConfig wxMenuConfig);
+
     /**
      * 批量删除菜单配置
      * 

yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/WxMenuConfigServiceImpl.java

@@ -1,17 +1,22 @@
 package com.yanzhu.manage.service.impl;
 
+import com.yanzhu.common.core.enums.IsDelEnums;
 import com.yanzhu.common.core.utils.DateUtils;
 import com.yanzhu.common.core.utils.StringUtils;
+import com.yanzhu.common.security.utils.SecurityUtils;
 import com.yanzhu.manage.domain.WxMenuConfig;
 import com.yanzhu.manage.domain.WxMenuConfigRole;
 import com.yanzhu.manage.mapper.WxMenuConfigMapper;
+import com.yanzhu.manage.mapper.WxMenuConfigRoleMapper;
 import com.yanzhu.manage.service.IWxMenuConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 菜单配置Service业务层处理
@@ -25,6 +30,9 @@ public class WxMenuConfigServiceImpl implements IWxMenuConfigService
     @Autowired
     private WxMenuConfigMapper wxMenuConfigMapper;
 
+    @Autowired
+    private WxMenuConfigRoleMapper wxMenuConfigRoleMapper;
+
     /**
      * 查询菜单配置
      * 
@@ -46,7 +54,19 @@ public class WxMenuConfigServiceImpl implements IWxMenuConfigService
     @Override
     public List<WxMenuConfig> selectWxMenuConfigList(WxMenuConfig wxMenuConfig)
     {
-        return wxMenuConfigMapper.selectWxMenuConfigList(wxMenuConfig);
+        wxMenuConfig.setActiveProjectId(SecurityUtils.getLoginUser().getProjectId());
+        List<WxMenuConfig> list = wxMenuConfigMapper.selectWxMenuConfigList(wxMenuConfig);
+        if(StringUtils.isNotEmpty(list)){
+            List<Long> smcIds = list.stream().map(WxMenuConfig::getId).collect(Collectors.toList());
+            List<WxMenuConfigRole> configRoles = wxMenuConfigRoleMapper.findgRoleListBySmcIds(smcIds);
+            if(StringUtils.isNotEmpty(configRoles)){
+                for(WxMenuConfig config:list){
+                    List<WxMenuConfigRole> _configRoles = configRoles.stream().filter(obj -> obj.getSmcid()==config.getId()).collect(Collectors.toList());
+                    config.setWxMenuConfigRoleList(_configRoles);
+                }
+            }
+        }
+        return list;
     }
 
     /**
@@ -59,6 +79,7 @@ public class WxMenuConfigServiceImpl implements IWxMenuConfigService
     @Override
     public int insertWxMenuConfig(WxMenuConfig wxMenuConfig)
     {
+        wxMenuConfig.setDelFlag(IsDelEnums.NO.getCode());
         wxMenuConfig.setCreateTime(DateUtils.getNowDate());
         int rows = wxMenuConfigMapper.insertWxMenuConfig(wxMenuConfig);
         insertWxMenuConfigRole(wxMenuConfig);
@@ -80,6 +101,17 @@ public class WxMenuConfigServiceImpl implements IWxMenuConfigService
         return wxMenuConfigMapper.updateWxMenuConfig(wxMenuConfig);
     }
 
+    /**
+     * 修改菜单配置
+     *
+     * @param wxMenuConfig 菜单配置
+     * @return 结果
+     */
+    @Override
+    public int updateWxMenuConfigStatus(WxMenuConfig wxMenuConfig){
+        return wxMenuConfigMapper.updateWxMenuConfig(wxMenuConfig);
+    }
+
     /**
      * 批量删除菜单配置
      * 
@@ -122,8 +154,10 @@ public class WxMenuConfigServiceImpl implements IWxMenuConfigService
             List<WxMenuConfigRole> list = new ArrayList<WxMenuConfigRole>();
             for (WxMenuConfigRole wxMenuConfigRole : wxMenuConfigRoleList)
             {
-                wxMenuConfigRole.setSmcid(id);
+                if(wxMenuConfigRole.getRoleId()!=null){
-                list.add(wxMenuConfigRole);
+                    wxMenuConfigRole.setSmcid(id);
+                    list.add(wxMenuConfigRole);
+                }
             }
             if (list.size() > 0)
             {

yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/controller/SysRoleController.java

@@ -276,8 +276,8 @@ public class SysRoleController extends BaseController
      * @param deptId
      * @return
      */
-    @GetMapping("/deptRole/{roleId}")
+    @GetMapping("/deptRole/{deptId}")
-    public AjaxResult list(@PathVariable("roleId") Long deptId)
+    public AjaxResult list(@PathVariable("deptId") Long deptId)
     {
         List<SysRole> list = roleService.findDeptRoleListByDeptId(deptId);
         return success(list);

yanzhu-ui-app/miniprogram/pages/project_flowable/approveTask/index.wxml

@@ -1,4 +1,3 @@
-<wxs module="format" src="/utils/format.wxs"></wxs>
 <view class="header_title">
     <view class="header_title_row">
         <van-row>

yanzhu-ui-app/miniprogram/pages/project_flowable/detailTask/index.wxml

@@ -1,4 +1,3 @@
-<wxs module="format" src="/utils/format.wxs"></wxs>
 <view class="header_title">
     <view class="header_title_row">
         <van-row>

yanzhu-ui-app/miniprogram/pages/project_more/index.wxml

@@ -1,3 +1,4 @@
+<wxs module="format" src="/utils/format.wxs"></wxs>
 <view class="header_title">
   <view class="header_title_row">
     <van-row>
@@ -27,7 +28,7 @@
           <span class="tabNum_active" wx:if="{{item.menuIdenti=='FBRYSH' && fbrtDB>0}}">{{fbrtDB}}</span>
           <span class="tabNum_active" wx:if="{{item.menuIdenti=='AQYHPC' && aqyhDB>0}}">{{aqyhDB}}</span>
           <span class="tabNum_active" wx:if="{{item.menuIdenti=='ZLYHPC' && zlyhDB>0}}">{{zlyhDB}}</span>
-          <image src="{{item.menuImg}}"></image>
+          <image src="{{format.httpImg(item.menuImg)}}"></image>
           <view>{{item.menuName}}</view>
         </view>
       </van-col>

yanzhu-ui-app/miniprogram/pages/project_quality/index.wxml

@@ -1,3 +1,4 @@
+<wxs module="format" src="/utils/format.wxs"></wxs>
 <view class="header_title">
 	<view class="header_title_row">
 		<van-row>
@@ -24,7 +25,7 @@
 			<van-col span="8" wx:for="{{menuList}}" wx:key="unique">
 				<view class="gd_min" data-id="{{item.menuIdenti}}" data-url="{{item.menuUrl}}" bindtap="goMenu">
 					<span class="tabNum_active" wx:if="{{item.menuIdenti=='ZLYHPC' && zlyhDB>0}}">{{zlyhDB}}</span>
-					<image src="{{item.menuImg}}"></image>
+					<image src="{{format.httpImg(item.menuImg)}}"></image>
 					<view>{{item.menuName}}</view>
 				</view>
 			</van-col>

yanzhu-ui-app/miniprogram/pages/project_safety/index.wxml

@@ -1,3 +1,4 @@
+<wxs module="format" src="/utils/format.wxs"></wxs>
 <view class="header_title">
 	<view class="header_title_row">
 		<van-row>
@@ -24,7 +25,7 @@
 			<van-col span="8" wx:for="{{menuList}}" wx:key="unique">
 				<view class="gd_min" data-id="{{item.menuIdenti}}" data-url="{{item.menuUrl}}" bindtap="goMenu">
 					<span class="tabNum_active" wx:if="{{item.menuIdenti=='AQYHPC' && aqyhDB>0}}">{{aqyhDB}}</span>
-					<image src="{{item.menuImg}}"></image>
+					<image src="{{format.httpImg(item.menuImg)}}"></image>
 					<view>{{item.menuName}}</view>
 				</view>
 			</van-col>

yanzhu-ui-app/miniprogram/utils/format.wxs

@@ -113,6 +113,13 @@ module.exports = {
 			return false;
 		}
 	},
+	httpImg:function(str){
+		if(str.indexOf("https:")>-1){
+			return str;
+		}else{
+			return "https://xiangguan.sxyanzhu.com"+str;
+		}
+	},
 	birthDate:function(timestamp){
 		var date = getDate(parseInt(timestamp));
 		var mm = date.getMonth()+1;

yanzhu-ui-vue3/src/api/manage/wxMenuConfig.js

@@ -35,6 +35,15 @@ export function updateWxMenuConfig(data) {
   })
 }
 
+// 修改菜单状态
+export function updateWxMenuConfigStatus(data) {
+  return request({
+    url: '/manage/wxMenuConfig/editStatus',
+    method: 'post',
+    data: data
+  })
+}
+
 // 删除菜单配置
 export function delWxMenuConfig(id) {
   return request({

yanzhu-ui-vue3/src/views/manage/wxMenuConfig/index.vue

@@ -1,14 +1,6 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="项目主键" prop="projectId">
-        <el-input
-          v-model="queryParams.projectId"
-          placeholder="请输入项目主键"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="菜单名称" prop="menuName">
         <el-input
           v-model="queryParams.menuName"
@@ -43,16 +35,6 @@
           v-hasPermi="['manage:wxMenuConfig:edit']"
         >修改</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="Delete"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['manage:wxMenuConfig:remove']"
-        >删除</el-button>
-      </el-col>
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -65,20 +47,63 @@
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
+    <el-tabs
+    v-model="queryParams.menuType"
+    type="card"
+    class="demo-tabs"
+    @tab-change="getList"
+  >
+    <el-tab-pane label="全部" name="all" />
+    <el-tab-pane label="安全管理" name="aqgl" />
+    <el-tab-pane label="质量管理" name="zhgl" />
+    <el-tab-pane label="项目管理" name="gdgn" />
+  </el-tabs>
     <el-table v-loading="loading" :data="wxMenuConfigList" @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="projectName" width="150"/>
-      <el-table-column label="项目主键" align="center" prop="projectId" />
+      <el-table-column label="菜单名称" align="center" prop="menuName" width="150"/>
-      <el-table-column label="菜单名称" align="center" prop="menuName" />
+      <el-table-column label="菜单标识" align="center" prop="menuIdenti" width="88"/>
-      <el-table-column label="菜单标识" align="center" prop="menuIdenti" />
+      <el-table-column label="菜单图标" align="center" prop="menuImg" width="80">
-      <el-table-column label="菜单图标" align="center" prop="menuImg" />
+        <template #default="scope">
-      <el-table-column label="菜单地址" align="center" prop="menuUrl" />
+          <image-preview :src="scope.row.menuImg" :width="60" :height="60" />
-      <el-table-column label="菜单排序" align="center" prop="menuSort" />
+        </template>
-      <el-table-column label="菜单类型" align="center" prop="menuType" />
+      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="菜单路由" align="center" prop="menuUrl"/>
+      <el-table-column label="菜单类型" align="center" prop="menuType" width="100">
+        <template #default="scope">
+          <dict-tag :options="wx_menu_type" :value="scope.row.menuType" />
+        </template>
+      </el-table-column>
+      <el-table-column label="菜单排序" align="center" prop="menuSort" width="80"/>
+      <el-table-column label="权限角色" align="center">
+        <template #default="scope">
+          <div class="flex gap-2">
+            <el-tag
+              v-for="role in scope.row.wxMenuConfigRoleList"
+              v-show="role.roleId"
+              effect="dark"
+              :type="role.roleId?'':'info'"
+            >
+              {{ role.roleId?role.roleName:'所有角色' }}
+            </el-tag>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="是否启用" align="center" prop="delFlag" width="88">
+        <template #default="scope">
+          <el-tooltip :content="scope.row.delFlag == 0 ? '启用' : '停用'" placement="top">
+            <el-switch
+              :active-value="parseInt(0)"
+              :inactive-value="parseInt(1)"
+              v-model="scope.row.delFlag"
+              @change="setStatus($event, scope.row)"
+            />
+          </el-tooltip>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" width="100" class-name="small-padding fixed-width">
         <template #default="scope">
           <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['manage:wxMenuConfig:edit']">修改</el-button>
-          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['manage:wxMenuConfig:remove']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -92,10 +117,20 @@
     />
 
     <!-- 添加或修改菜单配置对话框 -->
-    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+    <el-dialog :title="title" v-model="open" width="680px" append-to-body>
       <el-form ref="wxMenuConfigRef" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="项目主键" prop="projectId">
+        <el-form-item label="所属项目" prop="projectId">
-          <el-input v-model="form.projectId" placeholder="请输入项目主键" />
+          <el-tag effect="plain">{{ form.projectName }}</el-tag>
+        </el-form-item>
+        <el-form-item label="菜单类型" prop="menuType">
+          <el-select v-model="form.menuType" placeholder="请选择菜单类型" style="width:100%">
+            <el-option
+              v-for="dict in wx_menu_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="菜单名称" prop="menuName">
           <el-input v-model="form.menuName" placeholder="请输入菜单名称" />
@@ -104,13 +139,10 @@
           <el-input v-model="form.menuIdenti" placeholder="请输入菜单标识" />
         </el-form-item>
         <el-form-item label="菜单图标" prop="menuImg">
-          <el-input v-model="form.menuImg" placeholder="请输入菜单图标" />
+          <image-upload v-model="form.menuImg" :limit="1"/>
         </el-form-item>
-        <el-form-item label="菜单地址" prop="menuUrl">
+        <el-form-item label="菜单路由" prop="menuUrl">
-          <el-input v-model="form.menuUrl" placeholder="请输入菜单地址" />
+          <el-input v-model="form.menuUrl" placeholder="请输入菜单路由" />
-        </el-form-item>
-        <el-form-item label="删除状态" prop="delFlag">
-          <el-input v-model="form.delFlag" placeholder="请输入删除状态" />
         </el-form-item>
         <el-form-item label="菜单排序" prop="menuSort">
           <el-input v-model="form.menuSort" placeholder="请输入菜单排序" />
@@ -127,14 +159,16 @@
         <el-table :data="wxMenuConfigRoleList" :row-class-name="rowWxMenuConfigRoleIndex" @selection-change="handleWxMenuConfigRoleSelectionChange" ref="wxMenuConfigRole">
           <el-table-column type="selection" width="50" align="center" />
           <el-table-column label="序号" align="center" prop="index" width="50"/>
-          <el-table-column label="角色主键" prop="roleId" width="150">
+          <el-table-column label="权限角色" prop="roleId">
             <template #default="scope">
-              <el-input v-model="scope.row.roleId" placeholder="请输入角色主键" />
+              <el-select v-model="scope.row.roleId" placeholder="请选择权限角色" style="width:100%">
-            </template>
+                <el-option
-          </el-table-column>
+                  v-for="role in roleOptions"
-          <el-table-column label="用户主键" prop="userId" width="150">
+                  :key="role.roleId"
-            <template #default="scope">
+                  :label="role.roleName"
-              <el-input v-model="scope.row.userId" placeholder="请输入用户主键" />
+                  :value="role.roleId"
+                ></el-option>
+              </el-select>
             </template>
           </el-table-column>
         </el-table>
@@ -150,10 +184,14 @@
 </template>
 
 <script setup name="WxMenuConfig">
-import { listWxMenuConfig, getWxMenuConfig, delWxMenuConfig, addWxMenuConfig, updateWxMenuConfig } from "@/api/manage/wxMenuConfig";
+import { listWxMenuConfig, getWxMenuConfig, delWxMenuConfig, addWxMenuConfig, updateWxMenuConfig, updateWxMenuConfigStatus } from "@/api/manage/wxMenuConfig";
+import { getDeptRole } from "@/api/system/role";
+import useUserStore from '@/store/modules/user'
 
 const { proxy } = getCurrentInstance();
+const { wx_menu_type } = proxy.useDict('wx_menu_type');
 
+const userStore = useUserStore()
 const wxMenuConfigList = ref([]);
 const wxMenuConfigRoleList = ref([]);
 const open = ref(false);
@@ -165,17 +203,23 @@ const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
 const title = ref("");
+const roleOptions = ref([]);
 
 const data = reactive({
   form: {},
   queryParams: {
     pageNum: 1,
     pageSize: 10,
-    projectId: null,
     menuName: null,
-    menuType: null
+    menuType: 'all'
   },
   rules: {
+    menuType: [{ required: true, trigger: 'change', message: "请选择菜单类型" }],
+    menuName: [{ required: true, trigger: 'blur', message: "请输入菜单名称" }],
+    menuIdenti: [{ required: true, trigger: 'blur', message: "请输入菜单标识" }],
+    menuImg: [{ required: true, trigger: 'change', message: "请上传菜单图标" }],
+    menuUrl: [{ required: true, trigger: 'blur', message: "请输入菜单路由" }],
+    menuSort: [{ required: true, trigger: 'blur', message: "请输入菜单排序" }]
   }
 });
 
@@ -236,7 +280,14 @@ function handleSelectionChange(selection) {
 
 /** 新增按钮操作 */
 function handleAdd() {
+  if(!userStore.currentPrjId){
+    proxy.$modal.msgWarning("请切换到项目数据！！！");
+    return false;
+  }
   reset();
+  initProRoles(userStore.currentPrjId);
+  form.value.projectId = userStore.currentPrjId;
+  form.value.projectName = userStore.currentProName;
   open.value = true;
   title.value = "添加菜单配置";
 }
@@ -250,6 +301,7 @@ function handleUpdate(row) {
     wxMenuConfigRoleList.value = response.data.wxMenuConfigRoleList;
     open.value = true;
     title.value = "修改菜单配置";
+    initProRoles(form.value.projectId);
   });
 }
 
@@ -275,6 +327,28 @@ function submitForm() {
   });
 }
 
+/** 启用状态滑块控制 */
+function setStatus(val, row) {
+  proxy.$modal
+    .confirm(`是否确认${val == 0 ? "启用" : "停用"}当前数据项？`)
+    .then(function () {
+      let param = {'id': row.id, 'delFlag': val};
+      return updateWxMenuConfigStatus(param);
+    })
+    .then(() => {
+      getList();
+      proxy.$modal.msgSuccess("修改成功");
+    })
+    .catch(() => {
+      // 取消时恢复原始开关状态
+      if (val == 0) {
+        row.delFlag = 1;
+      } else {
+        row.delFlag = 0;
+      }
+    });
+}
+
 /** 删除按钮操作 */
 function handleDelete(row) {
   const _ids = row.id || ids.value;
@@ -324,5 +398,19 @@ function handleExport() {
   }, `wxMenuConfig_${new Date().getTime()}.xlsx`)
 }
 
+/** 初始化角色信息 */
+function initProRoles(proId){
+  getDeptRole(proId).then(res =>{
+    roleOptions.value = res.data;
+  })
+}
+
 getList();
 </script>
+<style lang="scss" scope>
+.gap-2{
+  .el-tag--default{
+    margin:2px 3px;
+  }
+}
+</style>