From 335d699956d8d2791b96a0469efb7711dab8107f Mon Sep 17 00:00:00 2001 From: ndbs Date: Mon, 15 Aug 2022 11:48:52 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=B8=80=E5=8D=A1=E9=80=9A=E6=B5=81?= =?UTF-8?q?=E6=B0=B4-=E8=B0=83=E6=95=B4=E6=89=8B=E6=9C=BA=E7=AB=AF?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MealCardRunTab/MealCardRunTabService.cs | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/MealCardRunTab/MealCardRunTabService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/MealCardRunTab/MealCardRunTabService.cs index 04187986f..80808978d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/MealCardRunTab/MealCardRunTabService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/MealCardRunTab/MealCardRunTabService.cs @@ -182,18 +182,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration dp.Add("identiName", queryParam["identiName"].ToString(), DbType.String); strSql.Append(" AND t.identiName = @identiName "); } - if (!queryParam["IsStuOrTeach"].IsEmpty()) - { - var IsStuOrTeach = queryParam["IsStuOrTeach"].ToString(); - if (IsStuOrTeach == "0") - { - strSql.Append(" AND t.identiName = '教师' "); - } - else if (IsStuOrTeach == "1") - { - strSql.Append(" AND t.identiName = '学生' "); - } - } if (!queryParam["flowtype"].IsEmpty()) { dp.Add("flowtype", queryParam["flowtype"].ToString(), DbType.String); From 1c0a67ed46ae08a83e56631242091af256aefeb2 Mon Sep 17 00:00:00 2001 From: ndbs Date: Mon, 15 Aug 2022 12:11:32 +0800 Subject: [PATCH 2/6] =?UTF-8?q?app2.0-=E4=B8=80=E5=8D=A1=E9=80=9A=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MealCardRunTab/MealCardRunTabService.cs | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/MealCardRunTab/MealCardRunTabService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/MealCardRunTab/MealCardRunTabService.cs index 80808978d..407db1d50 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/MealCardRunTab/MealCardRunTabService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/MealCardRunTab/MealCardRunTabService.cs @@ -164,8 +164,17 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } if (!queryParam["accountName"].IsEmpty()) { - dp.Add("accountName", "%" + queryParam["accountName"].ToString() + "%", DbType.String); - strSql.Append(" AND t.accountName Like @accountName "); + var IsPhone = queryParam["accountName"].ToString(); + if (IsPhone == "0") + { + dp.Add("accountName", queryParam["accountName"].ToString(), DbType.String); + strSql.Append(" AND t.accountName = @accountName "); + } + else + { + dp.Add("accountName", "%" + queryParam["accountName"].ToString() + "%", DbType.String); + strSql.Append(" AND t.accountName Like @accountName "); + } } if (!queryParam["depName"].IsEmpty()) { From 46485b6d1f37320d8b7b6223dbf309dcc6de73d0 Mon Sep 17 00:00:00 2001 From: ndbs Date: Mon, 15 Aug 2022 14:05:14 +0800 Subject: [PATCH 3/6] --- .../MealCardRunTab/MealCardRunTabService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/MealCardRunTab/MealCardRunTabService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/MealCardRunTab/MealCardRunTabService.cs index 407db1d50..e9c8d7aa8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/MealCardRunTab/MealCardRunTabService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/MealCardRunTab/MealCardRunTabService.cs @@ -164,7 +164,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } if (!queryParam["accountName"].IsEmpty()) { - var IsPhone = queryParam["accountName"].ToString(); + var IsPhone = queryParam["IsPhone"].ToString(); if (IsPhone == "0") { dp.Add("accountName", queryParam["accountName"].ToString(), DbType.String); From 62fd2507c931560c88d949b7547a36a534e2260f Mon Sep 17 00:00:00 2001 From: ndbs Date: Mon, 15 Aug 2022 14:21:54 +0800 Subject: [PATCH 4/6] --- Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js index 007172edc..9209ac4de 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js @@ -22,7 +22,7 @@ export default { // ], "apiHost": [ // "http://localhost:31173/" - "http://192.168.10.58:31173/" + "http://192.168.10.58:8112/" ], // 开发环境下自动填充登录账号密码，与接口地址一一对应，只在开发环境下显示 "devAccount": [ From 941830f5576f44bfcecfb8c0f94931c949dc9638 Mon Sep 17 00:00:00 2001 From: ndbs Date: Mon, 15 Aug 2022 18:28:15 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E9=80=9A=E8=AE=AF=E5=BD=95+=E6=89=8B?= =?UTF-8?q?=E6=9C=BA=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/learun-app/organize-tree.vue | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/organize-tree.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/organize-tree.vue index 5ca7caacc..abd7f8e3a 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/organize-tree.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/organize-tree.vue @@ -22,6 +22,7 @@ {{ name }} + @@ -196,6 +197,14 @@ export default { const rootItem = this.GET_GLOBAL(this.root.type)[this.root.id] return rootItem ? rootItem.name : '(根节点)' }, + mobile() { + if (this.root.mobile) { + return this.root.mobile + } + + const rootItem = this.GET_GLOBAL(this.root.type)[this.root.id] + return rootItem ? rootItem.mobile: '(根节点)' + }, // 头像圆形/方形显示参数 roundAvatar() { From 3ff5fcfaa9a684b98b3dd7bde8b46a6474fc645f Mon Sep 17 00:00:00 2001 From: ndbs Date: Tue, 16 Aug 2022 14:51:22 +0800 Subject: [PATCH 6/6] --- .../LearunApp-2.2.0/components/learun-app/organize-tree.vue | 4 ++-- Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/organize-tree.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/organize-tree.vue index abd7f8e3a..a507b580b 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/organize-tree.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/organize-tree.vue @@ -21,8 +21,8 @@ > - {{ name }} - + + {{ name + (mobile ? '(' +mobile + ')' : "") }} diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js index 9209ac4de..9ae07fe71 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js @@ -22,7 +22,7 @@ export default { // ], "apiHost": [ // "http://localhost:31173/" - "http://192.168.10.58:8112/" + "http://192.168.10.58:8012/" ], // 开发环境下自动填充登录账号密码，与接口地址一一对应，只在开发环境下显示 "devAccount": [