Merge branch 'dev' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc into dev

src/views/warehousenew/component/router/index.js

@@ -120,7 +120,7 @@ const warehouseManagementRouter = {
       path: 'warehouseNewManagementLook',
       component: () =>
         import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/warehouseManagementLook'),
-      name: 'warehouseManagementLook',
+      name: 'warehouseManagementLookNew',
       meta: {
         title: 'warehouseManagementLook',
         shortcutEntrance: 'warehouseManagementLook',

src/views/warehousenew/warehouseManagementList.vue

@@ -66,7 +66,7 @@
     <div class="position">
       <div class="title"><span style="font-size:18px;font-weight: 600;margin-left:20px">当期储量</span></div>
       <ws-button type="primary" @click="handleAdd()" v-hasPermission="`warehouseManagement.warehouse.warehouseInfo.add`" style="margin-left:20px">添加</ws-button>
-      <!-- <ws-button v-hasPermission="`warehouseManagement.warehouse.warehouseInfo.view` " @click="handleEdit()">查看</ws-button> -->
+      <ws-button v-hasPermission="`warehouseManagement.warehouse.warehouseInfo.view` " @click="handleLook()">查看</ws-button>
       <ws-button v-hasPermission="`warehouseManagement.warehouse.warehouseInfo.edit` " @click="handleEdit()">编辑</ws-button>
       <ws-button v-hasPermission="`warehouseManagement.warehouse.warehouseInfo.delete`" @click="handleDelete()">删除</ws-button>
       <ws-button v-hasPermission=" `warehouseManagement.warehouse.warehouseInfo.view`" @click="record()">记录</ws-button>
@@ -726,6 +726,12 @@
         this.$router.push({
           path: 'warehouseNewManagementEdit'
         })
+      },
+       //查看
+      handleLook() {
+        this.$router.push({
+          name: 'warehouseManagementLookNew'
+        })
       },
       //删除仓库
       handleDelete() {