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

2022-08-11 17:31:06 +08:00
parent 606d952e24 a612142267
commit 74756b1e18
14 changed files with 93 additions and 41 deletions
@@ -1257,4 +1257,6 @@ module.exports = {
  forward:'Forward',
  issuedBy:'Issued by',
  pleaseDecompositionStandardOrder:'Please import or bring in at least one decomposition standard order',
+  currentlyTheFirstOneThatCannotMovedUp:'Currently the first one that cannot be moved up',
+  currentlyTheLastOneCannotmovedDown:'Currently the last one cannot be moved down',
 }
@@ -1359,4 +1359,6 @@ module.exports = {
  forward:'转发',
  issuedBy:'发布人',
  pleaseDecompositionStandardOrder:'请导入或带入至少一条分解标准单',
+  currentlyTheFirstOneThatCannotMovedUp:'当前已是第一个无法进行上移',
+  currentlyTheLastOneCannotmovedDown:'当前已是最后一个无法进行下移',
 }
@@ -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) => {
@@ -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
@@ -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
@@ -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
@@ -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',