人员管理、机构按钮权限

config/dev.env.js

@@ -5,8 +5,8 @@ const prodEnv = require('./prod.env')
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   ENV_CONFIG:'"dev"',
-  BASE_URL: '"https://test.baoxianzhanggui.com/web-api"',//测试服务器
-  // BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
+  // BASE_URL: '"https://test.baoxianzhanggui.com/web-api"',//测试服务器
+  BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
   // BASE_URL: '"http://192.168.0.115:8080/"' //凯森
   // BASE_URL: '"http:///192.168.0.253:8082/"',//田智
   // BASE_URL: '"http:///192.168.0.253:8082/"',//田智

src/utils/btnPermission.js

@@ -11,11 +11,14 @@ const permission = {
         // sessionStorage.setItem('ButtonPermissions',JSON.stringify(['role:add']))
         // 自定义指令的执行函数，，取到登录缓存的按钮权限数组，赋值给全局对象userMsg
         global.ButtonPermissions = store.state.user.perms
-
         // global.ButtonPermissions = JSON.parse(sessionStorage.getItem('ButtonPermissions'))
-        if (!global.ButtonPermissions && global.ButtonPermissions.indexOf(value) < 0) {
+        if (global.ButtonPermissions && global.ButtonPermissions.indexOf(value) > 0) {
             el.style.display = 'block'
         }
+        else{
+            el.style.display = 'none'
+        }
+        console.log(global.ButtonPermissions.indexOf(value), el);
        
     }
 }

src/views/Core/KtButton.vue

@@ -51,7 +51,12 @@ export default {
     },
     hasPerms: function (perms) {
       // 根据权限标识和外部指示状态进行权限判断
-      return hasPermission(perms) & !this.disabled
+      if(!hasPermission(perms) ){
+        return false
+      }
+      else{
+        return true
+      }
     }
   },
   mounted() {

src/views/Letter/Letter.vue

@@ -1344,7 +1344,7 @@
                     v-show="reslistitem.quoteCode == '200' && !('editStatus' in reslistitem.result) "
                     type="text"
                     size="small"
-                    style="color:#2D4D89; "
+                    style="color:#2D4D89;font-size:14px"
                     @click="hbsubmitdialog(reslistitem)"
                   >下单</el-button>
                   <el-button

src/views/PeopleManage/Agent/AgentExamine.vue

@@ -80,7 +80,7 @@
           </el-row>
 
           <kt-common-table
-            permsButton1="sys:agent:edit"
+            permsButton1="sys:agent:examine"
             :data="pageResult"
             :columns="columns"
             :button1Name="'审核'"

src/views/PeopleManage/Agent/AgentLevel.vue

@@ -37,12 +37,12 @@
 				  	</el-row>
 				  </el-form>
 				  <div style="text-align: right; margin: 0">
-					<el-button style="background-color: #00bc70;border:1px solid #00bc70;" type="primary" size="mini" @click="levelVisible = false">确定</el-button>
-					<el-button size="mini" type="text" style="color: #00bc70;" @click="levelVisible = false">取消</el-button>
+					<el-button  type="primary" size="mini" @click="levelVisible = false">确定</el-button>
+					<el-button size="mini" type="text"  @click="levelVisible = false">取消</el-button>
 				  </div>
 			  </div>
 			  
-			  <el-button slot="reference" size="small" type="primary" icon="fa fa-plus" style="background-color: #00bc70;border:1px solid #00bc70;"> 添加</el-button>
+			  <el-button slot="reference" size="small" type="primary" icon="fa fa-plus"   v-permission="'sys:agentLevel:add'"> 添加</el-button>
 			</el-popover>
 		</div>
 		
@@ -82,12 +82,12 @@
 					  	</el-row>
 					  </el-form>
 					  <div style="text-align: right; margin: 0">
-						<el-button style="background-color: #00bc70;border:1px solid #00bc70;" type="primary" size="mini" @click="popoverEditHandleClose(positionTypeItem.id)">确定</el-button>
-						<el-button size="mini" type="text" style="color: #00bc70;" @click="popoverEditHandleClose(positionTypeItem.id)">取消</el-button>
+						<el-button  type="primary" size="mini" @click="popoverEditHandleClose(positionTypeItem.id)">确定</el-button>
+						<el-button size="mini" type="text"  @click="popoverEditHandleClose(positionTypeItem.id)">取消</el-button>
 					  </div>
 				  </div>
 				  
-				  <el-button slot="reference" type="text" style="color: #00bc70;margin-left: 20px;"> 编辑</el-button>
+				  <el-button slot="reference" type="text" style="margin-left: 20px;display: inline-block;" v-permission="'sys:agentLevel:edit'" > 编辑</el-button>
 				</el-popover>
 				<el-popover
 				  placement="bottom"
@@ -95,10 +95,10 @@
 				  :ref="`popoverdelpositiontype-${positionTypeItem.id}`">
 				  <p>确定删除当前职级类型及其全部职级信息？</p>
 				  <div style="text-align: right; margin: 0">
-				    <el-button style="background-color: #00bc70;border:1px solid #00bc70;" type="primary" size="mini" @click="popoverDelHandleClose">确定</el-button>
-				    <el-button size="mini" type="text" style="color: #00bc70;" @click="popoverDelHandleClose">取消</el-button>
+				    <el-button type="primary" size="mini" @click="popoverDelHandleClose">确定</el-button>
+				    <el-button size="mini" type="text" @click="popoverDelHandleClose">取消</el-button>
 				  </div>
-				  <el-button slot="reference" type="text" style="color: #00bc70;margin-left: 20px;"> 删除</el-button>
+				  <el-button slot="reference" type="text" style="display: block;"  v-permission="'sys:agentLevel:delete'"> 删除</el-button>
 				</el-popover>
 			</div>
 			<div class="edit-table-wrap" row-key="true">
@@ -108,13 +108,13 @@
 				  <el-table-column prop="supervisorPositionId" label="上级职级"></el-table-column>
 				  <el-table-column fixed="right" label="操作" width="220">
 					<template slot-scope="scope">
-					  <el-button  @click="addDrawer = true" type="text" class="textFontColor" size="small">编辑</el-button>
-					  <el-button type="text" size="small"  class="textFontColor">删除</el-button>
+					  <el-button  @click="addDrawer = true" type="text"  size="small" >编辑</el-button>
+					  <el-button type="text" size="small"  >删除</el-button>
 					</template>
 				  </el-table-column>
 				</el-table>
 			</div>
-			<el-button slot="reference" size="small" type="text" icon="fa fa-plus" @click="addAgentPosition(positionTypeIndex)" style="color: #00bc70;"> 添加</el-button>
+			<el-button slot="reference" size="small" type="text" icon="fa fa-plus" @click="addAgentPosition(positionTypeIndex)"> 添加</el-button>
 		</div>
 	</div>
 	
@@ -281,8 +281,6 @@
 		font-size: 16px;
 		font-weight: bold;
 	}
-	.textFontColor{
-		color:#00bc70!important;
-	}
+	
 }
 </style>

src/views/PeopleManage/Agent/AgentManage.vue

@@ -5,13 +5,15 @@
         <!-- 左侧树Start -->
         <SplitArea :size="leftSplitWidth" :minSize="240">
           <div>
-            <div>
+            <div >
               <!-- <el-checkbox v-model="containsSubDeptChecked"
                 >包含下级机构</el-checkbox
               > -->
-
               <kt-button
-                style="background-color: #ffc000; border: #ffc000"
+                style="
+                  background-color: #ffc000;
+                  border: #ffc000;
+                "
                 icon="fa fa-plus"
                 label="添加人员"
                 type="primary"
@@ -532,6 +534,7 @@ export default {
           {
             type: "primary",
             label: "编辑",
+            perm:'sys:agent:edit',
             icon: "fa fa-edit",
             click: (row, index) => {
               return this.handleTableEdit(row);

src/views/PeopleManage/BasicLawAudit.vue

@@ -62,12 +62,10 @@
               <el-button
                 size="small"
                 type="primary"
-                style="background-color: #00bc70; border: 1px solid #00bc70"
                 >查询</el-button
               >
               <el-button
                 size="small"
-                style="background-color: #ffffff; border: 1px solid c6e2ff"
                 >重置</el-button
               >
             </el-col>
@@ -149,7 +147,7 @@
                 <el-button
                   type="text"
                   size="small"
-                  class="textFontColor"
+                  v-permission="'sys:basicLawAudit:examine'"
                   @click="dialogVisible = true"
                   >审核</el-button
                 >
@@ -579,7 +577,7 @@
                   ></el-table-column>
                   <el-table-column fixed="right" label="操作" width="100">
                     <template slot-scope="scope">
-                      <el-button type="text" class="textFontColor" size="small"
+                      <el-button type="text" size="small"
                         >编辑</el-button
                       >
                     </template>
@@ -645,7 +643,6 @@
                           <el-button
                             type="text"
                             size="small"
-                            class="textFontColor"
                             >查看</el-button
                           >
                         </template>
@@ -769,7 +766,6 @@
                           <el-button
                             type="text"
                             size="small"
-                            class="textFontColor"
                             >查看</el-button
                           >
                         </template>
@@ -1216,9 +1212,7 @@ export default {
     font-size: 16px;
     font-weight: bold;
   }
-  .textFontColor {
-    color: #00bc70 !important;
-  }
+ 
 }
 
 .bottomFixed {

src/views/PeopleManage/BasicLawManage.vue

@@ -62,12 +62,10 @@
               <el-button
                 size="small"
                 type="primary"
-                style="background-color: #00bc70; border: 1px solid #00bc70"
                 >查询</el-button
               >
               <el-button
                 size="small"
-                style="background-color: #ffffff; border: 1px solid c6e2ff"
                 >重置</el-button
               >
             </el-col>
@@ -80,7 +78,7 @@
           size="small"
           type="primary"
           icon="fa fa-plus"
-          style="background-color: #00bc70; border: 1px solid #00bc70"
+          v-permission="'sys:basicLawManage:add'"
           @click="dialogVisible = true"
         >
           新增</el-button
@@ -154,19 +152,39 @@
             ></el-table-column>
             <el-table-column label="操作" min-width="200">
               <template slot-scope="scope">
-                <el-button type="text" size="small" class="textFontColor"
+                <!-- <el-button type="text" size="small"  v-permission="'sys:basicLawManage:view'"
                   >查看</el-button
-                >
-                <el-button
+                > -->
+                <kt-button
+                  label="查看"
+                  size="small"
+                  type="text"
+                  perms="sys:basicLawManage:view"
+                  @click="dialogVisible = true"
+                />
+                <!-- <el-button
                   type="text"
                   size="small"
-                  class="textFontColor"
+                  v-permission="'sys:basicLawManage:edit'"
                   @click="dialogVisible = true"
                   >编辑</el-button
-                >
-                <el-button type="text" size="small" class="textFontColor"
+                > -->
+                <kt-button
+                  label="编辑"
+                  size="small"
+                  type="text"
+                  perms="sys:basicLawManage:edit"
+                  @click="dialogVisible = true"
+                />
+                <kt-button
+                  label="作废"
+                  size="small"
+                  type="text"
+                  perms="sys:basicLawManage:cancel"
+                />
+                <!-- <el-button type="text" size="small"  v-permission="'sys:basicLawManage:cancel'"
                   >作废</el-button
-                >
+                > -->
               </template>
             </el-table-column>
           </el-table>
@@ -593,7 +611,7 @@
                   ></el-table-column>
                   <el-table-column fixed="right" label="操作" width="100">
                     <template slot-scope="scope">
-                      <el-button type="text" class="textFontColor" size="small"
+                      <el-button type="text"  size="small"
                         >编辑</el-button
                       >
                     </template>
@@ -659,7 +677,6 @@
                           <el-button
                             type="text"
                             size="small"
-                            class="textFontColor"
                             >查看</el-button
                           >
                         </template>
@@ -783,7 +800,6 @@
                           <el-button
                             type="text"
                             size="small"
-                            class="textFontColor"
                             >查看</el-button
                           >
                         </template>
@@ -943,8 +959,9 @@
 </template>
 
 <script>
+import KtButton from "@/views/Core/KtButton"; // 按钮权限组件
 export default {
-  components: {},
+  components: {KtButton},
   mounted() {
     const that = this;
     setTimeout(() => {
@@ -1230,9 +1247,7 @@ export default {
     font-size: 16px;
     font-weight: bold;
   }
-  .textFontColor {
-    color: #00bc70 !important;
-  }
+ 
 }
 
 .bottomFixed {

src/views/PeopleManage/Player/PlayerManage.vue

@@ -11,7 +11,7 @@
                 icon="fa fa-plus"
                 label="添加人员"
                 type="primary"
-                perms="sys:agent:add"
+                perms="sys:issuerchannel:add"
                 @click="handleAddButton"
               />
             </div>
@@ -279,6 +279,7 @@ export default {
           {
             type: "primary",
             label: "编辑",
+            perm:'sys:issuerchannel:edit',
             icon: "fa fa-edit",
             click: (row, index) => {
               return this.handleTableEdit(row);

src/views/PeopleManage/Player/PlayerManageteam.vue

@@ -11,7 +11,7 @@
                 icon="fa fa-plus"
                 label="添加人员"
                 type="primary"
-                perms="sys:agent:add"
+                perms="sys:teamchannel:add"
                 @click="handleAddButton"
               />
             </div>
@@ -462,6 +462,7 @@ export default {
           {
             type: "primary",
             label: "编辑",
+            perm:'sys:teamchannel:edit',
             icon: "fa fa-edit",
             click: (row, index) => {
               return this.handleTableEdit(row);

src/views/PeopleManage/Seo/StaffSeo.vue

@@ -85,7 +85,7 @@
           <!-- 筛选区域End -->
 
           <kt-common-table
-            permsButton1="sys:userverify:view"
+            permsButton4="sys:personnel:view"
             :data="pageResult"
             :columns="columns"
             button4Name="查看"

src/views/PeopleManage/Seo/TeamSeo.vue

@@ -133,7 +133,7 @@
       </el-table-column>
       <el-table-column header-align="center" align="center" label="操作">
         <template slot-scope="scope">
-          <el-button type="text" size="small" @click="handleTableEdit(scope)"
+          <el-button type="text" size="small" @click="handleTableEdit(scope)" v-permission="'sys:teamquery:view'"
             >查看</el-button
           >
         </template>

src/views/PeopleManage/Staff/StaffExamine.vue

@@ -54,7 +54,7 @@
             </el-form>
           </el-row>
 
-          <kt-common-table permsButton1="sys:agent:edit" :data="pageResult" :columns="columns" :button1Name="'审核'"
+          <kt-common-table permsButton1="sys:backline:examine" :data="pageResult" :columns="columns" :button1Name="'审核'"
             :showBatchDelete="false" @findPage="findPage" @handleButton1="handleTableEdit">
           </kt-common-table>
 

src/views/PeopleManage/Staff/StaffManage.vue

@@ -18,7 +18,7 @@
                 icon="fa fa-plus"
                 label="添加人员"
                 type="primary"
-                perms="sys:agent:add"
+                perms="sys:backline:add"
                 @click="handleAddButton"
               />
             </div>
@@ -98,8 +98,7 @@
           </el-row>
 
             <kt-common-table
-              permsEdit="sys:agent:edit"
-              permsDelete="sys:agent:delete"
+              permsEdit="sys:backline:edit"
               :data="pageResult"
               :columns="columns"
               editButtonName="编辑"

src/views/PeopleManage/TeamLeader/TeamLeaderExamine.vue

@@ -80,7 +80,7 @@
           </el-row>
 
             <kt-common-table
-               permsButton1="sys:agent:edit"
+               permsButton1="sys:team:examine"
               :data="pageResult"
               :columns="columns"
               :button1Name="'审核'"

src/views/PeopleManage/TeamLeader/TeamLeaderManage.vue

@@ -15,7 +15,7 @@
                 icon="fa fa-plus"
                 label="添加人员"
                 type="primary"
-                perms="sys:agent:add"
+                perms="sys:team:add"
                 @click="handleAddButton"
               />
             </div>
@@ -100,8 +100,7 @@
           </el-row>
 
           <kt-common-table
-            permsEdit="sys:agent:edit"
-            permsDelete="sys:agent:delete"
+            permsEdit="sys:team:edit"
             :data="pageResult"
             :columns="columns"
             editButtonName="编辑"

src/views/Sys/Deptall.vue

@@ -127,23 +127,13 @@
             width="150"
           >
             <template slot-scope="scope">
-              <el-button
-                type="text"
-                size="medium "
-                icon="el-icon-edit"
-                @click.native.stop="handleEdit(scope.row)"
+              <KtButton :perms="'sys:institution:edit'" :size="'medium'" :type="'text'" :label="'编辑'"
+              @click.native.stop="handleEdit(scope.row)"
                 @findPage="findSubDeptPage"
-                >编辑</el-button
-              >
-              <el-button
-                type="text"
-                style="color: #f56c6c"
-                :round="false"
-                size="medium "
-                icon="el-icon-delete"
-                @click.native.stop="deleteMechanism(scope.row)"
-                >删除</el-button
-              >
+               ></KtButton>
+               <KtButton :perms="'sys:institution:delete'" :size="'medium'" :type="'text'" :label="'删除'"
+              @click.native.stop="deleteMechanism(scope.row)"
+               ></KtButton>
             </template>
           </el-table-column>
         </el-table>
@@ -1111,12 +1101,6 @@ export default {
             }
           });
         })
-        .catch(() => {
-          that.$message({
-            type: "info",
-            message: "已取消删除",
-          });
-        });
     },
     handleDeleteFlag(data) {
       let that = this;