From 5eb341b08aa3bbe2873e88c2ee04cd449e615ba2 Mon Sep 17 00:00:00 2001 From: ndbs Date: Wed, 31 Aug 2022 21:17:04 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E6=88=91=E7=9A=84=E4=BC=9A=E8=AE=AE?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=9B=9E=E6=98=BE=E4=BC=9A=E8=AE=AE=E5=AE=A4?= =?UTF-8?q?=20=E6=89=8B=E6=9C=BA=E7=AB=AF=E6=8B=8D=E7=85=A7=20=E9=95=BF?= =?UTF-8?q?=E9=98=B3=E6=AD=A3=E5=BC=8F=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MeetingManagementService.cs | 7 +++- .../components/learun-app/upload-file.vue | 40 +++++++++++++------ .../LearunApp-2.2.0/config.js | 7 ++-- 3 files changed, 37 insertions(+), 17 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingManagement/MeetingManagementService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingManagement/MeetingManagementService.cs index 2ae1eaad2..da8f02177 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingManagement/MeetingManagementService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingManagement/MeetingManagementService.cs @@ -135,7 +135,12 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement { try { - return this.BaseRepository("CollegeMIS").FindEntity(keyValue); + var data = this.BaseRepository("CollegeMIS").FindEntity(keyValue); + if (data!=null) + { + data.ConferenceRoomName = this.BaseRepository("CollegeMIS").FindEntity(data.MeetingPlace).Name; + } + return data; } catch (Exception ex) { 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 82b9b3148..348d4decc 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 @@ -89,19 +89,33 @@ export default { // #endif // #ifndef MP-DINGTALK - uni.chooseFile({ - count: Number(this.number), - sizeType: ['original', 'compressed'], - sourceType: ['album', 'camera'], - success: ({ tempFilePaths }) => { - const newList = JSON.parse(JSON.stringify(this.value || [])).concat( - tempFilePaths//.map(t => ({ path: t, type: this.getFileExt(t) })) - ) - this.$emit('input', newList) - this.$emit('change', newList) - this.$emit('add') - } - }) + // uni.chooseFile({ + // count: Number(this.number), + // sizeType: ['original', 'compressed'], + // sourceType: ['album', 'camera'], + // success: ({ tempFilePaths }) => { + // const newList = JSON.parse(JSON.stringify(this.value || [])).concat( + // tempFilePaths//.map(t => ({ path: t, type: this.getFileExt(t) })) + // ) + // this.$emit('input', newList) + // this.$emit('change', newList) + // this.$emit('add') + // } + // }) + + uni.chooseImage({ + count: Number(this.number), + sizeType: ['original', 'compressed'], + sourceType: ['album', 'camera'], + success: ({ tempFilePaths }) => { + const newList = JSON.parse(JSON.stringify(this.value || [])).concat( + tempFilePaths//.map(t => ({ path: t, type: this.getFileExt(t) })) + ) + this.$emit('input', newList) + this.$emit('change', newList) + this.$emit('add') + } + }) // #endif }, 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 01eebb620..7612e8b03 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js @@ -21,10 +21,11 @@ export default { // "http://192.168.2.98:8088/" // ], "apiHost": [ - // "http://localhost:31173/" - "http://cyzjzx.gnway.cc:30626/" + "http://cyzjzx.gnway.cc:29615/" + // "http://cyzjzx.gnway.cc:30626/" ], - "webHost":"http://cyzjzx.gnway.cc:29618/", + // "webHost":"http://cyzjzx.gnway.cc:29618/", + "webHost":"http://wxd3f.cyzjzx.com/", // 开发环境下自动填充登录账号密码，与接口地址一一对应，只在开发环境下显示 "devAccount": [ // 20201130230 21364200000400266 老师 420528196310072253 学生 420528200606205026 420528200507261428 From 51604c7c311fd079299b9810c3162a850d1d9f58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=99=93=E7=90=AA?= Date: Wed, 31 Aug 2022 22:55:30 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E7=A6=85=E9=81=93bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SYS_ReceiveMessage/list.vue | 7 +++++- .../Sys_ReceiveFile/list.vue | 16 ++++++------- .../PersonnelManagement/MeetingMy/list.vue | 24 +++++++++++-------- .../PersonnelManagement/MeetingMy/single.vue | 15 ++++++++---- 4 files changed, 39 insertions(+), 23 deletions(-) diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/SYS_ReceiveMessage/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/SYS_ReceiveMessage/list.vue index 9149ade63..27db9141b 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/SYS_ReceiveMessage/list.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/SYS_ReceiveMessage/list.vue @@ -146,6 +146,11 @@ export default { onUnload() { this.OFF('EducationalAdministrationSYS_ReceiveMessage-list-change') }, + onShow() { + if(this.list.length){ + this.refreshList(false) + } + }, methods: { // 页面初始化 @@ -174,7 +179,7 @@ export default { { // 这里 sidx 表示排序字段，sord 表示排序方式(DESC=降序，ASC=升序) // 代码生成器生成时默认按照主键排序，您可以修改成按创建时间的字段降序 - pagination: { rows: 10, page: this.page, sidx: 'SENDTIME', sord: 'DESC' }, + pagination: { rows: 10, page: this.page, sidx: 'READFLAG asc,SENDTIME desc', sord: 'DESC' }, queryJson: JSON.stringify(this.searchData) }, '加载数据时出错' diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/Sys_ReceiveFile/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/Sys_ReceiveFile/list.vue index 152bd586d..d7819ed18 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/Sys_ReceiveFile/list.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/Sys_ReceiveFile/list.vue @@ -121,7 +121,7 @@ export default { scheme: { Sender: { type: 'text' }, Title: { type: 'text' }, - SendTime: { type: 'datetime', dateformat: '0' }, + SendTime: { type: 'datetime', dateformat: '1' }, SendType: { type: 'select', itemCode: 'FileSendType', dataSource: '0' }, ReadFlag: { type: 'select', dataSource: '0' }, ReadTime: { type: 'datetime', dateformat: '1' }, @@ -165,7 +165,7 @@ export default { }, onShow() { if(this.list.length){ - this.refreshList() + this.refreshList(false) } }, @@ -187,7 +187,7 @@ export default { }, // 拉取列表 - async fetchList() { + async fetchList(isConcat=true) { if (this.page > this.total) { return } this.searchData.ReceiverId=this.GET_GLOBAL('loginUser').userId; const result = await this.HTTP_GET( @@ -195,7 +195,7 @@ export default { { // 这里 sidx 表示排序字段，sord 表示排序方式(DESC=降序，ASC=升序) // 代码生成器生成时默认按照主键排序，您可以修改成按创建时间的字段降序 - pagination: { rows: 10, page: this.page, sidx: 'SendTime desc,SendStatus asc', sord: 'DESC' }, + pagination: { rows: 10, page: this.page, sidx: 'SendStatus asc,SendTime desc', sord: 'DESC' }, queryJson: JSON.stringify(this.searchData) }, '加载数据时出错' @@ -205,19 +205,19 @@ export default { this.total = result.total this.page = result.page + 1 - this.list = this.list.concat(result.rows) + this.list = isConcat?this.list.concat(result.rows):result.rows this.tips = `已加载 ${Math.min(result.page, result.total)} / ${result.total} 页，共 ${result.records} 项` this.loadState = result.page >= result.total ? '已加载所有项目' : '向下翻以加载更多' }, // 刷新清空列表 - async refreshList() { + async refreshList(isConcat=true) { this.page = 1 this.total = 2 this.list = [] - await this.fetchList() + await this.fetchList(isConcat) }, // 列表下拉 @@ -242,7 +242,7 @@ export default { Object.assign(result, mapValues(queryObj, t => (Array.isArray(t) ? t.join(',') : t))) this.searchData = result - await this.refreshList() + await this.refreshList(false) }, // 点击「清空查询条件」按钮 diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingMy/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingMy/list.vue index 062f06633..b302b9974 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingMy/list.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingMy/list.vue @@ -26,10 +26,14 @@ {{ displayListItem(item, "MeetingTitle") }} - + + + 会议地点： + {{ displayListItem(item, "ConferenceRoomName") }} + 开始时间： @@ -159,7 +163,8 @@ export default { // 数据项的数据类型、结构 scheme: { MeetingTitle: { type: "text" }, - MeetingPlace: { type: "select", dataSource: "0" }, + // MeetingPlace: { type: "select", dataSource: "0" }, + ConferenceRoomName: { type: "text"}, BeginTime: { type: "datetime", dateformat: "1" }, EndTime: { type: "datetime", dateformat: "1" }, RecordPerson: { type: "organize", dataType: "user" }, @@ -180,7 +185,7 @@ export default { // 数据源 dataSource: { - MeetingPlace: [], + // MeetingPlace: [], }, // 页面相关参数 @@ -220,7 +225,7 @@ export default { }, // 拉取列表 - async fetchList() { + async fetchList(isConcat=true) { if (this.page > this.total) { return; } @@ -248,7 +253,7 @@ export default { this.total = result.total; this.page = result.page + 1; - this.list = this.list.concat(result.rows); + this.list = isConcat?this.list.concat(result.rows):result.rows; this.tips = `已加载 ${Math.min(result.page, result.total)} / ${ result.total @@ -258,12 +263,12 @@ export default { }, // 刷新清空列表 - async refreshList() { + async refreshList(isConcat=true) { this.page = 1; this.total = 2; this.list = []; - await this.fetchList(); + await this.fetchList(isConcat); }, // 列表下拉 @@ -287,7 +292,7 @@ export default { ); this.searchData = result; - await this.refreshList(); + await this.refreshList(false); }, // 点击「清空查询条件」按钮 @@ -311,7 +316,6 @@ export default { this.NAV_TO(`./single?type=edit&id=${id}`); return; case "join": - console.log(123); this.NAV_TO(`/pages/PersonnelManagement/MeetingMinutes/list?meetId=${id}`); return; diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingMy/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingMy/single.vue index cc7dd2c2a..469240bcd 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingMy/single.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingMy/single.vue @@ -7,13 +7,19 @@ :disabled="!edit" title="会议主题" /> - + /> --> + Date: Wed, 31 Aug 2022 23:24:08 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E7=A6=85=E9=81=93bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Sys_ReceiveFile/single.vue | 4 ++-- .../pages/PersonnelManagement/DutySchedule/list.vue | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/Sys_ReceiveFile/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/Sys_ReceiveFile/single.vue index adb8edb70..639504c0e 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/Sys_ReceiveFile/single.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/Sys_ReceiveFile/single.vue @@ -115,7 +115,7 @@ export default { Sys_ReceiveFile: { Sender: { type: "text", title: "发送人" }, Title: { type: "text", title: "主题" }, - SendTime: { type: "datetime", title: "发送时间", dateformat: "0" }, + SendTime: { type: "datetime", title: "发送时间", dateformat: "1" }, SendType: { type: "select", title: "接收对象", @@ -124,7 +124,7 @@ export default { }, Contents: { type: "textarea", title: "内容" }, ReadFlag: { type: "select", title: "状态", dataSource: "0" }, - ReadTime: { type: "datetime", title: "查阅时间", dateformat: "0" }, + ReadTime: { type: "datetime", title: "查阅时间", dateformat: "1" }, }, }, // 数据源 dataSource: { diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/DutySchedule/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/DutySchedule/list.vue index 36dd9f4e3..00970a14d 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/DutySchedule/list.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/DutySchedule/list.vue @@ -156,7 +156,7 @@ export default { }, // 拉取列表 - async fetchList() { + async fetchList(isConcat=true) { if (this.page > this.total) { return } const result = await this.HTTP_GET( @@ -174,19 +174,19 @@ export default { this.total = result.total this.page = result.page + 1 - this.list = this.list.concat(result.rows) + this.list = isConcat?this.list.concat(result.rows):result.rows this.tips = `已加载 ${Math.min(result.page, result.total)} / ${result.total} 页，共 ${result.records} 项` this.loadState = result.page >= result.total ? '已加载所有项目' : '向下翻以加载更多' }, // 刷新清空列表 - async refreshList() { + async refreshList(isConcat=true) { this.page = 1 this.total = 2 this.list = [] - await this.fetchList() + await this.fetchList(isConcat) }, // 列表下拉 @@ -211,7 +211,7 @@ export default { Object.assign(result, mapValues(queryObj, t => (Array.isArray(t) ? t.join(',') : t))) this.searchData = result - await this.refreshList() + await this.refreshList(false) }, // 点击「清空查询条件」按钮 From b72514d98861377bbf6ea2c34277298e3a795e63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=99=93=E7=90=AA?= Date: Wed, 31 Aug 2022 23:44:21 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E7=A6=85=E9=81=93bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/learun-app/customlist-sidepage-datefilter.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/customlist-sidepage-datefilter.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/customlist-sidepage-datefilter.vue index d32ec0eba..86231177d 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/customlist-sidepage-datefilter.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/customlist-sidepage-datefilter.vue @@ -114,7 +114,7 @@ export default { } else if (type === 'today') { const e = { start: moment() - .subtract(1, 'day') + .subtract(0, 'day') .format('YYYY-MM-DD 00:00:00'), end: todayEnd } @@ -123,7 +123,7 @@ export default { } else if (type === '7d') { const e = { start: moment() - .subtract(7, 'days') + .subtract(6, 'days') .format('YYYY-MM-DD 00:00:00'), end: todayEnd } From 5e6c1ee6863ddc862d62a9beaa92d24716c8f1cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=99=93=E7=90=AA?= Date: Thu, 1 Sep 2022 09:46:03 +0800 Subject: [PATCH 5/7] =?UTF-8?q?app2.0=20=E6=88=91=E7=9A=84=E4=BC=9A?= =?UTF-8?q?=E8=AE=AE=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/PersonnelManagement/MeetingMy/list.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingMy/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingMy/list.vue index b302b9974..797905d16 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingMy/list.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingMy/list.vue @@ -95,7 +95,7 @@ @@ -181,7 +181,7 @@ export default { // MeetingPlace: "", // CreateUser: "", }, - hasInternalParticipants:0, + hasInternalParticipants:1, // 数据源 dataSource: { @@ -297,6 +297,7 @@ export default { // 点击「清空查询条件」按钮 reset() { + this.hasInternalParticipants = 1 this.queryData = this.COPY(this.defaultQueryData); this.searchChange(); }, From b85524a2daa4a3825f315d5f2b1497a3e6967182 Mon Sep 17 00:00:00 2001 From: ndbs Date: Thu, 1 Sep 2022 14:30:57 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E5=86=85=E9=83=A8=E9=82=AE=E4=BB=B6=20?= =?UTF-8?q?=E6=89=8B=E6=9C=BA=E7=AB=AF=E6=9F=A5=E7=9C=8B=E8=A7=A3=E7=A0=81?= =?UTF-8?q?=E6=9C=89=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/SYS_SendMessageController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/SYS_SendMessageController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/SYS_SendMessageController.cs index 3343c0963..e9ec32c57 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/SYS_SendMessageController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/SYS_SendMessageController.cs @@ -134,7 +134,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers SYS_SendMessageEntity entity = strEntity.ToObject(); entity.SENDERID = logInfo.userId; entity.SENDER = logInfo.realName; - entity.CONTENTS = HttpUtility.HtmlDecode(entity.CONTENTS); + entity.CONTENTS = WebHelper.HtmlEncode(entity.CONTENTS); entity.RECEIVER = string.Join(",", userIbll.GetListByUserIds(entity.RECEIVERID).Select(m => m.F_RealName)); if (!string.IsNullOrEmpty(entity.RECEIVERIDToo)) { From 8f90697b6e2ea3f1c796735e9656e00d5f4fa339 Mon Sep 17 00:00:00 2001 From: ndbs Date: Thu, 1 Sep 2022 16:06:04 +0800 Subject: [PATCH 7/7] =?UTF-8?q?app2.0=20=E4=BF=AE=E6=94=B9=E9=A6=96?= =?UTF-8?q?=E9=A1=B5=E7=99=BB=E5=BD=95=E8=B4=A6=E5=8F=B7=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/login.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/login.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/login.vue index 33bedb409..4c117feeb 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/login.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/login.vue @@ -25,7 +25,7 @@ - +