添加传参数

src/components/xsDet.vue

@@ -4306,9 +4306,11 @@ export default {
             // });
             this.$alert('签收成功!', '提示', {
               confirmButtonText: '确定',
-              type: 'success'
+              type: 'success',
+              callback: () => {
+                this.$router.go(0)
+              }
             })
-            this.$router.go(0)
           })
           .catch(() => {
             // this.$message({
@@ -4438,7 +4440,7 @@ export default {
           }
           location.href = '#nav8'
         } else {
-             if (this.xsDetails[8].xsss[0].shuju.length == '0') {
+          if (this.xsDetails[8].xsss[0].shuju.length == '0') {
             return this.$alert('请先提请办结反馈拟办意见', '提示', {
               confirmButtonText: '确定',
               type: 'warning'
@@ -4449,23 +4451,22 @@ export default {
       } else if (item.auth == 'SHCEA010607') {
         this.dialogVisibleFk1 = true
       } else if (item.auth == 'SHCEA010611') {
-       
         this.activeIndex = 7
         if (!this.xxzjbh) {
-           if (this.xsDetails[7].xsss[0].shuju.length == '0') {
-          return this.$alert('请先提请办结反馈拟办意见', '提示', {
-            confirmButtonText: '确定',
-            type: 'warning'
-          })
-        }
+          if (this.xsDetails[7].xsss[0].shuju.length == '0') {
+            return this.$alert('请先提请办结反馈拟办意见', '提示', {
+              confirmButtonText: '确定',
+              type: 'warning'
+            })
+          }
           location.href = '#nav8'
         } else {
-           if (this.xsDetails[8].xsss[0].shuju.length == '0') {
-          return this.$alert('请先提请办结反馈拟办意见', '提示', {
-            confirmButtonText: '确定',
-            type: 'warning'
-          })
-        }
+          if (this.xsDetails[8].xsss[0].shuju.length == '0') {
+            return this.$alert('请先提请办结反馈拟办意见', '提示', {
+              confirmButtonText: '确定',
+              type: 'warning'
+            })
+          }
           location.href = '#sjxfnav8'
         }
       } else if (item.auth == 'SHCEA010615') {
@@ -4505,23 +4506,22 @@ export default {
       })
     },
     goZjfkTz () {
-    
       this.activeIndex = 7
       if (!this.xxzjbh) {
-          if (this.xsDetails[7].xsss[0].shuju.length == '0') {
-        return this.$alert('请先提请办结反馈拟办意见', '提示', {
-          confirmButtonText: '确定',
-          type: 'warning'
-        })
-      }
+        if (this.xsDetails[7].xsss[0].shuju.length == '0') {
+          return this.$alert('请先提请办结反馈拟办意见', '提示', {
+            confirmButtonText: '确定',
+            type: 'warning'
+          })
+        }
         location.href = '#nav8'
       } else {
-          if (this.xsDetails[8].xsss[0].shuju.length == '0') {
-        return this.$alert('请先提请办结反馈拟办意见', '提示', {
-          confirmButtonText: '确定',
-          type: 'warning'
-        })
-      }
+        if (this.xsDetails[8].xsss[0].shuju.length == '0') {
+          return this.$alert('请先提请办结反馈拟办意见', '提示', {
+            confirmButtonText: '确定',
+            type: 'warning'
+          })
+        }
         location.href = '#sjxfnav8'
       }
 
@@ -4617,7 +4617,7 @@ export default {
         this.tableData.count = res.data.total
       })
     },
-      // 历史反馈
+    // 历史反馈
     getZljshcListLSs () {
       this.loadingTablelS = true
       // this.loadingTable3 = true
@@ -5403,7 +5403,9 @@ export default {
       })
         .then(() => {
           nbyjTqsp({
-            xxzjbh: scope.row.xxzjbh
+            xxzjbh: scope.row.xxzjbh,
+            shsexsbh: scope.row.shsexsbh,
+            glxxXxzjbh: this.xxzjbh
           }).then(res => {
             this.$alert('提请审批成功!', '提示', {
               confirmButtonText: '确定',
@@ -5489,7 +5491,11 @@ export default {
       console.log(scope.row, '拟办意见')
       this.$router.pushToTab({
         path: 'xssp',
-        query: { shsexsbh: scope.row.shsexsbh, xxzjbh: scope.row.xxzjbh }
+        query: {
+          shsexsbh: scope.row.shsexsbh,
+          xxzjbh: scope.row.xxzjbh,
+          glxxXxzjbh: this.xxzjbh
+        }
       })
     },
     queryTree (tree, id) {

src/views/xsDetail/xssp.vue

@@ -601,22 +601,10 @@ export default {
         this.$alert('保存草稿成功!', '提示', {
           confirmButtonText: '确定',
           type: 'success',
-
           callback: () => {
             window.opener.location.reload()
             this.loadingNbyj = false
             window.close()
-            // if (this.$route.query.glxxXxzjbh) {
-            //   this.$router.pushToTab({
-            //     path: 'sxjDetail',
-            //     query: { shsexsbh: this.shsexsbh, xxzjbh: this.$route.query.glxxXxzjbh }
-            //   })
-            // } else {
-            //   this.$router.pushToTab({
-            //     path: 'xsDetail',
-            //     query: { shsexsbh: this.shsexsbh }
-            //   })
-            // }
           }
         })
       })
@@ -631,7 +619,8 @@ export default {
         nblxdm: this.formLabelAlign.nblxdm,
         nbyj: this.formLabelAlign.nbyj,
         nbyjbt: `关于${this.formLabelAlign.nbyjbt}拟办意见`,
-        shsexsbh: this.shsexsbh
+        shsexsbh: this.shsexsbh,
+        glxxXxzjbh: this.$route.query.glxxXxzjbh
       }).then(res => {
         this.$alert('修改成功!', '提示', {
           confirmButtonText: '确定',
@@ -670,6 +659,7 @@ export default {
     },
     // 修改保存并提起审批
     goBcbtqsp () {
+      this.loadingNbyj = true
       saveAndTqspNbyj({
         xxzjbh: this.$route.query.xxzjbh,
         shsexslydm: this.formLabelAlign.shsexslydm,
@@ -677,7 +667,8 @@ export default {
         nblxdm: this.formLabelAlign.nblxdm,
         nbyj: this.formLabelAlign.nbyj,
         nbyjbt: `关于${this.formLabelAlign.nbyjbt}拟办意见`,
-        shsexsbh: this.shsexsbh
+        shsexsbh: this.shsexsbh,
+        glxxXxzjbh: this.$route.query.glxxXxzjbh
       }).then(res => {
         this.$alert('保存并提请审批成功!', '提示', {
           confirmButtonText: '确定',