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

src/SDrpManagement/agentOrder/details/index.vue

@@ -284,8 +284,14 @@ export default {
         }
       })
       this.tool.showMessage(res,()=>{
-        this.tool.showMessage(res)
-      })
+        let route = this.$route
+        if (route.path !== '/taskDetails') {
+          this.oldRoute = {path:route.path,query:route.query}
+          this.$store.dispatch('setHistoryRouter',this.oldRoute)
+        }
+        this.$router.replace({path:'/agent_orderDetails',query:{id:res.data.sa_orderid,rowindex:res.data.rowindex}})
+        this.queryMainData(this.$route.query.id)
+        })
     },
   },
   mounted () {