合并

src/views/design/volumeCatalog/index.vue

@@ -11,8 +11,8 @@
               <el-input v-model="queryParams.documentName" placeholder="请输入资料名称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item>
-              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button type="primary" icon="Search" @click="handleQuery" v-hasPermi="['design:volumeCatalog:query']">搜索</el-button>
-              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+              <el-button icon="Refresh" @click="resetQuery" v-hasPermi="['design:volumeCatalog:query']">重置</el-button>
             </el-form-item>
           </el-form>
         </el-card>
@@ -71,7 +71,7 @@
         <el-table-column label="备注" align="center" prop="remark" />
         <el-table-column label="图纸文件" align="center" prop="remark" width="150">
           <template #default="scope">
-            <el-button link type="primary" icon="View" @click="handleView(scope.row)" v-hasPermi="['out:monthPlan:remove']">查看文件</el-button>
+            <el-button link type="primary" icon="View" @click="handleView(scope.row)" v-hasPermi="['design:volumeFile:query']">查看文件</el-button>
           </template>
         </el-table-column>
         <el-table-column label="操作" align="center" fixed="right" width="200">
@@ -82,7 +82,7 @@
               v-if="scope.row.auditStatus != 'finish' && scope.row.auditStatus != 'termination' && scope.row.auditStatus != 'waiting'"
               icon="Edit"
               @click="handleUpdate(scope.row)"
-              v-hasPermi="['design:volumeCatalog:edit']"
+              v-hasPermi="['design:volumeFile:edit']"
               >修改</el-button
             >
             <el-button
@@ -91,6 +91,7 @@
               icon="Upload"
               @click="handleUpload(scope.row)"
               v-if="scope.row.auditStatus == 'draft' || scope.row.auditStatus == 'back'"
+              v-hasPermi="['design:volumeFile:add']"
               >上传图纸</el-button
             >
             <el-button
@@ -99,16 +100,9 @@
               icon="edit"
               @click="handleAudit(scope.row)"
               v-if="scope.row.auditStatus == 'draft' || scope.row.auditStatus == 'back'"
-              v-hasPermi="['out:monthPlan:remove']"
               >审核</el-button
             >
-            <el-button
+            <el-button link type="primary" icon="View" v-if="scope.row.auditStatus != 'draft'" @click="handleAuditView(scope.row)"
-              link
-              type="primary"
-              icon="View"
-              v-if="scope.row.auditStatus != 'draft'"
-              @click="handleAuditView(scope.row)"
-              v-hasPermi="['out:monthPlan:remove']"
               >查看流程</el-button
             >
             <el-button

src/views/materials/appointment/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="p-6 bg-gray-50 main">
-    <div class="appWidth mx-auto mt-40 bg-white rounded-xl shadow-sm overflow-hidden transition-all duration-300 hover:shadow-md">
+    <div class="appWidth mx-auto mt-38 bg-white rounded-xl shadow-sm overflow-hidden transition-all duration-300 hover:shadow-md">
       <!-- 表单标题区域 -->
       <div class="bg-gradient-to-r from-blue-500 to-blue-600 text-white p-6">
         <h2 class="text-2xl font-bold flex items-center"><i class="el-icon-user-circle mr-3"></i>人员配置</h2>

src/views/materials/cailiaoshebei/index.vue

@@ -125,7 +125,7 @@
                 >
               </el-col>
               <el-col :span="1.5">
-                <el-button plain type="warning" icon="Finished" @click="handleAudit()" v-hasPermi="['out:monthPlan:remove']">审核</el-button>
+                <el-button plain type="warning" icon="Finished" @click="handleAudit()">审核</el-button>
               </el-col>
               <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
             </el-row>

src/views/materials/materialsEquipment/materialIssue/index.vue

@@ -61,7 +61,7 @@
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="查看" placement="top">
-              <el-button link type="primary" icon="View" @click="handleView(scope.row)"></el-button>
+              <el-button link type="primary" icon="View" @click="handleView(scope.row)" v-hasPermi="['materials:materialIssue:query']"></el-button>
             </el-tooltip>
             <el-tooltip content="修改" placement="top">
               <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['materials:materialIssue:edit']"></el-button>

src/views/materials/materialsEquipment/materialReceive/index.vue

@@ -69,7 +69,7 @@
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="查看" placement="top">
-              <el-button link type="primary" icon="View" @click="handleView(scope.row)"></el-button>
+              <el-button link type="primary" icon="View" @click="handleView(scope.row)" v-hasPermi="['materials:materialReceive:query']"></el-button>
             </el-tooltip>
             <!-- <el-tooltip content="修改" placement="top">
               <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['materials:materialReceive:edit']"></el-button>