yaowang
/
vordm-admin
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://39.103.203.80:8102/yaowang/vordm-admin

This commit is contained in:
管李杰 2024-08-08 16:51:50 +08:00
parent a599205086 a45f000167
commit 8efd913d7a
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/router/route.js
View File

@ -12,7 +12,6 @@
* } * }
*/ */
/** /**
* 定义动态路由 * 定义动态路由
* @description 未开启 isRequestRoutes 为 true 时使用（前端控制路由），开启时第一个顶级 children 的路由将被替换成接口请求回来的路由数据 * @description 未开启 isRequestRoutes 为 true 时使用（前端控制路由），开启时第一个顶级 children 的路由将被替换成接口请求回来的路由数据
@ -58,7 +57,7 @@ export const dynamicRoutes = [
isAffix: false, isAffix: false,
isIframe: false, isIframe: false,
roles: ['admin', 'chief'], roles: ['admin', 'chief'],
icon: 'ele-WarnTriangleFilled', icon: 'ele-Bell',
zh: '响应管理', zh: '响应管理',
}, },
children: [ children: [
@ -67,14 +66,14 @@ export const dynamicRoutes = [
name: 'pending', name: 'pending',
component: () => import('/@/views/responseManagement/pending/index.vue'), component: () => import('/@/views/responseManagement/pending/index.vue'),
meta: { meta: {
title: 'pending', title: 'Pending',
isLink: '', isLink: '',
isHide: false, isHide: false,
isKeepAlive: true, isKeepAlive: true,
isAffix: false, isAffix: false,
isIframe: false, isIframe: false,
roles: ['admin'], roles: ['admin'],
icon: 'ele-WarnTriangleFilled', icon: 'ele-List',
zh: 'pending', zh: 'pending',
}, },
}, },
@ -83,14 +82,14 @@ export const dynamicRoutes = [
name: 'responding', name: 'responding',
component: () => import('/@/views/responseManagement/responding/index.vue'), component: () => import('/@/views/responseManagement/responding/index.vue'),
meta: { meta: {
title: 'responding', title: 'Responding',
isLink: '', isLink: '',
isHide: false, isHide: false,
isKeepAlive: true, isKeepAlive: true,
isAffix: false, isAffix: false,
isIframe: false, isIframe: false,
roles: ['admin'], roles: ['admin'],
icon: 'ele-WarnTriangleFilled', icon: 'ele-List',
zh: 'responding', zh: 'responding',
}, },
}, },
@ -99,14 +98,14 @@ export const dynamicRoutes = [
name: 'responded', name: 'responded',
component: () => import('/@/views/responseManagement/responded/index.vue'), component: () => import('/@/views/responseManagement/responded/index.vue'),
meta: { meta: {
title: 'responded', title: 'Responded',
isLink: '', isLink: '',
isHide: false, isHide: false,
isKeepAlive: true, isKeepAlive: true,
isAffix: false, isAffix: false,
isIframe: false, isIframe: false,
roles: ['admin'], roles: ['admin'],
icon: 'ele-WarnTriangleFilled', icon: 'ele-List',
zh: 'responded', zh: 'responded',
}, },
}, },
@ -115,14 +114,14 @@ export const dynamicRoutes = [
name: 'rejected', name: 'rejected',
component: () => import('/@/views/responseManagement/rejected/index.vue'), component: () => import('/@/views/responseManagement/rejected/index.vue'),
meta: { meta: {
title: 'rejected', title: 'Rejected',
isLink: '', isLink: '',
isHide: false, isHide: false,
isKeepAlive: true, isKeepAlive: true,
isAffix: false, isAffix: false,
isIframe: false, isIframe: false,
roles: ['admin'], roles: ['admin'],
icon: 'ele-WarnTriangleFilled', icon: 'ele-List',
zh: 'rejected', zh: 'rejected',
}, },
}, },
@ -197,7 +196,7 @@ export const dynamicRoutes = [
name: 'role', name: 'role',
component: () => import('/@/views/systemManagement/role/index.vue'), component: () => import('/@/views/systemManagement/role/index.vue'),
meta: { meta: {
title: 'role', title: 'Role',
isLink: '', isLink: '',
isHide: false, isHide: false,
isKeepAlive: true, isKeepAlive: true,
@ -212,7 +211,7 @@ export const dynamicRoutes = [
name: 'menu', name: 'menu',
component: () => import('/@/views/systemManagement/menu/index.vue'), component: () => import('/@/views/systemManagement/menu/index.vue'),
meta: { meta: {
title: 'menu', title: 'Menu',
isLink: '', isLink: '',
isHide: false, isHide: false,
isKeepAlive: true, isKeepAlive: true,

5
src/views/responseManagement/responding/component/selectUserNew.vue
View File

@ -202,11 +202,9 @@ const sendToLeft = (index,row) => {
}; };
const sendToRight = (index,row,type) => { const sendToRight = (index,row,type) => {
console.log(state.selectType)
if (type==0){ if (type==0){
let userStatus =row.userStatus==0?'1793193529859244033':'1123598816738675203' let userStatus =row.userStatus==0?'1793193529859244033':'1123598816738675203'
console.log(userStatus) if (state.selectData.length>0){
if (state.tableDataNew.data.length>0){
if (state.selectData.length==1){ if (state.selectData.length==1){
if (state.selectData[0].roleId==userStatus){ if (state.selectData[0].roleId==userStatus){
state.tableDataNew.data.splice(index, 1) state.tableDataNew.data.splice(index, 1)
@ -349,6 +347,7 @@ const save = async () => {
adminId: state.selectData[i].userId, adminId: state.selectData[i].userId,
adminName: state.selectData[i].userName, adminName: state.selectData[i].userName,
allocation: 'YES', allocation: 'YES',
applyForCount: 0,
}; };
let res = await submitNew(params).then((da) => { let res = await submitNew(params).then((da) => {
ElMessage.success('B2 success'); ElMessage.success('B2 success');