From e64197421cf28099935f71f193989a3394d47fe0 Mon Sep 17 00:00:00 2001
From: mrzcc <121184950@qq.com>
Date: 星期一, 17 二月 2020 18:12:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 WebService/src/main/resources/components/privilegePackage/add-privilege/addPrivilege.js |   54 +++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/WebService/src/main/resources/components/privilegePackage/add-privilege/addPrivilege.js b/WebService/src/main/resources/components/privilegePackage/add-privilege/addPrivilege.js
index 5ed224a..77643d8 100644
--- a/WebService/src/main/resources/components/privilegePackage/add-privilege/addPrivilege.js
+++ b/WebService/src/main/resources/components/privilegePackage/add-privilege/addPrivilege.js
@@ -4,10 +4,24 @@
         data:{
             addPrivilegeInfo:{
                 _currentPgId:'',
+                _pName:'',
                 name:'',
                 description:'',
                 errorInfo:'',
-                _noAddPrivilege:[]
+                _noAddPrivilege:[],
+                selectPrivileges:[]
+            }
+        },
+        watch: { // 鐩戣鍙屽悜缁戝畾鐨勬暟鎹暟缁�
+            addPrivilegeInfo: {
+                handler(){ // 鏁版嵁鏁扮粍鏈夊彉鍖栧皢瑙﹀彂姝ゅ嚱鏁�
+                    if(vc.component.addPrivilegeInfo.selectPrivileges.length == vc.component.addPrivilegeInfo._noAddPrivilege.length){
+                        document.querySelector('#quan').checked = true;
+                    }else {
+                        document.querySelector('#quan').checked = false;
+                    }
+                },
+                deep: true // 娣卞害鐩戣
             }
         },
          _initMethod:function(){
@@ -26,7 +40,8 @@
                 vc.component.addPrivilegeInfo._noAddPrivilege=[];
                 var param = {
                     params:{
-                        pgId:vc.component.addPrivilegeInfo._currentPgId
+                        pgId:vc.component.addPrivilegeInfo._currentPgId,
+                        pName:vc.component.addPrivilegeInfo._pName
                     }
                 }
                 vc.http.get(
@@ -47,14 +62,30 @@
                                 vc.component.addPrivilegeInfo.errorInfo = errInfo;
                              });
             },
-            addPrivilegeToPrivilegeGroup:function(_privilegeInfo){
+            addPrivilegeToPrivilegeGroup:function(){
 
                 vc.component.addPrivilegeInfo.errorInfo = "";
-                _privilegeInfo.pgId = vc.component.addPrivilegeInfo._currentPgId;
+                var _selectPrivileges = vc.component.addPrivilegeInfo.selectPrivileges;
+
+                if(_selectPrivileges.length < 1){
+                    vc.toast("璇峰厛閫夋嫨鏉冮檺");
+                    return ;
+                }
+                var _pIds = [];
+                for(var selectIndex = 0;selectIndex < _selectPrivileges.length;selectIndex ++){
+                    var _pId = {
+                        pId: _selectPrivileges[selectIndex]
+                    };
+                    _pIds.push(_pId);
+                }
+                var _objData = {
+                    pgId:vc.component.addPrivilegeInfo._currentPgId,
+                    pIds:_pIds
+                };
                 vc.http.post(
                     'addPrivilege',
                     'addPrivilegeToPrivilegeGroup',
-                    JSON.stringify(_privilegeInfo),
+                    JSON.stringify(_objData),
                     {
                         emulateJSON:true
                      },
@@ -63,6 +94,7 @@
                         if(res.status == 200){
                             //鍏抽棴model
                             vc.component.listNoAddPrivilege();
+                            $('#addPrivilegeModel').modal('hide');
                             vc.component.$emit('privilege_loadPrivilege',vc.component.addPrivilegeInfo._currentPgId);
                             return ;
                         }
@@ -73,6 +105,18 @@
 
                         vc.component.addPrivilegeInfo.errorInfo = errInfo;
                      });
+            },
+            checkAll:function(e){
+                    var checkObj = document.querySelectorAll('.checkItem'); // 鑾峰彇鎵�鏈塩heckbox椤�
+                    if(e.target.checked){ // 鍒ゅ畾鍏ㄩ�塩heckbox鐨勫嬀閫夌姸鎬�
+                        for(var i=0;i<checkObj.length;i++){
+                            if(!checkObj[i].checked){ // 灏嗘湭鍕鹃�夌殑checkbox閫夐」push鍒扮粦瀹氭暟缁勪腑
+                                vc.component.addPrivilegeInfo.selectPrivileges.push(checkObj[i].value);
+                            }
+                        }
+                    }else { // 濡傛灉鏄幓鎺夊叏閫夊垯娓呯┖checkbox閫夐」缁戝畾鏁扮粍
+                        vc.component.addPrivilegeInfo.selectPrivileges = [];
+                    }
             }
         }
     });

--
Gitblit v1.8.0