From efb73ef9dd117b6a977012689ad2a069a674362f 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: Sat, 11 Nov 2023 18:33:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=83=E9=99=90=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/TaskSelect/taskSelectSingle.vue |  4 ++--
 src/components/stockSelect/multi.vue           |  2 +-
 src/views/mes/dv/machinerytype/index.vue       |  6 +++---
 src/views/mes/md/bom/index.vue                 | 14 +++++++-------
 src/views/mes/qc/pendinginspect/index.vue      |  6 +++---
 src/views/mes/qc/qctemplate/index.vue          |  2 +-
 src/views/mes/tm/tool/index.vue                |  5 +++--
 src/views/mes/wm/stocktaking/result.vue        | 12 ++++++------
 src/views/mes/wm/warehouse/index.vue           |  2 +-
 9 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/src/components/TaskSelect/taskSelectSingle.vue b/src/components/TaskSelect/taskSelectSingle.vue
index 33c179d..e7ffe96 100644
--- a/src/components/TaskSelect/taskSelectSingle.vue
+++ b/src/components/TaskSelect/taskSelectSingle.vue
@@ -86,14 +86,14 @@
               type="text"
               icon="el-icon-edit"
               @click="handleUpdate(scope.row)"
-              v-hasPermi="['pro:protask:edit']"
+              v-hasPermi="['mes:pro:protask:edit']"
             >修改</el-button>
             <el-button
               size="mini"
               type="text"
               icon="el-icon-delete"
               @click="handleDelete(scope.row)"
-              v-hasPermi="['pro:protask:remove']"
+              v-hasPermi="['mes:pro:protask:remove']"
             >删除</el-button>
           </template>
         </el-table-column>
diff --git a/src/components/stockSelect/multi.vue b/src/components/stockSelect/multi.vue
index 77291e5..ab3b7c3 100644
--- a/src/components/stockSelect/multi.vue
+++ b/src/components/stockSelect/multi.vue
@@ -103,7 +103,7 @@
             icon="el-icon-download"
             size="mini"
             @click="handleExport"
-            v-hasPermi="['wm:wmstock:export']"
+            v-hasPermi="['mes:wm:wmstock:export']"
           >导出</el-button>
         </el-col>
         <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
diff --git a/src/views/mes/dv/machinerytype/index.vue b/src/views/mes/dv/machinerytype/index.vue
index 9db8201..1c4d4ad 100644
--- a/src/views/mes/dv/machinerytype/index.vue
+++ b/src/views/mes/dv/machinerytype/index.vue
@@ -47,14 +47,14 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['dv:machinerytype:edit']"
+            v-hasPermi="['mes:dv:machinerytype:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-plus"
             @click="handleAdd(scope.row)"
-            v-hasPermi="['dv:machinerytype:add']"
+            v-hasPermi="['mes:dv:machinerytype:add']"
           >新增</el-button>
           <el-button
             v-if="scope.row.parentTypeId != 0"
@@ -62,7 +62,7 @@
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['dv:machinerytype:remove']"
+            v-hasPermi="['mes:dv:machinerytype:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
diff --git a/src/views/mes/md/bom/index.vue b/src/views/mes/md/bom/index.vue
index cd72c9c..400b4a5 100644
--- a/src/views/mes/md/bom/index.vue
+++ b/src/views/mes/md/bom/index.vue
@@ -60,7 +60,7 @@
               icon="el-icon-plus"
               size="mini"
               @click="handleAdd"
-              v-hasPermi="['mes:md:item:add']"
+              v-hasPermi="['mes:md:mditem:add']"
             >新增</el-button>
           </el-col>
           <el-col :span="1.5">
@@ -71,7 +71,7 @@
               size="mini"
               :disabled="single"
               @click="handleUpdate"
-              v-hasPermi="['mes:md:item:edit']"
+              v-hasPermi="['mes:md:mditem:edit']"
             >修改</el-button>
           </el-col>
           <el-col :span="1.5">
@@ -82,7 +82,7 @@
               size="mini"
               :disabled="multiple"
               @click="handleDelete"
-              v-hasPermi="['mes:md:item:remove']"
+              v-hasPermi="['mes:md:mditem:remove']"
             >删除</el-button>
           </el-col>
           <el-col :span="1.5">
@@ -92,7 +92,7 @@
               icon="el-icon-upload2"
               size="mini"
               @click="handleImport"
-              v-hasPermi="['mes:md:item:import']"
+              v-hasPermi="['mes:md:mditem:import']"
             >导入</el-button>
           </el-col>
           <el-col :span="1.5">
@@ -102,7 +102,7 @@
               icon="el-icon-download"
               size="mini"
               @click="handleExport"
-              v-hasPermi="['mes:md:item:export']"
+              v-hasPermi="['mes:md:mditem:export']"
             >导出</el-button>
           </el-col>
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
@@ -148,14 +148,14 @@
                 type="text"
                 icon="el-icon-edit"
                 @click="handleUpdate(scope.row)"
-                v-hasPermi="['mes:md:item:edit']"
+                v-hasPermi="['mes:md:mditem:edit']"
               >修改</el-button>
               <el-button
                 size="mini"
                 type="text"
                 icon="el-icon-delete"
                 @click="handleDelete(scope.row)"
-                v-hasPermi="['mes:md:item:remove']"
+                v-hasPermi="['mes:md:mditem:remove']"
               >删除</el-button>              
             </template>
           </el-table-column>
diff --git a/src/views/mes/qc/pendinginspect/index.vue b/src/views/mes/qc/pendinginspect/index.vue
index 41ce265..b363fee 100644
--- a/src/views/mes/qc/pendinginspect/index.vue
+++ b/src/views/mes/qc/pendinginspect/index.vue
@@ -54,7 +54,7 @@
               icon="el-icon-edit"
               @click="handleAddIQC(scope.row)"
               v-if="scope.row.qcType == 'IQC'"
-              v-hasPermi="['mes:qc:qcindex:edit']"
+              v-hasPermi="['mes:qc:iqc:edit']"
             >来料检验</el-button>
             <el-button
               size="mini"
@@ -62,7 +62,7 @@
               icon="el-icon-edit"
               v-if="scope.row.qcType == 'PQC'"
               @click="handleAddPQC(scope.row)"
-              v-hasPermi="['mes:qc:qcindex:edit']"
+              v-hasPermi="['mes:qc:ipqc:edit']"
             >过程检验</el-button>
             <el-button
               size="mini"
@@ -70,7 +70,7 @@
               icon="el-icon-edit"
               v-if="scope.row.qcType == 'OQC'"
               @click="handleAddOQC(scope.row)"
-              v-hasPermi="['mes:qc:qcindex:edit']"
+              v-hasPermi="['mes:qc:oqc:edit']"
             >出货检验</el-button>
           </template>
         </el-table-column>
diff --git a/src/views/mes/qc/qctemplate/index.vue b/src/views/mes/qc/qctemplate/index.vue
index 903aad4..2345e29 100644
--- a/src/views/mes/qc/qctemplate/index.vue
+++ b/src/views/mes/qc/qctemplate/index.vue
@@ -90,7 +90,7 @@
           <el-button
             type="text"
             @click="handleView(scope.row)"
-            v-hasPermi="['mes:qc:template:query']"
+            v-hasPermi="['mes:qc:qctemplate:query']"
           >{{scope.row.templateCode}}</el-button>
         </template>
       </el-table-column>
diff --git a/src/views/mes/tm/tool/index.vue b/src/views/mes/tm/tool/index.vue
index 40e4ea8..d0a8354 100644
--- a/src/views/mes/tm/tool/index.vue
+++ b/src/views/mes/tm/tool/index.vue
@@ -126,15 +126,16 @@
     <el-table v-loading="loading" :data="toolList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="编号" align="center" prop="toolCode" >
+      </el-table-column>
+      <el-table-column label="名称" align="center" prop="toolName" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <el-button
             type="text"
             @click="handleView(scope.row)"
             v-hasPermi="['mes:tm:tool:query']"
-          >{{scope.row.toolCode}}</el-button>
+          >{{scope.row.toolName}}</el-button>
         </template>
       </el-table-column>
-      <el-table-column label="名称" align="center" prop="toolName" :show-overflow-tooltip="true"/>
       <el-table-column label="品牌" align="center" prop="brand" :show-overflow-tooltip="true"/>
       <el-table-column label="型号" align="center" prop="spec" :show-overflow-tooltip="true"/>
       <el-table-column label="类型" align="center" prop="toolTypeName" />
diff --git a/src/views/mes/wm/stocktaking/result.vue b/src/views/mes/wm/stocktaking/result.vue
index 93ec02a..b997767 100644
--- a/src/views/mes/wm/stocktaking/result.vue
+++ b/src/views/mes/wm/stocktaking/result.vue
@@ -84,7 +84,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['wm:stocktakingresult:add']"
+          v-hasPermi="['mes:wm:stocktaking:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -95,7 +95,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['wm:stocktakingresult:edit']"
+          v-hasPermi="['mes:wm:stocktaking:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -106,7 +106,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['wm:stocktakingresult:remove']"
+          v-hasPermi="['mes:wm:stocktaking:remove']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -116,7 +116,7 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['wm:stocktakingresult:export']"
+          v-hasPermi="['mes:wm:stocktaking:export']"
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -142,14 +142,14 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['wm:stocktakingresult:edit']"
+            v-hasPermi="['mes:wm:stocktaking:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['wm:stocktakingresult:remove']"
+            v-hasPermi="['mes:wm:stocktaking:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
diff --git a/src/views/mes/wm/warehouse/index.vue b/src/views/mes/wm/warehouse/index.vue
index 217ad7b..35b1718 100644
--- a/src/views/mes/wm/warehouse/index.vue
+++ b/src/views/mes/wm/warehouse/index.vue
@@ -86,7 +86,7 @@
             type="text"
             icon="el-icon-s-shop"
             @click="handleLocation(scope.row.warehouseId)"
-            v-hasPermi="['mes:wm:warehouse:edit','mes:wm:warehouse:list']"
+            v-hasPermi="['mes:wm:location:edit','mes:wm:location:list']"
           >库区</el-button>
           <el-button
             size="mini"