From 7f1125806caede3b2e9163b9c5c107208d435c4c 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 12:38:35 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=A6=85=E9=81=93=E4=B8=8A?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SYS_ReceiveMessage/single.vue | 2 +- .../PersonnelManagement/DutySchedule/list.vue | 4 +- .../DutySchedule/single.vue | 10 ++--- .../PersonnelManagement/MeetingMy/list.vue | 40 ++++++++++++------- .../PersonnelManagement/MeetingMy/single.vue | 23 +++++++---- 5 files changed, 50 insertions(+), 29 deletions(-) diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/SYS_ReceiveMessage/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/SYS_ReceiveMessage/single.vue index a24dcdbe9..a2bf1a9f6 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/SYS_ReceiveMessage/single.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/SYS_ReceiveMessage/single.vue @@ -109,7 +109,7 @@ export default { SENDER: { type: 'text', title: '发件人' }, TITLE: { type: 'text', title: '主题' }, // READFLAG: { type: 'select', title: '状态', dataSource: '0' }, - SENDTIME: { type: 'datetime', title: '收件时间', dateformat: '0' }, + SENDTIME: { type: 'datetime', title: '收件时间', dateformat: '1' }, URL: { type: 'upload', title: '附件上传' }, CONTENTS: { type: 'textarea', title: '邮件内容' }, }, 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 ecf189881..36dd9f4e3 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 @@ -101,8 +101,8 @@ export default { // Date: { type: 'datetime', dateformat: '0' }, // Person: { type: 'text' }, Remark: { type: 'textarea' }, - StartTime: { type: 'datetime', dateformat: '0' }, - EndTime: { type: 'datetime', dateformat: '0' }, + StartTime: { type: 'datetime', dateformat: '1' }, + EndTime: { type: 'datetime', dateformat: '1' }, F_RealName: { type: 'text' }, }, diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/DutySchedule/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/DutySchedule/single.vue index 89e333ad3..09d4dde16 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/DutySchedule/single.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/DutySchedule/single.vue @@ -1,13 +1,13 @@ @@ -153,11 +160,11 @@ export default { scheme: { MeetingTitle: { type: "text" }, MeetingPlace: { type: "select", dataSource: "0" }, - BeginTime: { type: "datetime", dateformat: "0" }, - EndTime: { type: "datetime", dateformat: "0" }, + BeginTime: { type: "datetime", dateformat: "1" }, + EndTime: { type: "datetime", dateformat: "1" }, RecordPerson: { type: "organize", dataType: "user" }, Content: { type: "texteditor" }, - Files: { type: "upload" }, + // Files: { type: "upload" }, CreateUser: { type: "organize", dataType: "user" }, }, @@ -166,9 +173,10 @@ export default { defaultQueryData: {}, queryData: { MeetingTitle: "", - MeetingPlace: "", - CreateUser: "", + // MeetingPlace: "", + // CreateUser: "", }, + hasInternalParticipants:0, // 数据源 dataSource: { @@ -218,7 +226,11 @@ export default { } var userInfo = this.GET_GLOBAL("loginUser"); - this.searchData.CreateUser = userInfo.userId; + if(this.hasInternalParticipants) { + this.searchData.InternalParticipants = userInfo.userId + }else{ + this.searchData.CreateUser = userInfo.userId; + } const result = await this.HTTP_GET( "learun/adms/PersonnelManagement/MeetingManagement/pagelist", { 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 0c57ac63f..cc7dd2c2a 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 @@ -39,13 +39,20 @@ :readonly="!edit" title="会议内容" /> - + /> --> + - + @@ -110,17 +117,18 @@ export default { // 表单数据 current: {}, origin: {}, + fileList:[], // 表单项数据结构 scheme: { MeetingManagement: { MeetingTitle: { type: 'text', title: '会议主题' }, MeetingPlace: { type: 'select', title: '会议地点', dataSource: '0' }, - BeginTime: { type: 'datetime', title: '开始时间', dateformat: '0' }, - EndTime: { type: 'datetime', title: '结束时间', dateformat: '0' }, + BeginTime: { type: 'datetime', title: '开始时间', dateformat: '1' }, + EndTime: { type: 'datetime', title: '结束时间', dateformat: '1' }, RecordPerson: { type: 'organize', title: '会议记录者', dataType: 'user' }, Content: { type: 'texteditor', title: '会议内容' }, - Files: { type: 'upload', title: '附件上传' }, + // Files: { type: 'upload', title: '附件上传' }, CreateUser: { type: 'organize', title: '申请人', dataType: 'user' }, }, @@ -167,6 +175,7 @@ export default { this.origin = await this.getDefaultForm() } else { const result = await this.HTTP_GET('learun/adms/PersonnelManagement/MeetingManagement/form', this.id) + // this.fileList = await this.getFileListById(result.MeetingManagement.FilePath) this.origin = await this.formatFormData(result) } this.current = this.COPY(this.origin)