From 41d7f42db67d688144800c5d16cb0c71dc23c186 Mon Sep 17 00:00:00 2001 From: ndbs Date: Fri, 23 Sep 2022 11:22:14 +0800 Subject: [PATCH 1/3] =?UTF-8?q?app2.0=E4=B8=8A=E4=BC=A0=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E4=B8=8A=E4=BC=A0=E9=99=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LearunApp-2.2.0/components/learun-app/upload-file.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/upload-file.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/upload-file.vue index bdeb390ce..2dd1df797 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/upload-file.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/upload-file.vue @@ -111,7 +111,7 @@ export default { // } // }) - uni.chooseImage({ + uni.chooseFile({ count: Number(this.number), sizeType: ['original', 'compressed'], sourceType: ['album', 'camera'], From 92a43507a8b94818af000df71508154cf9940d9c Mon Sep 17 00:00:00 2001 From: ndbs Date: Fri, 23 Sep 2022 12:16:28 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=AD=A6=E7=B1=8D=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E5=8A=A0=E5=85=A5=E5=B9=B4=E7=BA=A7=E8=81=94=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/StuInfoBasic/Index.cshtml | 8 ++++---- .../Views/StuInfoBasic/Index.js | 15 ++++++++++----- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.cshtml index ee33a818c..c8f6ed840 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.cshtml @@ -19,13 +19,13 @@
-
班级
-
-
-
年级
+
+
班级
+
+
姓名
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js index e9422510d..c5fa514c3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js @@ -41,7 +41,7 @@ var bootstrap = function ($, learun) { param: { strWhere: "1=1 AND CheckMark=1" }, select: function (item) { var Grades = $("#Grade").lrselectGet(); - if (Grades) { + if (Grades != null && Grades != "" && Grades != "undefined") { if (item) { $('#ClassNo').lrselectRefresh({ allowSearch: true, @@ -78,12 +78,14 @@ var bootstrap = function ($, learun) { text: "text", select: function (item) { var MajorNos = $("#MajorNo").lrselectGet(); - if (MajorNos) { + if (MajorNos != null && MajorNos != "" && MajorNos != "undefined") { if (item) { $('#ClassNo').lrselectRefresh({ allowSearch: true, url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', - param: { strWhere: "majorno='" + item.MajorNos + "' AND CheckMark=1 AND Grade='" + item + "' order by classno desc" } + param: { + strWhere: "majorno='" + MajorNos + "' AND CheckMark=1 AND Grade='" + item.text + "' order by classno desc" + } }); } else { $('#ClassNo').lrselectRefresh({ @@ -97,7 +99,9 @@ var bootstrap = function ($, learun) { $('#ClassNo').lrselectRefresh({ allowSearch: true, url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', - param: { strWhere: " CheckMark=1 AND Grade='" + Grades + "' order by classno desc" } + param: { + strWhere: "CheckMark=1 AND Grade='" + item.text + "' order by classno desc" + } }); } else { $('#ClassNo').lrselectRefresh({ @@ -106,7 +110,8 @@ var bootstrap = function ($, learun) { param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" } }); } - } + } + } }); $('#ClassNo').lrselect({ From c3f6f62cd644dc07512015c214e6c841e143070d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=99=93=E7=90=AA?= Date: Fri, 23 Sep 2022 12:29:57 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E5=A4=9A=E9=80=89=E7=BB=84=E4=BB=B6=20=E5=AE=9E=E7=8E=B0?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E7=9A=84=E5=A4=9A=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/learun-app/organize-picker.vue | 2 +- Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js | 4 ++-- .../pages/PersonnelManagement/MeetingManagement/list.vue | 4 ++-- .../PersonnelManagement/MeetingManagement/single.vue | 5 ++--- .../pages/common/select-organize-multiple.vue | 8 ++++---- 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/organize-picker.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/organize-picker.vue index 586450ed4..8c7f9fa70 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/organize-picker.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/organize-picker.vue @@ -67,7 +67,7 @@ export default { let values = this.value.split(",") if(values.length>1){ - const orgItems = values.map(t=>list[t].name).toString() + const orgItems = values.map(t=>list[t]?list[t].name:'').toString() return orgItems } 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 f3f6ba6fe..600ac69e3 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js @@ -21,9 +21,9 @@ export default { // "http://192.168.2.98:8088/" // ], "apiHost": [ - "http://cyzjzx.gnway.cc:30626/"//测试地址 + // "http://cyzjzx.gnway.cc:30626/"//测试地址 // "http://cyzjzx.gnway.cc:29615/"//正式地址 - // "http://192.168.10.31:8088/" + "http://192.168.10.58:8012/" ], "webHost":"http://cyzjzx.gnway.cc:29618/",//测试地址 //"webHost":"http://wxd3f.cyzjzx.com/",//正式地址 diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingManagement/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingManagement/list.vue index fcf2f7932..b012a98b5 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingManagement/list.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingManagement/list.vue @@ -106,13 +106,13 @@ title="会议地点" placeholder="按会议地点查询" /> - + /> --> diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingManagement/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingManagement/single.vue index 67336586b..1b6bfc745 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingManagement/single.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingManagement/single.vue @@ -51,7 +51,7 @@ :readonly="!edit" type="user" title="参会人员" - multiple + :multiple="true" /> --> - 已选择人员：{{names||'暂无'}} + 已选择：{{names||'暂无'}} @@ -64,8 +64,8 @@ export default { let arr = this.ids.split(",") let items = [] for (let s of arr) { - if(this.GET_GLOBAL("user")[s]){ - items.push({...this.GET_GLOBAL("user")[s],id:s}) + if(this.GET_GLOBAL(type)[s]){ + items.push({...this.GET_GLOBAL(type)[s],id:s}) } } this.items = items @@ -82,7 +82,7 @@ export default { this.type = type || 'user' const selectType = { user: '职员', department: '部门', company: '公司' }[type] - this.SET_TITLE(`请选择一个${selectType}`) + this.SET_TITLE(`请选择${selectType}`) }, findItem(arr,item){