From ca8bcc00b94ba6e80c8593b36161f82a81f7f3af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?yinjinlu-pc=5C=E5=B0=B9=E9=87=91=E8=B7=AF?=
 <411641505@qq.com>
Date: Fri, 6 Sep 2024 16:36:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=83=E9=99=90=E7=9B=B8=E5=85=B3=E7=9A=84?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main.js                         | 2 ++
 src/views/mes/wm/barcode/config.vue | 4 ++--
 src/views/mes/wm/barcode/index.vue  | 5 +++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/main.js b/src/main.js
index c72f050..7ba0370 100644
--- a/src/main.js
+++ b/src/main.js
@@ -21,6 +21,7 @@ import './permission' // permission control
 import { getDicts } from "@/api/system/dict/data";
 import { getConfigKey } from "@/api/system/config";
 import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree } from "@/utils/ruoyi";
+import { checkPermi } from './utils/permission';
 // 分页组件
 import Pagination from "@/components/Pagination";
 // 自定义表格工具组件
@@ -52,6 +53,7 @@ Vue.prototype.selectDictLabel = selectDictLabel
 Vue.prototype.selectDictLabels = selectDictLabels
 Vue.prototype.download = download
 Vue.prototype.handleTree = handleTree
+Vue.prototype.checkPermission = checkPermi
 
 // 全局组件挂载
 Vue.component('DictTag', DictTag)
diff --git a/src/views/mes/wm/barcode/config.vue b/src/views/mes/wm/barcode/config.vue
index 1e0c847..eaf764f 100644
--- a/src/views/mes/wm/barcode/config.vue
+++ b/src/views/mes/wm/barcode/config.vue
@@ -48,9 +48,9 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
-    <ReportSelect ref="reportRef" @onSelected="onReportSelected"></ReportSelect>
+    <ReportSelect v-if="checkPermission(['mes:wm:barcodeconfig:edit'])" ref="reportRef" @onSelected="onReportSelected"></ReportSelect>
     <div slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="showFlag=false">确 定</el-button>
+      <el-button type="primary" v-hasPermi="['mes:wm:barcodeconfig:edit']" @click="showFlag=false">确 定</el-button>
       <el-button @click="showFlag=false">取 消</el-button>
     </div>
   </el-dialog>
diff --git a/src/views/mes/wm/barcode/index.vue b/src/views/mes/wm/barcode/index.vue
index 231e141..8c5c06c 100644
--- a/src/views/mes/wm/barcode/index.vue
+++ b/src/views/mes/wm/barcode/index.vue
@@ -63,7 +63,7 @@
           icon="el-icon-s-tools"
           size="mini"
           @click="handleConfig"
-          v-hasPermi="['mes:wm:barcode:edit']"
+          v-hasPermi="['mes:wm:barcodeconfig:list']"
         >条码设置</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -75,7 +75,7 @@
           v-hasPermi="['mes:wm:barcode:view']"
         >批量打印</el-button>
       </el-col>
-      <Barcodeconfig ref="barcodeconfig"></Barcodeconfig>
+      <Barcodeconfig v-if="checkPermission(['mes:wm:barcodeconfig:list'])" ref="barcodeconfig"></Barcodeconfig>
       <BarcodeBatchPrint ref="barcodebatchprint"></BarcodeBatchPrint>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -335,6 +335,7 @@ import StockSelect from "@/components/stockSelect/single.vue"
 import Barcodeconfig from "./config.vue"
 import BarcodeBatchPrint from "./batchprint.vue"
 import {getTreeList} from "@/api/mes/wm/warehouse"
+import { checkPermi } from "@/utils/permission.js";
 export default {
   name: "Barcode",
   dicts: ['mes_barcode_type','mes_barcode_formart','sys_yes_no'],