@lambo-design/workflow-approve 1.0.0-beta.20 → 1.0.0-beta.22

package/src/components/{candidate-groups-help-box.vue → candidate-groups-box.vue}

@@ -21,7 +21,7 @@
               <span>{{ value }}</span>
             </Option>
           </OptionGroup>
-          <OptionGroup label="岗位">
+          <OptionGroup label="岗位" v-if="ucAdapterType === 'x1'">
             <Option v-for="(value, key) in organTree.postMap" :key="key" :value="`${key}:${value},4`">
               <span>{{ value }}</span>
             </Option>
@@ -34,7 +34,7 @@
       </div>
       <div class="cont">
         <div
-          :class="[this.dataName == '' || this.dataName == '0' || this.dataName == '2' || this.dataName == '4'? 'contLeftTwo': 'contLeft']">
+          :class="[this.dataName == '' || this.dataName == '0' || this.dataName == '2' || this.dataName == '4' || (this.dataName == '3' && ucAdapterType =='sc') ? 'contLeftTwo': 'contLeft']">
 
           <Tabs :animated="false" @on-click="dataNameClick">
             <TabPane label="选组织">
@@ -69,7 +69,7 @@
                 <div v-show="roleList.length == 0">暂无数据</div>
               </div>
             </TabPane>
-            <TabPane label="选岗位">
+            <TabPane label="选岗位" v-if="ucAdapterType === 'x1'">
               <div class="overflowAuto">
                 <div v-if="readingRangePost.length === 0">暂无数据</div>
                 <Tree v-else v-for="(item,index) in readingRangePost" :key="index" :data="item" ref="treePost"
@@ -78,11 +78,18 @@
                       @on-select-change="selectPostChange"></Tree>
               </div>
             </TabPane>
+            <TabPane label="选组织类型"  v-if="ucAdapterType === 'sc'">
+              <div class="overflowAuto">
+                <div v-if="readingRangeOrgType.length === 0">暂无数据</div>
+                <Tree v-else v-for="(item,index) in readingRangeOrgType" :key="index" :data="item" ref="treeBM" check-strictly  show-checkbox expand-node
+                      :load-data="loadOrgType" @on-check-change="checkOrgTypeChange"></Tree>
+              </div>
+            </TabPane>
 
           </Tabs>
 
         </div>
-        <div class="contRight" v-if="this.dataName == '1' || this.dataName == '3'">
+        <div class="contRight" v-if="this.dataName == '1' || (this.dataName == '3' && ucAdapterType === 'x1')">
           <Card dis-hover>
             <div class="overflowAuto" v-if="dataName === 1">
               <CheckboxGroup v-model="treeUserValue" class="checkbox-container" @on-change="getReadingRangeUser">
@@ -98,7 +105,7 @@
                 </Checkbox>
               </CheckboxGroup>
             </div>
-            <div class="overflowAuto" v-else-if="dataName === 3">
+            <div class="overflowAuto" v-else-if="dataName === 3 && ucAdapterType === 'x1'">
               <CheckboxGroup v-model="treePostValue" class="checkbox-container" @on-change="getReadingRangePosts">
                 <Checkbox v-for="(item) in treePostCenterValue" :key="item.positionId"
                           :label="item.positionId+','+item.positionName">
@@ -116,11 +123,11 @@
           </Card>
         </div>
         <div
-          :class="[this.dataName == '' || this.dataName == '0' || this.dataName == '2' || this.dataName == '4' ? 'contRightTwo': 'contRight']">
+          :class="[this.dataName == '' || this.dataName == '0' || this.dataName == '2' || this.dataName == '4' || (this.dataName == '3' && ucAdapterType =='sc')  ? 'contRightTwo': 'contRight']">
           <Card dis-hover>
             <div class="overflowAuto">
               <Title>已选择:{{ treeLength }}/100 <a type="text" style="float: right;color: #989898"
-                                                         @click="readingRangeEmpty">清空已选</a></Title>
+                @click="readingRangeEmpty">清空已选</a></Title>
               <Collapse v-model="value" style="margin-top: 10px">
                 <Panel name="1">
                   <span class="fontSize">组织</span>
@@ -155,7 +162,7 @@
                     </div>
                   </template>
                 </Panel>
-                <Panel name="4">
+                <Panel name="4" v-if="ucAdapterType === 'x1'">
                   <span class="fontSize">岗位</span>
                   <template #content>
                     <div v-for="item in treePostValue" :key="item.key">
@@ -166,6 +173,15 @@
                     </div>
                   </template>
                 </Panel>
+                <Panel name="5" v-if="ucAdapterType === 'sc'">
+                  <span class="fontSize">组织类型</span>
+                  <template #content>
+                    <div v-for="(item, itemIndex) in treeOrgTypeValue" :key="itemIndex">
+                      <span>{{ item.typeName }}</span>
+                      <Icon type="md-close" style="float: right" @click="processOrgTypeDel(itemIndex,item)"/>
+                    </div>
+                  </template>
+                </Panel>
               </Collapse>
             </div>
           </Card>
@@ -199,6 +215,7 @@ export default {
   data() {
     return {
       id: "",
+      ucAdapterType: 'x1',
       treePostNameCenterValue: [],
       treeUserNameCenterValue: [],
       selectedKeys: [],
@@ -221,6 +238,7 @@ export default {
       treeUserValueCenter: [],
       treeLength: 0,
       treeValueBM: [],
+      treeOrgTypeValue:[],
       dataName: "",
       postList: [],//选中岗位集合（右侧显示）
       processPostList: [],//岗位集合
@@ -231,8 +249,9 @@ export default {
       treePostValue: [],
       treeUserCenterValue: [],
       treePostCenterValue: [],
-      readingRangeBM: [],//权限范围数据部门
+      readingRangeBM: [],//权限范围数据组织
       readingRange: [],//权限范围数据人员
+      readingRangeOrgType:[],//权限范围数据部门
       modalBoxShow: false,
       placeholder: "自动同意",
       loading: false,
@@ -244,17 +263,7 @@ export default {
         directChild: false,
         isAdmin: ''
       },
-      treeSelectData: [
-        {
-          title: '公司',
-          value: 'com',
-        },
-        {
-          title: '部门',
-          value: 'dept',
-        },
-      ],
-      value: ['1', '2', '3', '4'],
+      value: ['1', '2', '3', '4', '5'],
       currentNode: {},
       currentNodeUser: {},
       currentNodePost: {},
@@ -270,7 +279,7 @@ export default {
     };
   },
   created() {
-    this.init()
+    this.getSystemConfig()
   },
   computed: {
   },
@@ -367,37 +376,20 @@ export default {
         })
       }
     },
-    getOrganTypeList(organTreeType) {
-      const self = this
-      if (organTreeType === '00') {
-        ajax.get(self.upmsServerContext + '/manage/orgType/qryOrgTypeList?parentType=0').then(function (resp) {
-          if (resp.data.code == 1) {
-            const result = [];
-            resp.data.data.rows.forEach(item => {
-              const {typeName, organType} = item;
-              let node = {title: typeName, value: organType, loading: false, children: []};
-              result.push(node);
-            });
-            self.treeSelectData = result
-          }
-        }).catch(err => {
-          console.log(err);
-        })
-      } else {
-        ajax.get(self.upmsServerContext + '/manage/bizorgan/getOrgTree?bizOrganTreeType=' + organTreeType).then(function (resp) {
-          if (resp.data.code == 1) {
-            const result = [];
-            resp.data.data.forEach(item => {
-              const {bizOrganId, bizOrganName} = item;
-              result.push({title: bizOrganName, value: bizOrganId, loading: false, children: []});
-            });
-            self.treeSelectData = result
+    getOrgType(row) {
+      let self = this
+      let types = row.types
+      let typeList = types.split(",")
+      if (types && typeList.length > 0) {
+        typeList.forEach(item => {
+          let type = {
+            bizTypeCode: item.split(':')[0],
+            typeName: item.split(':')[1],
           }
-        }).catch(err => {
-          console.log(err);
+          self.treeOrgTypeValue.push(type)
+          self.updateLength()
         })
       }
-
     },
 
     getRootOrganTree(organTreeType){
@@ -455,32 +447,55 @@ export default {
         permScopeTwo = permScopeTwo.split(';')
         for (let i = 0; i < permScopeTwo.length; i++) {
           ajax.get(self.upmsServerContext + '/manage/ucOrgan/getParentOrgInfo?organCode=' + permScopeTwo[i] + '&orgTreeType=' + self.organTreeType)
-            .then(resp => {
-              let orgCode = resp.data.data.organCode
-              ajax.get(self.upmsServerContext + '/manage/ucOrgan/getOrgSubNodes?organCode=' + orgCode + '&orgTreeType=' + organTreeType).then(function (resp) {
-                if (resp.data.code === 1) {
-                  let data = resp.data.data
-                  if (data && data.length > 0) {
-                    data.forEach(item => {
-                      if (item.organCode === permScopeTwo[i]) {
+              .then(resp => {
+                if (resp.data.code === 1 || resp.data.code === 200){
+                  let orgCode = resp.data.data.organCode
+                  ajax.get(self.upmsServerContext + '/manage/ucOrgan/getOrgSubNodes?organCode=' + orgCode + '&orgTreeType=' + organTreeType).then(function (resp) {
+                    if (resp.data.code === 1) {
+                      let data = resp.data.data
+                      if (data && data.length > 0) {
+                        data.forEach(item => {
+                          if (item.organCode === permScopeTwo[i]) {
+                            let obj = {}
+                            obj.type = item.organType
+                            obj.id = item.organId
+                            obj.orders = item.orders
+                            obj.title = item.organName
+                            obj.name = item.organName
+                            obj.com = item.com
+                            obj.code = item.organCode
+                            obj.loading = false
+                            obj.children = []
+                            obj.hasChild = true
+                            childsTree.push(obj)
+                          }
+                        })
+                      }
+                    }
+                  })
+                }  else if (resp.data.data === '11006'){
+                  //当前组织无父节点
+                  let params = {
+                    orgTreeType: organTreeType,
+                  }
+                  ajax.post(self.upmsServerContext + "/manage/org/get/" + permScopeTwo[i], params)
+                      .then(resp => {
+                        let data = resp.data.data
                         let obj = {}
-                        obj.type = item.organType
-                        obj.id = item.organId
-                        obj.orders = item.orders
-                        obj.title = item.organName
-                        obj.name = item.organName
-                        obj.com = item.com
-                        obj.code = item.organCode
+                        obj.type = data.organType
+                        obj.id = data.organId
+                        obj.orders = data.orders
+                        obj.title = data.organName
+                        obj.name = data.organName
+                        obj.com = data.com
+                        obj.code = data.organCode
                         obj.loading = false
                         obj.children = []
                         obj.hasChild = true
                         childsTree.push(obj)
-                      }
-                    })
-                  }
+                      })
                 }
               })
-            })
         }
         self.readingRangeBM.push(childsTree)
         const codesSeen = new Map();
@@ -503,54 +518,94 @@ export default {
       let permScopeTwo = permScope.split(';')
       for (let i = 0; i < permScopeTwo.length; i++) {
         ajax.get(self.upmsServerContext + "/manage/user/get/" + permScopeTwo[i] + '?treeType=' + organTreeType)
-          .then(resp => {
-            if (resp.data.code == 1) {
-              let organCode = resp.data.data.organCode
-              ajax.get(self.upmsServerContext + '/manage/ucOrgan/getParentOrgInfo?organCode=' + organCode + '&orgTreeType=' + organTreeType)
-                .then(resp => {
-                  let orgCode = resp.data.data.organCode
-                  ajax.get(self.upmsServerContext + '/manage/ucOrgan/getOrgSubNodes?organCode=' + orgCode + '&orgTreeType=' + organTreeType).then(function (resp) {
-                    if (resp.data.code === 1) {
-                      let data = resp.data.data
-                      if (data && data.length > 0) {
-                        data.forEach(item => {
-                          if (item.organCode == organCode) {
-                            let obj = {}
-                            obj.type = item.organType
-                            obj.id = item.organId
-                            obj.orders = item.orders
-                            obj.title = item.organName
-                            obj.name = item.organName
-                            obj.com = resp.data.data.organId
-                            obj.code = item.organCode
-                            obj.loading = false
-                            obj.checked = false
-                            obj.children = []
-                            obj.hasChild = true
-                            childsTree.push(obj)
+            .then(resp => {
+              if (resp.data.code == 1) {
+                let organCode = resp.data.data.organCode
+                ajax.get(self.upmsServerContext + '/manage/ucOrgan/getParentOrgInfo?organCode=' + organCode + '&orgTreeType=' + organTreeType)
+                    .then(resp => {
+                      if (resp.data.code === 1 || resp.data.code === 200){
+                        let orgCode = resp.data.data.organCode
+                        ajax.get(self.upmsServerContext + '/manage/ucOrgan/getOrgSubNodes?organCode=' + orgCode + '&orgTreeType=' + organTreeType).then(function (resp) {
+                          if (resp.data.code === 1) {
+                            let data = resp.data.data
+                            if (data && data.length > 0) {
+                              data.forEach(item => {
+                                if (item.organCode == organCode) {
+                                  let obj = {}
+                                  obj.type = item.organType
+                                  obj.id = item.organId
+                                  obj.orders = item.orders
+                                  obj.title = item.organName
+                                  obj.name = item.organName
+                                  obj.com = resp.data.data.organId
+                                  obj.code = item.organCode
+                                  obj.loading = false
+                                  obj.checked = false
+                                  obj.children = []
+                                  obj.hasChild = true
+                                  childsTree.push(obj)
+                                }
+                              })
+                            }
+                            const map = new Map()
+                            treeValue = childsTree.filter((item) => {
+                              return !map.has(item.code) && map.set(item.code, true)
+                            })
+                            if (i === permScopeTwo.length - 1) {
+                              self.readingRange.push(treeValue)
+                              const codesSeen = new Map();
+                              self.readingRange = self.readingRange.reduce((acc, item, index) => {
+                                if (!codesSeen.has(item.code)) {
+                                  codesSeen.set(item.code, index);
+                                  acc.push(item);
+                                }
+                                return acc;
+                              }, []);
+                            }
                           }
                         })
+                      } else if (resp.data.data === 11006){
+                        //当前组织无父节点
+                        let params = {
+                          orgTreeType: organTreeType,
+                        }
+                        ajax.post(self.upmsServerContext + "/manage/org/get/" + organCode, params)
+                            .then(resp => {
+                              let data = resp.data.data
+                              let obj = {}
+                              obj.type = data.organType
+                              obj.id = data.organId
+                              obj.orders = data.orders
+                              obj.title = data.organName
+                              obj.name = data.organName
+                              obj.com = data.organId
+                              obj.code = data.organCode
+                              obj.loading = false
+                              obj.checked = false
+                              obj.children = []
+                              obj.hasChild = true
+                              childsTree.push(obj)
+
+                              const map = new Map()
+                              treeValue = childsTree.filter((item) => {
+                                return !map.has(item.code) && map.set(item.code, true)
+                              })
+                              if (i === permScopeTwo.length-1){
+                                self.readingRange.push(treeValue)
+                                const codesSeen = new Map();
+                                self.readingRange = self.readingRange.reduce((acc, item, index) => {
+                                  if (!codesSeen.has(item.code)) {
+                                    codesSeen.set(item.code, index);
+                                    acc.push(item);
+                                  }
+                                  return acc;
+                                }, []);
+                              }
+                            })
                       }
-                      const map = new Map()
-                      treeValue = childsTree.filter((item) => {
-                        return !map.has(item.code) && map.set(item.code, true)
-                      })
-                      if (i === permScopeTwo.length - 1) {
-                        self.readingRange.push(treeValue)
-                        const codesSeen = new Map();
-                        self.readingRange = self.readingRange.reduce((acc, item, index) => {
-                          if (!codesSeen.has(item.code)) {
-                            codesSeen.set(item.code, index);
-                            acc.push(item);
-                          }
-                          return acc;
-                        }, []);
-                      }
-                    }
-                  })
-                })
-            }
-          })
+                    })
+              }
+            })
       }
 
     },
@@ -680,6 +735,81 @@ export default {
         }
       }
     },
+    //获取部门
+    getReadingRangeOrgType(row, organTreeType) {
+      let self = this
+      let childsTree = []
+      if (row == 'undefined' || row == "all"){
+        let params = {
+          orgTreeType: organTreeType
+        }
+        ajax.get(self.upmsServerContext + "/manage/bizorgan/qryOrgTypeList", {params: params}).then(function (resp) {
+          if (resp.data.code === 1 || resp.data.code === 200) {
+            let data = resp.data.data;
+            if (data.length > 0) {
+              data.forEach(item => {
+                self.formatOrgTypeData(item, childsTree)
+              })
+            }
+            self.readingRangeOrgType = childsTree;
+          } else {
+            self.$Message.error(resp.data.message)
+          }
+        })
+      } else {
+        var permScope = row.substring(row.indexOf("T:") + 2)
+        if (permScope.length > 0) {
+          let permScopeTwo = permScope.split(';')
+          for (let i = 0; i < permScopeTwo.length; i++) {
+            let params = {
+              organTypeCode: permScopeTwo[i],
+              orgTreeType: organTreeType
+            }
+            ajax.get(self.upmsServerContext + "/manage/bizorgan/qryOrgTypeByCode",{params : params}).then(resp => {
+              if (resp.data.code === 1 || resp.data.code === 200) {
+                let data = resp.data.data
+                if (data) {
+                  self.formatOrgTypeData(resp.data.data, childsTree)
+                }
+                self.readingRangeOrgType.push(childsTree)
+                const codesSeen = new Map();
+                self.readingRangeOrgType = self.readingRangeOrgType.reduce((acc, item, index) => {
+                  if (!codesSeen.has(item.bizTypeId)) {
+                    codesSeen.set(item.bizTypeId, index);
+                    acc.push(item);
+                  }
+                  return acc;
+                }, []);
+              } else {
+                self.$Message.error(resp.data.message)
+              }
+            })
+          }
+        }
+      }
+    },
+    formatOrgTypeData(item, childsTree){
+      let obj = {}
+      obj.bizOrganTreeType = item.bizOrganTreeType
+      obj.bizTypeCode = item.bizTypeCode
+      obj.bizTypeId = item.bizTypeId
+      obj.parentTypeCode = item.parentTypeCode
+      obj.parentTypeId = item.parentTypeId
+      obj.parentTypeName = item.parentTypeName
+      obj.typeName = item.typeName
+      obj.title = item.typeName
+      obj.name = item.typeName
+      obj.orders = item.orders
+      obj.loading = false
+      obj.children = []
+      obj.hasChild = true
+      if (item.children && item.children.length > 0){
+        item.children.forEach(child => {
+          this.formatOrgTypeData(child, obj.children)
+        })
+      }
+      childsTree.push(obj)
+    },
 
     loadTreeSelectData(data, callback) {
       const self = this
@@ -713,8 +843,6 @@ export default {
       }
       self.$delete(data, 'loading')
     },
-    init() {
-    },
 
     //权限范围组织部门单条删除
     readingRangeDepDel(res, info) {
@@ -798,6 +926,13 @@ export default {
       // }
       this.updateLength();
     },
+    //部门单条删除
+    processOrgTypeDel(res, info) {
+      this.treeOrgTypeValue[res].checked = false;
+      this.treeOrgTypeValue.splice(res, 1)
+      this.userNum = "1"
+      this.updateLength();
+    },
 
     dataNameClick(data) {
       this.dataName = data
@@ -843,7 +978,7 @@ export default {
         const childs = [];
         if (resp.data.code == 1 || resp.data.code === 200) {
           let nodeDatas = resp.data.data
-          if (nodeDatas.length > 0) {
+          if (nodeDatas && nodeDatas.length > 0) {
             nodeDatas.forEach(item => {
               let obj = {};
               let typeName = '';
@@ -886,6 +1021,45 @@ export default {
         }
       })
     },
+    //权限范围组织类型点击事件
+    loadOrgType(node, callback){
+      this.getDataOrgType(node, function (data) {
+        if (data && data.length > 0) {
+          callback(data)
+        }
+      })
+    },
+    getDataOrgType(node, callback){
+      let self = this
+      ajax.get(self.upmsServerContext + "/manage/bizorgan/qrySubOrgTypeList", {
+        params: {
+          orgTreeType: self.organTreeType,
+          typeId: node.bizTypeId
+        }
+      }).then(function (resp) {
+        const childs = [];
+        if (resp.data.code == 1 || resp.data.code === 200) {
+          let nodeDatas = resp.data.data
+          if (nodeDatas && nodeDatas.length > 0) {
+            nodeDatas.forEach(item => {
+              self.formatOrgTypeData(item, childs)
+            })
+          } else {
+            self.$set(node, "hasChild", false)
+            self.$delete(node, 'loading')
+          }
+          if (callback) {
+            callback(childs)
+          }
+        }else {
+          self.$set(node, 'hasChild', false)
+          self.$delete(node, 'loading')
+          if (callback) {
+            callback()
+          }
+        }
+      })
+    },
     //阅读范围组织点击事件
     selectReRaBMChange(row, info) {
       let self = this
@@ -936,6 +1110,41 @@ export default {
       }
       this.updateLength()
     },
+    //权限范围组织类型选择事件
+    checkOrgTypeChange(row, info) {
+      let self = this
+      let mergedArray = []
+      let uniqueArray = []
+      mergedArray = [].concat(this.treeOrgTypeValue, row);
+      uniqueArray = Array.from(new Set(mergedArray));
+      uniqueArray = uniqueArray.filter((obj, index, self) =>
+        index === self.findIndex((o) => o.bizTypeCode === obj.bizTypeCode)
+      );
+      if (info.checked == true) {
+        row.forEach(ro => {
+          let depList = []
+          depList = row.filter(obj1 => !this.treeOrgTypeValue.some(obj2 => obj2.bizTypeCode === obj1.bizTypeCode));
+          depList = [...new Set(depList)];
+          depList = depList.reverse();
+          let bizTypeCode = depList[0] ? depList[0].bizTypeCode : ''
+          this.userNum = "1"
+          if (bizTypeCode) {
+            this.treeOrgTypeValue.push(depList[0])
+          }
+        })
+      } else {
+        this.userNum = "1"
+        let list = []
+        uniqueArray.forEach(item => {
+          if (item.bizTypeCode != info.bizTypeCode) {
+            list.push(item)
+          }
+        })
+        this.treeOrgTypeValue = list
+      }
+
+      this.updateLength()
+    },
     selectUserChange(node) {
       let self = this
       if (node.length > 0) {
@@ -1612,9 +1821,14 @@ export default {
       this.treeLength = 0
       this.organModel = []
       this.postKeys = []
+      //组织类型集合
+      this.treeOrgTypeValue.forEach(item =>{
+        item.checked = false
+      })
+      this.treeOrgTypeValue = [];
     },
     updateLength() {
-      this.treeLength = this.treeValueBM.length + this.treeUserValue.length + this.noticeRoleNameList.length + this.treePostValue.length
+      this.treeLength = this.treeValueBM.length + this.treeUserValue.length + this.noticeRoleNameList.length + this.treePostValue.length + this.treeOrgTypeValue.length
     },
     clearCache() {
       this.readingRangeBM = []
@@ -1639,6 +1853,23 @@ export default {
       this.treeLength = 0
       this.organModel = []
       this.postKeys = []
+      //组织类型
+      this.readingRangeOrgType = []
+      this.readingRangeOrgType.forEach(item => {
+        item.checked = false
+      })
+      this.treeOrgTypeValue = [];
+    },
+    getSystemConfig(){
+      const self = this
+      ajax.get(self.smartFlowServerContext + '/anon/systemConfig/getSystemConfig').then(function (resp) {
+        const result = resp.data;
+        if (result && result.code === '200') {
+          self.ucAdapterType = result.data.ucAdapterType
+        }
+      }).catch(err => {
+        console.log(err);
+      })
     },
     toggleShowHelpBox(permScope, inputValue, organTreeType, id) {
       this.clearCache()
@@ -1646,19 +1877,18 @@ export default {
       this.permScope = permScope
       this.organTreeType = organTreeType
       this.organTreeRedis(this.permScope)
-      this.getOrganTypeList(this.organTreeType);
       if (inputValue){
         this.getOrgan(inputValue)
         this.getUser(inputValue)
         this.getRole(inputValue)
-        this.getPost(inputValue)
+        this.ucAdapterType === 'x1' ? this.getPost(inputValue) : this.getOrgType(inputValue)
       }
       if (this.permScope == 'all'){
         this.getRootOrganTree(organTreeType)
       } else {
         this.getReadingRangeBM(this.permScope, inputValue, this.organTreeType)
         this.getReadingRange(this.permScope, this.organTreeType)
-        this.getReadingRangePost(this.permScope, this.organTreeType)
+        this.ucAdapterType === 'x1' ? this.getReadingRangePost(this.permScope, this.organTreeType) : this.getReadingRangeOrgType(this.permScope, this.organTreeType)
       }
       this.getReadingRangeAllRole(this.permScope)
       this.modalBoxShow = !this.modalBoxShow;
@@ -1693,13 +1923,21 @@ export default {
         names.push(item.split(',')[1])
         positions.push(item.split(',')[0] + ':' + item.split(',')[1])
       })
-      let value = 'O:' + organ.join(";") + "," + "U:" + nameValue.join(";") + "," + "P:" + postList.join(";") + "," + "R:" + roleList.join(";") + "," + "RP:";
+      let orgTypeList = [];
+      let orgTypes = [];
+      this.treeOrgTypeValue.forEach(item => {
+        orgTypeList.push(item.bizTypeCode)
+        names.push(item.typeName)
+        orgTypes.push(item.bizTypeCode + ':' + item.typeName)
+      })
+      let value = 'O:' + organ.join(";") + "," + "U:" + nameValue.join(";") + "," + "P:" + postList.join(";") + "," + "R:" + roleList.join(";") + "," + "RP:,T:" + orgTypeList.join(";");
       let nameStr = names.join(",")
       let detail = {
         organs: organs.join(","),
         users: users.join(","),
         roles: roles.join(","),
-        positions: positions.join(",")
+        positions: positions.join(","),
+        types: orgTypes.join(","),
       }
       this.$emit('update-cand-groups', value, nameStr, detail, this.id);
       this.modalBoxShow = false;