From cb0028b0b61616a4e84fa8d5d5d636320fd2846b Mon Sep 17 00:00:00 2001
From: cjp <3096114695@qq.com>
Date: Wed, 1 May 2024 21:36:00 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=8C=89=E9=92=AE=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E8=A1=A5=E5=85=85=2021:35?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/index/index.js                      |  2 +-
 .../projectFront/carManage/carManage.vue      | 28 ++++++++++++++++++-
 .../laborManage/assessmentCentent.vue         |  8 +++---
 .../projectFront/laborManage/blackList.vue    |  4 +--
 .../projectFront/laborManage/rosterNew.vue    |  1 +
 .../laborManage/safetyTrainManage.vue         | 10 +++----
 .../laborManage/workTypeManage.vue            |  9 ++++--
 .../progressManagementAg/progressApproval.vue |  2 +-
 .../projectganttChart.vue                     |  4 +--
 9 files changed, 49 insertions(+), 19 deletions(-)

diff --git a/src/pages/index/index.js b/src/pages/index/index.js
index f6f126a9..0836ee6d 100644
--- a/src/pages/index/index.js
+++ b/src/pages/index/index.js
@@ -293,7 +293,7 @@ function checkPermission(permission) {
   permissions = permissions.filter(
     (x) => x.menuName == permission.moduleName
   )[0];
-  // console.log(permissions,'666777')
+  console.log(permissions,'ddddd')
   if(!permissions.actionList){
     return false;
   }
diff --git a/src/views/projectFront/carManage/carManage.vue b/src/views/projectFront/carManage/carManage.vue
index daa47d4c..be9942a2 100644
--- a/src/views/projectFront/carManage/carManage.vue
+++ b/src/views/projectFront/carManage/carManage.vue
@@ -66,6 +66,7 @@
           :label="$t('message.carManage.driverTelephone')"
           align="center"
         ></el-table-column>
+        <!-- 黑白名单调控 -->
         <el-table-column
           prop="isBlack"
           :label="$t('message.carManage.isBlack')"
@@ -73,6 +74,7 @@
         >
           <template slot-scope="scope">
             <!-- {{ $t('message.carManage.isBlackArr')[scope.row.isBlack] }} -->
+            <!-- v-permission="{key: 'clgl_blackWhiteList', moduleName: '车辆黑白名单管理'}" -->
             {{ $t("message.carManage.isBlackArr")[scope.row.isBlack] }}
             <el-switch
               v-model="scope.row.isBlack"
@@ -80,7 +82,7 @@
               :active-value="0"
               inactive-color="#000000"
               :inactive-value="1"
-              :disabled="scope.row.carModuleType === 2 ? true : false"
+              :disabled="!editPermission ?true : scope.row.carModuleType === 2 ? true : false "
               @change="e => blackSwich(e,scope.row)"
             >
             </el-switch>
@@ -501,6 +503,7 @@ import {
 } from "../../../assets/js/api/carManage";
 import { getProjectChilderSystemUserListApi } from "@/assets/js/api/configManage";
 import { getWorkerInfoList, getEnterpriseInfoList } from "@/assets/js/api/laborPerson";
+import store from '@/store'
 export default {
   data() {
     var validReserveStartTime = (rule, value, callback) => {
@@ -564,6 +567,7 @@ export default {
       COMPANY: COMPANY,
       fileList: [],
       showImgUrl: "",
+      editPermission:false,
       props: {
         multiple: true,
       },
@@ -719,8 +723,30 @@ export default {
     this.getAppWorkerList();
     this.getUDevList();
     this.getEnterpriseListFn();
+    this.getBlackWhiteBoole()
   },
   methods: {
+    getBlackWhiteBoole(){
+      let clgl = {key: 'clgl_blackWhiteList', moduleName: '车辆黑白名单管理'}
+      console.log('1111111111111111111111111',this.checkPermission(clgl) );
+      this.editPermission =  this.checkPermission(clgl);
+    },
+    checkPermission(permission){
+      var permissions = store.state.userInfo.menuAuthority.menuList;
+      permissions = permissions.filter(
+        (x) => x.menuName == permission.moduleName
+      )[0];
+      // console.log(permissions,'666777')
+      if(!permissions.actionList){
+        return false;
+      }
+      let index = permissions.actionList.findIndex(
+        (x) => x.actionCode == permission.key
+      )
+      console.log(index,'666777')
+      return index != -1?true:false;
+        },
+
     // 获取企业分级列表
     getEnterpriseListFn() {
       getEnterpriseInfoList({
diff --git a/src/views/projectFront/laborManage/assessmentCentent.vue b/src/views/projectFront/laborManage/assessmentCentent.vue
index 9270133b..678261a7 100644
--- a/src/views/projectFront/laborManage/assessmentCentent.vue
+++ b/src/views/projectFront/laborManage/assessmentCentent.vue
@@ -24,10 +24,10 @@
               ></el-input>
             </el-form-item>
             <el-form-item>
-              <el-button type="primary" @click="onSubmit" plain>{{
+              <el-button v-permission="{key: 'query', moduleName: '评价中心'}" type="primary" @click="onSubmit" plain>{{
                 $t('message.laborMange.inquire')
               }}</el-button>
-              <el-button type="primary" @click="addInfoBtn" plain>{{
+              <el-button v-permission="{key: 'pjzx_add_jl', moduleName: '评价中心'}" type="primary" @click="addInfoBtn" plain>{{
                 $t('message.laborMange.newRewardInfo')
               }}</el-button>
             </el-form-item>
@@ -157,10 +157,10 @@
               ></el-input>
             </el-form-item>
             <el-form-item>
-              <el-button type="primary" @click="onSubmit" plain>{{
+              <el-button v-permission="{key: 'query', moduleName: '评价中心'}" type="primary" @click="onSubmit" plain>{{
                 $t('message.laborMange.inquire')
               }}</el-button>
-              <el-button type="primary" @click="addInfoBtn" plain>{{
+              <el-button v-permission="{key: 'pjzx_add_blp', moduleName: '评价中心'}" type="primary" @click="addInfoBtn" plain>{{
                 $t('message.laborMange.add') +
                 $t('message.laborMange.badRecord')
               }}</el-button>
diff --git a/src/views/projectFront/laborManage/blackList.vue b/src/views/projectFront/laborManage/blackList.vue
index 18569022..c3eb2465 100644
--- a/src/views/projectFront/laborManage/blackList.vue
+++ b/src/views/projectFront/laborManage/blackList.vue
@@ -18,10 +18,10 @@
           ></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" plain @click="loadCardData">
+          <el-button v-permission="{key: 'query', moduleName: '黑名单管理'}" type="primary" plain @click="loadCardData">
             {{ $t("message.personnelPosition.beaconManage.query") }}
           </el-button>
-          <el-button type="warning" plain @click="resetForm">
+          <el-button v-permission="{key: 'renovate', moduleName: '黑名单管理'}" type="warning" plain @click="resetForm">
             {{ $t("message.personnelPosition.beaconManage.refresh") }}
           </el-button>
           <el-button v-permission="{key: 'add', moduleName: '黑名单管理'}" type="primary" @click="addPoint">
diff --git a/src/views/projectFront/laborManage/rosterNew.vue b/src/views/projectFront/laborManage/rosterNew.vue
index 86122110..24ede5ee 100644
--- a/src/views/projectFront/laborManage/rosterNew.vue
+++ b/src/views/projectFront/laborManage/rosterNew.vue
@@ -364,6 +364,7 @@
               <template slot-scope="scope">
                 <div class="tableBtns">
                   <el-button
+                    v-permission="{key: 'hmc_ckxfxq', moduleName: '花名册'}"
                     size="medium"
                     type="text"
                     class="operationText"
diff --git a/src/views/projectFront/laborManage/safetyTrainManage.vue b/src/views/projectFront/laborManage/safetyTrainManage.vue
index 7247e085..9802d8c7 100644
--- a/src/views/projectFront/laborManage/safetyTrainManage.vue
+++ b/src/views/projectFront/laborManage/safetyTrainManage.vue
@@ -31,10 +31,10 @@
           ></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" plain @click="loadCardData">
+          <el-button v-permission="{key: 'query', moduleName: '安全培训管理'}" type="primary" plain @click="loadCardData">
             {{ $t("message.personnelPosition.beaconManage.query") }}
           </el-button>
-          <el-button type="warning" plain @click="resetForm">
+          <el-button v-permission="{key: 'renovate', moduleName: '安全培训管理'}" type="warning" plain @click="resetForm">
             {{ $t("message.personnelPosition.beaconManage.refresh") }}
           </el-button>
           <!-- 添加安全教育培训 -->
@@ -109,7 +109,7 @@
         >
           <template slot-scope="scope">
             <div class="tableBtns">
-              <div v-permission="{key: 'edit', moduleName: '安全培训管理'}" @click="uploadPoint(scope.row)" class="operationText">
+              <div v-permission="{key: 'download', moduleName: '安全培训管理'}" @click="uploadPoint(scope.row)" class="operationText">
               <img
                   src="@/assets/images/icon_upload.png"
                   width="15px"
@@ -117,7 +117,7 @@
                 />
                 <span><a :href="uploadaurl" class="uploadpoint">下载</a></span>
               </div>
-              <div v-permission="{key: 'delete', moduleName: '安全培训管理'}" @click="editPoint(scope.row)" class="operationText">
+              <div v-permission="{key: 'edit', moduleName: '安全培训管理'}" @click="editPoint(scope.row)" class="operationText">
                 <img
                   src="@/assets/images/icon-edit.png"
                   width="15px"
@@ -127,7 +127,7 @@
                   $t("message.personnelPosition.beaconManage.table.edit")
                 }}</span>
               </div>
-              <div @click="removePoint(scope.row)" class="operationText">
+              <div v-permission="{key: 'delete', moduleName: '安全培训管理'}" @click="removePoint(scope.row)" class="operationText">
                 <img
                   src="@/assets/images/icon-delete.png"
                   width="15px"
diff --git a/src/views/projectFront/laborManage/workTypeManage.vue b/src/views/projectFront/laborManage/workTypeManage.vue
index 58791e57..2760b7c0 100644
--- a/src/views/projectFront/laborManage/workTypeManage.vue
+++ b/src/views/projectFront/laborManage/workTypeManage.vue
@@ -2,8 +2,11 @@
     <div class="fullHeight">
         <div class="searchBox whiteBlock">
             <!-- 添加 -->
-            <el-button size="medium" type="primary" @click="addBefore">{{$t('message.workType.operate.add')}}
+            <el-button   v-permission="{key: 'gzgl_query', moduleName: '工种管理'}"  size="medium" type="primary" @click="getWorkerList">查询
             </el-button>
+            <el-button v-permission="{key: 'gzgl_add', moduleName: '工种管理'}" size="medium" type="primary" @click="addBefore">{{$t('message.workType.operate.add')}}
+            </el-button>
+
         </div>
         <div class="table_wrap whiteBlock">
             <vue-scroll>
@@ -19,12 +22,12 @@
                         <template slot-scope="scope">
                             <div class="tableBtns" v-if="scope.row.typeName!='特殊工种'">
                                 <!-- 编辑 -->
-                                <div  @click="editBefore(scope.row)" class="operationText">
+                                <div v-permission="{key: 'gzgl_edit', moduleName: '工种管理'}"  @click="editBefore(scope.row)" class="operationText">
                                     <img src="@/assets/images/icon-edit.png" width="15px" height="15px"/>
                                     <span>{{$t('message.workType.edit')}}</span>
                                 </div>
                                 <!-- 删除 -->
-                                <div  @click="deleteBefore(scope.row)" class="operationText">
+                                <div v-permission="{key: 'gzgl_delete', moduleName: '工种管理'}"  @click="deleteBefore(scope.row)" class="operationText">
                                     <img src="@/assets/images/icon-delete.png" width="15px" height="15px"/>
                                     <span>{{$t('message.workType.delete')}}</span>
                                 </div>
diff --git a/src/views/projectFront/progressManagementAg/progressApproval.vue b/src/views/projectFront/progressManagementAg/progressApproval.vue
index b312fe37..e9e28b31 100644
--- a/src/views/projectFront/progressManagementAg/progressApproval.vue
+++ b/src/views/projectFront/progressManagementAg/progressApproval.vue
@@ -38,7 +38,7 @@
           ></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" plain @click="getWarningListData"
+          <el-button v-permission="{key: 'jdsp_query', moduleName: '进度审批'}"  type="primary" plain @click="getWarningListData"
             >查询</el-button
           >
           <el-button type="warning" plain @click="refresh">刷新</el-button>
diff --git a/src/views/projectFront/progressManagementAg/projectganttChart.vue b/src/views/projectFront/progressManagementAg/projectganttChart.vue
index cc584dd1..d696a653 100644
--- a/src/views/projectFront/progressManagementAg/projectganttChart.vue
+++ b/src/views/projectFront/progressManagementAg/projectganttChart.vue
@@ -83,10 +83,10 @@
         <span>项目剩余天数：{{progressData.projectSurplusDayNum || 0}}天</span>
         </div>
       <div class="update-operate">
-        <el-button type="primary" size="medium" @click="updateProgressFn(1)" :disabled="![5,10].includes($store.state.userInfo.accountType)"
+        <el-button v-permission="{key: 'xmzjd_xmzjd', moduleName: '项目总进度'}" type="primary" size="medium" @click="updateProgressFn(1)" :disabled="![5,10].includes($store.state.userInfo.accountType)"
           >更新项目总进度</el-button
         >
-        <el-button type="primary" size="medium" @click="updateProgressFn(2)"
+        <el-button v-permission="{key: 'xmzjd_cbsjd', moduleName: '项目总进度'}" type="primary" size="medium" @click="updateProgressFn(2)"
           >更新承包商进度</el-button
         >
       </div>