Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage

jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue

@@ -163,7 +163,11 @@
             this.sortList.push(this.dataSource[index - 1])
           }
         }
-        this.move()
+        if (this.sortList.length > 1) {
+          this.move()
+        } else {
+          this.$message.warning(this.$t('currentlyTheFirstOneThatCannotMovedUp'))
+        }
       },
       moveDownClick(row, index) {
         this.sortList = []
@@ -180,7 +184,11 @@
             this.sortList.push(this.dataSource[index + 1])
           }
         }
-        this.move()
+        if (this.sortList.length > 1) {
+          this.move()
+        } else {
+          this.$message.warning(this.$t('currentlyTheLastOneCannotmovedDown'))
+        }
       },
       move() {
         postAction('/report/lawsMonthlyReportTitleTemplateEO/move', { lawsMonthlyReportTitleTemplateEOS: this.sortList }).then((res) => {

jero-web/src/views/dashboard/components/myList.vue

@@ -88,6 +88,7 @@
       prcClick(row) {
         // let index = row.taskIds.lastIndexOf(',')
         // row.taskIds = row.taskIds.slice(0, index)
+        row.router = this.$route.path
         if (row.prcType == '1') {
           let newUrl = this.$router.resolve({
             path: '/handshakeProcess',
@@ -100,7 +101,7 @@
             query: row
           })
           window.open(newUrl.href, '_blank')
-        }else if (row.prcType == '6') {
+        } else if (row.prcType == '6') {
           let newUrl = this.$router.resolve({
             path: '/evaluationProcess',
             query: row

jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue

@@ -327,7 +327,7 @@
             this.$message.success(this.$t('OperationSuccessful'))
             this.loading = false
             this.$router.push({
-              path: '/technologyAssessment'
+              path: this.$route.query.router
             })
           } else {
             this.loading = false

jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue

@@ -192,7 +192,7 @@
             this.$message.success(this.$t('OperationSuccessful'))
             this.loading = false
             this.$router.push({
-              path: '/collectionOfRegulatoryOpinions'
+              path: this.$route.query.router
             })
           } else {
             this.loading = false

jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue

@@ -154,6 +154,7 @@
       dealWith(row) {
         // let index = row.taskIds.lastIndexOf(',')
         // row.taskIds = row.taskIds.slice(0, index)
+        row.router = this.$route.path
         if (row.prcType == '1') {
           let newUrl = this.$router.resolve({
             path: '/handshakeProcess',