From d3ac50881fa46bf3b0d2369398969bf9c1114cf5 Mon Sep 17 00:00:00 2001 From: kanfengyao Date: Thu, 25 Jul 2024 17:39:41 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=A4=A7=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/route.js | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/src/router/route.js b/src/router/route.js index 24daa85..022bf98 100644 --- a/src/router/route.js +++ b/src/router/route.js @@ -12,7 +12,6 @@ * } */ - /** * 定义动态路由 * @description 未开启 isRequestRoutes 为 true 时使用（前端控制路由），开启时第一个顶级 children 的路由将被替换成接口请求回来的路由数据 @@ -58,7 +57,7 @@ export const dynamicRoutes = [ isAffix: false, isIframe: false, roles: ['admin', 'chief'], - icon: 'ele-WarnTriangleFilled', + icon: 'ele-Bell', zh: '响应管理', }, children: [ @@ -67,14 +66,14 @@ export const dynamicRoutes = [ name: 'pending', component: () => import('/@/views/responseManagement/pending/index.vue'), meta: { - title: 'pending', + title: 'Pending', isLink: '', isHide: false, isKeepAlive: true, isAffix: false, isIframe: false, roles: ['admin'], - icon: 'ele-WarnTriangleFilled', + icon: 'ele-List', zh: 'pending', }, }, @@ -83,14 +82,14 @@ export const dynamicRoutes = [ name: 'responding', component: () => import('/@/views/responseManagement/responding/index.vue'), meta: { - title: 'responding', + title: 'Responding', isLink: '', isHide: false, isKeepAlive: true, isAffix: false, isIframe: false, roles: ['admin'], - icon: 'ele-WarnTriangleFilled', + icon: 'ele-List', zh: 'responding', }, }, @@ -99,14 +98,14 @@ export const dynamicRoutes = [ name: 'responded', component: () => import('/@/views/responseManagement/responded/index.vue'), meta: { - title: 'responded', + title: 'Responded', isLink: '', isHide: false, isKeepAlive: true, isAffix: false, isIframe: false, roles: ['admin'], - icon: 'ele-WarnTriangleFilled', + icon: 'ele-List', zh: 'responded', }, }, @@ -115,14 +114,14 @@ export const dynamicRoutes = [ name: 'rejected', component: () => import('/@/views/responseManagement/rejected/index.vue'), meta: { - title: 'rejected', + title: 'Rejected', isLink: '', isHide: false, isKeepAlive: true, isAffix: false, isIframe: false, roles: ['admin'], - icon: 'ele-WarnTriangleFilled', + icon: 'ele-List', zh: 'rejected', }, }, @@ -197,7 +196,7 @@ export const dynamicRoutes = [ name: 'role', component: () => import('/@/views/systemManagement/role/index.vue'), meta: { - title: 'role', + title: 'Role', isLink: '', isHide: false, isKeepAlive: true, @@ -212,7 +211,7 @@ export const dynamicRoutes = [ name: 'menu', component: () => import('/@/views/systemManagement/menu/index.vue'), meta: { - title: 'menu', + title: 'Menu', isLink: '', isHide: false, isKeepAlive: true, From b7e83fbf89e4933ff1cf2ee18638ab0dd2c786f6 Mon Sep 17 00:00:00 2001 From: nihaotian Date: Fri, 26 Jul 2024 08:25:41 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../responseManagement/responding/component/selectUserNew.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/responseManagement/responding/component/selectUserNew.vue b/src/views/responseManagement/responding/component/selectUserNew.vue index 778c246..ffa0cd7 100644 --- a/src/views/responseManagement/responding/component/selectUserNew.vue +++ b/src/views/responseManagement/responding/component/selectUserNew.vue @@ -349,6 +349,7 @@ const save = async () => { adminId: state.selectData[i].userId, adminName: state.selectData[i].userName, allocation: 'YES', + applyForCount: 0, }; let res = await submitNew(params).then((da) => { ElMessage.success('B2 success'); From a45f0001672283d57c79e20abfc547a9007854c5 Mon Sep 17 00:00:00 2001 From: nihaotian Date: Fri, 26 Jul 2024 15:40:58 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=88=86=E9=85=8D=E6=88=90=E4=B8=BA?= =?UTF-8?q?=E7=81=BE=E5=AE=B3=E7=AE=A1=E7=90=86=E5=91=98=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../responseManagement/responding/component/selectUserNew.vue | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/views/responseManagement/responding/component/selectUserNew.vue b/src/views/responseManagement/responding/component/selectUserNew.vue index ffa0cd7..77e0df1 100644 --- a/src/views/responseManagement/responding/component/selectUserNew.vue +++ b/src/views/responseManagement/responding/component/selectUserNew.vue @@ -202,11 +202,9 @@ const sendToLeft = (index,row) => { }; const sendToRight = (index,row,type) => { - console.log(state.selectType) if (type==0){ let userStatus =row.userStatus==0?'1793193529859244033':'1123598816738675203' - console.log(userStatus) - if (state.tableDataNew.data.length>0){ + if (state.selectData.length>0){ if (state.selectData.length==1){ if (state.selectData[0].roleId==userStatus){ state.tableDataNew.data.splice(index, 1)