Merge branch 'master' of http://gitlab.oytour.com/huangyuanyuan/assets

src/components/assetsman/outboundApplication.vue

@@ -61,7 +61,7 @@
                       <img @click="SeeDetails(row,'/outboundDetails')" style="width:24px;height:24px;margin-right:10px;" src="../../assets/img/chakan.png" alt="" />
                   </el-tooltip>
               <el-tooltip class="item" effect="dark" content="出库" placement="top">
-                <span class="outBand_div" v-if="row.ApplyStatus==2&&(row.OutStatus==0||row.OutStatus==1)" @click="goUrl('outboundDetail',row.ID)">
+                <span class="outBand_div" v-if="row.ApplyStatus==2&&(row.OutStatus==0||row.OutStatus==1)" @click="goUrl('outboundOperate',row.ID)">
                   <i class="iconfont icon-chuku"></i>
                 </span>
               </el-tooltip>

src/router/config.js

@@ -83,9 +83,9 @@ export default {
                 },
                 //出库详情
                 {
-                    path: '/outboundDetail',
-                    name: 'outboundDetail',
-                    component: resolve => require(['@/components/assetsman/outboundDetail'], resolve),
+                    path: '/outboundOperate',
+                    name: 'outboundOperate',
+                    component: resolve => require(['@/components/assetsman/outboundOperate'], resolve),
                 },
                 {
                     path: '/outboundDetails',