From 38f4dc10936b959bf2d7e6a9f8fa9f123f3cb81f Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Sat, 12 Oct 2019 18:43:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81=E5=88=86=E5=8C=96=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/langs/en/approval.js | 7 +++++- src/i18n/langs/en/error.js | 3 ++- src/i18n/langs/en/lesson.js | 3 ++- src/i18n/langs/en/rules.js | 3 ++- src/i18n/langs/en/tip.js | 5 +++- src/i18n/langs/zh/approval.js | 7 +++++- src/i18n/langs/zh/error.js | 3 ++- src/i18n/langs/zh/lesson.js | 3 ++- src/i18n/langs/zh/rules.js | 3 ++- src/i18n/langs/zh/tip.js | 5 +++- src/views/approval/lesson/detail.vue | 11 ++++----- src/views/approval/lesson/index.vue | 37 +++++++++++++--------------- src/views/lesson/home.vue | 28 +++++++++++++++------ 13 files changed, 75 insertions(+), 43 deletions(-) diff --git a/src/i18n/langs/en/approval.js b/src/i18n/langs/en/approval.js index 6d3a8b7be..f6d2aa413 100644 --- a/src/i18n/langs/en/approval.js +++ b/src/i18n/langs/en/approval.js @@ -25,5 +25,10 @@ export default { passedRunPlan: 'Passed Run Plan', rejectRunPlan: 'Reject Run Plan', runPlanPreview: 'RunPlan Preview', - inputRunPlanName: 'Please input run plan name' + inputRunPlanName: 'Please input run plan name', + courseDescription: 'Course description', + lookOver: 'Look over', + courseDetails: 'Course details', + instructions: 'Instructions', + chapterTrainingName:'Chapter/training name' }; diff --git a/src/i18n/langs/en/error.js b/src/i18n/langs/en/error.js index 821f09bd4..b91e2910c 100644 --- a/src/i18n/langs/en/error.js +++ b/src/i18n/langs/en/error.js @@ -92,5 +92,6 @@ export default { getStationListFail: 'Failed to get station list', obtainTrainGroupNumberFailed: 'Failed to obtain train group number', getTrainListFailed: 'Failed to get train list', - getDraftCourseDataFailed: 'Failed to get draft course data!' + getDraftCourseDataFailed: 'Failed to get draft course data!', + failedToGetCourseData: 'Failed to get course data!' }; diff --git a/src/i18n/langs/en/lesson.js b/src/i18n/langs/en/lesson.js index 9af063a3a..ae2b28df0 100644 --- a/src/i18n/langs/en/lesson.js +++ b/src/i18n/langs/en/lesson.js @@ -110,5 +110,6 @@ export default { notRelease: 'Not release', pendingReview: 'Pending review', published: 'Published', - rejected: 'Rejected' + rejected: 'Rejected', + review: 'Review' }; diff --git a/src/i18n/langs/en/rules.js b/src/i18n/langs/en/rules.js index 83149866a..98a05f915 100644 --- a/src/i18n/langs/en/rules.js +++ b/src/i18n/langs/en/rules.js @@ -301,5 +301,6 @@ export default { enterTheElevatorCode: 'Please enter the elevator code', enterTheElevatorWidth: 'Please enter the elevator width', enterTheElevatorHeight: 'Please enter the elevator height', - enterTheElevatorColor: 'Please enter the elevator color' + enterTheElevatorColor: 'Please enter the elevator color', + enterRejectReason: 'Please enter reject reason' }; diff --git a/src/i18n/langs/en/tip.js b/src/i18n/langs/en/tip.js index b81a4ae1f..23876861f 100644 --- a/src/i18n/langs/en/tip.js +++ b/src/i18n/langs/en/tip.js @@ -201,5 +201,8 @@ export default { createPlanFailed: 'Failed to create plan!', cancelCoursePublicationHint: 'This action will cancel the course publication application, is it OK?', cancelTheSuccessfulApplicationOfTheCourseRelease: 'Cancel the successful application of the course release!', - cancellationOfCoursePublicationApplicationFailed: 'Cancellation of course publication application failed!' + cancellationOfCoursePublicationApplicationFailed: 'Cancellation of course publication application failed!', + publishTheCourseHint: 'This operation will publish the course. Are you sure?', + rejectedCourseReleaseApplicationSuccessful: 'Rejected course release application successful!', + rejectedCourseReleaseApplicationFailed: 'Rejected course release application failed!' }; diff --git a/src/i18n/langs/zh/approval.js b/src/i18n/langs/zh/approval.js index eae503ae9..0f64069ca 100644 --- a/src/i18n/langs/zh/approval.js +++ b/src/i18n/langs/zh/approval.js @@ -25,5 +25,10 @@ export default { passedRunPlan: '通过运行图', rejectRunPlan: '驳回运行图', runPlanPreview: '预览', - inputRunPlanName: '请输入运行图名称' + inputRunPlanName: '请输入运行图名称', + courseDescription: '课程说明', + lookOver: '查看', + courseDetails: '课程详情', + instructions: '说明', + chapterTrainingName: '章节/课程名称' }; diff --git a/src/i18n/langs/zh/error.js b/src/i18n/langs/zh/error.js index e2c03b3b5..509c69bb3 100644 --- a/src/i18n/langs/zh/error.js +++ b/src/i18n/langs/zh/error.js @@ -92,5 +92,6 @@ export default { getStationListFail: '获取车站列表失败', obtainTrainGroupNumberFailed: '获取列车车组号失败', getTrainListFailed: '获取列车列表失败', - getDraftCourseDataFailed: '获取草稿课程数据失败！' + getDraftCourseDataFailed: '获取草稿课程数据失败！', + failedToGetCourseData: '获取课程数据失败！' }; diff --git a/src/i18n/langs/zh/lesson.js b/src/i18n/langs/zh/lesson.js index 2f7282d37..44e5dc703 100644 --- a/src/i18n/langs/zh/lesson.js +++ b/src/i18n/langs/zh/lesson.js @@ -109,6 +109,7 @@ export default { notRelease: '未发布', pendingReview: '待审核', published: '已发布', - rejected: '已驳回' + rejected: '已驳回', + review: '查看' }; diff --git a/src/i18n/langs/zh/rules.js b/src/i18n/langs/zh/rules.js index 29842be55..bf21ada69 100644 --- a/src/i18n/langs/zh/rules.js +++ b/src/i18n/langs/zh/rules.js @@ -303,5 +303,6 @@ export default { enterTheElevatorCode: '请输入电梯编号', enterTheElevatorWidth: '请输入电梯宽度', enterTheElevatorHeight: '请输入电梯高度', - enterTheElevatorColor: '请输入电梯颜色' + enterTheElevatorColor: '请输入电梯颜色', + enterRejectReason: '请输入驳回说明' }; diff --git a/src/i18n/langs/zh/tip.js b/src/i18n/langs/zh/tip.js index 6f2469475..b6e0d0683 100644 --- a/src/i18n/langs/zh/tip.js +++ b/src/i18n/langs/zh/tip.js @@ -201,5 +201,8 @@ export default { createPlanFailed: '创建计划失败！', cancelCoursePublicationHint: '此操作将撤销课程发布申请，是否确定？', cancelTheSuccessfulApplicationOfTheCourseRelease: '撤销课程发布申请成功！', - cancellationOfCoursePublicationApplicationFailed: '撤销课程发布申请失败！' + cancellationOfCoursePublicationApplicationFailed: '撤销课程发布申请失败！', + publishTheCourseHint: '此操作将发布课程，是否确定？', + rejectedCourseReleaseApplicationSuccessful: '驳回课程发布申请成功！', + rejectedCourseReleaseApplicationFailed: '驳回课程发布申请失败！' }; diff --git a/src/views/approval/lesson/detail.vue b/src/views/approval/lesson/detail.vue index 2379acb47..299666776 100644 --- a/src/views/approval/lesson/detail.vue +++ b/src/views/approval/lesson/detail.vue @@ -1,6 +1,6 @@ @@ -86,12 +95,14 @@ import PublishCreate from './lessoncategory/edit/create'; import PublishLesson from './lessoncategory/edit/lesson/publish'; import { delLesson } from '@/api/jmap/lessondraft'; + import LessonDetail from '@/views/approval/lesson/detail'; export default { name: 'LessonHome', components: { PublishCreate, - PublishLesson + PublishLesson, + LessonDetail }, computed: { mapId() { @@ -161,7 +172,7 @@ lessonStatus = this.$t('lesson.published'); break; case '3': - lessonStatus = this.$t('lesson.rejected'); + lessonStatus = this.$t('lesson.rejected')+`(${this.$t('global.remarks')}：${row.explanation})`; break; } return lessonStatus; @@ -230,6 +241,9 @@ this.refuse(); }); }); + }, + goDetail(row) { + this.$refs.lessonDetail.show(row.id); } } };