fmui-base 1.0.48 → 2.0.0

package/lib/selectMember/select.js

@@ -128,7 +128,9 @@ var Page = function (_React$Component) {
 
       isShowNav: false, //是否展示面包屑导航
       isShowCheckAll: false, //是否展示全选
+      isShowThisOrg: false,
       commonCheckAll: false, //常用是否全选
+      navCommonList: [], //面包屑导航list,常用
       navUserList: [], //面包屑导航list
       navOrgList: [], //面包屑导航list
       roleCheckAll: false, //角色是否全选
@@ -140,6 +142,7 @@ var Page = function (_React$Component) {
       isSelectShow: false, //是否是已选查看页
       staSelectType: "0",
       activeKey: 'user',
+      commonTreeData: [],
       commonUsedData: [],
       commonDefaultData: [],
       userOrgList: [],
@@ -388,7 +391,7 @@ var Page = function (_React$Component) {
         code = "";
       }
 
-      if (chooseType == null || chooseType == undefined || chooseType == "") {
+      if (typeof chooseType == "undefined" || chooseType == null || chooseType == undefined || chooseType == "") {
         chooseType = "";
 
         if (chooseObj) {
@@ -397,7 +400,7 @@ var Page = function (_React$Component) {
             chooseType = "userAndOrg";
           } else if (code.indexOf("userNotOrg") >= 0 && code.indexOf("org") < 0) {
             chooseType = "userNotOrg";
-          } else if (code.indexOf("userNotOrg") < 0 && code.indexOf("org") >= 0) {
+          } else if (code.indexOf("org") >= 0 || code.indexOf("dept") >= 0 || code.indexOf("inst") >= 0) {
             chooseType = "org";
           } else {
             chooseType = "";
@@ -1035,7 +1038,7 @@ var Page = function (_React$Component) {
             }
           }
         } else {
-          if (chooseType.indexOf("userNotOrg") < 0) {
+          if (chooseType.indexOf("userNotGroup") < 0) {
             for (var i = 0; i < groupList.length; i++) {
               if (groupList[i].canUse == "1") {
                 if (groupList[i].checked) {
@@ -1165,7 +1168,7 @@ var Page = function (_React$Component) {
             }
           }
         } else {
-          if (chooseType.indexOf("userNotOrg") < 0) {
+          if (chooseType.indexOf("userNotPersonGroup") < 0) {
             for (var i = 0; i < personalGroupList.length; i++) {
               if (personalGroupList[i].canUse == "1") {
                 if (personalGroupList[i].checked) {
@@ -1295,7 +1298,7 @@ var Page = function (_React$Component) {
             }
           }
         } else {
-          if (chooseType.indexOf("userNotOrg") < 0) {
+          if (chooseType.indexOf("userNotDuty") < 0) {
             for (var i = 0; i < dutyList.length; i++) {
               if (dutyList[i].canUse == "1") {
                 if (dutyList[i].checked) {
@@ -1425,7 +1428,7 @@ var Page = function (_React$Component) {
             }
           }
         } else {
-          if (chooseType.indexOf("userNotOrg") < 0) {
+          if (chooseType.indexOf("userNotPoliticalOutlook") < 0) {
             for (var i = 0; i < politicalOutlookList.length; i++) {
               if (politicalOutlookList[i].canUse == "1") {
                 if (politicalOutlookList[i].checked) {
@@ -1485,6 +1488,77 @@ var Page = function (_React$Component) {
       }
     }
 
+    //选择本组织
+
+  }, {
+    key: 'checkThisOrg',
+    value: function checkThisOrg(type) {
+      var _this3 = this;
+
+      var t = this;
+      var scopeList = this.state.scopeList;
+      var chooseType = this.getChooseType();
+      if ("politicalOutlook" == type) {
+        //政治面貌
+        var navList = t.state.navPoliticalOutlookList;
+        var index = navList.length - 1;
+        if (navList[index].canUse == "0") {
+          return;
+        }
+        navList[index].checkThisOrg = !navList[index].checkThisOrg;
+        var selectedList = t.state.selectedList;
+        var politicalOutlookUserList = t.state.politicalOutlookUserList;
+        var total = t.state.total;
+        var selectPoliticalOutlookUserNum = t.state.selectPoliticalOutlookUserNum;
+        var selectUsers = selectedList.selectUsers;
+        if (selectUsers == null || selectUsers == undefined) {
+          selectUsers = [];
+        }
+
+        for (var i = 0; i < politicalOutlookUserList.length; i++) {
+          if (politicalOutlookUserList[i].isSameOrg == "1") {
+            if (!politicalOutlookUserList[i].checked) {
+              politicalOutlookUserList[i].checked = true;
+              total++;
+              selectPoliticalOutlookUserNum++;
+            } else {
+              politicalOutlookUserList[i].checked = false;
+              total--;
+              selectPoliticalOutlookUserNum--;
+            }
+
+            var flag = true;
+            for (var j = 0; j < selectUsers.length; j++) {
+              if (selectUsers[j].id == politicalOutlookUserList[i].id) {
+                flag = false;
+                break;
+              }
+            }
+            if (flag) {
+              var scope = {
+                "scopeType": "user",
+                "scopeName": politicalOutlookUserList[i].userName,
+                "scopeValue": politicalOutlookUserList[i].id
+              };
+              scopeList.push(scope);
+              selectUsers.push(politicalOutlookUserList[i]);
+            }
+          }
+        }
+        selectedList.selectUsers = selectUsers;
+        t.setState({
+          politicalOutlookUserList: politicalOutlookUserList,
+          total: total,
+          navList: navList,
+          selectPoliticalOutlookUserNum: selectPoliticalOutlookUserNum,
+          selectedList: selectedList,
+          scopeList: scopeList
+        }, function () {
+          _this3.instance.update(_this3.getContent());
+        });
+      }
+    }
+
     //获取URL
 
   }, {
@@ -1597,7 +1671,110 @@ var Page = function (_React$Component) {
       var finalId = id;
       var checkType = this.props.checkType;
       var chooseType = this.getChooseType();
-      if (type == "user") {
+      if (type == "common") {
+        var navList = t.state.navCommonList;
+        var index = navList.length - 1;
+        var selectUserNum = 0;
+        var isShowNav = true,
+            isShowCheckAll = true;
+        if (checkType == "radio" || id == "0") {
+          isShowCheckAll = false;
+        }
+        var url = "";
+        if (id == "0") {
+          isShowNav = false;
+          navList = [];
+          id = "";
+          // url = t.getFetchUrl("common", "", "", false, false);
+          t.getSelectData("1");
+        } else {
+          for (var i = 0; i < navList.length; i++) {
+            if (navList[i].scopeValue == id) {
+              navList.splice(i + 1, navList.length - i);
+              break;
+            }
+          }
+          url = t.getFetchUrl(navType, id, "", true, true);
+
+          fetch(url, {
+            method: "GET",
+            mode: "cors",
+            headers: {
+              'Accept': 'application/json, text/plain, */*',
+              'Content-Type': 'application/x-www-form-urlencoded'
+            }
+          }).then(function (response) {
+            return response.json();
+          }).then(function (result) {
+            //alert(JSON.stringify(result));
+            //console.log("fetch请求数据"+JSON.stringify(result));
+            var itemList = [],
+                userList = [];
+            if (navType == "org") {
+              itemList = result.data.orgList;
+              userList = result.data.userList;
+            } else if (navType == "group") {
+              itemList = result.data.groupList;
+              userList = result.data.userList;
+            }
+            if (itemList == null || itemList == undefined) {
+              itemList = [];
+            }
+            if (userList == null || userList == undefined || userList.length <= 0) {
+              userList = [];
+            } else {
+              var selectUsers = t.state.selectedList.selectUsers;
+              selectUserNum = t.dataIsChecked(userList, selectUsers, selectUserNum);
+              if (selectUserNum == userList.length) {
+                navList[navList.length - 1].checkAll = true;
+              }
+            }
+
+            var commonTreeData = [];
+            var commonUsedData = [];
+            for (var i = 0; i < itemList.length; i++) {
+              var data = {};
+              if (navType == "org") {
+                data = {
+                  scopeType: "org",
+                  scopeName: itemList[i].orgName,
+                  scopeValue: itemList[i].id,
+                  checked: itemList[i].checked
+                };
+              } else if (navType == "group") {
+                data = {
+                  scopeType: "group",
+                  scopeName: itemList[i].groupName,
+                  scopeValue: itemList[i].id,
+                  checked: itemList[i].checked
+                };
+              }
+              commonTreeData.push(data);
+            }
+            for (var i = 0; i < userList.length; i++) {
+              var data = {
+                scopeType: "user",
+                scopeName: userList[i].userName,
+                scopeValue: userList[i].id,
+                checked: userList[i].checked
+              };
+              commonUsedData.push(data);
+            }
+            t.setState({
+              commonTreeData: commonTreeData,
+              commonUsedData: commonUsedData,
+              selectUserNum: selectUserNum,
+              navCommonList: navList,
+              isShowNav: isShowNav,
+              isShowCheckAll: isShowCheckAll
+            }, function () {
+              t.instance.update(t.getContent());
+            });
+          }).catch(function (error) {
+            alert("869错误：" + error);
+          });
+        }
+      } else if (type == "user") {
         var navList = t.state.navUserList;
         var index = navList.length - 1;
         var selectUserNum = 0;
@@ -2160,9 +2337,9 @@ var Page = function (_React$Component) {
             noUsePoliticalOutlookNum = 0,
             selectPoliticalOutlookUserNum = 0;
         var isShowNav = true,
-            isShowCheckAll = true;
+            isShowCheckAll = true;var isShowThisOrg = true;
         if (checkType == 'radio') {
-          isShowCheckAll = false;
+          isShowCheckAll = false;isShowThisOrg = false;
         }
         var politicalOutlookName = this.state.politicalOutlookName;
         var url = "";
@@ -2238,7 +2415,8 @@ var Page = function (_React$Component) {
               selectPoliticalOutlookUserNum: selectUserNum,
               navPoliticalOutlookList: navList,
               isShowNav: isShowNav,
-              isShowCheckAll: isShowCheckAll
+              isShowCheckAll: isShowCheckAll,
+              isShowThisOrg: isShowThisOrg
             }, function () {
               t.instance.update(t.getContent());
             });
@@ -2354,38 +2532,68 @@ var Page = function (_React$Component) {
 
   }, {
     key: 'handleOrgShow',
-    value: function handleOrgShow(orgId, org) {
+    value: function handleOrgShow(itemId, org, from) {
 
       var chooseType = this.getChooseType();
-      var orgList = this.state.orgList;
-      var orgUserList = this.state.orgUserList;
-      var navList = this.state.navOrgList;
+      var itemList = [];
+      var navList = [];
       var selectOrgNum = 0,
           noUseOrgNum = 0,
           selectOrgUserNum = 0;
+      // var orgUserList = this.state.orgUserList;
+      if (from == "common") {
+        itemList = this.state.commonTreeData;
+        navList = this.state.navCommonList;
+      } else {
+        itemList = this.state.orgList;
+        navList = this.state.navOrgList;
+      }
+
       var index = navList.length - 1;
-      var currentOrg = {};
-      for (var i = 0; i < orgList.length; i++) {
-        if (orgList[i].id == orgId) {
-          currentOrg = orgList[i];
+      var currentItem = {};
+      for (var i = 0; i < itemList.length; i++) {
+        if (from == "common") {
+          if (itemList[i].scopeValue == itemId) {
+            currentItem = itemList[i];
+          }
+        } else {
+          if (itemList[i].id == itemId) {
+            currentItem = itemList[i];
+          }
         }
         if (navList.length > 0) {
-          if (navList[index].id == orgList[i].id) {
-            navList.splice(index, 1);
-            break;
+          if (from == "common") {
+            if (navList[index].scopeValue == itemList[i].scopeValue) {
+              navList.splice(index, 1);
+              break;
+            }
+          } else {
+            if (navList[index].id == itemList[i].id) {
+              navList.splice(index, 1);
+              break;
+            }
           }
         } else {
           break;
         }
       }
-      navList.push(currentOrg);
+      navList.push(currentItem);
       var isShowCheckAll = true;
       if (this.props.checkType == "radio") {
         isShowCheckAll = false;
       }
       //获取下级组织数据
       var t = this;
-      var url = t.getFetchUrl("org", orgId, this.state.orgName, true, true);
+      var type = "";
+      var serach = "";
+      if (from == "common") {
+        type = "org";
+        serach = this.state.commonName;
+      } else {
+        type = "org";
+        serach = this.state.orgName;
+      }
+      var url = t.getFetchUrl(type, itemId, serach, true, true);
       fetch(url, {
         method: "GET",
         mode: "cors",
@@ -2448,16 +2656,54 @@ var Page = function (_React$Component) {
         if (checkAllUser && checkAllOrg) {
           navList[navList.length - 1].checkAll = true;
         }
-        t.setState({
-          orgList: orgList,
-          orgUserList: userList,
-          selectOrgNum: selectOrgNum,
-          noUseOrgNum: noUseOrgNum,
-          selectOrgUserNum: selectUserNum,
-          navOrgList: navList,
-          isShowNav: true,
-          isShowCheckAll: isShowCheckAll
-        }, function () {
+        var stateParam = {};
+
+        if (from == "common") {
+          var commonTreeData = [];
+          var commonUsedData = [];
+          for (var i = 0; i < orgList.length; i++) {
+            var data = {
+              scopeType: "org",
+              scopeName: orgList[i].orgName,
+              scopeValue: orgList[i].id,
+              checked: orgList[i].checked
+            };
+            commonTreeData.push(data);
+          }
+          for (var i = 0; i < userList.length; i++) {
+            var data = {
+              scopeType: "user",
+              scopeName: userList[i].userName,
+              scopeValue: userList[i].id,
+              checked: userList[i].checked
+            };
+            commonUsedData.push(data);
+          }
+
+          stateParam = {
+            commonTreeData: commonTreeData,
+            commonUsedData: commonUsedData,
+            selectOrgNum: selectOrgNum,
+            noUseOrgNum: noUseOrgNum,
+            selectOrgUserNum: selectUserNum,
+            navCommonList: navList,
+            isShowNav: true,
+            isShowCheckAll: isShowCheckAll
+          };
+        } else {
+          stateParam = {
+            orgList: orgList,
+            orgUserList: userList,
+            selectOrgNum: selectOrgNum,
+            noUseOrgNum: noUseOrgNum,
+            selectOrgUserNum: selectUserNum,
+            navOrgList: navList,
+            isShowNav: true,
+            isShowCheckAll: isShowCheckAll
+          };
+        }
+
+        t.setState(stateParam, function () {
           t.instance.update(t.getContent());
         });
       }).catch(function (error) {
@@ -2841,9 +3087,9 @@ var Page = function (_React$Component) {
         }
       }
       navList.push(currentPoliticalOutlook);
-      var isShowCheckAll = true;
+      var isShowCheckAll = true;var isShowThisOrg = true;
       if (this.props.checkType == "radio") {
-        isShowCheckAll = false;
+        isShowCheckAll = false;isShowThisOrg = false;
       }
       //获取下级组织数据
       var t = this;
@@ -2879,7 +3125,7 @@ var Page = function (_React$Component) {
           if (userList == null || userList == undefined) {
             userList = [];
           } else {
-            if (chooseType.indexOf("userNotPersonGroup") >= 0 || chooseType.indexOf("userAndPersonGroup") >= 0 || true) {
+            if (chooseType.indexOf("userNotPoliticalOutlook") >= 0 || chooseType.indexOf("userAndPoliticalOutlook") >= 0 || true) {
               var selectUsers = t.state.selectedList.selectUsers;
               selectUserNum = t.dataIsChecked(userList, selectUsers, selectUserNum);
               if (selectUserNum != userList.length) {
@@ -2905,7 +3151,8 @@ var Page = function (_React$Component) {
             selectPoliticalOutlookUserNum: selectUserNum,
             navPoliticalOutlookList: navList,
             isShowNav: true,
-            isShowCheckAll: isShowCheckAll
+            isShowCheckAll: isShowCheckAll,
+            isShowThisOrg: isShowThisOrg
           }, function () {
             t.instance.update(t.getContent());
           });
@@ -2921,13 +3168,14 @@ var Page = function (_React$Component) {
 
   }, {
     key: 'handleGroupShow',
-    value: function handleGroupShow(groupId) {
+    value: function handleGroupShow(groupId, group, from) {
       var chooseType = this.getChooseType();
       var groupList = this.state.groupList;
       var groupUserList = this.state.groupUserList;
       var navList = this.state.navGroupList;
       var selectGroupNum = 0,
           noUseGroupNum = 0;
+
       var index = navList.length - 1;
       var currentGroup = {};
       for (var i = 0; i < groupList.length; i++) {
@@ -3017,42 +3265,302 @@ var Page = function (_React$Component) {
       });
     }
 
-    //单个选中方法
+    //常用点击
 
   }, {
-    key: 'checkOneItem',
-    value: function checkOneItem(canUse, checked, selectData, dataList, checkType, total, selectNum, index, scopeList, type) {
-      var result = { "total": total, selectNum: selectNum };
-      if (canUse == "1") {
-        if (checked) {
-          if (checkType == "radio") {
-            if (selectData.length == 0 && total == 0) {
-              total++;
+    key: 'handleCommonShow',
+    value: function handleCommonShow(itemId, item, from, navType) {
+      var chooseType = this.getChooseType();
+      var itemList = [];
+      var navList = [];
+      var selectItemNum = 0,
+          noUseItemNum = 0,
+          selectOrgUserNum = 0;
+      // var orgUserList = this.state.orgUserList;
+      if (from == "common") {
+        itemList = this.state.commonTreeData;
+        navList = this.state.navCommonList;
+      } else if (from == "org") {
+        itemList = this.state.orgList;
+        navList = this.state.navOrgList;
+      } else if (from == "group") {
+        itemList = this.state.groupList;
+        navList = this.state.navGroupList;
+      } else if (from == "station") {
+        itemList = this.state.stationList;
+        navList = this.state.navStationList;
+      } else if (from == "role") {
+        itemList = this.state.roleList;
+        // navList = this.state.navRoleList;
+      }
+
+      var index = navList.length - 1;
+      var currentItem = {};
+      for (var i = 0; i < itemList.length; i++) {
+        if (from == "common") {
+          if (itemList[i].scopeValue == itemId) {
+            currentItem = itemList[i];
+          }
+        } else if (from == "org") {
+          if (itemList[i].id == itemId) {
+            currentItem = itemList[i];
+          }
+        } else if (from == "group") {
+          if (itemList[i].id == itemId) {
+            currentItem = itemList[i];
+          }
+        } else if (from == "station") {
+          if (itemList[i].id == itemId) {
+            currentItem = itemList[i];
+          }
+        } else if (from == "role") {
+          if (itemList[i].id == itemId) {
+            currentItem = itemList[i];
+          }
+        }
+        if (navList.length > 0) {
+          if (from == "common") {
+            if (navList[index].scopeValue == itemList[i].scopeValue) {
+              navList.splice(index, 1);
+              break;
             }
-            selectNum = 1;
-            selectData[0] = dataList[index];
-            for (var i = 0; i < dataList.length; i++) {
-              if (dataList[i].checked && i != index) {
-                dataList[i].checked = false;
-                break;
-              }
+          } else if (from == "org") {
+            if (navList[index].id == itemList[i].id) {
+              navList.splice(index, 1);
+              break;
+            }
+          } else if (from == "group") {
+            if (navList[index].id == itemList[i].id) {
+              navList.splice(index, 1);
+              break;
             }
-          } else {
-            total++;
-            selectNum++;
-            selectData.push(dataList[index]);
           }
-          var scope = { "scopeValue": dataList[index].id };
-          if (type == "user") {
-            scope.scopeType = "user";
-            scope.scopeName = dataList[index].userName;
-          } else if (type == "org") {
-            scope.scopeType = "org";
-            scope.scopeName = dataList[index].orgName;
-            scope.orgType = dataList[index].orgType;
-          } else if (type == "role") {
-            scope.scopeType = "role";
-            scope.scopeName = dataList[index].roleName;
+        } else {
+          break;
+        }
+      }
+      navList.push(currentItem);
+      var isShowCheckAll = true;
+      if (this.props.checkType == "radio") {
+        isShowCheckAll = false;
+      }
+      //获取下级组织数据
+      var t = this;
+      var type = "";
+      var serach = "";
+      if (from == "common") {
+        type = navType;
+        serach = this.state.commonName;
+      } else if (from == "org") {
+        type = "org";
+        serach = this.state.orgName;
+      } else if (from == "group") {
+        type = "group";
+        serach = this.state.groupName;
+      }
+      var url = t.getFetchUrl(type, itemId, serach, true, true);
+      fetch(url, {
+        method: "GET",
+        mode: "cors",
+        headers: {
+          'Accept': 'application/json, text/plain, */*',
+          'Content-Type': 'application/x-www-form-urlencoded'
+        }
+      }).then(function (response) {
+        return response.json();
+      }).then(function (result) {
+        //alert(JSON.stringify(result));
+        //console.log("fetch请求数据"+JSON.stringify(result));
+        var itemList = undefined;
+        if (from == "common") {
+          if (navType == "org") {
+            itemList = result.data.orgList;
+          } else if (navType == "group") {
+            itemList = result.data.groupList;
+          }
+        } else if (from == "org") {
+          if (item && item.isCur) {
+            itemList = [];
+          } else {
+            itemList = result.data.orgList;
+          }
+        } else if (from == "group") {
+          itemList = result.data.groupList;
+        }
+
+        var userList = result.data.userList;
+        if (from == "org") {
+          if (itemList == undefined && userList == undefined) {
+            orgList = result.data;
+          }
+        }
+        var checkAllItem = true;
+        if (itemList == null || itemList == undefined) {
+          itemList = [];
+        } else {
+          if (from == "group") {
+            if (chooseType.indexOf("userNotGroup") < 0) {
+              var selectGroups = t.state.selectedList.selectGroups;
+              selectItemNum = t.dataIsChecked(itemList, selectGroups, selectItemNum);
+              noUseItemNum = t.countNoUseNum(itemList);
+              if (selectItemNum != itemList.length - noUseItemNum) {
+                checkAllItem = false;
+              }
+            }
+          } else if (from == "org") {
+            if (chooseType.indexOf("userNotOrg") < 0) {
+              var selectOrgs = t.state.selectedList.selectOrgs;
+              selectItemNum = t.dataIsChecked(itemList, selectOrgs, selectItemNum);
+              noUseItemNum = t.countNoUseNum(itemList);
+              if (selectItemNum != itemList.length - noUseItemNum) {
+                checkAllItem = false;
+              }
+            }
+          }
+        }
+        var selectUserNum = 0;
+        var checkAllUser = true;
+        if (userList == null || userList == undefined) {
+          userList = [];
+        } else {
+          if (from == "group") {
+            if (chooseType.indexOf("userNotGroup") >= 0 || chooseType.indexOf("userAndGroup") >= 0) {
+              var selectUsers = t.state.selectedList.selectUsers;
+              selectUserNum = t.dataIsChecked(userList, selectUsers, selectUserNum);
+              if (selectUserNum != userList.length) {
+                checkAllUser = false;
+              }
+            }
+          } else {
+            if (chooseType.indexOf("userNotOrg") >= 0 || chooseType.indexOf("userAndOrg") >= 0) {
+              var selectUsers = t.state.selectedList.selectUsers;
+              selectUserNum = t.dataIsChecked(userList, selectUsers, selectUserNum);
+              if (selectUserNum != userList.length) {
+                checkAllUser = false;
+              }
+            }
+          }
+        }
+        if (itemList.length == noUseItemNum && userList.length == 0) {
+          //全部不可选
+          navList[navList.length - 1].canUse = "0";
+        } else {
+          //如果是我的部门.
+          if (item && item.isCur) {
+            navList[navList.length - 1].canUse = "0";
+          } else {
+            navList[navList.length - 1].canUse = "1";
+          }
+        }
+        if (checkAllUser && checkAllItem) {
+          navList[navList.length - 1].checkAll = true;
+        }
+        var stateParam = {};
+
+        if (from == "common") {
+          var commonTreeData = [];
+          var commonUsedData = [];
+          for (var i = 0; i < itemList.length; i++) {
+            var data = {};
+            if (navType == "org") {
+              data = {
+                scopeType: navType,
+                scopeName: itemList[i].orgName,
+                scopeValue: itemList[i].id,
+                checked: itemList[i].checked
+              };
+            } else if (navType == "group") {
+              data = {
+                scopeType: navType,
+                scopeName: itemList[i].groupName,
+                scopeValue: itemList[i].id,
+                checked: itemList[i].checked
+              };
+            }
+            commonTreeData.push(data);
+          }
+          for (var i = 0; i < userList.length; i++) {
+            var data = {
+              scopeType: "user",
+              scopeName: userList[i].userName,
+              scopeValue: userList[i].id,
+              checked: userList[i].checked
+            };
+            commonUsedData.push(data);
+          }
+          stateParam = {
+            commonTreeData: commonTreeData,
+            commonUsedData: commonUsedData,
+            navCommonList: navList,
+            isShowNav: true,
+            isShowCheckAll: isShowCheckAll
+          };
+          if (navType == "org") {
+            stateParam.noUseOrgNum = noUseItemNum;
+            stateParam.selectOrgNum = selectItemNum;
+            stateParam.selectOrgUserNum = selectUserNum;
+          } else if (navType == "group") {
+            stateParam.noUseGroupNum = noUseItemNum;
+            stateParam.selectGroupNum = selectItemNum;
+            stateParam.selectGroupUserNum = selectUserNum;
+          }
+        } else {
+          stateParam = {
+            orgList: orgList,
+            orgUserList: userList,
+            selectOrgNum: selectOrgNum,
+            noUseOrgNum: noUseOrgNum,
+            selectOrgUserNum: selectUserNum,
+            navOrgList: navList,
+            isShowNav: true,
+            isShowCheckAll: isShowCheckAll
+          };
+        }
+
+        t.setState(stateParam, function () {
+          t.instance.update(t.getContent());
+        });
+      }).catch(function (error) {
+        alert("1322错误：" + error);
+      });
+    }
+
+    //单个选中方法
+
+  }, {
+    key: 'checkOneItem',
+    value: function checkOneItem(canUse, checked, selectData, dataList, checkType, total, selectNum, index, scopeList, type) {
+      var result = { "total": total, selectNum: selectNum };
+      if (canUse == "1") {
+        if (checked) {
+          if (checkType == "radio") {
+            if (selectData.length == 0 && total == 0) {
+              total++;
+            }
+            selectNum = 1;
+            selectData[0] = dataList[index];
+            for (var i = 0; i < dataList.length; i++) {
+              if (dataList[i].checked && i != index) {
+                dataList[i].checked = false;
+                break;
+              }
+            }
+          } else {
+            total++;
+            selectNum++;
+            selectData.push(dataList[index]);
+          }
+          var scope = { "scopeValue": dataList[index].id };
+          if (type == "user") {
+            scope.scopeType = "user";
+            scope.scopeName = dataList[index].userName;
+          } else if (type == "org") {
+            scope.scopeType = "org";
+            scope.scopeName = dataList[index].orgName;
+            scope.orgType = dataList[index].orgType;
+          } else if (type == "role") {
+            scope.scopeType = "role";
+            scope.scopeName = dataList[index].roleName;
           } else if (type == "station") {
             scope.scopeType = "station";
             scope.scopeName = dataList[index].stationName;
@@ -3157,7 +3665,7 @@ var Page = function (_React$Component) {
   }, {
     key: 'checkItemMember',
     value: function checkItemMember(index, type) {
-      var _this3 = this;
+      var _this4 = this;
 
       var t = this;
       var checkType = this.props.checkType;
@@ -3220,7 +3728,7 @@ var Page = function (_React$Component) {
           selectedList: selectedList,
           scopeList: scopeList
         }, function () {
-          _this3.instance.update(_this3.getContent(), true);
+          _this4.instance.update(_this4.getContent(), true);
         });
       } else if ("user" == type) {
         var userList = t.state.userList;
@@ -3249,7 +3757,7 @@ var Page = function (_React$Component) {
           selectedList: selectedList,
           scopeList: scopeList
         }, function () {
-          _this3.instance.update(_this3.getContent(), true);
+          _this4.instance.update(_this4.getContent(), true);
         });
       } else if ("org" == type) {
         var orgList = t.state.orgList;
@@ -3286,11 +3794,18 @@ var Page = function (_React$Component) {
           selectedList: selectedList,
           scopeList: scopeList
         }, function () {
-          _this3.instance.update(_this3.getContent(), true);
+          _this4.instance.update(_this4.getContent(), true);
         });
       } else if ("orgUser" == type) {
         var orgUserList = t.state.orgUserList;
-        orgUserList[index].checked = !orgUserList[index].checked;
+        // orgUserList[index].checked = !orgUserList[index].checked;
+
+        var checkUserId = orgUserList[index].id;
+        orgUserList.map(function (orgUserListItem) {
+          if (orgUserListItem.id == checkUserId) {
+            orgUserListItem.checked = !orgUserListItem.checked;
+          }
+        });
         var total = t.state.total;
         var selectOrgUserNum = t.state.selectOrgUserNum; //当前组织下选中的用户数量
         var selectUsers = selectedList.selectUsers;
@@ -3324,7 +3839,7 @@ var Page = function (_React$Component) {
           selectedList: selectedList,
           scopeList: scopeList
         }, function () {
-          _this3.instance.update(_this3.getContent(), true);
+          _this4.instance.update(_this4.getContent(), true);
         });
       } else if ("role" == type) {
         var roleList = t.state.roleList;
@@ -3353,7 +3868,7 @@ var Page = function (_React$Component) {
           roleCheckAll: roleCheckAll,
           scopeList: scopeList
         }, function () {
-          _this3.instance.update(_this3.getContent(), true);
+          _this4.instance.update(_this4.getContent(), true);
         });
       } else if ("station" == type) {
         var stationList = t.state.stationList;
@@ -3383,7 +3898,7 @@ var Page = function (_React$Component) {
           navStationList: navList,
           scopeList: scopeList
         }, function () {
-          _this3.instance.update(_this3.getContent(), true);
+          _this4.instance.update(_this4.getContent(), true);
         });
       } else if ("stationUser" == type) {
         var stationUserList = t.state.stationUserList;
@@ -3457,7 +3972,7 @@ var Page = function (_React$Component) {
           navGroupList: navList,
           scopeList: scopeList
         }, function () {
-          _this3.instance.update(_this3.getContent(), true);
+          _this4.instance.update(_this4.getContent(), true);
         });
       } else if ("groupUser" == type) {
         var groupUserList = t.state.groupUserList;
@@ -3531,7 +4046,7 @@ var Page = function (_React$Component) {
           navPersonalGroupList: navList,
           scopeList: scopeList
         }, function () {
-          _this3.instance.update(_this3.getContent(), true);
+          _this4.instance.update(_this4.getContent(), true);
         });
       } else if ("personalGroupUser" == type) {
         var personalGroupUserList = t.state.personalGroupUserList;
@@ -3605,7 +4120,7 @@ var Page = function (_React$Component) {
           navDutyList: navList,
           scopeList: scopeList
         }, function () {
-          _this3.instance.update(_this3.getContent(), true);
+          _this4.instance.update(_this4.getContent(), true);
         });
       } else if ("dutyUser" == type) {
         var dutyUserList = t.state.dutyUserList;
@@ -3679,7 +4194,7 @@ var Page = function (_React$Component) {
           navPoliticalOutlookList: navList,
           scopeList: scopeList
         }, function () {
-          _this3.instance.update(_this3.getContent(), true);
+          _this4.instance.update(_this4.getContent(), true);
         });
       } else if ("politicalOutlookUser" == type) {
         var politicalOutlookUserList = t.state.politicalOutlookUserList;
@@ -3749,13 +4264,30 @@ var Page = function (_React$Component) {
         t.instance.update(t.getContent());
       });
     }
+    //新增 4.4 处理 orgNamePath 显示最后层级
 
+  }, {
+    key: 'handleOrgNamePath',
+    value: function handleOrgNamePath(value) {
+      var orgNamePath = '';
+      if (value) {
+        if (value.indexOf('/') > 0) {
+          var arr = value.split('/');
+          orgNamePath = arr[arr.length - 1];
+          return orgNamePath;
+        } else {
+          return value;
+        }
+      } else {
+        return '';
+      }
+    }
     //删除已选选项
 
   }, {
     key: 'deleteItemMember',
     value: function deleteItemMember(index, type) {
-      var _this4 = this;
+      var _this5 = this;
 
       var selectedList = this.state.selectedList;
       var scopeList = this.state.scopeList;
@@ -3945,7 +4477,7 @@ var Page = function (_React$Component) {
           navGroupList: navGroupList,
           scopeList: scopeList
         }, function () {
-          _this4.instance.update(_this4.getContent());
+          _this5.instance.update(_this5.getContent());
         });
       } else if (type == "org") {
         var selectOrgs = selectedList.selectOrgs;
@@ -4004,7 +4536,7 @@ var Page = function (_React$Component) {
           navOrgList: navList,
           scopeList: scopeList
         }, function () {
-          _this4.instance.update(_this4.getContent());
+          _this5.instance.update(_this5.getContent());
         });
       } else if (type == "role") {
         var selectRoles = selectedList.selectRoles;
@@ -4052,7 +4584,7 @@ var Page = function (_React$Component) {
           roleCheckAll: roleCheckAll,
           scopeList: scopeList
         }, function () {
-          _this4.instance.update(_this4.getContent());
+          _this5.instance.update(_this5.getContent());
         });
       } else if (type == "station") {
         var selectStations = selectedList.selectStations;
@@ -4104,7 +4636,7 @@ var Page = function (_React$Component) {
           navStationList: navList,
           scopeList: scopeList
         }, function () {
-          _this4.instance.update(_this4.getContent());
+          _this5.instance.update(_this5.getContent());
         });
       } else if (type == "group") {
         var selectGroups = selectedList.selectGroups;
@@ -4159,7 +4691,7 @@ var Page = function (_React$Component) {
           navGroupList: navList,
           scopeList: scopeList
         }, function () {
-          _this4.instance.update(_this4.getContent());
+          _this5.instance.update(_this5.getContent());
         });
       } else if (type == "personGroup") {
         var selectPersonalGroups = selectedList.selectPersonalGroups;
@@ -4214,7 +4746,7 @@ var Page = function (_React$Component) {
           navPersonalGroupList: navList,
           scopeList: scopeList
         }, function () {
-          _this4.instance.update(_this4.getContent());
+          _this5.instance.update(_this5.getContent());
         });
       } else if (type == "duty") {
         var selectDutys = selectedList.selectDutys;
@@ -4269,7 +4801,7 @@ var Page = function (_React$Component) {
           navDutyList: navList,
           scopeList: scopeList
         }, function () {
-          _this4.instance.update(_this4.getContent());
+          _this5.instance.update(_this5.getContent());
         });
       } else if (type == "politicalOutlook") {
         var selectPoliticalOutlooks = selectedList.selectPoliticalOutlooks;
@@ -4324,7 +4856,7 @@ var Page = function (_React$Component) {
           navPoliticalOutlookList: navList,
           scopeList: scopeList
         }, function () {
-          _this4.instance.update(_this4.getContent());
+          _this5.instance.update(_this5.getContent());
         });
       }
     }
@@ -4745,7 +5277,7 @@ var Page = function (_React$Component) {
 
   }, {
     key: 'getSelectData',
-    value: function getSelectData() {
+    value: function getSelectData(initCommon) {
       var code = this.getRealCode().split(",");
       var type = code[0];
       var realUserCode = "user";
@@ -4757,37 +5289,55 @@ var Page = function (_React$Component) {
         type = "org";
       }
       var t = this;
-      if (type == "common") {
+      if (type == "common" || initCommon == "1") {
         var _checkType = this.props.checkType;
         var commonUsedData = [];
-        var commonUsedPropsData = this.props.commonUsedData;
+        var commonTreeData = [];
+        //常用新的逻辑
+        var commonUsedPropsData = this.props.commonTreeData;
+        var commonUsedDataSearch = this.props.commonUsedData; //用来搜索
         var selectCommonNum = 0;
         var commonCheckAll = false;
         var commonDefaultData = [];
         if (commonUsedPropsData != null && commonUsedPropsData != undefined && commonUsedPropsData.length > 0) {
           for (var i = 0; i < commonUsedPropsData.length; i++) {
-            var data = {
-              scopeType: commonUsedPropsData[i].scopeType,
-              scopeName: commonUsedPropsData[i].scopeName,
-              scopeValue: commonUsedPropsData[i].scopeValue,
-              checked: commonUsedPropsData[i].checked,
-              imageId: commonUsedPropsData[i].imageId,
-              orgNamePath: commonUsedPropsData[i].orgNamePath
-            };
-            commonUsedData.push(data);
+            if (commonUsedPropsData[i].scopeType == "user") {
+              var data = {
+                scopeType: commonUsedPropsData[i].scopeType,
+                scopeName: commonUsedPropsData[i].scopeName,
+                scopeValue: commonUsedPropsData[i].scopeValue,
+                checked: commonUsedPropsData[i].checked,
+                imageId: commonUsedPropsData[i].imageId,
+                orgNamePath: commonUsedPropsData[i].orgNamePath
+              };
+              commonUsedData.push(data);
+            } else {
+              var data = {
+                scopeType: commonUsedPropsData[i].scopeType,
+                scopeName: commonUsedPropsData[i].scopeName,
+                scopeValue: commonUsedPropsData[i].scopeValue,
+                checked: commonUsedPropsData[i].checked,
+                imageId: commonUsedPropsData[i].imageId,
+                orgNamePath: commonUsedPropsData[i].orgNamePath
+              };
+              commonTreeData.push(data);
+            }
           }
           selectCommonNum = t.commonDataChecked(commonUsedData);
           if (selectCommonNum == commonUsedData.length) {
             commonCheckAll = true;
           }
-          for (var i = 0; i < commonUsedData.length; i++) {
+        }
+
+        if (commonUsedDataSearch != null && commonUsedDataSearch != undefined && commonUsedDataSearch.length > 0) {
+          for (var i = 0; i < commonUsedDataSearch.length; i++) {
             var data = {
-              scopeType: commonUsedData[i].scopeType,
-              scopeName: commonUsedData[i].scopeName,
-              scopeValue: commonUsedData[i].scopeValue,
-              checked: commonUsedData[i].checked,
-              imageId: commonUsedData[i].imageId,
-              orgNamePath: commonUsedData[i].orgNamePath
+              scopeType: commonUsedDataSearch[i].scopeType,
+              scopeName: commonUsedDataSearch[i].scopeName,
+              scopeValue: commonUsedDataSearch[i].scopeValue,
+              checked: commonUsedDataSearch[i].checked,
+              imageId: commonUsedDataSearch[i].imageId,
+              orgNamePath: commonUsedDataSearch[i].orgNamePath
             };
             commonDefaultData.push(data);
           }
@@ -4796,14 +5346,23 @@ var Page = function (_React$Component) {
         if (_checkType == "radio") {
           isShowCheckAll = false;
         }
-        t.setState({
+        var navList = [];
+        var stateParam = {
+          commonTreeData: commonTreeData,
           commonUsedData: commonUsedData,
           commonDefaultData: commonDefaultData,
           selectCommonNum: selectCommonNum,
+          navCommonList: navList,
           isShowCheckAll: isShowCheckAll,
           commonCheckAll: commonCheckAll,
           activeKey: type
-        }, function () {
+        };
+        navList.push({ "scopeValue": "0", "scopeName": "全部", "checkAll": false });
+        if (initCommon) {
+          stateParam.isShowNav = false;
+        }
+
+        t.setState(stateParam, function () {
           t.instance.update(t.getContent());
         });
       } else if (type == "user") {
@@ -4826,7 +5385,7 @@ var Page = function (_React$Component) {
           }
           t.setState({
             userOrgList: orgList,
-            activeKey: type
+            activeKey: "org"
           }, function () {
             t.instance.update(t.getContent());
           });
@@ -4888,7 +5447,7 @@ var Page = function (_React$Component) {
         }).catch(function (error) {
           alert("2662错误：" + error);
         });
-      } else if (type == "role") {
+      } else if (type.indexOf("role") >= 0 || type.indexOf("Role") >= 0) {
         var checkType = this.props.checkType;
         var isShowCheckAll = true;
         if (checkType == "radio") {
@@ -4931,7 +5490,7 @@ var Page = function (_React$Component) {
         }).catch(function (error) {
           alert("2700错误：" + error);
         });
-      } else if (type == "station") {
+      } else if (type.indexOf("station") >= 0 || type.indexOf("Station") >= 0) {
         var checkType = this.props.checkType;
         var isShowCheckAll = true;
         if (checkType == "radio") {
@@ -4950,7 +5509,7 @@ var Page = function (_React$Component) {
         }).then(function (result) {
           //alert(JSON.stringify(result));
           //console.log("fetch请求数据"+JSON.stringify(result));
-          var stationList = result.data;
+          var stationList = result.data.stationList;
           var selectStaNum = 0,
               noUseStationNum = 0;
           var navList = [{ "id": "0", "orgName": "全部", "checkAll": false }];
@@ -4976,14 +5535,14 @@ var Page = function (_React$Component) {
             noUseStationNum: noUseStationNum,
             navStationList: navList,
             isShowCheckAll: isShowCheckAll,
-            activeKey: type
+            activeKey: "station"
           }, function () {
             t.instance.update(t.getContent());
           });
         }).catch(function (error) {
           alert("2745错误：" + error);
         });
-      } else if (type == "group") {
+      } else if ((type.indexOf("group") >= 0 || type.indexOf("Group") >= 0) && type.indexOf("person") < 0) {
         var checkType = this.props.checkType;
         var isShowCheckAll = true;
         if (checkType == "radio") {
@@ -5030,14 +5589,14 @@ var Page = function (_React$Component) {
             selectGroupUserNum: 0,
             navGroupList: navList,
             isShowCheckAll: isShowCheckAll,
-            activeKey: type
+            activeKey: "group"
           }, function () {
             t.instance.update(t.getContent());
           });
         }).catch(function (error) {
           alert("2792错误：" + error);
         });
-      } else if (type == "personGroup") {
+      } else if (type.indexOf("personGroup") >= 0 || type.indexOf("PersonGroup") >= 0) {
         var checkType = this.props.checkType;
         var isShowCheckAll = true;
         if (checkType == "radio") {
@@ -5084,61 +5643,165 @@ var Page = function (_React$Component) {
             selectPersonalGroupUserNum: 0,
             navPersonalGroupList: navList,
             isShowCheckAll: isShowCheckAll,
-            activeKey: type
+            activeKey: "personGroup"
           }, function () {
             t.instance.update(t.getContent());
           });
         }).catch(function (error) {
           alert("2792错误：" + error);
         });
-      }
-    }
-
-    //获取当前用户组织信息（包含所有上级组织）
-
-  }, {
-    key: 'getSelectMyOrgData',
-    value: function getSelectMyOrgData() {
-      var code = this.getRealCode().split(",");
-      var type = code[0];
-      var realUserCode = "user";
-      var chooseObj = this.props.chooseObj;
-      if (chooseObj) {
-        realUserCode = "userNotOrg";
-      }
-      if (type == realUserCode) {
-        type = "org";
-      }
-      var t = this;
-      var selectOrgNum = 0,
-          noUseOrgNum = 0;
-      var url = t.getFetchUrl("myOrg", '', '', false, false);
-
-      fetch(url, {
-        method: "GET",
-        mode: "cors",
-        headers: {
-          'Accept': 'application/json, text/plain, */*',
-          'Content-Type': 'application/x-www-form-urlencoded'
+      } else if (type == "duty" || type.indexOf("Duty") >= 0) {
+        var checkType = this.props.checkType;
+        var isShowCheckAll = true;
+        if (checkType == "radio") {
+          isShowCheckAll = false;
         }
-      }).then(function (response) {
-        return response.json();
-      }).then(function (result) {
-        var orgData = result.data;
-        var orgList = [];
-        var orgId = '';
-        var navOrgList = [{ "id": "0", "orgName": "全部", "checkAll": false, "canUse": "1" }];
-        if (orgData != null && orgData.length > 0) {
-          var len = orgData.length;
-          orgId = orgData[len - 1].id;
-          orgList.push(orgData[len - 1]);
-
-          if (len > 1) {
-            for (var k = 0; k < len - 1; k++) {
-              navOrgList.push(orgData[k]);
+        var url = t.getFetchUrl("duty", "", "", false, true);
+        fetch(url, {
+          method: "GET",
+          mode: "cors",
+          headers: {
+            'Accept': 'application/json, text/plain, */*',
+            'Content-Type': 'application/x-www-form-urlencoded'
+          }
+        }).then(function (response) {
+          return response.json();
+        }).then(function (result) {
+          //alert(JSON.stringify(result));
+          //console.log("fetch请求数据"+JSON.stringify(result));
+          var dutyList = result.data.dutyList;
+          var selectDutyNum = 0,
+              noUseDutyNum = 0;
+          var navList = [{ "id": "0", "orgName": "全部", "checkAll": false }];
+          if (dutyList == null || dutyList == undefined) {
+            dutyList = [];
+          } else {
+            var selectDutys = t.state.selectedList.selectDutys;
+            selectDutyNum = t.dataIsChecked(dutyList, selectDutys, selectDutyNum);
+            noUseDutyNum = t.countNoUseNum(dutyList); //不可选岗位数量
+            if (dutyList.length == noUseDutyNum) {
+              //全部不可选
+              navList[0].canUse = "0";
+            } else {
+              navList[0].canUse = "1";
+              if (selectDutyNum == dutyList.length - noUseDutyNum) {
+                navList[0].checkAll = true;
+              }
             }
           }
-          //[{"orgType":"1","orgName":"万户","pid":"4b42f2a0952711e8a71e000c29ee419e","id":"40289a3e650e47d301650e585f2e0001","canUse":"1","ddUid":"","checked":"false"}],
+          t.setState({
+            dutyList: dutyList,
+            selectDutyNum: selectDutyNum,
+            noUseDutyNum: noUseDutyNum,
+            navDutyList: navList,
+            isShowCheckAll: isShowCheckAll,
+            activeKey: "duty"
+          }, function () {
+            t.instance.update(t.getContent());
+          });
+        }).catch(function (error) {
+          alert("2745错误：" + error);
+        });
+      } else if (type == "politicalOutlook" || type.indexOf("PoliticalOutlook") >= 0) {
+        var checkType = this.props.checkType;
+        var isShowCheckAll = true;
+        if (checkType == "radio") {
+          isShowCheckAll = false;
+        }
+        var url = t.getFetchUrl("politicalOutlook", "", "", false, true);
+        fetch(url, {
+          method: "GET",
+          mode: "cors",
+          headers: {
+            'Accept': 'application/json, text/plain, */*',
+            'Content-Type': 'application/x-www-form-urlencoded'
+          }
+        }).then(function (response) {
+          return response.json();
+        }).then(function (result) {
+          //alert(JSON.stringify(result));
+          //console.log("fetch请求数据"+JSON.stringify(result));
+          var politicalOutlookList = result.data.politicalOutlookList;
+          var selectPoliticalOutlookNum = 0,
+              noUsePoliticalOutlookNum = 0;
+          var navList = [{ "id": "0", "orgName": "全部", "checkAll": false }];
+          if (politicalOutlookList == null || politicalOutlookList == undefined) {
+            politicalOutlookList = [];
+          } else {
+            var selectPoliticalOutlooks = t.state.selectedList.selectPoliticalOutlooks;
+            selectPoliticalOutlookNum = t.dataIsChecked(politicalOutlookList, selectPoliticalOutlooks, selectPoliticalOutlookNum);
+            noUsePoliticalOutlookNum = t.countNoUseNum(politicalOutlookList); //不可选岗位数量
+            if (politicalOutlookList.length == noUsePoliticalOutlookNum) {
+              //全部不可选
+              navList[0].canUse = "0";
+            } else {
+              navList[0].canUse = "1";
+              if (selectPoliticalOutlookNum == politicalOutlookList.length - noUsePoliticalOutlookNum) {
+                navList[0].checkAll = true;
+              }
+            }
+          }
+          t.setState({
+            politicalOutlookList: politicalOutlookList,
+            selectPoliticalOutlookNum: selectPoliticalOutlookNum,
+            noUsePoliticalOutlookNum: noUsePoliticalOutlookNum,
+            navPoliticalOutlookList: navList,
+            isShowCheckAll: isShowCheckAll,
+            activeKey: "politicalOutlook"
+          }, function () {
+            t.instance.update(t.getContent());
+          });
+        }).catch(function (error) {
+          alert("2745错误：" + error);
+        });
+      }
+    }
+
+    //获取当前用户组织信息（包含所有上级组织）
+
+  }, {
+    key: 'getSelectMyOrgData',
+    value: function getSelectMyOrgData() {
+      var code = this.getRealCode().split(",");
+      var type = code[0];
+      var realUserCode = "user";
+      var chooseObj = this.props.chooseObj;
+      if (chooseObj) {
+        realUserCode = "userNotOrg";
+      }
+      if (type == realUserCode) {
+        type = "org";
+      }
+      var t = this;
+      var selectOrgNum = 0,
+          noUseOrgNum = 0;
+      var url = t.getFetchUrl("myOrg", '', '', false, false);
+
+      fetch(url, {
+        method: "GET",
+        mode: "cors",
+        headers: {
+          'Accept': 'application/json, text/plain, */*',
+          'Content-Type': 'application/x-www-form-urlencoded'
+        }
+      }).then(function (response) {
+        return response.json();
+      }).then(function (result) {
+        var orgData = result.data;
+        var orgList = [];
+        var orgId = '';
+        var navOrgList = [{ "id": "0", "orgName": "全部", "checkAll": false, "canUse": "1" }];
+        if (orgData != null && orgData.length > 0) {
+          var len = orgData.length;
+          orgId = orgData[len - 1].id;
+          orgList.push(orgData[len - 1]);
+
+          if (len > 1) {
+            for (var k = 0; k < len - 1; k++) {
+              navOrgList.push(orgData[k]);
+            }
+          }
+          //[{"orgType":"1","orgName":"万户","pid":"4b42f2a0952711e8a71e000c29ee419e","id":"40289a3e650e47d301650e585f2e0001","canUse":"1","ddUid":"","checked":"false"}],
           //[{"id":"0","orgName":"全部","checkAll":false,"canUse":"1"},{"orgType":"1","orgName":"默认单位","pid":"","id":"4b42f2a0952711e8a71e000c29ee419e","canUse":"1","ddUid":"","checked":"false"}],
           t.setState({
             orgList: orgList,
@@ -6068,162 +6731,356 @@ var Page = function (_React$Component) {
         return false;
       }
       var t = this;
-      if (searchType == "0" && value == "") {
-        return;
-      } else {
-        if (type == "common") {
-          var commonSearchData = [];
-          var commonUsedData = t.state.commonDefaultData;
-          if (searchType == "0" && value != "") {
-            if (commonUsedData != null && commonUsedData != undefined && commonUsedData.length > 0) {
-              for (var i = 0; i < commonUsedData.length; i++) {
-                if (commonUsedData[i].scopeName.indexOf(value) >= 0) {
-                  commonSearchData.push(commonUsedData[i]);
-                }
+      //if (searchType == "0" && value == "") {
+      //   if(type == "common"){
+      //     var commonUsedPropsData = this.props.commonTreeData;
+      //       if (commonUsedPropsData != null && commonUsedPropsData != undefined && commonUsedPropsData.length > 0) {
+      //         for (var i = 0; i < commonUsedPropsData.length; i++) {
+      //           if (commonUsedPropsData[i].scopeType == "user") {
+      //             var data = {
+      //               scopeType: commonUsedPropsData[i].scopeType,
+      //               scopeName: commonUsedPropsData[i].scopeName,
+      //               scopeValue: commonUsedPropsData[i].scopeValue,
+      //               checked: commonUsedPropsData[i].checked,
+      //               imageId: commonUsedPropsData[i].imageId,
+      //               orgNamePath: commonUsedPropsData[i].orgNamePath
+      //             };
+      //             commonSearchData.push(data);
+      //           } else {
+      //             var data = {
+      //               scopeType: commonUsedPropsData[i].scopeType,
+      //               scopeName: commonUsedPropsData[i].scopeName,
+      //               scopeValue: commonUsedPropsData[i].scopeValue,
+      //               checked: commonUsedPropsData[i].checked,
+      //               imageId: commonUsedPropsData[i].imageId,
+      //               orgNamePath: commonUsedPropsData[i].orgNamePath
+      //             };
+      //             commonTreeData.push(data);
+      //           }
+      //         }
+      //       } 
+      //   }else{
+      //     return;
+      //   }
+
+      // } else {
+      if (type == "common") {
+        var commonSearchData = [];
+        var commonTreeData = [];
+        var commonUsedData = t.state.commonDefaultData;
+        if (searchType == "0" && value != "") {
+          if (commonUsedData != null && commonUsedData != undefined && commonUsedData.length > 0) {
+            for (var i = 0; i < commonUsedData.length; i++) {
+              if (commonUsedData[i].scopeName.indexOf(value) >= 0) {
+                commonSearchData.push(commonUsedData[i]);
               }
             }
-          } else {
-            if (commonUsedData != null && commonUsedData != undefined && commonUsedData.length > 0) {
-              for (var i = 0; i < commonUsedData.length; i++) {
-                commonSearchData.push(commonUsedData[i]);
+          }
+        } else {
+          //  if (commonUsedData != null && commonUsedData != undefined && commonUsedData.length > 0) {
+          //   for (var i = 0; i < commonUsedData.length; i++) {
+          //     commonSearchData.push(commonUsedData[i]);
+          //   }
+          // }
+          var commonUsedPropsData = this.props.commonTreeData;
+          if (commonUsedPropsData != null && commonUsedPropsData != undefined && commonUsedPropsData.length > 0) {
+            for (var i = 0; i < commonUsedPropsData.length; i++) {
+              if (commonUsedPropsData[i].scopeType == "user") {
+                var data = {
+                  scopeType: commonUsedPropsData[i].scopeType,
+                  scopeName: commonUsedPropsData[i].scopeName,
+                  scopeValue: commonUsedPropsData[i].scopeValue,
+                  checked: commonUsedPropsData[i].checked,
+                  imageId: commonUsedPropsData[i].imageId,
+                  orgNamePath: commonUsedPropsData[i].orgNamePath
+                };
+                commonSearchData.push(data);
+              } else {
+                var data = {
+                  scopeType: commonUsedPropsData[i].scopeType,
+                  scopeName: commonUsedPropsData[i].scopeName,
+                  scopeValue: commonUsedPropsData[i].scopeValue,
+                  checked: commonUsedPropsData[i].checked,
+                  imageId: commonUsedPropsData[i].imageId,
+                  orgNamePath: commonUsedPropsData[i].orgNamePath
+                };
+                commonTreeData.push(data);
               }
             }
           }
+          // selectCommonNum = t.commonDataChecked(commonUsedData);
+          // if (selectCommonNum == commonUsedData.length) {
+          //   commonCheckAll = true;
+          // }
+
+        }
 
-          var selectCommonNum = 0;
-          if (commonSearchData.length > 0) {
-            selectCommonNum = t.commonDataChecked(commonSearchData);
+        var selectCommonNum = 0;
+        if (commonSearchData.length > 0) {
+          selectCommonNum = t.commonDataChecked(commonSearchData);
+        }
+        var commonCheckAll = false;
+        if (commonSearchData != null && commonSearchData != undefined && selectCommonNum == commonSearchData.length) {
+          commonCheckAll = true;
+        }
+        t.setState({
+          commonUsedData: commonSearchData,
+          commonTreeData: commonTreeData,
+          selectCommonNum: selectCommonNum,
+          isShowCheckAll: isShowCheckAll,
+          commonCheckAll: commonCheckAll,
+          commonName: value,
+          isShowNav: false,
+          activeKey: type
+        }, function () {
+          t.instance.update(t.getContent());
+        });
+      } else if (type == "user") {
+        var hasSerValCurOrg = [];
+        var url = "";
+        if (searchType == "0" && value != "") {
+          //搜索
+          hasSerValCurOrg = t.getHasSearchValueInCurOrg(value);
+          url = t.getFetchUrl("user", "", value, false, true);
+        } else {
+          hasSerValCurOrg = t.getHasSearchValueInCurOrg();
+          url = t.getFetchUrl("org", "", "", false, false);
+        }
+        fetch(url, {
+          method: "GET",
+          mode: "cors",
+          headers: {
+            'Accept': 'application/json, text/plain, */*',
+            'Content-Type': 'application/x-www-form-urlencoded'
           }
-          var commonCheckAll = false;
-          if (commonSearchData != null && commonSearchData != undefined && selectCommonNum == commonSearchData.length) {
-            commonCheckAll = true;
+        }).then(function (response) {
+          return response.json();
+        }).then(function (result) {
+          //alert(JSON.stringify(result));
+          //console.log("fetch请求数据"+JSON.stringify(result));
+          var orgList = [],
+              userList = [];
+          if (searchType == "0") {
+            userList = result.data;
+          } else {
+            orgList = result.data;
+          }
+          if (searchType == "0" && value != "") {}
+          if (orgList == null || orgList == undefined) {
+            orgList = hasSerValCurOrg;
+          } else {
+            orgList = hasSerValCurOrg.concat(orgList);
+          }
+          var selectUserNum = 0;
+          var navList = [];
+          if (searchType == "0") {
+            navList = [{ "id": "0", "userName": "全部", "checkAll": false }];
+          }
+          if (userList == null || userList == undefined) {
+            userList = [];
+          } else {
+            var selectUsers = t.state.selectedList.selectUsers;
+            selectUserNum = t.dataIsChecked(userList, selectUsers, selectUserNum);
+            if (selectUserNum == userList.length && searchType == "0") {
+              navList[0].checkAll = true;
+            }
           }
           t.setState({
-            commonUsedData: commonSearchData,
-            selectCommonNum: selectCommonNum,
-            isShowCheckAll: isShowCheckAll,
-            commonCheckAll: commonCheckAll,
-            commonName: value,
+            userOrgList: orgList,
+            userList: userList,
+            selectUserNum: selectUserNum,
+            userName: value,
+            navUserList: navList,
             isShowNav: false,
-            activeKey: type
+            isShowCheckAll: isShowCheckAll
           }, function () {
             t.instance.update(t.getContent());
           });
-        } else if (type == "user") {
-          var hasSerValCurOrg = [];
-          var url = "";
-          if (searchType == "0" && value != "") {
-            //搜索
-            hasSerValCurOrg = t.getHasSearchValueInCurOrg(value);
-            url = t.getFetchUrl("user", "", value, false, true);
-          } else {
-            hasSerValCurOrg = t.getHasSearchValueInCurOrg();
-            url = t.getFetchUrl("org", "", "", false, false);
+        }).catch(function (e) {
+          alert("错误：" + e);
+        });
+      } else if (type == "org") {
+        var hasSerValCurOrg = [];
+        var url = "";
+        if (searchType == "0" && value != "") {
+          //搜索
+          hasSerValCurOrg = t.getHasSearchValueInCurOrg(value);
+          url = t.getFetchUrl("org", "", value, true, true);
+        } else {
+          hasSerValCurOrg = t.getHasSearchValueInCurOrg();
+          url = t.getFetchUrl("org", "", value, false, true);
+        }
+        fetch(url, {
+          method: "GET",
+          mode: "cors",
+          headers: {
+            'Accept': 'application/json, text/plain, */*',
+            'Content-Type': 'application/x-www-form-urlencoded'
           }
-          fetch(url, {
-            method: "GET",
-            mode: "cors",
-            headers: {
-              'Accept': 'application/json, text/plain, */*',
-              'Content-Type': 'application/x-www-form-urlencoded'
-            }
-          }).then(function (response) {
-            return response.json();
-          }).then(function (result) {
-            //alert(JSON.stringify(result));
-            //console.log("fetch请求数据"+JSON.stringify(result));
-            var orgList = [],
-                userList = [];
-            if (searchType == "0") {
-              userList = result.data;
-            } else {
-              orgList = result.data;
-            }
-            if (searchType == "0" && value != "") {}
-            if (orgList == null || orgList == undefined) {
-              orgList = hasSerValCurOrg;
-            } else {
-              orgList = hasSerValCurOrg.concat(orgList);
-            }
-            var selectUserNum = 0;
-            var navList = [];
-            if (searchType == "0") {
-              navList = [{ "id": "0", "userName": "全部", "checkAll": false }];
+        }).then(function (response) {
+          return response.json();
+        }).then(function (result) {
+          //alert(JSON.stringify(result));
+          //console.log("fetch请求数据"+JSON.stringify(result));
+          var orgList = result.data.orgList;
+          var userList = result.data.userList;
+          if (orgList == undefined && userList == undefined) {
+            orgList = result.data;
+          }
+          var selectOrgNum = 0,
+              noUseOrgNum = 0;
+          var navList = [{ "id": "0", "orgName": "全部", "checkAll": false }];
+          var checkAllOrg = true;
+          // if (orgList == null || orgList == undefined || (searchType == "0" && chooseType.indexOf("userNotOrg") >= 0)) {
+          if (orgList == null || orgList == undefined) {
+            orgList = hasSerValCurOrg;
+          } else {
+            orgList = hasSerValCurOrg.concat(orgList);
+            if (chooseType.indexOf("userNotOrg") < 0) {
+              var selectOrgs = t.state.selectedList.selectOrgs;
+              selectOrgNum = t.dataIsChecked(orgList, selectOrgs, selectOrgNum);
+              noUseOrgNum = t.countNoUseNum(orgList);
+              if (selectOrgNum != orgList.length - noUseOrgNum) {
+                checkAllOrg = false;
+              }
             }
-            if (userList == null || userList == undefined) {
-              userList = [];
-            } else {
+          }
+          var selectUserNum = 0;
+          var checkAllUser = true;
+          if (userList == null || userList == undefined) {
+            userList = [];
+          } else {
+            if (chooseType.indexOf("userNotOrg") >= 0 || chooseType.indexOf("userAndOrg") >= 0) {
               var selectUsers = t.state.selectedList.selectUsers;
               selectUserNum = t.dataIsChecked(userList, selectUsers, selectUserNum);
-              if (selectUserNum == userList.length && searchType == "0") {
-                navList[0].checkAll = true;
+              if (selectUserNum != userList.length) {
+                checkAllUser = false;
               }
             }
-            t.setState({
-              userOrgList: orgList,
-              userList: userList,
-              selectUserNum: selectUserNum,
-              userName: value,
-              navUserList: navList,
-              isShowNav: false,
-              isShowCheckAll: isShowCheckAll
-            }, function () {
-              t.instance.update(t.getContent());
-            });
-          }).catch(function (e) {
-            alert("错误：" + e);
-          });
-        } else if (type == "org") {
-          var hasSerValCurOrg = [];
-          var url = "";
-          if (searchType == "0" && value != "") {
-            //搜索
-            hasSerValCurOrg = t.getHasSearchValueInCurOrg(value);
-            url = t.getFetchUrl("org", "", value, true, true);
-          } else {
-            hasSerValCurOrg = t.getHasSearchValueInCurOrg();
-            url = t.getFetchUrl("org", "", value, false, true);
           }
-          fetch(url, {
-            method: "GET",
-            mode: "cors",
-            headers: {
-              'Accept': 'application/json, text/plain, */*',
-              'Content-Type': 'application/x-www-form-urlencoded'
+          if (orgList.length == noUseOrgNum && userList.length == 0) {
+            //全部不可选
+            navList[0].canUse = "0";
+          } else {
+            navList[0].canUse = "1";
+          }
+          if (checkAllUser && checkAllOrg) {
+            navList[0].checkAll = true;
+          }
+          t.setState({
+            orgList: orgList,
+            orgUserList: userList,
+            selectOrgNum: selectOrgNum,
+            noUseOrgNum: noUseOrgNum,
+            selectOrgUserNum: selectUserNum,
+            orgName: value,
+            navOrgList: navList,
+            isShowNav: false,
+            isShowCheckAll: isShowCheckAll
+          }, function () {
+            t.instance.update(t.getContent());
+          });
+        }).catch(function (error) {
+          alert("3463错误：" + error);
+        });
+      } else if (type == "role") {
+        var url = t.getFetchUrl("role", "", value, false, true);
+        fetch(url, {
+          method: "GET",
+          mode: "cors",
+          headers: {
+            'Accept': 'application/json, text/plain, */*',
+            'Content-Type': 'application/x-www-form-urlencoded'
+          }
+        }).then(function (response) {
+          return response.json();
+        }).then(function (result) {
+          //alert(JSON.stringify(result));
+          //console.log("fetch请求数据"+JSON.stringify(result));
+          var roleList = result.data;
+          var selectRoleNum = 0;
+          var roleCheckAll = false;
+          if (roleList == null || roleList == undefined) {
+            roleList = [];
+          } else {
+            var selectRoles = t.state.selectedList.selectRoles;
+            selectRoleNum = t.dataIsChecked(roleList, selectRoles, selectRoleNum);
+            if (selectRoleNum == roleList.length) {
+              roleCheckAll = true;
             }
-          }).then(function (response) {
-            return response.json();
-          }).then(function (result) {
-            //alert(JSON.stringify(result));
-            //console.log("fetch请求数据"+JSON.stringify(result));
-            var orgList = result.data.orgList;
-            var userList = result.data.userList;
-            if (orgList == undefined && userList == undefined) {
-              orgList = result.data;
+          }
+          t.setState({
+            roleList: roleList,
+            selectRoleNum: selectRoleNum,
+            roleName: value,
+            roleCheckAll: roleCheckAll,
+            isShowNav: false,
+            isShowCheckAll: isShowCheckAll
+          }, function () {
+            t.instance.update(t.getContent());
+          });
+        }).catch(function (error) {
+          alert("3497错误：" + error);
+        });
+      } else if (type == "station") {
+        var url = "";
+        if (t.state.staSelectType == "1" && searchType != "0") {
+          url = t.getFetchUrl("org", "", "", false, false);
+        } else {
+          url = t.getFetchUrl("station", "", value, false, true);
+        }
+        fetch(url, {
+          method: "GET",
+          mode: "cors",
+          headers: {
+            'Accept': 'application/json, text/plain, */*',
+            'Content-Type': 'application/x-www-form-urlencoded'
+          }
+        }).then(function (response) {
+          return response.json();
+        }).then(function (result) {
+          //alert(JSON.stringify(result));
+          //console.log("fetch请求数据"+JSON.stringify(result));
+          var stationList = [],
+              orgList = [],
+              navList = [];
+          var selectStaNum = 0,
+              noUseStationNum = 0;
+          var checkAllStation = true;
+          if (t.state.staSelectType == "1" && searchType != "0") {
+            orgList = result.data;
+            if (orgList == null || orgList == undefined) {
+              orgList = [];
             }
-            var selectOrgNum = 0,
-                noUseOrgNum = 0;
-            var navList = [{ "id": "0", "orgName": "全部", "checkAll": false }];
-            var checkAllOrg = true;
-            if (orgList == null || orgList == undefined || searchType == "0" && chooseType.indexOf("userNotOrg") >= 0) {
-              orgList = hasSerValCurOrg;
+          } else {
+            stationList = result.data.stationList;
+            navList = [{ "id": "0", "orgName": "全部", "checkAll": false }];
+            if (stationList == null || stationList == undefined) {
+              stationList = [];
             } else {
-              orgList = hasSerValCurOrg.concat(orgList);
-              if (chooseType.indexOf("userNotOrg") < 0) {
-                var selectOrgs = t.state.selectedList.selectOrgs;
-                selectOrgNum = t.dataIsChecked(orgList, selectOrgs, selectOrgNum);
-                noUseOrgNum = t.countNoUseNum(orgList);
-                if (selectOrgNum != orgList.length - noUseOrgNum) {
-                  checkAllOrg = false;
-                }
+              var selectStations = t.state.selectedList.selectStations;
+              selectStaNum = t.dataIsChecked(stationList, selectStations, selectStaNum);
+              noUseStationNum = t.countNoUseNum(stationList);
+              if (selectStaNum != stationList.length - noUseStationNum) {
+                checkAllStation = false;
               }
+              // if (stationList.length == noUseStationNum) {//全部不可选
+              //   navList[0].canUse = "0";
+              // } else {
+              //   navList[0].canUse = "1";
+              //   if (selectStaNum == (stationList.length - noUseStationNum)) {
+              //     navList[0].checkAll = true;
+              //   }
+              // }
             }
+
+            var userList = result.data.userList;
             var selectUserNum = 0;
             var checkAllUser = true;
             if (userList == null || userList == undefined) {
               userList = [];
             } else {
-              if (chooseType.indexOf("userNotOrg") >= 0 || chooseType.indexOf("userAndOrg") >= 0) {
+              if (chooseType.indexOf("userNotStation") >= 0 || chooseType.indexOf("userAndStation") >= 0) {
                 var selectUsers = t.state.selectedList.selectUsers;
                 selectUserNum = t.dataIsChecked(userList, selectUsers, selectUserNum);
                 if (selectUserNum != userList.length) {
@@ -6231,195 +7088,232 @@ var Page = function (_React$Component) {
                 }
               }
             }
-            if (orgList.length == noUseOrgNum && userList.length == 0) {
+            if (stationList.length == noUseStationNum && userList.length == 0) {
               //全部不可选
               navList[0].canUse = "0";
             } else {
               navList[0].canUse = "1";
             }
-            if (checkAllUser && checkAllOrg) {
+            if (checkAllUser && checkAllStation) {
               navList[0].checkAll = true;
             }
-            t.setState({
-              orgList: orgList,
-              orgUserList: userList,
-              selectOrgNum: selectOrgNum,
-              noUseOrgNum: noUseOrgNum,
-              selectOrgUserNum: selectUserNum,
-              orgName: value,
-              navOrgList: navList,
-              isShowNav: false,
-              isShowCheckAll: isShowCheckAll
-            }, function () {
-              t.instance.update(t.getContent());
-            });
-          }).catch(function (error) {
-            alert("3463错误：" + error);
+          }
+          t.setState({
+            stationList: stationList,
+            stationUserList: userList,
+            stationOrgList: orgList,
+            selectStaNum: selectStaNum,
+            noUseStationNum: noUseStationNum,
+            stationName: value,
+            navStationList: navList,
+            isShowNav: false,
+            isShowCheckAll: isShowCheckAll
+          }, function () {
+            t.instance.update(t.getContent());
           });
-        } else if (type == "role") {
-          var url = t.getFetchUrl("role", "", value, false, true);
-          fetch(url, {
-            method: "GET",
-            mode: "cors",
-            headers: {
-              'Accept': 'application/json, text/plain, */*',
-              'Content-Type': 'application/x-www-form-urlencoded'
+        }).catch(function (error) {
+          alert("3552错误：" + error);
+        });
+      } else if (type == "group") {
+        var url = "";
+        if (searchType == "0" && value != "") {
+          url = t.getFetchUrl("group", "", value, true, true);
+        } else {
+          url = t.getFetchUrl("group", "", value, false, true);
+        }
+        fetch(url, {
+          method: "GET",
+          mode: "cors",
+          headers: {
+            'Accept': 'application/json, text/plain, */*',
+            'Content-Type': 'application/x-www-form-urlencoded'
+          }
+        }).then(function (response) {
+          return response.json();
+        }).then(function (result) {
+          //alert(JSON.stringify(result));
+          //console.log("fetch请求数据"+JSON.stringify(result));
+          var groupList = result.data.groupList;
+          var selectGroupNum = 0,
+              noUseGroupNum = 0;
+          var checkAllGroup = true;
+          var navList = [{ "id": "0", "groupName": "全部", "checkAll": false }];
+          // if (groupList == null || groupList == undefined || (searchType == "0" && chooseType.indexOf("userNotGroup") >= 0)) {
+          if (groupList == null || groupList == undefined) {
+            groupList = [];
+          } else {
+            if (chooseType.indexOf("userNotGroup") < 0) {
+              var selectGroups = t.state.selectedList.selectGroups;
+              selectGroupNum = t.dataIsChecked(groupList, selectGroups, selectGroupNum);
+              noUseGroupNum = t.countNoUseNum(groupList);
+              if (selectGroupNum != groupList.length - noUseGroupNum) {
+                checkAllGroup = false;
+              }
             }
-          }).then(function (response) {
-            return response.json();
-          }).then(function (result) {
-            //alert(JSON.stringify(result));
-            //console.log("fetch请求数据"+JSON.stringify(result));
-            var roleList = result.data;
-            var selectRoleNum = 0;
-            var roleCheckAll = false;
-            if (roleList == null || roleList == undefined) {
-              roleList = [];
-            } else {
-              var selectRoles = t.state.selectedList.selectRoles;
-              selectRoleNum = t.dataIsChecked(roleList, selectRoles, selectRoleNum);
-              if (selectRoleNum == roleList.length) {
-                roleCheckAll = true;
+          }
+          var userList = result.data.userList;
+          var selectUserNum = 0;
+          var checkAllUser = true;
+          if (userList == null || userList == undefined) {
+            userList = [];
+          } else {
+            if (chooseType.indexOf("userNotGroup") >= 0 || chooseType.indexOf("userAndGroup") >= 0) {
+              var selectUsers = t.state.selectedList.selectUsers;
+              selectUserNum = t.dataIsChecked(userList, selectUsers, selectUserNum);
+              if (selectUserNum != userList.length) {
+                checkAllUser = false;
               }
             }
-            t.setState({
-              roleList: roleList,
-              selectRoleNum: selectRoleNum,
-              roleName: value,
-              roleCheckAll: roleCheckAll,
-              isShowNav: false,
-              isShowCheckAll: isShowCheckAll
-            }, function () {
-              t.instance.update(t.getContent());
-            });
-          }).catch(function (error) {
-            alert("3497错误：" + error);
-          });
-        } else if (type == "station") {
-          var url = "";
-          if (t.state.staSelectType == "1" && searchType != "0") {
-            url = t.getFetchUrl("org", "", "", false, false);
+          }
+          if (groupList.length == noUseGroupNum && userList.length == 0) {
+            //全部不可选
+            navList[0].canUse = "0";
           } else {
-            url = t.getFetchUrl("station", "", value, false, true);
+            navList[0].canUse = "1";
           }
-          fetch(url, {
-            method: "GET",
-            mode: "cors",
-            headers: {
-              'Accept': 'application/json, text/plain, */*',
-              'Content-Type': 'application/x-www-form-urlencoded'
-            }
-          }).then(function (response) {
-            return response.json();
-          }).then(function (result) {
-            //alert(JSON.stringify(result));
-            //console.log("fetch请求数据"+JSON.stringify(result));
-            var stationList = [],
-                orgList = [],
-                navList = [];
-            var selectStaNum = 0,
-                noUseStationNum = 0;
-            var checkAllStation = true;
-            if (t.state.staSelectType == "1" && searchType != "0") {
-              orgList = result.data;
-              if (orgList == null || orgList == undefined) {
-                orgList = [];
-              }
-            } else {
-              stationList = result.data.stationList;
-              navList = [{ "id": "0", "orgName": "全部", "checkAll": false }];
-              if (stationList == null || stationList == undefined) {
-                stationList = [];
-              } else {
-                var selectStations = t.state.selectedList.selectStations;
-                selectStaNum = t.dataIsChecked(stationList, selectStations, selectStaNum);
-                noUseStationNum = t.countNoUseNum(stationList);
-                if (selectStaNum != stationList.length - noUseStationNum) {
-                  checkAllStation = false;
-                }
-                // if (stationList.length == noUseStationNum) {//全部不可选
-                //   navList[0].canUse = "0";
-                // } else {
-                //   navList[0].canUse = "1";
-                //   if (selectStaNum == (stationList.length - noUseStationNum)) {
-                //     navList[0].checkAll = true;
-                //   }
-                // }
-              }
+          if (checkAllUser && checkAllGroup) {
+            navList[0].checkAll = true;
+          }
+          t.setState({
+            groupList: groupList,
+            groupUserList: userList,
+            selectGroupNum: selectGroupNum,
+            noUseGroupNum: noUseGroupNum,
+            selectGroupUserNum: selectUserNum,
+            groupName: value,
+            navGroupList: navList,
+            isShowNav: false,
+            isShowCheckAll: isShowCheckAll
+          }, function () {
+            t.instance.update(t.getContent());
+          });
+        }).catch(function (error) {
+          alert("3620错误：" + error);
+        });
+      } else if (type == "personGroup") {
+        var url = "";
 
-              var userList = result.data.userList;
-              var selectUserNum = 0;
-              var checkAllUser = true;
-              if (userList == null || userList == undefined) {
-                userList = [];
-              } else {
-                if (chooseType.indexOf("userNotStation") >= 0 || chooseType.indexOf("userAndStation") >= 0) {
-                  var selectUsers = t.state.selectedList.selectUsers;
-                  selectUserNum = t.dataIsChecked(userList, selectUsers, selectUserNum);
-                  if (selectUserNum != userList.length) {
-                    checkAllUser = false;
-                  }
+        // let personalGroupId=t.state.navPersonalGroupList.length>0?t.state.navPersonalGroupList[t.state.navPersonalGroupList.length-1].id:0;
+        if (searchType == "0" && value != "") {
+          url = t.getFetchUrl("personGroup", "", value, true, true);
+        } else {
+          url = t.getFetchUrl("personGroup", "", value, false, true);
+        }
+
+        fetch(url, {
+          method: "GET",
+          mode: "cors",
+          headers: {
+            'Accept': 'application/json, text/plain, */*',
+            'Content-Type': 'application/x-www-form-urlencoded'
+          }
+        }).then(function (response) {
+          return response.json();
+        }).then(function (result) {
+          //alert(JSON.stringify(result));
+          //console.log("fetch请求数据"+JSON.stringify(result));
+          if (result.success) {
+            var personalGroupList = result.content.personalGroupList;
+            var selectPersonalGroupNum = 0,
+                noUsePersonalGroupNum = 0;
+            var checkAllPersonalGroup = true;
+
+            var navList = [{ "id": "0", "personalGroupName": "全部", "checkAll": false }];
+            // if (personalGroupList == null || personalGroupList == undefined || (searchType == "0" && chooseType.indexOf("userNotPersonGroup") >= 0)) {
+            if (personalGroupList == null || personalGroupList == undefined) {
+              personalGroupList = [];
+            } else {
+              if (chooseType.indexOf("userNotPersonGroup") < 0 || true) {
+                var selectPersonalGroups = t.state.selectedList.selectPersonalGroups;
+                selectPersonalGroupNum = t.dataIsChecked(personalGroupList, selectPersonalGroups, selectPersonalGroupNum);
+                noUsePersonalGroupNum = t.countNoUseNum(personalGroupList);
+                if (selectPersonalGroupNum != personalGroupList.length - noUsePersonalGroupNum) {
+                  checkAllPersonalGroup = false;
                 }
               }
-              if (stationList.length == noUseStationNum && userList.length == 0) {
-                //全部不可选
-                navList[0].canUse = "0";
-              } else {
-                navList[0].canUse = "1";
-              }
-              if (checkAllUser && checkAllStation) {
-                navList[0].checkAll = true;
+            }
+            var userList = result.content.userList;
+            var selectUserNum = 0;
+            var checkAllUser = true;
+            if (userList == null || userList == undefined) {
+              userList = [];
+            } else {
+              if (chooseType.indexOf("userNotPersonGroup") >= 0 || chooseType.indexOf("userAndPersonGroup") >= 0 || true) {
+                var selectUsers = t.state.selectedList.selectUsers;
+                selectUserNum = t.dataIsChecked(userList, selectUsers, selectUserNum);
+                if (selectUserNum != userList.length) {
+                  checkAllUser = false;
+                }
               }
             }
+            if (personalGroupList.length == noUsePersonalGroupNum && userList.length == 0) {
+              //全部不可选
+              navList[0].canUse = "0";
+            } else {
+              navList[0].canUse = "1";
+            }
+            if (checkAllUser && checkAllPersonalGroup) {
+              navList[0].checkAll = true;
+            }
             t.setState({
-              stationList: stationList,
-              stationUserList: userList,
-              stationOrgList: orgList,
-              selectStaNum: selectStaNum,
-              noUseStationNum: noUseStationNum,
-              stationName: value,
-              navStationList: navList,
+              personalGroupList: personalGroupList,
+              personalGroupUserList: userList,
+              selectPersonalGroupNum: selectPersonalGroupNum,
+              noUsePersonalGroupNum: noUsePersonalGroupNum,
+              selectPersonalGroupUserNum: selectUserNum,
+              personalGroupName: value,
+              navPersonalGroupList: navList,
               isShowNav: false,
               isShowCheckAll: isShowCheckAll
             }, function () {
               t.instance.update(t.getContent());
             });
-          }).catch(function (error) {
-            alert("3552错误：" + error);
-          });
-        } else if (type == "group") {
-          var url = "";
-          if (searchType == "0" && value != "") {
-            url = t.getFetchUrl("group", "", value, true, true);
           } else {
-            url = t.getFetchUrl("group", "", value, false, true);
+            alert("职务查询接口错误：" + result.errorMsg);
           }
-          fetch(url, {
-            method: "GET",
-            mode: "cors",
-            headers: {
-              'Accept': 'application/json, text/plain, */*',
-              'Content-Type': 'application/x-www-form-urlencoded'
-            }
-          }).then(function (response) {
-            return response.json();
-          }).then(function (result) {
-            //alert(JSON.stringify(result));
-            //console.log("fetch请求数据"+JSON.stringify(result));
-            var groupList = result.data.groupList;
-            var selectGroupNum = 0,
-                noUseGroupNum = 0;
-            var checkAllGroup = true;
-            var navList = [{ "id": "0", "groupName": "全部", "checkAll": false }];
-            if (groupList == null || groupList == undefined || searchType == "0" && chooseType.indexOf("userNotGroup") >= 0) {
-              groupList = [];
+        }).catch(function (error) {
+          alert("3620错误：" + error);
+        });
+      } else if (type == "duty") {
+        //职位
+        var url = "";
+
+        // let personalGroupId=t.state.navPersonalGroupList.length>0?t.state.navPersonalGroupList[t.state.navPersonalGroupList.length-1].id:0;
+        if (searchType == "0" && value != "") {
+          url = t.getFetchUrl("duty", "", value, true, true);
+        } else {
+          url = t.getFetchUrl("duty", "", value, false, true);
+        }
+
+        fetch(url, {
+          method: "GET",
+          mode: "cors",
+          headers: {
+            'Accept': 'application/json, text/plain, */*',
+            'Content-Type': 'application/x-www-form-urlencoded'
+          }
+        }).then(function (response) {
+          return response.json();
+        }).then(function (result) {
+          //alert(JSON.stringify(result));
+          //console.log("fetch请求数据"+JSON.stringify(result));
+          if (result.type == "success") {
+            var dutyList = result.data.dutyList;
+            var selectDutyNum = 0,
+                noUseDutyNum = 0;
+            var checkAllDuty = true;
+
+            var navList = [{ "id": "0", "dutyName": "全部", "checkAll": false }];
+            // if (dutyList == null || dutyList == undefined || (searchType == "0" && chooseType.indexOf("userNotDuty") >= 0)) {
+            if (dutyList == null || dutyList == undefined) {
+              dutyList = [];
             } else {
-              if (chooseType.indexOf("userNotGroup") < 0) {
-                var selectGroups = t.state.selectedList.selectGroups;
-                selectGroupNum = t.dataIsChecked(groupList, selectGroups, selectGroupNum);
-                noUseGroupNum = t.countNoUseNum(groupList);
-                if (selectGroupNum != groupList.length - noUseGroupNum) {
-                  checkAllGroup = false;
+              if (chooseType.indexOf("userNotDuty") < 0 || true) {
+                var selectDutys = t.state.selectedList.selectDutys;
+                selectDutyNum = t.dataIsChecked(dutyList, selectDutys, selectDutyNum);
+                noUseDutyNum = t.countNoUseNum(dutyList);
+                if (selectDutyNum != dutyList.length - noUseDutyNum) {
+                  checkAllDuty = false;
                 }
               }
             }
@@ -6429,7 +7323,7 @@ var Page = function (_React$Component) {
             if (userList == null || userList == undefined) {
               userList = [];
             } else {
-              if (chooseType.indexOf("userNotGroup") >= 0 || chooseType.indexOf("userAndGroup") >= 0) {
+              if (chooseType.indexOf("userNotDuty") >= 0 || chooseType.indexOf("userAndDuty") >= 0 || true) {
                 var selectUsers = t.state.selectedList.selectUsers;
                 selectUserNum = t.dataIsChecked(userList, selectUsers, selectUserNum);
                 if (selectUserNum != userList.length) {
@@ -6437,284 +7331,121 @@ var Page = function (_React$Component) {
                 }
               }
             }
-            if (groupList.length == noUseGroupNum && userList.length == 0) {
+            if (dutyList.length == noUseDutyNum && userList.length == 0) {
               //全部不可选
               navList[0].canUse = "0";
             } else {
               navList[0].canUse = "1";
             }
-            if (checkAllUser && checkAllGroup) {
+            if (checkAllUser && checkAllDuty) {
               navList[0].checkAll = true;
             }
             t.setState({
-              groupList: groupList,
-              groupUserList: userList,
-              selectGroupNum: selectGroupNum,
-              noUseGroupNum: noUseGroupNum,
-              selectGroupUserNum: selectUserNum,
-              groupName: value,
-              navGroupList: navList,
+              dutyList: dutyList,
+              dutyUserList: userList,
+              selectDutyNum: selectDutyNum,
+              noUseDutyNum: noUseDutyNum,
+              selectDutyUserNum: selectUserNum,
+              dutyName: value,
+              navDutyList: navList,
               isShowNav: false,
               isShowCheckAll: isShowCheckAll
             }, function () {
               t.instance.update(t.getContent());
             });
-          }).catch(function (error) {
-            alert("3620错误：" + error);
-          });
-        } else if (type == "personGroup") {
-          var url = "";
-
-          // let personalGroupId=t.state.navPersonalGroupList.length>0?t.state.navPersonalGroupList[t.state.navPersonalGroupList.length-1].id:0;
-          if (searchType == "0" && value != "") {
-            url = t.getFetchUrl("personGroup", "", value, true, true);
           } else {
-            url = t.getFetchUrl("personGroup", "", value, false, true);
+            alert("职务查询接口错误：" + result.message);
           }
+        }).catch(function (error) {
+          alert("3620错误：" + error);
+        });
+      } else if (type == "politicalOutlook") {
+        //政治面貌
+        var url = "";
 
-          fetch(url, {
-            method: "GET",
-            mode: "cors",
-            headers: {
-              'Accept': 'application/json, text/plain, */*',
-              'Content-Type': 'application/x-www-form-urlencoded'
-            }
-          }).then(function (response) {
-            return response.json();
-          }).then(function (result) {
-            //alert(JSON.stringify(result));
-            //console.log("fetch请求数据"+JSON.stringify(result));
-            if (result.success) {
-              var personalGroupList = result.content.personalGroupList;
-              var selectPersonalGroupNum = 0,
-                  noUsePersonalGroupNum = 0;
-              var checkAllPersonalGroup = true;
-
-              var navList = [{ "id": "0", "personalGroupName": "全部", "checkAll": false }];
-              if (personalGroupList == null || personalGroupList == undefined || searchType == "0" && chooseType.indexOf("userNotPersonGroup") >= 0) {
-                personalGroupList = [];
-              } else {
-                if (chooseType.indexOf("userNotPersonGroup") < 0 || true) {
-                  var selectPersonalGroups = t.state.selectedList.selectPersonalGroups;
-                  selectPersonalGroupNum = t.dataIsChecked(personalGroupList, selectPersonalGroups, selectPersonalGroupNum);
-                  noUsePersonalGroupNum = t.countNoUseNum(personalGroupList);
-                  if (selectPersonalGroupNum != personalGroupList.length - noUsePersonalGroupNum) {
-                    checkAllPersonalGroup = false;
-                  }
-                }
-              }
-              var userList = result.content.userList;
-              var selectUserNum = 0;
-              var checkAllUser = true;
-              if (userList == null || userList == undefined) {
-                userList = [];
-              } else {
-                if (chooseType.indexOf("userNotPersonGroup") >= 0 || chooseType.indexOf("userAndPersonGroup") >= 0 || true) {
-                  var selectUsers = t.state.selectedList.selectUsers;
-                  selectUserNum = t.dataIsChecked(userList, selectUsers, selectUserNum);
-                  if (selectUserNum != userList.length) {
-                    checkAllUser = false;
-                  }
-                }
-              }
-              if (personalGroupList.length == noUsePersonalGroupNum && userList.length == 0) {
-                //全部不可选
-                navList[0].canUse = "0";
-              } else {
-                navList[0].canUse = "1";
-              }
-              if (checkAllUser && checkAllPersonalGroup) {
-                navList[0].checkAll = true;
-              }
-              t.setState({
-                personalGroupList: personalGroupList,
-                personalGroupUserList: userList,
-                selectPersonalGroupNum: selectPersonalGroupNum,
-                noUsePersonalGroupNum: noUsePersonalGroupNum,
-                selectPersonalGroupUserNum: selectUserNum,
-                personalGroupName: value,
-                navPersonalGroupList: navList,
-                isShowNav: false,
-                isShowCheckAll: isShowCheckAll
-              }, function () {
-                t.instance.update(t.getContent());
-              });
-            } else {
-              alert("职务查询接口错误：" + result.errorMsg);
-            }
-          }).catch(function (error) {
-            alert("3620错误：" + error);
-          });
-        } else if (type == "duty") {
-          //职位
-          var url = "";
+        // let personalGroupId=t.state.navPersonalGroupList.length>0?t.state.navPersonalGroupList[t.state.navPersonalGroupList.length-1].id:0;
+        if (searchType == "0" && value != "") {
+          url = t.getFetchUrl("politicalOutlook", "", value, true, true);
+        } else {
+          url = t.getFetchUrl("politicalOutlook", "", value, false, true);
+        }
 
-          // let personalGroupId=t.state.navPersonalGroupList.length>0?t.state.navPersonalGroupList[t.state.navPersonalGroupList.length-1].id:0;
-          if (searchType == "0" && value != "") {
-            url = t.getFetchUrl("duty", "", value, true, true);
-          } else {
-            url = t.getFetchUrl("duty", "", value, false, true);
+        fetch(url, {
+          method: "GET",
+          mode: "cors",
+          headers: {
+            'Accept': 'application/json, text/plain, */*',
+            'Content-Type': 'application/x-www-form-urlencoded'
           }
+        }).then(function (response) {
+          return response.json();
+        }).then(function (result) {
+          //alert(JSON.stringify(result));
+          //console.log("fetch请求数据"+JSON.stringify(result));
+          if (result.type == "success") {
+            var politicalOutlookList = result.data.politicalOutlookList;
+            var selectPoliticalOutlookNum = 0,
+                noUsePoliticalOutlookNum = 0;
+            var checkAllPoliticalOutlook = true;
 
-          fetch(url, {
-            method: "GET",
-            mode: "cors",
-            headers: {
-              'Accept': 'application/json, text/plain, */*',
-              'Content-Type': 'application/x-www-form-urlencoded'
-            }
-          }).then(function (response) {
-            return response.json();
-          }).then(function (result) {
-            //alert(JSON.stringify(result));
-            //console.log("fetch请求数据"+JSON.stringify(result));
-            if (result.type == "success") {
-              var dutyList = result.data.dutyList;
-              var selectDutyNum = 0,
-                  noUseDutyNum = 0;
-              var checkAllDuty = true;
-
-              var navList = [{ "id": "0", "dutyName": "全部", "checkAll": false }];
-              if (dutyList == null || dutyList == undefined || searchType == "0" && chooseType.indexOf("userNotDuty") >= 0) {
-                dutyList = [];
-              } else {
-                if (chooseType.indexOf("userNotDuty") < 0 || true) {
-                  var selectDutys = t.state.selectedList.selectDutys;
-                  selectDutyNum = t.dataIsChecked(dutyList, selectDutys, selectDutyNum);
-                  noUseDutyNum = t.countNoUseNum(dutyList);
-                  if (selectDutyNum != dutyList.length - noUseDutyNum) {
-                    checkAllDuty = false;
-                  }
-                }
-              }
-              var userList = result.data.userList;
-              var selectUserNum = 0;
-              var checkAllUser = true;
-              if (userList == null || userList == undefined) {
-                userList = [];
-              } else {
-                if (chooseType.indexOf("userNotDuty") >= 0 || chooseType.indexOf("userAndDuty") >= 0 || true) {
-                  var selectUsers = t.state.selectedList.selectUsers;
-                  selectUserNum = t.dataIsChecked(userList, selectUsers, selectUserNum);
-                  if (selectUserNum != userList.length) {
-                    checkAllUser = false;
-                  }
-                }
-              }
-              if (dutyList.length == noUseDutyNum && userList.length == 0) {
-                //全部不可选
-                navList[0].canUse = "0";
-              } else {
-                navList[0].canUse = "1";
-              }
-              if (checkAllUser && checkAllDuty) {
-                navList[0].checkAll = true;
-              }
-              t.setState({
-                dutyList: dutyList,
-                dutyUserList: userList,
-                selectDutyNum: selectDutyNum,
-                noUseDutyNum: noUseDutyNum,
-                selectDutyUserNum: selectUserNum,
-                dutyName: value,
-                navDutyList: navList,
-                isShowNav: false,
-                isShowCheckAll: isShowCheckAll
-              }, function () {
-                t.instance.update(t.getContent());
-              });
+            var navList = [{ "id": "0", "politicalOutlookName": "全部", "checkAll": false }];
+            // if (politicalOutlookList == null || politicalOutlookList == undefined || (searchType == "0" && chooseType.indexOf("userNotPoliticalOutlook") >= 0)) {
+            if (politicalOutlookList == null || politicalOutlookList == undefined || searchType == "0" && chooseType.indexOf("userNotPoliticalOutlook") >= 0) {
+              politicalOutlookList = [];
             } else {
-              alert("职务查询接口错误：" + result.message);
-            }
-          }).catch(function (error) {
-            alert("3620错误：" + error);
-          });
-        } else if (type == "politicalOutlook") {
-          //政治面貌
-          var url = "";
-
-          // let personalGroupId=t.state.navPersonalGroupList.length>0?t.state.navPersonalGroupList[t.state.navPersonalGroupList.length-1].id:0;
-          if (searchType == "0" && value != "") {
-            url = t.getFetchUrl("politicalOutlook", "", value, true, true);
-          } else {
-            url = t.getFetchUrl("politicalOutlook", "", value, false, true);
-          }
-
-          fetch(url, {
-            method: "GET",
-            mode: "cors",
-            headers: {
-              'Accept': 'application/json, text/plain, */*',
-              'Content-Type': 'application/x-www-form-urlencoded'
-            }
-          }).then(function (response) {
-            return response.json();
-          }).then(function (result) {
-            //alert(JSON.stringify(result));
-            //console.log("fetch请求数据"+JSON.stringify(result));
-            if (result.type == "success") {
-              var politicalOutlookList = result.data.politicalOutlookList;
-              var selectPoliticalOutlookNum = 0,
-                  noUsePoliticalOutlookNum = 0;
-              var checkAllPoliticalOutlook = true;
-
-              var navList = [{ "id": "0", "politicalOutlookName": "全部", "checkAll": false }];
-              if (politicalOutlookList == null || politicalOutlookList == undefined || searchType == "0" && chooseType.indexOf("userNotPoliticalOutlook") >= 0) {
-                politicalOutlookList = [];
-              } else {
-                if (chooseType.indexOf("userNotPoliticalOutlook") < 0 || true) {
-                  var selectPoliticalOutlooks = t.state.selectedList.selectPoliticalOutlooks;
-                  selectPoliticalOutlookNum = t.dataIsChecked(politicalOutlookList, selectPoliticalOutlooks, selectPoliticalOutlookNum);
-                  noUsePoliticalOutlookNum = t.countNoUseNum(politicalOutlookList);
-                  if (selectPoliticalOutlookNum != politicalOutlookList.length - noUsePoliticalOutlookNum) {
-                    checkAllPoliticalOutlook = false;
-                  }
-                }
-              }
-              var userList = result.data.userList;
-              var selectUserNum = 0;
-              var checkAllUser = true;
-              if (userList == null || userList == undefined) {
-                userList = [];
-              } else {
-                if (chooseType.indexOf("userNotPoliticalOutlook") >= 0 || chooseType.indexOf("userAndPoliticalOutlook") >= 0 || true) {
-                  var selectUsers = t.state.selectedList.selectUsers;
-                  selectUserNum = t.dataIsChecked(userList, selectUsers, selectUserNum);
-                  if (selectUserNum != userList.length) {
-                    checkAllUser = false;
-                  }
+              if (chooseType.indexOf("userNotPoliticalOutlook") < 0 || true) {
+                var selectPoliticalOutlooks = t.state.selectedList.selectPoliticalOutlooks;
+                selectPoliticalOutlookNum = t.dataIsChecked(politicalOutlookList, selectPoliticalOutlooks, selectPoliticalOutlookNum);
+                noUsePoliticalOutlookNum = t.countNoUseNum(politicalOutlookList);
+                if (selectPoliticalOutlookNum != politicalOutlookList.length - noUsePoliticalOutlookNum) {
+                  checkAllPoliticalOutlook = false;
                 }
               }
-              if (politicalOutlookList.length == noUsePoliticalOutlookNum && userList.length == 0) {
-                //全部不可选
-                navList[0].canUse = "0";
-              } else {
-                navList[0].canUse = "1";
-              }
-              if (checkAllUser && checkAllPoliticalOutlook) {
-                navList[0].checkAll = true;
+            }
+            var userList = result.data.userList;
+            var selectUserNum = 0;
+            var checkAllUser = true;
+            if (userList == null || userList == undefined) {
+              userList = [];
+            } else {
+              if (chooseType.indexOf("userNotPoliticalOutlook") >= 0 || chooseType.indexOf("userAndPoliticalOutlook") >= 0 || true) {
+                var selectUsers = t.state.selectedList.selectUsers;
+                selectUserNum = t.dataIsChecked(userList, selectUsers, selectUserNum);
+                if (selectUserNum != userList.length) {
+                  checkAllUser = false;
+                }
               }
-              t.setState({
-                politicalOutlookList: politicalOutlookList,
-                politicalOutlookUserList: userList,
-                selectPoliticalOutlookNum: selectPoliticalOutlookNum,
-                noUsePoliticalOutlookNum: noUsePoliticalOutlookNum,
-                selectPoliticalOutlookUserNum: selectUserNum,
-                politicalOutlookName: value,
-                navPoliticalOutlookList: navList,
-                isShowNav: false,
-                isShowCheckAll: isShowCheckAll
-              }, function () {
-                t.instance.update(t.getContent());
-              });
+            }
+            if (politicalOutlookList.length == noUsePoliticalOutlookNum && userList.length == 0) {
+              //全部不可选
+              navList[0].canUse = "0";
             } else {
-              alert("政治面貌查询接口错误：" + result.message);
+              navList[0].canUse = "1";
             }
-          }).catch(function (error) {
-            alert("3620错误：" + error);
-          });
-        }
+            if (checkAllUser && checkAllPoliticalOutlook) {
+              navList[0].checkAll = true;
+            }
+            t.setState({
+              politicalOutlookList: politicalOutlookList,
+              politicalOutlookUserList: userList,
+              selectPoliticalOutlookNum: selectPoliticalOutlookNum,
+              noUsePoliticalOutlookNum: noUsePoliticalOutlookNum,
+              selectPoliticalOutlookUserNum: selectUserNum,
+              politicalOutlookName: value,
+              navPoliticalOutlookList: navList,
+              isShowNav: false,
+              isShowCheckAll: isShowCheckAll
+            }, function () {
+              t.instance.update(t.getContent());
+            });
+          } else {
+            alert("政治面貌查询接口错误：" + result.message);
+          }
+        }).catch(function (error) {
+          alert("3620错误：" + error);
+        });
       }
+      //}
     }
   }, {
     key: 'getContent',
@@ -6769,6 +7500,7 @@ var Page = function (_React$Component) {
       var commonUsedData = this.state.commonUsedData;
       var currentNav = "";
       var currentCheckAll = false;
+      var currentCheckThisOrg = false;
       var checkAllCanUse = "";
       var activeKey = this.state.activeKey;
       if (activeKey == "user") {
@@ -6786,10 +7518,13 @@ var Page = function (_React$Component) {
         navList = this.state.navDutyList;
       } else if (activeKey == "politicalOutlook") {
         navList = this.state.navPoliticalOutlookList;
+      } else if (activeKey == "common") {
+        navList = this.state.navCommonList;
       }
       if (navList != null && navList.length > 0) {
         currentNav = navList[navList.length - 1].id;
         currentCheckAll = navList[navList.length - 1].checkAll;
+        currentCheckThisOrg = navList[navList.length - 1].checkThisOrg;
         //是我的部门
         if (navList[navList.length - 1].isCur) {
           checkAllCanUse = "1";
@@ -6840,17 +7575,6 @@ var Page = function (_React$Component) {
                 '\u6682\u65E0\u6570\u636E'
               )
             )
-          ),
-          _react2.default.createElement(
-            'div',
-            { className: 't-bottom-fixed no-border t-BCf' },
-            _react2.default.createElement(
-              _Button2.default,
-              { type: 'primary', onClick: function onClick() {
-                  t.handleSelectClick(false);
-                } },
-              '\u8FD4\u56DE'
-            )
           )
         ),
         _react2.default.createElement(
@@ -6860,384 +7584,296 @@ var Page = function (_React$Component) {
             'div',
             { style: { overflow: "auto", height: '' + this.state.winHeight }, className: 't-PB168' },
             _react2.default.createElement(
-              HBox,
-              { vAlign: 'center', className: selectUsers.length > 0 ? "t-PL16 t-PR16 t-FS14" : "t-DN" },
-              _react2.default.createElement(
-                Box,
-                { className: 't-PT10 t-PB10', flex: 1 },
-                '\u5DF2\u9009\u7528\u6237:',
-                selectUsers.length
-              ),
-              _react2.default.createElement(
-                Box,
-                { className: selectUsers.length > 0 ? "t-FCred" : "t-DN", onClick: function onClick() {
-                    t.clearItemMember();
-                  } },
-                '\u6E05\u7A7A'
-              )
+              'div',
+              { className: 'selected-title' },
+              '\u5DF2\u9009'
             ),
             _react2.default.createElement(
-              HBox,
-              { className: selectUsers.length > 0 ? "dd-appwrap" : "t-DN" },
+              'div',
+              _defineProperty({ className: selectUsers.length > 0 ? "dd-appwrap" : "t-DN" }, 'className', 'user-list mt-10'),
               selectUsers.map(function (item, i) {
                 return _react2.default.createElement(
-                  VBox,
-                  { className: 'dd-app dd-app-avatar', vAlign: 'center', hAlign: 'center' },
-                  _react2.default.createElement(
-                    Box,
-                    null,
-                    _react2.default.createElement(_Avatar2.default, { filter: function filter(prevName) {
-                        return prevName;
-                      }, name: item.userName.indexOf("(") > 0 ? item.userName.substring(0, item.userName.indexOf("(")) : item.userName, src: "", defaultColor: '#8ccfec' })
-                  ),
+                  'div',
+                  { className: 'selected-list-item' },
+                  _react2.default.createElement(_Avatar2.default, { filter: function filter(prevName) {
+                      return prevName;
+                    }, name: item.userName.indexOf("(") > 0 ? item.userName.substring(0, item.userName.indexOf("(")) : item.userName, src: "", defaultColor: '#8ccfec' }),
                   _react2.default.createElement(
-                    Box,
-                    { className: 't-MT6 t-PL4 t-PR4 t-WB t-FAC t-omit t-LH1_4' },
-                    item.userName
+                    'div',
+                    { className: 'right-content' },
+                    _react2.default.createElement(
+                      'li',
+                      null,
+                      _react2.default.createElement(
+                        'p',
+                        null,
+                        item.userName
+                      ),
+                      _react2.default.createElement(
+                        'p',
+                        null,
+                        t.handleOrgNamePath(item.orgNamePath)
+                      )
+                    )
                   ),
                   _react2.default.createElement(
-                    Box,
-                    { className: 'dd-appbadge', onClick: function onClick() {
+                    'div',
+                    { className: 'delete-icon' },
+                    _react2.default.createElement('i', { className: 'iconfont icon-close', onClick: function onClick() {
                         t.deleteItemMember(i, "user");
-                      } },
-                    _react2.default.createElement('i', { className: 'iconfont icon-plus t-rotate-45' })
+                      } })
                   )
                 );
               })
             ),
             _react2.default.createElement(
-              HBox,
-              { vAlign: 'center', className: selectOrgs.length > 0 ? "t-PL16 t-PR16 t-FS14" : "t-DN" },
-              _react2.default.createElement(
-                Box,
-                { className: 't-PT10 t-PB10', flex: 1 },
-                '\u5DF2\u9009\u7EC4\u7EC7:',
-                selectOrgs.length
-              ),
-              _react2.default.createElement(
-                Box,
-                { className: selectUsers.length <= 0 ? "t-FCred" : "t-DN", onClick: function onClick() {
-                    t.clearItemMember();
-                  } },
-                '\u6E05\u7A7A'
-              )
-            ),
-            _react2.default.createElement(
-              HBox,
-              { className: selectOrgs.length > 0 ? "dd-appwrap" : "t-DN" },
+              'div',
+              _defineProperty({ className: selectOrgs.length > 0 ? "dd-appwrap" : "t-DN" }, 'className', 'org-list mt-10'),
               selectOrgs.map(function (item, i) {
                 return _react2.default.createElement(
-                  VBox,
-                  { className: 'dd-app dd-app-avatar', vAlign: 'center', hAlign: 'center' },
+                  'div',
+                  { className: 'selected-list-item' },
                   _react2.default.createElement(
-                    Box,
-                    null,
-                    _react2.default.createElement(
-                      'div',
-                      { className: 't-avatar t-WH40 t-LH40 t-BCoranger' },
-                      _react2.default.createElement('i', { className: item.orgType == '3' ? "t-FS20 iconfont icon-organization t-FCf" : "t-FS20 iconfont icon-mechanism t-FCf" })
-                    )
+                    'div',
+                    { className: 't-avatar t-WH40 t-LH40 t-BCoranger icon' },
+                    _react2.default.createElement('i', { className: item.orgType == '3' ? "t-FS20 iconfont icon-organization t-FCf" : "t-FS20 iconfont icon-mechanism t-FCf" })
                   ),
                   _react2.default.createElement(
-                    Box,
-                    { className: 't-MT6 t-PL4 t-PR4 t-WB t-FAC t-omit t-LH1_4' },
-                    item.orgName
+                    'div',
+                    { className: 'right-content' },
+                    _react2.default.createElement(
+                      'li',
+                      null,
+                      _react2.default.createElement(
+                        'p',
+                        null,
+                        item.orgName
+                      ),
+                      _react2.default.createElement('p', null)
+                    )
                   ),
                   _react2.default.createElement(
-                    Box,
-                    { className: 'dd-appbadge', onClick: function onClick() {
+                    'div',
+                    { className: 'delete-icon' },
+                    _react2.default.createElement('i', { className: 'iconfont icon-close', onClick: function onClick() {
                         t.deleteItemMember(i, "org");
-                      } },
-                    _react2.default.createElement('i', { className: 'iconfont icon-plus t-rotate-45' })
+                      } })
                   )
                 );
               })
             ),
             _react2.default.createElement(
-              HBox,
-              { vAlign: 'center', className: selectRoles.length > 0 ? "t-PL16 t-PR16 t-FS14" : "t-DN" },
-              _react2.default.createElement(
-                Box,
-                { className: 't-PT10 t-PB10', flex: 1 },
-                '\u5DF2\u9009\u89D2\u8272:',
-                selectRoles.length
-              ),
-              _react2.default.createElement(
-                Box,
-                { className: selectUsers.length <= 0 && selectOrgs.length <= 0 ? "t-FCred" : "t-DN", onClick: function onClick() {
-                    t.clearItemMember();
-                  } },
-                '\u6E05\u7A7A'
-              )
-            ),
-            _react2.default.createElement(
-              HBox,
-              { className: selectRoles.length > 0 ? "dd-appwrap" : "t-DN" },
-              selectRoles.map(function (item, i) {
+              'div',
+              _defineProperty({ className: selectStations.length > 0 ? "dd-appwrap" : "t-DN" }, 'className', 'station-list mt-10'),
+              selectStations.map(function (item, i) {
                 return _react2.default.createElement(
-                  VBox,
-                  { className: 'dd-app dd-app-avatar', vAlign: 'center', hAlign: 'center' },
+                  'div',
+                  { className: 'selected-list-item' },
                   _react2.default.createElement(
-                    Box,
-                    null,
-                    _react2.default.createElement(
-                      'div',
-                      { className: 't-avatar t-WH40 t-LH40 t-BCgreen' },
-                      _react2.default.createElement('i', { className: 't-FS20 iconfont icon-role t-FCf' })
-                    )
+                    'div',
+                    { className: 't-avatar t-WH40 t-LH40 t-BCoranger icon' },
+                    _react2.default.createElement('i', { className: 't-FS20 iconfont icon-mine t-FCf ' })
                   ),
                   _react2.default.createElement(
-                    Box,
-                    { className: 't-MT6 t-PL4 t-PR4 t-WB t-FAC t-omit t-LH1_4' },
-                    item.roleName
+                    'div',
+                    { className: 'right-content' },
+                    _react2.default.createElement(
+                      'li',
+                      null,
+                      _react2.default.createElement(
+                        'p',
+                        null,
+                        item.stationName
+                      ),
+                      _react2.default.createElement('p', null)
+                    )
                   ),
                   _react2.default.createElement(
-                    Box,
-                    { className: 'dd-appbadge', onClick: function onClick() {
-                        t.deleteItemMember(i, "role");
-                      } },
-                    _react2.default.createElement('i', { className: 'iconfont icon-plus t-rotate-45' })
+                    'div',
+                    { className: 'delete-icon' },
+                    _react2.default.createElement('i', { className: 'iconfont icon-close', onClick: function onClick() {
+                        t.deleteItemMember(i, "station");
+                      } })
                   )
                 );
               })
             ),
             _react2.default.createElement(
-              HBox,
-              { vAlign: 'center', className: selectStations.length > 0 ? "t-PL16 t-PR16 t-FS14" : "t-DN" },
-              _react2.default.createElement(
-                Box,
-                { className: 't-PT10 t-PB10', flex: 1 },
-                '\u5DF2\u9009\u5C97\u4F4D:',
-                selectStations.length
-              ),
-              _react2.default.createElement(
-                Box,
-                { className: selectUsers.length <= 0 && selectOrgs.length <= 0 && selectRoles.length <= 0 ? "t-FCred" : "t-DN", onClick: function onClick() {
-                    t.clearItemMember();
-                  } },
-                '\u6E05\u7A7A'
-              )
-            ),
-            _react2.default.createElement(
-              HBox,
-              { className: selectStations.length > 0 ? "dd-appwrap" : "t-DN" },
-              selectStations.map(function (item, i) {
+              'div',
+              _defineProperty({ className: selectDutys.length > 0 ? "dd-appwrap" : "t-DN" }, 'className', 'duty-list mt-10'),
+              selectDutys.map(function (item, i) {
                 return _react2.default.createElement(
-                  VBox,
-                  { className: 'dd-app dd-app-avatar', vAlign: 'center', hAlign: 'center' },
+                  'div',
+                  { className: 'selected-list-item' },
                   _react2.default.createElement(
-                    Box,
-                    null,
-                    _react2.default.createElement(
-                      'div',
-                      { className: 't-avatar t-WH40 t-LH40 t-BCoranger' },
-                      _react2.default.createElement('i', { className: 't-FS20 iconfont icon-mine t-FCf' })
-                    )
+                    'div',
+                    { className: 't-avatar t-WH40 t-LH40 t-BCblue icon' },
+                    _react2.default.createElement('i', { className: 't-FS20 iconfont icon-group t-FCf' })
                   ),
                   _react2.default.createElement(
-                    Box,
-                    { className: 't-MT6 t-PL4 t-PR4 t-WB t-FAC t-omit t-LH1_4' },
-                    item.stationName
+                    'div',
+                    { className: 'right-content' },
+                    _react2.default.createElement(
+                      'li',
+                      null,
+                      _react2.default.createElement(
+                        'p',
+                        null,
+                        item.dutyName
+                      ),
+                      _react2.default.createElement('p', null)
+                    )
                   ),
                   _react2.default.createElement(
-                    Box,
-                    { className: 'dd-appbadge', onClick: function onClick() {
-                        t.deleteItemMember(i, "station");
-                      } },
-                    _react2.default.createElement('i', { className: 'iconfont icon-plus t-rotate-45' })
+                    'div',
+                    { className: 'delete-icon' },
+                    _react2.default.createElement('i', { className: 'iconfont icon-close', onClick: function onClick() {
+                        t.deleteItemMember(i, "duty");
+                      } })
                   )
                 );
               })
             ),
             _react2.default.createElement(
-              HBox,
-              { vAlign: 'center', className: selectGroups.length > 0 ? "t-PL16 t-PR16 t-FS14" : "t-DN" },
-              _react2.default.createElement(
-                Box,
-                { className: 't-PT10 t-PB10', flex: 1 },
-                '\u5DF2\u9009\u7FA4\u7EC4:',
-                selectGroups.length
-              ),
-              _react2.default.createElement(
-                Box,
-                { className: selectUsers.length <= 0 && selectOrgs.length <= 0 && selectRoles.length <= 0 && selectStations.length <= 0 ? "t-FCred" : "t-DN", onClick: function onClick() {
-                    t.clearItemMember();
-                  } },
-                '\u6E05\u7A7A'
-              )
-            ),
-            _react2.default.createElement(
-              HBox,
-              { className: selectGroups.length > 0 ? "dd-appwrap" : "t-DN" },
+              'div',
+              _defineProperty({ className: selectGroups.length > 0 ? "dd-appwrap" : "t-DN" }, 'className', 'group-list mt-10'),
               selectGroups.map(function (item, i) {
-
                 return _react2.default.createElement(
-                  VBox,
-                  { className: 'dd-app dd-app-avatar', vAlign: 'center', hAlign: 'center' },
+                  'div',
+                  { className: 'selected-list-item' },
                   _react2.default.createElement(
-                    Box,
-                    null,
-                    _react2.default.createElement(
-                      'div',
-                      { className: 't-avatar t-WH40 t-LH40 t-BCblue' },
-                      _react2.default.createElement('i', { className: 't-FS20 iconfont icon-group t-FCf' })
-                    )
+                    'div',
+                    { className: 't-avatar t-WH40 t-LH40 t-BCblue icon' },
+                    _react2.default.createElement('i', { className: 't-FS20 iconfont icon-group t-FCf' })
                   ),
                   _react2.default.createElement(
-                    Box,
-                    { className: 't-MT6 t-PL4 t-PR4 t-WB t-FAC t-omit t-LH1_4' },
-                    item.groupName
+                    'div',
+                    { className: 'right-content' },
+                    _react2.default.createElement(
+                      'li',
+                      null,
+                      _react2.default.createElement(
+                        'p',
+                        null,
+                        item.groupName
+                      ),
+                      _react2.default.createElement('p', null)
+                    )
                   ),
                   _react2.default.createElement(
-                    Box,
-                    { className: 'dd-appbadge', onClick: function onClick() {
+                    'div',
+                    { className: 'delete-icon' },
+                    _react2.default.createElement('i', { className: 'iconfont icon-close', onClick: function onClick() {
                         t.deleteItemMember(i, "group");
-                      } },
-                    _react2.default.createElement('i', { className: 'iconfont icon-plus t-rotate-45' })
+                      } })
                   )
                 );
               })
             ),
             _react2.default.createElement(
-              HBox,
-              { vAlign: 'center', className: selectPersonalGroups.length > 0 ? "t-PL16 t-PR16 t-FS14" : "t-DN" },
-              _react2.default.createElement(
-                Box,
-                { className: 't-PT10 t-PB10', flex: 1 },
-                '\u5DF2\u9009\u4E2A\u4EBA\u7FA4\u7EC4:',
-                selectPersonalGroups.length
-              ),
-              _react2.default.createElement(
-                Box,
-                { className: selectUsers.length <= 0 && selectOrgs.length <= 0 && selectRoles.length <= 0 && selectStations.length <= 0 && selectGroups.length <= 0 && selectPersonalGroups.length < 0 && selectDutys.length <= 0 && selectPoliticalOutlooks.length <= 0 ? "t-FCred" : "t-DN", onClick: function onClick() {
-                    t.clearItemMember();
-                  } },
-                '\u6E05\u7A7A'
-              )
-            ),
-            _react2.default.createElement(
-              HBox,
-              { className: selectPersonalGroups.length > 0 ? "dd-appwrap" : "t-DN" },
+              'div',
+              _defineProperty({ className: selectPersonalGroups.length > 0 ? "dd-appwrap" : "t-DN" }, 'className', 'personal-group-list mt-10'),
               selectPersonalGroups.map(function (item, i) {
                 return _react2.default.createElement(
-                  VBox,
-                  { className: 'dd-app dd-app-avatar', vAlign: 'center', hAlign: 'center', onClick: function onClick() {
-                      t.deleteItemMember(i, "personGroup");
-                    } },
+                  'div',
+                  { className: 'selected-list-item' },
                   _react2.default.createElement(
-                    Box,
-                    null,
-                    _react2.default.createElement(
-                      'div',
-                      { className: 't-avatar t-WH40 t-LH40 t-BCblue' },
-                      _react2.default.createElement('i', { className: 't-FS20 iconfont icon-group t-FCf' })
-                    )
+                    'div',
+                    { className: 't-avatar t-WH40 t-LH40 t-BCblue icon' },
+                    _react2.default.createElement('i', { className: 't-FS20 iconfont icon-group t-FCf' })
                   ),
                   _react2.default.createElement(
-                    Box,
-                    { className: 't-MT6 t-PL4 t-PR4 t-WB t-FAC t-omit t-LH1_4' },
-                    item.personalGroupName
+                    'div',
+                    { className: 'right-content' },
+                    _react2.default.createElement(
+                      'li',
+                      null,
+                      _react2.default.createElement(
+                        'p',
+                        null,
+                        item.personalGroupName
+                      ),
+                      _react2.default.createElement('p', null)
+                    )
                   ),
                   _react2.default.createElement(
-                    Box,
-                    { className: 'dd-appbadge' },
-                    _react2.default.createElement('i', { className: 'iconfont icon-plus t-rotate-45' })
+                    'div',
+                    { className: 'delete-icon' },
+                    _react2.default.createElement('i', { className: 'iconfont icon-close', onClick: function onClick() {
+                        t.deleteItemMember(i, "personGroup");
+                      } })
                   )
                 );
               })
             ),
             _react2.default.createElement(
-              HBox,
-              { vAlign: 'center', className: selectDutys.length > 0 ? "t-PL16 t-PR16 t-FS14" : "t-DN" },
-              _react2.default.createElement(
-                Box,
-                { className: 't-PT10 t-PB10', flex: 1 },
-                '\u5DF2\u9009\u804C\u52A1:',
-                selectDutys.length
-              ),
-              _react2.default.createElement(
-                Box,
-                { className: selectUsers.length <= 0 && selectOrgs.length <= 0 && selectRoles.length <= 0 && selectStations.length <= 0 && selectGroups.length <= 0 && selectPersonalGroups.length < 0 && selectDutys.length <= 0 && selectPoliticalOutlooks.length <= 0 ? "t-FCred" : "t-DN", onClick: function onClick() {
-                    t.clearItemMember();
-                  } },
-                '\u6E05\u7A7A'
-              )
-            ),
-            _react2.default.createElement(
-              HBox,
-              { className: selectDutys.length > 0 ? "dd-appwrap" : "t-DN" },
-              selectDutys.map(function (item, i) {
+              'div',
+              _defineProperty({ className: selectPersonalGroups.length > 0 ? "dd-appwrap" : "t-DN" }, 'className', 'role-list mt-10'),
+              selectRoles.map(function (item, i) {
                 return _react2.default.createElement(
-                  VBox,
-                  { className: 'dd-app dd-app-avatar', vAlign: 'center', hAlign: 'center', onClick: function onClick() {
-                      t.deleteItemMember(i, "duty");
-                    } },
+                  'div',
+                  { className: 'selected-list-item' },
                   _react2.default.createElement(
-                    Box,
-                    null,
-                    _react2.default.createElement(
-                      'div',
-                      { className: 't-avatar t-WH40 t-LH40 t-BCblue' },
-                      _react2.default.createElement('i', { className: 't-FS20 iconfont icon-group t-FCf' })
-                    )
+                    'div',
+                    { className: 't-avatar t-WH40 t-LH40 t-BCgreen icon' },
+                    _react2.default.createElement('i', { className: 't-FS20 iconfont icon-role t-FCf' })
                   ),
                   _react2.default.createElement(
-                    Box,
-                    { className: 't-MT6 t-PL4 t-PR4 t-WB t-FAC t-omit t-LH1_4' },
-                    item.dutyName
+                    'div',
+                    { className: 'right-content' },
+                    _react2.default.createElement(
+                      'li',
+                      null,
+                      _react2.default.createElement(
+                        'p',
+                        null,
+                        item.roleName
+                      ),
+                      _react2.default.createElement('p', null)
+                    )
                   ),
                   _react2.default.createElement(
-                    Box,
-                    { className: 'dd-appbadge' },
-                    _react2.default.createElement('i', { className: 'iconfont icon-plus t-rotate-45' })
+                    'div',
+                    { className: 'delete-icon' },
+                    _react2.default.createElement('i', { className: 'iconfont icon-close', onClick: function onClick() {
+                        t.deleteItemMember(i, "role");
+                      } })
                   )
                 );
               })
             ),
             _react2.default.createElement(
-              HBox,
-              { vAlign: 'center', className: selectPoliticalOutlooks.length > 0 ? "t-PL16 t-PR16 t-FS14" : "t-DN" },
-              _react2.default.createElement(
-                Box,
-                { className: 't-PT10 t-PB10', flex: 1 },
-                '\u5DF2\u9009\u653F\u6CBB\u9762\u8C8C:',
-                selectPoliticalOutlooks.length
-              ),
-              _react2.default.createElement(
-                Box,
-                { className: selectUsers.length <= 0 && selectOrgs.length <= 0 && selectRoles.length <= 0 && selectStations.length <= 0 && selectGroups.length <= 0 && selectPersonalGroups.length < 0 && selectDutys.length <= 0 && selectPoliticalOutlooks.length <= 0 ? "t-FCred" : "t-DN", onClick: function onClick() {
-                    t.clearItemMember();
-                  } },
-                '\u6E05\u7A7A'
-              )
-            ),
-            _react2.default.createElement(
-              HBox,
-              { className: selectPoliticalOutlooks.length > 0 ? "dd-appwrap" : "t-DN" },
+              'div',
+              _defineProperty({ className: selectPersonalGroups.length > 0 ? "dd-appwrap" : "t-DN" }, 'className', 'political-list mt-10'),
               selectPoliticalOutlooks.map(function (item, i) {
                 return _react2.default.createElement(
-                  VBox,
-                  { className: 'dd-app dd-app-avatar', vAlign: 'center', hAlign: 'center', onClick: function onClick() {
-                      t.deleteItemMember(i, "politicalOutlook");
-                    } },
+                  'div',
+                  { className: 'selected-list-item' },
+                  _react2.default.createElement(
+                    'div',
+                    { className: 't-avatar t-WH40 t-LH40 t-BCblue icon' },
+                    _react2.default.createElement('i', { className: 't-FS20 iconfont icon-group t-FCf' })
+                  ),
                   _react2.default.createElement(
-                    Box,
-                    null,
+                    'div',
+                    { className: 'right-content' },
                     _react2.default.createElement(
-                      'div',
-                      { className: 't-avatar t-WH40 t-LH40 t-BCblue' },
-                      _react2.default.createElement('i', { className: 't-FS20 iconfont icon-group t-FCf' })
+                      'li',
+                      null,
+                      _react2.default.createElement(
+                        'p',
+                        null,
+                        item.name
+                      ),
+                      _react2.default.createElement('p', null)
                     )
                   ),
                   _react2.default.createElement(
-                    Box,
-                    { className: 't-MT6 t-PL4 t-PR4 t-WB t-FAC t-omit t-LH1_4' },
-                    item.name
-                  ),
-                  _react2.default.createElement(
-                    Box,
-                    { className: 'dd-appbadge' },
-                    _react2.default.createElement('i', { className: 'iconfont icon-plus t-rotate-45' })
+                    'div',
+                    { className: 'delete-icon' },
+                    _react2.default.createElement('i', { className: 'iconfont icon-close', onClick: function onClick() {
+                        t.deleteItemMember(i, "politicalOutlook");
+                      } })
                   )
                 );
               })
@@ -7245,13 +7881,24 @@ var Page = function (_React$Component) {
           ),
           _react2.default.createElement(
             'div',
-            { className: 't-bottom-fixed no-border t-BCf' },
+            { className: 't-bottom-fixed no-border t-BCf selected-bottom' },
             _react2.default.createElement(
-              _Button2.default,
-              { type: 'primary', onClick: function onClick() {
-                  t.handleSelectClick(false);
-                } },
-              '\u8FD4\u56DE'
+              'div',
+              { className: 'right-btn' },
+              _react2.default.createElement(
+                _Button2.default,
+                { type: 'primary', onClick: function onClick() {
+                    t.handleSelectClick(false);
+                  }, className: 'go-back' },
+                '\u8FD4\u56DE'
+              ),
+              _react2.default.createElement(
+                _Button2.default,
+                { type: 'danger', onClick: function onClick() {
+                    t.clearItemMember();
+                  }, className: 'delete-all' },
+                '\u6E05\u7A7A'
+              )
             )
           )
         ),
@@ -7267,7 +7914,49 @@ var Page = function (_React$Component) {
                 tabContent = _react2.default.createElement(
                   'div',
                   { id: 'anchor', style: { overflow: "auto", height: '' + t.state.tabHeight }, className: 't-PB68 dd-top-border scrollHeight t-PR' },
-                  (commonUsedData == null || commonUsedData == undefined || commonUsedData.length <= 0) && t.state.activeKey == "common" ? _react2.default.createElement(
+                  _react2.default.createElement(
+                    'div',
+                    { className: t.state.commonName == "" && t.state.isShowNav ? "t-BCf7 t-OFA t-WSN dd-bottom-border" : "t-DN" },
+                    navList.map(function (item, index) {
+                      if (index == 0) {
+                        return _react2.default.createElement(
+                          'div',
+                          { className: 't-PL16 t-LH42 t-FCddblue t-DIB', onClick: function onClick() {
+                              t.handleNavClick("0", "common", "");
+                            } },
+                          '\u5168\u90E8'
+                        );
+                      } else {
+                        var nameHtml = "";
+                        if (index == navList.length - 1) {
+                          nameHtml = _react2.default.createElement(
+                            'div',
+                            { className: 't-FC9 t-DIB' },
+                            item.scopeName
+                          );
+                        } else {
+                          nameHtml = _react2.default.createElement(
+                            'div',
+                            { className: 't-FC9 t-DIB t-FCddblue', onClick: function onClick() {
+                                t.handleNavClick(item.scopeValue, "common", item.scopeType);
+                              } },
+                            item.scopeName
+                          );
+                        }
+                        return _react2.default.createElement(
+                          'div',
+                          { className: 't-DIB' },
+                          _react2.default.createElement(
+                            'div',
+                            { className: 't-PL10 t-PR10 t-FCc t-DIB' },
+                            '>'
+                          ),
+                          nameHtml
+                        );
+                      }
+                    })
+                  ),
+                  t.state.commonTreeData.length <= 0 && t.state.commonUsedData.length <= 0 && t.state.activeKey == "common" ? _react2.default.createElement(
                     'div',
                     { className: 'nodata-wrapper' },
                     _react2.default.createElement(
@@ -7288,9 +7977,108 @@ var Page = function (_React$Component) {
                         t.state.nodataText
                       )
                     )
-                  ) : commonUsedData.map(function (item, index) {
+                  ) : "",
+                  t.state.commonTreeData.map(function (item, index) {
+                    var scopeType = item.scopeType;
+                    var showHtml = "";
+                    var clickHtml = "";
+                    if (scopeType == "user") {
+                      showHtml = _react2.default.createElement(
+                        Box,
+                        { className: 't-PT10 t-PB10 t-PL10 t-PR6' },
+                        _react2.default.createElement(_Avatar2.default, { filter: function filter(prevName) {
+                            return prevName;
+                          }, name: item.scopeName.indexOf("(") > 0 ? item.scopeName.substring(0, item.scopeName.indexOf("(")) : item.scopeName, src: "", defaultColor: '#F6BF26' })
+                      );
+                    } else if (scopeType == "org") {
+                      showHtml = _react2.default.createElement(
+                        Box,
+                        { className: 't-PT10 t-PB10 t-PR6' },
+                        _react2.default.createElement('i', { className: 'iconfont icon-organization t-FCd t-FS20' })
+                      );
+                      clickHtml = _react2.default.createElement(
+                        Box,
+                        { className: "t-PR16", onClick: function onClick() {
+                            t.handleCommonShow(item.scopeValue, item, 'common', "org");
+                          } },
+                        _react2.default.createElement('i', { className: 'iconfont icon-arrow-up t-rotate-90 t-FCc' })
+                      );
+                    } else if (scopeType == "role") {
+                      showHtml = _react2.default.createElement(
+                        Box,
+                        { className: 't-PT10 t-PB10 t-PL6 t-PR6' },
+                        _react2.default.createElement('i', { className: 'iconfont icon-role t-FCd t-FS20' })
+                      );
+                      clickHtml = _react2.default.createElement(
+                        Box,
+                        { className: "t-PR16", onClick: function onClick() {
+                            t.handleRoleShow(item.scopeValue, item, 'common');
+                          } },
+                        _react2.default.createElement('i', { className: 'iconfont icon-arrow-up t-rotate-90 t-FCc' })
+                      );
+                    } else if (scopeType == "station") {
+                      showHtml = _react2.default.createElement(
+                        Box,
+                        { className: 't-PT10 t-PB10 t-PR6' },
+                        _react2.default.createElement('i', { className: 'iconfont icon-mine t-FCd t-FS20' })
+                      );
+                      clickHtml = _react2.default.createElement(
+                        Box,
+                        { className: "t-PR16", onClick: function onClick() {
+                            t.handleStationShow(item.scopeValue, item, 'common');
+                          } },
+                        _react2.default.createElement('i', { className: 'iconfont icon-arrow-up t-rotate-90 t-FCc' })
+                      );
+                    } else if (scopeType == "group") {
+                      showHtml = _react2.default.createElement(
+                        Box,
+                        { className: 't-PT10 t-PB10 t-PR6' },
+                        _react2.default.createElement('i', { className: 'iconfont icon-group t-FCd t-FS20' })
+                      );
+                      clickHtml = _react2.default.createElement(
+                        Box,
+                        { className: "t-PR16", onClick: function onClick() {
+                            t.handleCommonShow(item.scopeValue, item, 'common', 'group');
+                          } },
+                        _react2.default.createElement('i', { className: 'iconfont icon-arrow-up t-rotate-90 t-FCc' })
+                      );
+                    } else if (scopeType == "personGroup") {
+                      showHtml = _react2.default.createElement(
+                        Box,
+                        { className: 't-PT10 t-PB10 t-PR6' },
+                        _react2.default.createElement('i', { className: 'iconfont icon-group t-FCd t-FS20' })
+                      );
+                      clickHtml = _react2.default.createElement(
+                        Box,
+                        { className: t.state.orgName == "" ? "t-PR16" : "t-DN", onClick: function onClick() {
+                            t.handleCommonShow(item.id, item);
+                          } },
+                        _react2.default.createElement('i', { className: 'iconfont icon-arrow-up t-rotate-90 t-FCc' })
+                      );
+                    }
+                    return _react2.default.createElement(
+                      'div',
+                      { className: 't-PL16 t-PR16 dd-bottom-border t-BCf' },
+                      _react2.default.createElement(
+                        HBox,
+                        { vAlign: 'center' },
+                        _react2.default.createElement(HBox, null),
+                        showHtml,
+                        _react2.default.createElement(
+                          Box,
+                          { flex: 1, className: 't-FS16 t-PL4 t-PR10 ', onClick: function onClick() {
+                              t.handleCommonShow(item.scopeValue, item, 'common', item.scopeType);
+                            } },
+                          item.scopeName
+                        ),
+                        clickHtml
+                      )
+                    );
+                  }),
+                  t.state.commonUsedData.map(function (item, index) {
                     var scopeType = item.scopeType;
                     var showHtml = "";
+                    var clickHtml = "";
                     if (scopeType == "user") {
                       showHtml = _react2.default.createElement(
                         Box,
@@ -7305,6 +8093,13 @@ var Page = function (_React$Component) {
                         { className: 't-PT10 t-PB10 t-PR6' },
                         _react2.default.createElement('i', { className: 'iconfont icon-organization t-FCd t-FS20' })
                       );
+                      clickHtml = _react2.default.createElement(
+                        Box,
+                        { className: t.state.orgName == "" ? "t-PR16" : "t-DN", onClick: function onClick() {
+                            t.handleCommonShow(item.id, item);
+                          } },
+                        _react2.default.createElement('i', { className: 'iconfont icon-arrow-up t-rotate-90 t-FCc' })
+                      );
                     } else if (scopeType == "role") {
                       showHtml = _react2.default.createElement(
                         Box,
@@ -7317,18 +8112,39 @@ var Page = function (_React$Component) {
                         { className: 't-PT10 t-PB10 t-PR6' },
                         _react2.default.createElement('i', { className: 'iconfont icon-mine t-FCd t-FS20' })
                       );
+                      clickHtml = _react2.default.createElement(
+                        Box,
+                        { className: t.state.orgName == "" ? "t-PR16" : "t-DN", onClick: function onClick() {
+                            t.handleCommonShow(item.id, item);
+                          } },
+                        _react2.default.createElement('i', { className: 'iconfont icon-arrow-up t-rotate-90 t-FCc' })
+                      );
                     } else if (scopeType == "group") {
                       showHtml = _react2.default.createElement(
                         Box,
                         { className: 't-PT10 t-PB10 t-PR6' },
                         _react2.default.createElement('i', { className: 'iconfont icon-group t-FCd t-FS20' })
                       );
+                      clickHtml = _react2.default.createElement(
+                        Box,
+                        { className: t.state.orgName == "" ? "t-PR16" : "t-DN", onClick: function onClick() {
+                            t.handleCommonShow(item.id, item);
+                          } },
+                        _react2.default.createElement('i', { className: 'iconfont icon-arrow-up t-rotate-90 t-FCc' })
+                      );
                     } else if (scopeType == "personGroup") {
                       showHtml = _react2.default.createElement(
                         Box,
                         { className: 't-PT10 t-PB10 t-PR6' },
                         _react2.default.createElement('i', { className: 'iconfont icon-group t-FCd t-FS20' })
                       );
+                      clickHtml = _react2.default.createElement(
+                        Box,
+                        { className: t.state.orgName == "" ? "t-PR16" : "t-DN", onClick: function onClick() {
+                            t.handleCommonShow(item.id, item);
+                          } },
+                        _react2.default.createElement('i', { className: 'iconfont icon-arrow-up t-rotate-90 t-FCc' })
+                      );
                     }
                     return _react2.default.createElement(
                       'div',
@@ -7357,7 +8173,8 @@ var Page = function (_React$Component) {
                             { className: 't-FS13 t-PR10', style: { color: '#33333373' } },
                             item.orgNamePath
                           )
-                        )
+                        ),
+                        clickHtml
                       )
                     );
                   })
@@ -7421,7 +8238,7 @@ var Page = function (_React$Component) {
                       if (index == 0) {
                         return _react2.default.createElement(
                           'div',
-                          { className: 't-PL16 t-LH42 t-FCddblue t-DIB', onClick: function onClick() {
+                          { className: 't-PL16 t-LH42 t-FCblue t-DIB', onClick: function onClick() {
                               t.handleNavClick("0", "org", "");
                             } },
                           '\u5168\u90E8'
@@ -7447,7 +8264,7 @@ var Page = function (_React$Component) {
                         } else {
                           nameHtml = _react2.default.createElement(
                             'div',
-                            { className: 't-FC9 t-DIB t-FCddblue', onClick: function onClick() {
+                            { className: 't-FC9 t-DIB t-FCblue', onClick: function onClick() {
                                 t.handleNavClick(item.id, "org", "");
                               } },
                             item.orgName
@@ -7490,49 +8307,51 @@ var Page = function (_React$Component) {
                   ) : "",
                   t.state.orgList.map(function (org, index) {
                     if (chooseType.indexOf("userNotOrg") < 0) {
-                      return _react2.default.createElement(
-                        HBox,
-                        { vAlign: 'center', className: 'dd-bottom-border t-BCf' },
-                        _react2.default.createElement(
+                      if (org.isCur && chooseType.indexOf("userAndOrg") < 0) {} else {
+                        return _react2.default.createElement(
                           HBox,
-                          { className: 't-PL16 t-PR10', onClick: function onClick() {
-                              t.checkItemMember(index, "org");
-                            } },
-                          getOrgType == "" || getOrgType == "2" && (org.orgType == '2' || org.orgType == '1') || getOrgType == "3" && org.orgType == '3' ? _react2.default.createElement(
-                            'div',
-                            {
-                              className: org.canUse == '0' ? 't-checkbox-field-icon-list disabled' : org.checked ? 't-checkbox-field-icon-list checked' + (isRadio ? ' t-list-cricle' : '') : 'un-checked t-checkbox-field-icon-list' + (isRadio ? ' t-list-cricle' : '') },
-                            _react2.default.createElement('i', { className: 'iconfont icon-checked t-FCf t-FS14' })
-                          ) : ""
-                        ),
-                        _react2.default.createElement(
-                          Box,
-                          { className: 't-PT10 t-PB10 t-PR6' },
-                          _react2.default.createElement('i', { className: org.orgType == '3' ? "iconfont icon-organization t-FCd t-FS20" : "iconfont icon-mechanism t-FCd t-FS20" })
-                        ),
-                        org.isCur ? _react2.default.createElement(
-                          Box,
-                          { flex: 1, onClick: function onClick() {
-                              t.state.orgName == "" && t.handleOrgShow(org.id, org);
-                            }, className: 't-FS16 t-PL4 t-PR10 t-omit' },
-                          "我的部门",
-                          _react2.default.createElement('i', { className: 'iconfont t-ML6 icon-dotted' }),
-                          org.orgName
-                        ) : _react2.default.createElement(
-                          Box,
-                          { flex: 1, onClick: function onClick() {
-                              t.state.orgName == "" && t.handleOrgShow(org.id, org);
-                            }, className: 't-FS16 t-PL4 t-PR10 t-omit' },
-                          org.orgName
-                        ),
-                        _react2.default.createElement(
-                          Box,
-                          { className: t.state.orgName == "" ? "t-PR16" : "t-DN", onClick: function onClick() {
-                              t.handleOrgShow(org.id, org);
-                            } },
-                          _react2.default.createElement('i', { className: 'iconfont icon-arrow-up t-rotate-90 t-FCc' })
-                        )
-                      );
+                          { vAlign: 'center', className: 'dd-bottom-border t-BCf' },
+                          _react2.default.createElement(
+                            HBox,
+                            { className: 't-PL16 t-PR10', onClick: function onClick() {
+                                t.checkItemMember(index, "org");
+                              } },
+                            getOrgType == "" || getOrgType == "2" && (org.orgType == '2' || org.orgType == '1') || getOrgType == "3" && org.orgType == '3' ? _react2.default.createElement(
+                              'div',
+                              {
+                                className: org.canUse == '0' ? 't-checkbox-field-icon-list disabled' : org.checked ? 't-checkbox-field-icon-list checked' + (isRadio ? ' t-list-cricle' : '') : 'un-checked t-checkbox-field-icon-list' + (isRadio ? ' t-list-cricle' : '') },
+                              _react2.default.createElement('i', { className: 'iconfont icon-checked t-FCf t-FS14' })
+                            ) : ""
+                          ),
+                          _react2.default.createElement(
+                            Box,
+                            { className: 't-PT10 t-PB10 t-PR6' },
+                            _react2.default.createElement('i', { className: org.orgType == '3' ? "iconfont icon-organization t-FCd t-FS20" : "iconfont icon-mechanism t-FCd t-FS20" })
+                          ),
+                          org.isCur ? _react2.default.createElement(
+                            Box,
+                            { flex: 1, onClick: function onClick() {
+                                t.state.orgName == "" && t.handleOrgShow(org.id, org);
+                              }, className: 't-FS16 t-PL4 t-PR10 t-omit' },
+                            "我的部门",
+                            _react2.default.createElement('i', { className: 'iconfont t-ML6 icon-dotted' }),
+                            org.orgName
+                          ) : _react2.default.createElement(
+                            Box,
+                            { flex: 1, onClick: function onClick() {
+                                t.state.orgName == "" && t.handleOrgShow(org.id, org);
+                              }, className: 't-FS16 t-PL4 t-PR10 t-omit' },
+                            org.orgName
+                          ),
+                          _react2.default.createElement(
+                            Box,
+                            { className: t.state.orgName == "" ? "t-PR16" : "t-DN", onClick: function onClick() {
+                                t.handleOrgShow(org.id, org);
+                              } },
+                            _react2.default.createElement('i', { className: 'iconfont icon-arrow-up t-rotate-90 t-FCc' })
+                          )
+                        );
+                      }
                     } else {
                       return _react2.default.createElement(
                         HBox,
@@ -7566,7 +8385,7 @@ var Page = function (_React$Component) {
                   chooseType.indexOf("userAndOrg") >= 0 || chooseType.indexOf("userNotOrg") >= 0 ? t.state.orgUserList.map(function (user, index) {
                     return _react2.default.createElement(
                       HBox,
-                      { vAlign: 'center', className: 'dd-bottom-border t-BCf', onClick: function onClick() {
+                      { vAlign: 'center', className: ' t-BCf', onClick: function onClick() {
                           t.checkItemMember(index, "orgUser");
                         } },
                       _react2.default.createElement(
@@ -7587,7 +8406,7 @@ var Page = function (_React$Component) {
                       ),
                       _react2.default.createElement(
                         Box,
-                        { flex: 1, className: 't-FS16 t-PL4 t-PR10' },
+                        { flex: 1, className: 't-FS16 t-PL4 t-PR10 dd-bottom-border select-user-info', style: { paddingBottom: 5 + 'px' } },
                         user.userName,
                         _react2.default.createElement(
                           'div',
@@ -7758,7 +8577,7 @@ var Page = function (_React$Component) {
                       if (index == 0) {
                         return _react2.default.createElement(
                           'div',
-                          { className: 't-PL16 t-LH42 t-FCddblue t-DIB', onClick: function onClick() {
+                          { className: 't-PL16 t-LH42 t-FCblue t-DIB', onClick: function onClick() {
                               t.handleNavClick("0", "station", "");
                             } },
                           '\u5168\u90E8'
@@ -7774,7 +8593,7 @@ var Page = function (_React$Component) {
                         } else {
                           nameHtml = _react2.default.createElement(
                             'div',
-                            { className: 't-FC9 t-DIB t-FCddblue', onClick: function onClick() {
+                            { className: 't-FC9 t-DIB t-FCblue', onClick: function onClick() {
                                 t.handleNavClick(item.id, "station", item.type);
                               } },
                             item.type == "org" ? item.orgName : item.stationName
@@ -7971,7 +8790,7 @@ var Page = function (_React$Component) {
                       if (index == 0) {
                         return _react2.default.createElement(
                           'div',
-                          { className: 't-PL16 t-LH42 t-FCddblue t-DIB', onClick: function onClick() {
+                          { className: 't-PL16 t-LH42 t-FCblue t-DIB', onClick: function onClick() {
                               t.handleNavClick("0", "group", "");
                             } },
                           '\u5168\u90E8'
@@ -7987,7 +8806,7 @@ var Page = function (_React$Component) {
                         } else {
                           nameHtml = _react2.default.createElement(
                             'div',
-                            { className: 't-FC9 t-DIB t-FCddblue', onClick: function onClick() {
+                            { className: 't-FC9 t-DIB t-FCblue', onClick: function onClick() {
                                 t.handleNavClick(item.id, "group", "");
                               } },
                             item.groupName
@@ -8188,7 +9007,7 @@ var Page = function (_React$Component) {
                       if (index == 0) {
                         return _react2.default.createElement(
                           'div',
-                          { className: 't-PL16 t-LH42 t-FCddblue t-DIB', onClick: function onClick() {
+                          { className: 't-PL16 t-LH42 t-FCblue t-DIB', onClick: function onClick() {
                               t.handleNavClick("0", "personGroup", "");
                             } },
                           '\u5168\u90E8'
@@ -8204,7 +9023,7 @@ var Page = function (_React$Component) {
                         } else {
                           nameHtml = _react2.default.createElement(
                             'div',
-                            { className: 't-FC9 t-DIB t-FCddblue', onClick: function onClick() {
+                            { className: 't-FC9 t-DIB t-FCblue', onClick: function onClick() {
                                 t.handleNavClick(item.id, "personGroup", "");
                               } },
                             item.personalGroupName
@@ -8393,7 +9212,7 @@ var Page = function (_React$Component) {
                     { className: t.state.userName == "" && t.state.isShowNav ? "t-BCf7 t-OFA t-WSN dd-bottom-border" : "t-DN" },
                     _react2.default.createElement(
                       'div',
-                      { className: 't-PL16 t-LH42 t-FCddblue t-DIB', onClick: function onClick() {
+                      { className: 't-PL16 t-LH42 t-FCblue t-DIB', onClick: function onClick() {
                           t.handleNavClick("0", "user", "");
                         } },
                       '\u5168\u90E8'
@@ -8409,7 +9228,7 @@ var Page = function (_React$Component) {
                       } else {
                         nameHtml = _react2.default.createElement(
                           'div',
-                          { className: 't-FC9 t-DIB t-FCddblue', onClick: function onClick() {
+                          { className: 't-FC9 t-DIB t-FCblue', onClick: function onClick() {
                               t.handleNavClick(item.id, "user", "");
                             } },
                           item.orgName
@@ -8548,7 +9367,7 @@ var Page = function (_React$Component) {
                       if (index == 0) {
                         return _react2.default.createElement(
                           'div',
-                          { className: 't-PL16 t-LH42 t-FCddblue t-DIB', onClick: function onClick() {
+                          { className: 't-PL16 t-LH42 t-FCblue t-DIB', onClick: function onClick() {
                               t.handleNavClick("0", "duty", "");
                             } },
                           '\u5168\u90E8'
@@ -8564,7 +9383,7 @@ var Page = function (_React$Component) {
                         } else {
                           nameHtml = _react2.default.createElement(
                             'div',
-                            { className: 't-FC9 t-DIB t-FCddblue', onClick: function onClick() {
+                            { className: 't-FC9 t-DIB t-FCblue', onClick: function onClick() {
                                 t.handleNavClick(item.id, "duty", "");
                               } },
                             item.dutyName
@@ -8727,6 +9546,14 @@ var Page = function (_React$Component) {
                     isShowCheckAll = false;
                   }
                 }
+                var isShowThisOrg = t.state.isShowThisOrg;
+                if (isShowThisOrg) {
+                  if ((chooseType.indexOf("userAndPoliticalOutlook") >= 0 || chooseType.indexOf("userNotPoliticalOutlook") >= 0) && t.state.politicalOutlookUserList.length > 0) {
+                    isShowThisOrg = true;
+                  } else {
+                    isShowThisOrg = false;
+                  }
+                }
                 var tabContent = _react2.default.createElement(
                   'div',
                   { id: 'anchor', style: { overflow: "auto", height: '' + t.state.tabHeight }, className: 't-PB68 dd-top-border scrollHeight t-PR t-BCf' },
@@ -8758,6 +9585,30 @@ var Page = function (_React$Component) {
                       )
                     )
                   ),
+                  _react2.default.createElement(
+                    'div',
+                    { className: 't-PL16 t-PR16 t-LH3 dd-bottom-border t-BCf', onClick: function onClick() {
+                        t.checkThisOrg("politicalOutlook");
+                      } },
+                    _react2.default.createElement(
+                      HBox,
+                      { vAlign: 'center', className: isShowThisOrg && t.state.navPoliticalOutlookList.length > 1 ? "" : "t-DN" },
+                      _react2.default.createElement(
+                        HBox,
+                        null,
+                        _react2.default.createElement(
+                          'div',
+                          { className: currentCheckThisOrg ? 't-checkbox-field-icon-list checked' : 'un-checked t-checkbox-field-icon-list' },
+                          _react2.default.createElement('i', { className: 'iconfont icon-checked t-FCf t-FS14' })
+                        )
+                      ),
+                      _react2.default.createElement(
+                        Box,
+                        { flex: 1, className: 't-ML10' },
+                        '\u672C\u7EC4\u7EC7\u53CA\u4E0B\u7EA7'
+                      )
+                    )
+                  ),
                   _react2.default.createElement(
                     'div',
                     { className: t.state.politicalOutlookName == "" && t.state.isShowNav ? "t-BCf7 t-OFA t-WSN dd-bottom-border" : "t-DN" },
@@ -8765,7 +9616,7 @@ var Page = function (_React$Component) {
                       if (index == 0) {
                         return _react2.default.createElement(
                           'div',
-                          { className: 't-PL16 t-LH42 t-FCddblue t-DIB', onClick: function onClick() {
+                          { className: 't-PL16 t-LH42 t-FCblue t-DIB', onClick: function onClick() {
                               t.handleNavClick("0", "politicalOutlook", "");
                             } },
                           '\u5168\u90E8'
@@ -8781,7 +9632,7 @@ var Page = function (_React$Component) {
                         } else {
                           nameHtml = _react2.default.createElement(
                             'div',
-                            { className: 't-FC9 t-DIB t-FCddblue', onClick: function onClick() {
+                            { className: 't-FC9 t-DIB t-FCblue', onClick: function onClick() {
                                 t.handleNavClick(item.id, "politicalOutlook", "");
                               } },
                             item.politicalOutlookName
@@ -8855,7 +9706,7 @@ var Page = function (_React$Component) {
                         ),
                         _react2.default.createElement(
                           Box,
-                          { className: t.state.politicalOutlookName == "" ? "t-PR16" : "t-DN", onClick: function onClick() {
+                          { className: t.state.politicalOutlookName == "" && chooseType.indexOf("userAndPoliticalOutlook") >= 0 ? "t-PR16" : "t-DN", onClick: function onClick() {
                               t.state.politicalOutlookName == "" && t.handlePoliticalOutlookShow(politicalOutlook.id);
                             } },
                           _react2.default.createElement('i', { className: 'iconfont icon-arrow-up t-rotate-90 t-FCc' })
@@ -8938,44 +9789,38 @@ var Page = function (_React$Component) {
           ),
           _react2.default.createElement(
             HBox,
-            { vAlign: 'center', className: 't-FBH t-FBAC t-PL10 t-BCf dd-top-border', style: { position: "fixed", paddingBottom: '' + t.state.bottomHeight, left: "0px", right: "0px", bottom: "0px" } },
+            { vAlign: 'center', className: 't-FBH t-FBAC t-PL10 t-BCf dd-top-border selected-bottom', style: { position: "fixed", bottom: "0px", left: "0px", right: "0px" } },
             _react2.default.createElement(
-              Box,
-              { flex: 1, className: 't-FS16 t-FCddblue', onClick: function onClick() {
-                  t.handleSelectClick(true);
-                } },
+              'div',
+              { className: 'selected-bottom-left' },
               _react2.default.createElement(
-                'span',
-                null,
-                '\u5DF2\u9009:'
+                Box,
+                { className: 't-FS16 t-FCddblue seleted-content' },
+                _react2.default.createElement(
+                  'span',
+                  null,
+                  '\u5DF2\u9009\u62E9\uFF1A'
+                ),
+                _react2.default.createElement(
+                  'span',
+                  null,
+                  t.state.total
+                )
               ),
               _react2.default.createElement(
                 'span',
-                null,
-                t.state.total
-              )
-            ),
-            _react2.default.createElement(
-              Box,
-              { flex: 1 },
-              _react2.default.createElement(
-                _Button2.default,
-                { style: { borderRadius: 0, height: '51px !important', margin: '0', lineHeight: '51px !important' }, type: 'secondary', size: 'medium', onClick: function onClick() {
-                    t.handleClick("0");
-                  } },
-                '\u53D6\u6D88'
+                { className: 'right-arrow', style: { marginLeft: 10 + 'px', marginRight: 10 + 'px' } },
+                _react2.default.createElement('i', { className: 'iconfont icon-right-arrow', onClick: function onClick() {
+                    t.handleSelectClick(true);
+                  } })
               )
             ),
             _react2.default.createElement(
-              Box,
-              { flex: 1 },
-              _react2.default.createElement(
-                _Button2.default,
-                { style: { borderRadius: 0, height: '51px !important', margin: '0', lineHeight: '51px !important' }, type: 'primary', size: 'medium', onClick: function onClick() {
-                    t.handleClick("1");
-                  } },
-                '\u786E\u5B9A'
-              )
+              _Button2.default,
+              { className: 'confirm-btn', style: { borderRadius: 40 + 'px', height: '51px !important', margin: '0', lineHeight: '51px !important', marginRight: 10 + 'px' }, type: 'primary', size: 'medium', onClick: function onClick() {
+                  t.handleClick("1");
+                } },
+              '\u786E\u5B9A'
             )
           )
         )
@@ -9140,6 +9985,7 @@ var Page = function (_React$Component) {
         staSelectType: "0",
         isShowNav: false,
         isShowCheckAll: false,
+        isShowThisOrg: false,
         total: total
       });
     }
@@ -9225,7 +10071,8 @@ var Page = function (_React$Component) {
           navGroupList: [],
           staSelectType: "0",
           isShowNav: false,
-          isShowCheckAll: false
+          isShowCheckAll: false,
+          isShowThisOrg: false
         }, _defineProperty(_setState, 'personalGroupName', ""), _defineProperty(_setState, 'personalGroupList', []), _defineProperty(_setState, 'personalGroupUserList', []), _defineProperty(_setState, 'navPersonalGroupList', []), _defineProperty(_setState, 'dutyName', ""), _defineProperty(_setState, 'dutyList', []), _defineProperty(_setState, 'dutyUserList', []), _defineProperty(_setState, 'navDutyList', []), _defineProperty(_setState, 'politicalOutlookName', ""), _defineProperty(_setState, 'politicalOutlookList', []), _defineProperty(_setState, 'politicalOutlookUserList', []), _defineProperty(_setState, 'navPoliticalOutlookList', []), _setState));
         debugger;
         this.props.onChange(result);
@@ -9343,7 +10190,7 @@ var Page = function (_React$Component) {
   }, {
     key: 'clickAdd',
     value: function clickAdd() {
-      var _this5 = this;
+      var _this6 = this;
 
       var readOnly = this.state.readOnly;
       var showSecret = this.state.showSecret;
@@ -9405,24 +10252,24 @@ var Page = function (_React$Component) {
               curUsersObj: usersObj
             }, function () {
               //是否直接显示当前用户组织
-              var isShowInMyOrg = _this5.state.isShowInMyOrg;
+              var isShowInMyOrg = _this6.state.isShowInMyOrg;
               if (isShowInMyOrg) {
                 //this.getSelectData();
-                var code = _this5.getRealCode().split(",");
+                var code = _this6.getRealCode().split(",");
                 var type = code[0];
                 var realUserCode = "user";
-                var chooseObj = _this5.props.chooseObj;
+                var chooseObj = _this6.props.chooseObj;
                 if (chooseObj) {
                   realUserCode = "userNotOrg";
                 }
                 if (type == realUserCode || type == "org") {
                   //获取当前用户信息
-                  _this5.getSelectMyOrgData();
+                  _this6.getSelectMyOrgData();
                 } else {
-                  _this5.getSelectData();
+                  _this6.getSelectData();
                 }
               } else {
-                _this5.getSelectData();
+                _this6.getSelectData();
               }
             });
           }
@@ -9452,7 +10299,7 @@ var Page = function (_React$Component) {
   }, {
     key: 'render',
     value: function render() {
-      var _this6 = this;
+      var _this7 = this;
 
       var t = this;
 
@@ -9486,7 +10333,7 @@ var Page = function (_React$Component) {
             _react2.default.createElement(
               _Button2.default,
               { type: 'primary', onClick: function onClick() {
-                  _this6.clickAdd();
+                  _this7.clickAdd();
                 } },
               this.state.label
             )
@@ -9504,7 +10351,7 @@ var Page = function (_React$Component) {
         return _react2.default.createElement(
           HBox,
           { vAlign: 'center', className: 't-FS16 t-PL16 t-PR16', onClick: function onClick() {
-              _this6.clickAdd();
+              _this7.clickAdd();
             } },
           _react2.default.createElement(
             Box,
@@ -9587,7 +10434,7 @@ var Page = function (_React$Component) {
             _react2.default.createElement(
               HBox,
               { className: readOnly ? "t-DN" : "", vAlign: 'center', onClick: function onClick() {
-                  _this6.clickAdd();
+                  _this7.clickAdd();
                 } },
               _react2.default.createElement(
                 Box,