Merge branch 'develop' of http://52.130.252.100:10000/TEAMMODEL/TEAMModelOS into develop

TEAMModelOS/ClientApp/public/lang/zh-TW.js

@@ -963,7 +963,7 @@ const LANG_ZH_TW = {
             tips: '注意事項',
             tips1: '檔案名請使用當前班級的學生學號來命名。 ',
             tips2: '單張圖片大小不能超過1MB。 ',
-            tips3: '圖片副檔名必須是 jpg/png/jpeg 中任意一種。 '
+            tips3: '圖片副檔名必須是 jpg/png/jpeg/pdf 中任意一種。 '
         },
         isLeaveSch: '（已離校）',
         schoolClass: '複製學校班級',

TEAMModelOS/ClientApp/src/view/newsheet/index.vue

@@ -641,10 +641,21 @@
 						tabName: 'paper'
 					}
 				}
-				this.$router.push({
-					name: this.fromRouter || 'personalBank',
-					params: params
-				})
+				if(this.$route.params.paper && this.fromRouter === 'EvDetail') {
+					this.$router.push({
+						path: '/home/evDetail',
+						query: {
+							examId: this.$route.params.paper.examId,
+							scope: this.$route.params.paper.examScope,
+							code: this.$route.params.paper.examCode,
+						}
+					})
+				} else {
+					this.$router.push({
+						name: this.fromRouter || 'personalBank',
+						params: params
+					})
+				}
 				// this.$router.go(-1)
 			},
 			reload() {