From ff255c7e9489402fa106e6af13f7fc10870138b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AA=86=E4=B9=90?= <342503599@qq.com>
Date: Wed, 29 Jun 2022 17:51:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectFront/configManage/roleManage.vue  | 44 ++++++++++++-------
 .../personModule/administration.vue           | 16 ++++---
 .../personModule/laborComponent.vue           |  5 ++-
 3 files changed, 40 insertions(+), 25 deletions(-)

diff --git a/src/views/projectFront/configManage/roleManage.vue b/src/views/projectFront/configManage/roleManage.vue
index f9ff23d0..ae22d915 100644
--- a/src/views/projectFront/configManage/roleManage.vue
+++ b/src/views/projectFront/configManage/roleManage.vue
@@ -172,14 +172,19 @@
       <div class="dialog_content">
         <!-- default-expand-all -->
           <!-- <div>项目模块</div> -->
-          <div>
-            <el-checkbox v-model="checkAll" @change="selectAll"></el-checkbox>全选
-          </div>
+          <!-- <div>
+            <el-checkbox
+             v-model="checkAll" 
+             @change="selectAll">全选</el-checkbox>
+          </div> -->
+          <!--  :props="props" -->
           <el-tree ref="tree"
+            v-bind="myTree"
             node-key="authorityId"
-            :props="props"
             :data="projectMenus"
             show-checkbox
+            :default-expand-all="isExpand"
+            :filter-node-method="filterNode"
             @check-change="handleCheckChange"
           >
             <span class="custom-tree-node" slot-scope="{ node, data }">
@@ -236,7 +241,15 @@ export default {
   },
   data() {
     return {
-      checkAll:false, //是否全选
+      myTree:{
+        data:[],
+        props: {
+        label: "name",
+        children: "menuList",
+       },
+       treeAllChildNode: [], // 数所有的可选择的子节点
+       checkAll:false, //是否全选
+      },
       addEditForm: {
         roleName: "",
         roleDesc: "",
@@ -271,10 +284,6 @@ export default {
       //   total: 0, //总条数
       // },
       // count: 0,
-      props: {
-        label: "name",
-        children: "menuList",
-      },
       projectMenus:[],
       selectRoleMenus:[],
       allOperateList:[],
@@ -498,14 +507,15 @@ export default {
       // console.log('选择',this.$refs.tree.getCheckedKeys());
     },
      // 全选反选
-    selectAll(){
-      // if(this.checkAll){
-      //   // console.log('111111',this.$refs)
-      //     this.$refs.tree.setCheckedNodes(this.projectMenus);
-      // }else{
-      //     this.$refs.tree.setCheckedKeys([])
-      // }
-    },
+    // selectAll(){
+    //   if(this.checkAll){
+    //     // for(let i = 0;)
+    //     console.log('111111',this.$refs)
+    //       this.$refs.tree.setCheckedNodes(this.projectMenus);
+    //   }else{
+    //       this.$refs.tree.setCheckedKeys([])
+    //   }
+    // },
   },
 };
 </script>
diff --git a/src/views/projectFront/laborManage/personModule/administration.vue b/src/views/projectFront/laborManage/personModule/administration.vue
index 27b57616..68221608 100644
--- a/src/views/projectFront/laborManage/personModule/administration.vue
+++ b/src/views/projectFront/laborManage/personModule/administration.vue
@@ -260,7 +260,7 @@
             <el-form-item :label="$t('message.laborMange.workingState')">
               <el-select
                 v-model="tableParameter.inserviceType"
-                style="width: 120px"
+                style="width: 100px"
               >
                 <el-option
                   :label="$t('message.laborMange.all')"
@@ -282,7 +282,7 @@
             >
               <el-select
                 v-model="tableParameter.codeState"
-                style="width: 120px"
+                style="width: 80px"
               >
                 <el-option
                   :label="$t('message.laborMange.all')"
@@ -308,14 +308,14 @@
             </el-form-item>
             <el-form-item :label="$t('message.laborMange.compellation')">
               <el-input
-                style="width: 120px"
+                style="width: 100px"
                 v-model="tableParameter.workerName"
                 :placeholder="$t('message.laborMange.placeholder2')"
               ></el-input>
             </el-form-item>
             <el-form-item :label="$t('message.laborMange.IdNumber')">
               <el-input
-                style="width: 120px"
+                style="width: 80px"
                 v-model="tableParameter.idCard"
                 :placeholder="$t('message.laborMange.placeholder2')"
               ></el-input>
@@ -1870,10 +1870,12 @@ export default {
     data.menuList.forEach((item)=>{
       if(item.actionList){
          item.actionList.forEach((item2)=>{
-          if(item2.actionCode = 'akey_issued' ){
-              this.key = true ;
-              // console.log('key',this.key)
+          if(item2.actionCode == 'akey_issued'){
+              this.key = false
+          } else {
+            this.key = true
           }
+          console.log('this.key',this.key)
         })
       }
     })
diff --git a/src/views/projectFront/laborManage/personModule/laborComponent.vue b/src/views/projectFront/laborManage/personModule/laborComponent.vue
index a9c7db66..e5a85d7f 100644
--- a/src/views/projectFront/laborManage/personModule/laborComponent.vue
+++ b/src/views/projectFront/laborManage/personModule/laborComponent.vue
@@ -2461,9 +2461,12 @@ export default {
     data.menuList.forEach((item)=>{
       if(item.actionList){
          item.actionList.forEach((item2)=>{
-          if(item2.actionCode = 'akey_issued'){
+          if(item2.actionCode == 'akey_issued'){
               this.key = true
+          } else {
+            this.key = false
           }
+          console.log('this.key',this.key)
         })
       }
     })