Merge branch '红色分支' into allTestUrgent

src/HDrpManagement/ProductMag/detail/index.vue

@@ -72,7 +72,7 @@
           class="inline-16"
           v-if="tool.checkAuth($route.name,'delete') && mainData.status == '新建'"
         />
-        <Void :data="mainData" @onSuccess="queryMainData($route.query.id)" v-if="tool.checkAuth($route.name,'toVoid') && mainData.isonsale == 0 && mainData.status == '新建'"/>
+        <Void :data="mainData" @onSuccess="$router.back()" v-if="tool.checkAuth($route.name,'toVoid') && mainData.isonsale == 0 && mainData.status == '新建'"/>
       </div>
       <div slot="slot0" >
         <detail_data :basic="mainData"></detail_data>