liqianyi пре 2 година
родитељ
комит
68f44e62a1
2 измењених фајлова са 7 додато и 6 уклоњено
  1. 5 4
      src/views/common/login.vue
  2. 2 2
      src/views/modules/warehouse/inventory.vue

+ 5 - 4
src/views/common/login.vue

@@ -33,10 +33,10 @@
           </div>
         </div>
       </div>
-      <div class="site-wrapper site-sidebar--fold"
-        v-loading.fullscreen.lock="loading"
-        element-loading-text="拼命加载中">
-      </div>
+<!--      <div class="site-wrapper site-sidebar&#45;&#45;fold"-->
+<!--        v-loading.fullscreen.lock="loading"-->
+<!--        element-loading-text="拼命加载中">-->
+<!--      </div>-->
     </div>
 </template>
 
@@ -67,6 +67,7 @@
       }
     },
     created () {
+      console.log('login')
       // this.getCaptcha()
     },
     methods: {

+ 2 - 2
src/views/modules/warehouse/inventory.vue

@@ -113,11 +113,11 @@
           fixed="right"
           header-align="center"
           align="center"
-          width="100"
+          width="140"
           label="操作">
           <template slot-scope="scope">
             <el-button v-if="isAuth('wh:inventory:info')" type="text" size="small" @click="detailHandle(scope.row.inventoryId)">查看</el-button>
-<!--            <el-button v-if="isAuth('wh:inventory:export') && Number(scope.row.state) === 0" type="text" size="small" @click="exportExcel(scope.row.inventoryId)">导出</el-button>-->
+            <el-button v-if="isAuth('wh:inventory:export') && Number(scope.row.state) === 0" type="text" size="small" @click="exportExcel(scope.row.inventoryId)">导出</el-button>
             <el-button v-if="isAuth('wh:inventory:import') && Number(scope.row.state) === 0" type="text" size="small" @click="importExcel()">导入</el-button>
 <!--            <el-button v-if="isAuth('wh:inventory:start') && Number(scope.row.state) === 0" type="text" size="small" @click="addOrUpdateHandle(scope.row.inventoryId, false)">盘点</el-button>-->
           </template>