From 52e18000ace434b2acdebce5e118c45c337a3fe7 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 28 五月 2024 13:31:54 +0800
Subject: [PATCH] 合并冲突
---
src/views/warehouse/changestock/index.vue | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/views/warehouse/changestock/index.vue b/src/views/warehouse/changestock/index.vue
index 22c7325..5ed304a 100644
--- a/src/views/warehouse/changestock/index.vue
+++ b/src/views/warehouse/changestock/index.vue
@@ -94,11 +94,12 @@
<span>瀹炴椂搴撳瓨</span>
</div>
<el-button size="mini" type="primary" @click="addOrUpdateHandle()"
- >鏂板</el-button
+ v-if="permissions.warehouse_changestock_add">鏂板</el-button
>
- <el-button size="mini" type="primary" @click="addStockSubmit()">鎺ユ敹</el-button>
+ <el-button size="mini" type="primary" @click="addStockSubmit()"
+ v-if="permissions.warehouse_changestock_receive">鎺ユ敹</el-button>
<el-button size="mini" type="primary" @click="deleteStockSubmit()"
- >鍙戞斁</el-button
+ v-if="permissions.warehouse_changestock_grant">鍙戞斁</el-button
>
<el-table
--
Gitblit v1.9.3