system-clients 3.2.30 → 3.2.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "system-clients",
-  "version": "3.2.30",
+  "version": "3.2.31",
   "description": "系统基础框架",
   "main": "src/index.js",
   "directories": {

package/src/components/server/ResSelectGroup.vue

@@ -1,198 +1,198 @@
-<template>
-  <div :class="style" v-show="companyshow">
-    <label class="font_normal_body">公&emsp;&emsp;司</label>
-    <right-tree @re-res="getorg"
-                :mustselect="mustselect"
-                :initresid='initres.org'></right-tree>
-  </div>
-  <div :class="style" v-show="departmentshow">
-    <label class="font_normal_body">部&emsp;&emsp;门</label>
-    <res-select restype='department' v-ref:department
-                @res-select="getdep"
-                :parentresid="depresid"
-                :initresid='initres.dep'
-                :mustselect="mustselect"
-                :is-mul="mul">
-    </res-select>
-  </div>
-  <div :class="style" v-show="operatorshow && (!cascade)">
-    <label class="font_normal_body">人&emsp;&emsp;员</label>
-    <res-select restype='user'
-                @res-select="getuser"
-                :parentresid="depresid"
-                :initresid='initres.user'
-                :mustselect="mustselect"
-                :is-mul="mul">
-    </res-select>
-  </div>
-  <div :class="style" v-show="operatorshow && cascade">
-    <label class="font_normal_body">人&emsp;&emsp;员</label>
-    <res-select restype='user'
-                @res-select="getuser"
-                :parentresid="userresid"
-                :initresid='initres.user'
-                :mustselect="mustselect"
-                :is-mul="mul">
-    </res-select>
-  </div>
-  <div :class="style " v-if="sliceareashow" >
-    <label class="font_normal_body">片&emsp;&emsp;区</label>
-    <v-select :value.sync="slice_area" v-model="slice_area"  @change='getarea'
-              :options='sliceArea' placeholder='片区/管理站' filer-key="name"
-              close-on-select v-ref:slice>
-    </v-select>
-  </div>
-</template>
-<script>
-import plugin from '../../plugins/GetLoginInfoService'
-import { HttpResetClass } from 'vue-client'
-export default {
-  title: '资源选择测试',
-  props: {
-    style: {
-      type: String,
-      default: 'col-sm-2 form-group'
-    },
-    mul: {
-      type: Boolean,
-      default: true
-    },
-    //初始值
-    initres: {
-      type: Object,
-      default: null,
-    },
-    showComponent:{
-      default:['company','department','operator','slicearea']
-    },
-    //人员是否和部门关联
-    cascade: {
-      type: Boolean,
-      default: true
-    },
-    selectin: {
-      type: Boolean,
-      default: false
-    }
-  },
-  data () {
-    return {
-      orgresid:[this.$login.f.orgid],
-      depresid:[],
-      userresid:[],
-      operatorsid: [],
-      sliceArea: [],
-      slice_area:[],
-      companyshow:false,
-      departmentshow:false,
-      operatorshow:false,
-      sliceareashow:false,
-      mustselect:false,
-      obj:{
-        orgnames:[],
-        depnames:[],
-        operatornames:[]
-      }
-    }
-  },
-  ready () {
-    if(this.$login.r.includes('部门默认选中')&& this.selectin){
-      this.initres.dep = [this.$login.f.depids]
-    }
-    if(this.$login.r.includes('人员默认选中')&& this.selectin){
-      this.initres.user = [this.$login.f.id]
-      if(this.$login.r.includes('人员强制选中')){
-        this.mustselect = true
-      }
-    }
-    this.initComponent();
-    this.initAreas(this.$login.f.orgid)
-  },
-  methods:{
-    initComponent(){
-      let self=this;
-      this.showComponent.find((item)=>{
-        switch(item){
-          case 'company': self.companyshow=true; break;
-          case 'department': self.departmentshow=true; break;
-          case 'operator': self.operatorshow=true; break;
-          case 'slicearea': self.sliceareashow=true; break;
-        }
-      })
-    },
-    // 初始化片区
-    async initAreas (val) {
-      if (val) {
-        let http = new HttpResetClass()
-        let getAllArea = await http.load('POST', '/rs/search', {
-          source: 'this.getParentByType($organization$).getAllChildrens().where(row.getType() == $zone$)',
-          userid: this.$login.f.id
-        }, {resolveMsg: null, rejectMsg: '获取片区出错！！！'})
-        let arr = getAllArea.data.filter((res) => {
-          return res.parentid == val
-        })
-        this.sliceArea = []
-        this.slice_area = []
-        arr.forEach((res) => {
-          this.sliceArea.push({label: res.name, value: {name: res.name, code:res.number}})
-        })
-      }
-    },
-    returnOrg(ids){
-      let limit = this.$login.r.includes('数据授权限定')
-
-      let condition;
-      if(this.depresid.length > 0)
-        condition = " and f_orgid in " + plugin.convertToIn(this.depresid);
-      else
-        condition = " and f_orgid = " + this.$login.f.orgid;
-      if(this.userresid.length > 0){
-        condition += " and f_depid in " + plugin.convertToIn(this.userresid);
-      } else {
-        if (limit) {
-          let depids = []
-          for (let row of this.$refs.department.resoptions) {
-            depids.push(row.value)
-          }
-          let depid = depids.length ? plugin.convertToIn(depids) : ('')
-          condition += " and f_depid in " + depid;
-        }
-      }
-      if(ids && ids.length > 0){
-        condition += " and f_operatorid in " + plugin.convertToIn(ids);
-      }
-      if(this.slice_area.length>0){
-        condition += " and f_zones = '" + this.slice_area[0].name+"'"
-      }
-      this.$dispatch('re-res',condition,this.obj)
-    },
-    getorg (obj) {
-      this.depresid=obj.resids
-      this.obj.orgnames = obj.res
-      this.initAreas(obj.resids)
-      this.returnOrg();
-    },
-    getdep(obj,val) {
-      this.obj.depnames = val
-      this.userresid=obj
-      this.returnOrg();
-    },
-    getuser(obj,val) {
-      this.obj.operatornames = val
-      this.operatorsid = obj
-      this.returnOrg(obj);
-    },
-    getarea(val) {
-      this.slice_area=val
-      if(this.operatorsid){
-        this.returnOrg(this.operatorsid);
-      }else{
-        this.returnOrg();
-      }
-    }
-  },
-  watch: {
-
-  }
-}
-</script>
+<template>
+  <div :class="style" v-show="companyshow">
+    <label class="font_normal_body">公&emsp;&emsp;司</label>
+    <right-tree @re-res="getorg"
+                :mustselect="mustselect"
+                :initresid='initres.org'></right-tree>
+  </div>
+  <div :class="style" v-show="departmentshow">
+    <label class="font_normal_body">部&emsp;&emsp;门</label>
+    <res-select restype='department' v-ref:department
+                @res-select="getdep"
+                :parentresid="depresid"
+                :initresid='initres.dep'
+                :mustselect="mustselect"
+                :is-mul="mul">
+    </res-select>
+  </div>
+  <div :class="style" v-show="operatorshow && (!cascade)">
+    <label class="font_normal_body">人&emsp;&emsp;员</label>
+    <res-select restype='user'
+                @res-select="getuser"
+                :parentresid="depresid"
+                :initresid='initres.user'
+                :mustselect="mustselect"
+                :is-mul="mul">
+    </res-select>
+  </div>
+  <div :class="style" v-show="operatorshow && cascade">
+    <label class="font_normal_body">人&emsp;&emsp;员</label>
+    <res-select restype='user'
+                @res-select="getuser"
+                :parentresid="userresid"
+                :initresid='initres.user'
+                :mustselect="mustselect"
+                :is-mul="mul">
+    </res-select>
+  </div>
+  <div :class="style " v-if="sliceareashow" >
+    <label class="font_normal_body">片&emsp;&emsp;区</label>
+    <v-select :value.sync="slice_area" v-model="slice_area"  @change='getarea'
+              :options='sliceArea' placeholder='片区/管理站' filer-key="name"
+              close-on-select v-ref:slice>
+    </v-select>
+  </div>
+</template>
+<script>
+import plugin from '../../plugins/GetLoginInfoService'
+import { HttpResetClass } from 'vue-client'
+export default {
+  title: '资源选择测试',
+  props: {
+    style: {
+      type: String,
+      default: 'col-sm-2 form-group'
+    },
+    mul: {
+      type: Boolean,
+      default: true
+    },
+    //初始值
+    initres: {
+      type: Object,
+      default: null,
+    },
+    showComponent:{
+      default:['company','department','operator','slicearea']
+    },
+    //人员是否和部门关联
+    cascade: {
+      type: Boolean,
+      default: true
+    },
+    selectin: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data () {
+    return {
+      orgresid:[this.$login.f.orgid],
+      depresid:[],
+      userresid:[],
+      operatorsid: [],
+      sliceArea: [],
+      slice_area:[],
+      companyshow:false,
+      departmentshow:false,
+      operatorshow:false,
+      sliceareashow:false,
+      mustselect:false,
+      obj:{
+        orgnames:[],
+        depnames:[],
+        operatornames:[]
+      }
+    }
+  },
+  ready () {
+    if(this.$login.r.includes('部门默认选中')&& this.selectin){
+      this.initres.dep = [this.$login.f.depids]
+    }
+    if(this.$login.r.includes('人员默认选中')&& this.selectin){
+      this.initres.user = [this.$login.f.id]
+      if(this.$login.r.includes('人员强制选中')){
+        this.mustselect = true
+      }
+    }
+    this.initComponent();
+    this.initAreas(this.$login.f.orgid)
+  },
+  methods:{
+    initComponent(){
+      let self=this;
+      this.showComponent.find((item)=>{
+        switch(item){
+          case 'company': self.companyshow=true; break;
+          case 'department': self.departmentshow=true; break;
+          case 'operator': self.operatorshow=true; break;
+          case 'slicearea': self.sliceareashow=true; break;
+        }
+      })
+    },
+    // 初始化片区
+    async initAreas (val) {
+      if (val) {
+        let http = new HttpResetClass()
+        let getAllArea = await http.load('POST', '/rs/search', {
+          source: 'this.getParentByType($organization$).getAllChildrens().where(row.getType() == $zone$)',
+          userid: this.$login.f.id
+        }, {resolveMsg: null, rejectMsg: '获取片区出错！！！'})
+        let arr = getAllArea.data.filter((res) => {
+          return res.parentid == val
+        })
+        this.sliceArea = []
+        this.slice_area = []
+        arr.forEach((res) => {
+          this.sliceArea.push({label: res.name, value: {name: res.name, code:res.number}})
+        })
+      }
+    },
+    returnOrg(ids){
+      let limit = this.$login.r.includes('数据授权限定')
+
+      let condition;
+      if(this.depresid.length > 0)
+        condition = " and f_orgid in " + plugin.convertToIn(this.depresid);
+      else
+        condition = " and f_orgid = " + this.$login.f.orgid;
+      if(this.userresid.length > 0){
+        condition += " and f_depid in " + plugin.convertToIn(this.userresid);
+      } else {
+        if (limit) {
+          let depids = []
+          for (let row of this.$refs.department.resoptions) {
+            depids.push(row.value)
+          }
+          let depid = depids.length ? plugin.convertToIn(depids) : ('')
+          condition += " and f_depid in " + depid;
+        }
+      }
+      if(ids && ids.length > 0){
+        condition += " and f_operatorid in " + plugin.convertToIn(ids);
+      }
+      if(this.slice_area.length>0){
+        condition += " and f_zones = '" + this.slice_area[0].name+"'"
+      }
+      this.$dispatch('re-res',condition,this.obj)
+    },
+    getorg (obj) {
+      this.depresid=obj.resids
+      this.obj.orgnames = obj.res
+      this.initAreas(obj.resids)
+      this.returnOrg();
+    },
+    getdep(obj,val) {
+      this.obj.depnames = val
+      this.userresid=obj
+      this.returnOrg();
+    },
+    getuser(obj,val) {
+      this.obj.operatornames = val
+      this.operatorsid = obj
+      this.returnOrg(obj);
+    },
+    getarea(val) {
+      this.slice_area=val
+      if(this.operatorsid){
+        this.returnOrg(this.operatorsid);
+      }else{
+        this.returnOrg();
+      }
+    }
+  },
+  watch: {
+
+  }
+}
+</script>

package/src/components/server/RightTree.vue

@@ -1,348 +1,348 @@
-<template>
-  <dropdown :model='model' class="auto" id="res-tree" v-if="!islist" v-el:dropdown :style="{width:width}">
-    <button type="button" class="btn btn-default dropdown-toggle select-style" data-toggle="dropdown">
-      <span class='btn-content' :style="{textOverflow:'ellipsis',overflow: 'hidden'}">{{ orgnames }}</span>
-      <span class="caret"></span>
-    </button>
-    <div  class="dropdown-menu auto" style="width:auto;max-height: 500px;overflow: auto" >
-      <input type="text" placeholder="Search"
-             placeholder='请输入'
-             slot="dropdown-menu"
-             v-model="searchText"
-             class="form-control" autocomplete="off"
-             @keydown.enter="buluer(searchText)">
-      <tree :filter="strsign" :model='model' v-ref:tree  :is-click="false"  role="menu">
-          <span  partial>
-            <span class="glyphicon glyphicon-chevron-down" v-show="row.open&&row.data.children.length>0" style="color:balck;"></span>
-            <span class="glyphicon glyphicon-chevron-right" v-show="!row.open&&row.data.children.length>0" style="color:balck;"></span>
-            <span class="RightTreeCanSelect" v-if="row.data.hasright" @click.stop="$parent.$parent.$parent.selectclick(row.data)">{{row.data.name}}</span>
-            <span class="RightTreeCanNotSelect" v-else>{{row.data.name}}</span>
-            <span class="glyphicon glyphicon-ok " v-if="$parent.$parent.$parent.isSelect(row.data.id)" style="color:balck;"></span>
-          </span>
-      </tree>
-    </div>
-
-  </dropdown>
-  <v-select v-if="islist"
-            placeholder='请选择'
-            :options='childrenOptions'
-            :disabled="mustselect"
-            @change="selectclick"
-            :value-single="true"
-            close-on-select></v-select>
-</template>
-<script>
-import Vue from 'vue';
-import co from 'co'
-import { PagedList, HttpResetClass } from 'vue-client'
-import * as ldapHelper from '../../util/LdapHelper'
-let saveGen = function * (self) {
-  //获取分公司树
-  let data = {
-    source: self.source,
-    userid: self.userid
-  }
-  // if(self.$treeorg==null || (self.$treeorg!=null&&self.$treeorg.length==0)){
-  let http = new HttpResetClass()
-  let ret = yield http.load('POST', `${self.Url}/rs/search`, data, {resolveMsg: null, rejectMsg: null})
-  // 去掉前面的两层节点
-  ret.data[0].children[0].children.forEach((item) => {
-    self.model.push(item)
-  })
-  Vue.$treeorg = Vue.prototype.$treeorg = self.model;
-  // }
-  //if(self.$treeorg!=null){
-  //  self.model = self.$treeorg;
-  //}
-  // 给资源添加父关系
-  ldapHelper.procParent(self.model)
-  // 树转列
-  // if (self.islist) {
-  //   self.treetoList(self.model)
-  // }
-  if(self.initresid.length>0){
-    if(self.initresid[0] == ''){
-      self.initresid[0] = self.$login.f.orgid;
-    }
-  }else{
-    self.initresid = [];
-    self.initresid[0] = self.$login.f.orgid;
-  }
-  if(self.initresid&&self.initresid.length>0){
-    self.isselect = false;
-    self.initTreetoList(self.model)
-    self.initregion(self.childrenOptions)
-    self.childrenOptions.forEach((item) => {
-      if(item.id == null && item.value !=null ){
-        item = item.value
-      }
-      if(item.id==self.initresid[0]){
-        //默认加载如果已选中的和传入参数相等会取消选择，这种操作不应该被允许
-        if(self.orgids==item.id){
-          self.initdataone(item);
-          return;
-        }
-        self.selectclick(item);
-        self.isselect = true;
-        return;
-      }
-    })
-    //如果没有找到公司，说明是选择的是大区
-    if(!self.isselect){
-      self.childrenregionOption.forEach((item) => {
-        if(item.id == null && item.value !=null ){
-          item = item.value;
-        }
-        if(item.id==self.initresid[0]){
-          //默认加载如果已选中的和传入参数相等会取消选择，这种操作不应该被允许
-          if(self.orgids==item.id){
-            self.initdataone(item);
-            return;
-          }
-          self.selectclick(item);
-          return;
-        }
-      })
-    }
-  }
-  //self.selectRes()
-}
-export default {
-  title: '资源树',
-  props: {
-    searchText:'',
-    strsign:'',
-    source: {
-      type: String,
-      require: true,
-      default:`tool.getFullTree(this.getRights().where(row.getType() == $organization$))`
-    },
-    //资源初始化数据
-    initresid: {
-      type: Array,
-      default() { return [] },
-    },
-    resid: {
-    },
-    islist: {
-      type: Boolean,
-      default: false
-    },
-    //是否有查看上级的权限
-    Url:{
-      type: String,
-      default:''
-    },
-    mustselect: {
-      type: Boolean,
-      default: false
-    },
-    width:{
-      type:String,
-      default:'60%'
-    }
-  },
-  data () {
-    return {
-      resobj:{res:this.$login.f.orgs, resids:this.$login.f.orgid},
-      userid: this.$login.f.id,
-      resname:[this.$login.f.orgs],
-      orgnames : "请选择",
-      //单选点击 返回所有子
-      orgids : null,
-      orgobj:null,
-      model: [
-
-      ],
-      childrenOptions: [],
-      childrenregionOption:[],
-      isselect: false
-    }
-  },
-  methods: {
-    selectRes () {
-      let newobj={
-        "res": [this.resname],
-        "resids": [this.orgids],
-      }
-      this.$emit('re-res', newobj)
-    },
-    //树形结构变成list
-    initTreetoList(val) {
-      for (let value of val) {
-        this.initErgodicList(value)
-      }
-    },
-    //找到跟节点
-    initErgodicList (val) {
-      if(val.children.length > 0){
-        this.childrenOptions.push(val)
-        this.treetoList(val.children)
-      }else{
-        this.childrenOptions.push(val)
-      }
-    },
-    initregion(val){
-      if(val ==null ) return;
-      val.forEach((item)=>{
-        if(item.name != null){
-          if(item.name.includes("公司")){
-            return;
-          }else{
-            this.initregion(item.children)
-            this.childrenregionOption.push({label:"",value:item})
-            //return item;
-          }
-        }else{
-          return;
-        }
-      })
-
-    },
-    async buluer (val) {
-      this.strsign=val
-      await new Promise(resolve => {
-        this.$nextTick(() => {
-          resolve()
-        })
-      })
-    },
-    //点击资源的方法
-    selectclick (row) {
-      if(this.orgids==row.id){
-        //取消点击
-        this.orgnames="请选择"
-        this.orgids=null
-        this.orgobj=null
-        let newobj={
-          "res": [],
-          "resids": [],
-          "orgobj": [],
-        }
-        this.$emit('re-res', newobj)
-      }else{
-        //点中点击
-        this.orgnames=row.name
-        this.orgids=row.id
-        this.orgobj=row
-        let objs=[]
-        let objids=[]
-        let objnames=[]
-        this.addResChild(row,objs)
-        objs.forEach((item) => {
-          objids.push(item.id)
-          objnames.push(item.name)
-        })
-        let newobj={
-          "res": objnames,
-          "resids": objids,
-          "orgobj": objs,
-        }
-        this.$emit('re-res', newobj)
-      }
-    },
-    initdataone(row){
-      //点中点击
-      this.orgnames=row.name
-      this.orgids=row.id
-      this.orgobj=row
-      let objs=[]
-      let objids=[]
-      let objnames=[]
-      this.addResChild(row,objs)
-      objs.forEach((item) => {
-        objids.push(item.id)
-        objnames.push(item.name)
-      })
-      let newobj={
-        "res": objnames,
-        "resids": objids,
-        "orgobj": objs,
-      }
-      this.$emit('re-res', newobj)
-    },
-    addResChild(val,objs){
-      objs.push(val)
-      if(val.children && val.children.length>0){
-        Object.keys(val.children).forEach((key) => {
-          this.addResChild(val.children[key],objs)
-        })
-      }
-      return objs
-    },
-    //检查是否显示对勾
-    isSelect(val) {
-      if(this.orgids==val){
-        return true
-      }else{
-        return false
-      }
-    },
-    //树形结构变成list
-    treetoList(val) {
-      for (let value of val) {
-        this.ergodicList(value)
-      }
-    },
-    //找到跟节点
-    ergodicList (val) {
-      val.children.length > 0 ? this.treetoList(val.children) : this.childrenOptions.push({label: val.name, value: val})
-    },
-    //处理显示默认值
-    dealResObj (val) {
-      try{
-        var arr=val.res.split(".")
-        //截取最后一个分公司名字
-        this.resname=arr[arr.length-1].toString()
-        this.orgnames=arr[arr.length-1].toString()
-        this.resid = val.resids
-        this.orgids = val.resids
-      }catch (e){
-        this.resname='请选择组织'
-      }
-    },
-    judgBoundary(){
-      //判断是否超出边界，超出移动
-      if(document.documentElement.offsetWidth< this.$els.dropdown.getBoundingClientRect().right){
-        this.left = document.documentElement.offsetWidth - this.$els.dropdown.getBoundingClientRect().right - 25
-      }
-    }
-  },
-  events: {
-
-  },
-  ready () {
-    this.dealResObj (this.resobj)
-    let gen = saveGen(this)
-    return co(gen)
-  },
-  watch: {
-  }
-}
-</script>
-<style lang="less">
-#res-tree {
-  .list-group-item {
-    background-color: #FFF;
-    color: #000;
-    padding: 5px 10px;
-    border:0px;
-    white-space: nowrap;
-  }
-}
-#res-tree .list-group {
-  width: auto;
-  min-width: 100%;
-}
-.hide-text-overflow{
-  overflow: hidden;
-  text-overflow: ellipsis
-}
-.select-style {
-  border: 0px;
-  /*border-bottom: 2px solid #C9CCCF;*/
-  border: 1px solid #93B2D3;
-  border-radius: 0px;
-  color: #555;
-}
-</style>
+<template>
+  <dropdown :model='model' class="auto" id="res-tree" v-if="!islist" v-el:dropdown :style="{width:width}">
+    <button type="button" class="btn btn-default dropdown-toggle select-style" data-toggle="dropdown" :disabled="mustselect">
+      <span class='btn-content' :style="{textOverflow:'ellipsis',overflow: 'hidden'}">{{ orgnames }}</span>
+      <span class="caret"></span>
+    </button>
+    <div  class="dropdown-menu auto" style="width:auto;max-height: 500px;overflow: auto" >
+      <input type="text" placeholder="Search"
+             placeholder='请输入'
+             slot="dropdown-menu"
+             v-model="searchText"
+             class="form-control" autocomplete="off"
+             @keydown.enter="buluer(searchText)">
+      <tree :filter="strsign" :model='model' v-ref:tree  :is-click="false"  role="menu">
+          <span  partial>
+            <span class="glyphicon glyphicon-chevron-down" v-show="row.open&&row.data.children.length>0" style="color:balck;"></span>
+            <span class="glyphicon glyphicon-chevron-right" v-show="!row.open&&row.data.children.length>0" style="color:balck;"></span>
+            <span class="RightTreeCanSelect" v-if="row.data.hasright" @click.stop="$parent.$parent.$parent.selectclick(row.data)">{{row.data.name}}</span>
+            <span class="RightTreeCanNotSelect" v-else>{{row.data.name}}</span>
+            <span class="glyphicon glyphicon-ok " v-if="$parent.$parent.$parent.isSelect(row.data.id)" style="color:balck;"></span>
+          </span>
+      </tree>
+    </div>
+
+  </dropdown>
+  <v-select v-if="islist"
+            placeholder='请选择'
+            :options='childrenOptions'
+            :disabled="mustselect"
+            @change="selectclick"
+            :value-single="true"
+            close-on-select></v-select>
+</template>
+<script>
+import Vue from 'vue';
+import co from 'co'
+import { PagedList, HttpResetClass } from 'vue-client'
+import * as ldapHelper from '../../util/LdapHelper'
+let saveGen = function * (self) {
+  //获取分公司树
+  let data = {
+    source: self.source,
+    userid: self.userid
+  }
+  // if(self.$treeorg==null || (self.$treeorg!=null&&self.$treeorg.length==0)){
+  let http = new HttpResetClass()
+  let ret = yield http.load('POST', `${self.Url}/rs/search`, data, {resolveMsg: null, rejectMsg: null})
+  // 去掉前面的两层节点
+  ret.data[0].children[0].children.forEach((item) => {
+    self.model.push(item)
+  })
+  Vue.$treeorg = Vue.prototype.$treeorg = self.model;
+  // }
+  //if(self.$treeorg!=null){
+  //  self.model = self.$treeorg;
+  //}
+  // 给资源添加父关系
+  ldapHelper.procParent(self.model)
+  // 树转列
+  // if (self.islist) {
+  //   self.treetoList(self.model)
+  // }
+  if(self.initresid.length>0){
+    if(self.initresid[0] == ''){
+      self.initresid[0] = self.$login.f.orgid;
+    }
+  }else{
+    self.initresid = [];
+    self.initresid[0] = self.$login.f.orgid;
+  }
+  if(self.initresid&&self.initresid.length>0){
+    self.isselect = false;
+    self.initTreetoList(self.model)
+    self.initregion(self.childrenOptions)
+    self.childrenOptions.forEach((item) => {
+      if(item.id == null && item.value !=null ){
+        item = item.value
+      }
+      if(item.id==self.initresid[0]){
+        //默认加载如果已选中的和传入参数相等会取消选择，这种操作不应该被允许
+        if(self.orgids==item.id){
+          self.initdataone(item);
+          return;
+        }
+        self.selectclick(item);
+        self.isselect = true;
+        return;
+      }
+    })
+    //如果没有找到公司，说明是选择的是大区
+    if(!self.isselect){
+      self.childrenregionOption.forEach((item) => {
+        if(item.id == null && item.value !=null ){
+          item = item.value;
+        }
+        if(item.id==self.initresid[0]){
+          //默认加载如果已选中的和传入参数相等会取消选择，这种操作不应该被允许
+          if(self.orgids==item.id){
+            self.initdataone(item);
+            return;
+          }
+          self.selectclick(item);
+          return;
+        }
+      })
+    }
+  }
+  //self.selectRes()
+}
+export default {
+  title: '资源树',
+  props: {
+    searchText:'',
+    strsign:'',
+    source: {
+      type: String,
+      require: true,
+      default:`tool.getFullTree(this.getRights().where(row.getType() == $organization$))`
+    },
+    //资源初始化数据
+    initresid: {
+      type: Array,
+      default() { return [] },
+    },
+    resid: {
+    },
+    islist: {
+      type: Boolean,
+      default: false
+    },
+    //是否有查看上级的权限
+    Url:{
+      type: String,
+      default:''
+    },
+    mustselect: {
+      type: Boolean,
+      default: false
+    },
+    width:{
+      type:String,
+      default:'60%'
+    }
+  },
+  data () {
+    return {
+      resobj:{res:this.$login.f.orgs, resids:this.$login.f.orgid},
+      userid: this.$login.f.id,
+      resname:[this.$login.f.orgs],
+      orgnames : "请选择",
+      //单选点击 返回所有子
+      orgids : null,
+      orgobj:null,
+      model: [
+
+      ],
+      childrenOptions: [],
+      childrenregionOption:[],
+      isselect: false
+    }
+  },
+  methods: {
+    selectRes () {
+      let newobj={
+        "res": [this.resname],
+        "resids": [this.orgids],
+      }
+      this.$emit('re-res', newobj)
+    },
+    //树形结构变成list
+    initTreetoList(val) {
+      for (let value of val) {
+        this.initErgodicList(value)
+      }
+    },
+    //找到跟节点
+    initErgodicList (val) {
+      if(val.children.length > 0){
+        this.childrenOptions.push(val)
+        this.treetoList(val.children)
+      }else{
+        this.childrenOptions.push(val)
+      }
+    },
+    initregion(val){
+      if(val ==null ) return;
+      val.forEach((item)=>{
+        if(item.name != null){
+          if(item.name.includes("公司")){
+            return;
+          }else{
+            this.initregion(item.children)
+            this.childrenregionOption.push({label:"",value:item})
+            //return item;
+          }
+        }else{
+          return;
+        }
+      })
+
+    },
+    async buluer (val) {
+      this.strsign=val
+      await new Promise(resolve => {
+        this.$nextTick(() => {
+          resolve()
+        })
+      })
+    },
+    //点击资源的方法
+    selectclick (row) {
+      if(this.orgids==row.id){
+        //取消点击
+        this.orgnames="请选择"
+        this.orgids=null
+        this.orgobj=null
+        let newobj={
+          "res": [],
+          "resids": [],
+          "orgobj": [],
+        }
+        this.$emit('re-res', newobj)
+      }else{
+        //点中点击
+        this.orgnames=row.name
+        this.orgids=row.id
+        this.orgobj=row
+        let objs=[]
+        let objids=[]
+        let objnames=[]
+        this.addResChild(row,objs)
+        objs.forEach((item) => {
+          objids.push(item.id)
+          objnames.push(item.name)
+        })
+        let newobj={
+          "res": objnames,
+          "resids": objids,
+          "orgobj": objs,
+        }
+        this.$emit('re-res', newobj)
+      }
+    },
+    initdataone(row){
+      //点中点击
+      this.orgnames=row.name
+      this.orgids=row.id
+      this.orgobj=row
+      let objs=[]
+      let objids=[]
+      let objnames=[]
+      this.addResChild(row,objs)
+      objs.forEach((item) => {
+        objids.push(item.id)
+        objnames.push(item.name)
+      })
+      let newobj={
+        "res": objnames,
+        "resids": objids,
+        "orgobj": objs,
+      }
+      this.$emit('re-res', newobj)
+    },
+    addResChild(val,objs){
+      objs.push(val)
+      if(val.children && val.children.length>0){
+        Object.keys(val.children).forEach((key) => {
+          this.addResChild(val.children[key],objs)
+        })
+      }
+      return objs
+    },
+    //检查是否显示对勾
+    isSelect(val) {
+      if(this.orgids==val){
+        return true
+      }else{
+        return false
+      }
+    },
+    //树形结构变成list
+    treetoList(val) {
+      for (let value of val) {
+        this.ergodicList(value)
+      }
+    },
+    //找到跟节点
+    ergodicList (val) {
+      val.children.length > 0 ? this.treetoList(val.children) : this.childrenOptions.push({label: val.name, value: val})
+    },
+    //处理显示默认值
+    dealResObj (val) {
+      try{
+        var arr=val.res.split(".")
+        //截取最后一个分公司名字
+        this.resname=arr[arr.length-1].toString()
+        this.orgnames=arr[arr.length-1].toString()
+        this.resid = val.resids
+        this.orgids = val.resids
+      }catch (e){
+        this.resname='请选择组织'
+      }
+    },
+    judgBoundary(){
+      //判断是否超出边界，超出移动
+      if(document.documentElement.offsetWidth< this.$els.dropdown.getBoundingClientRect().right){
+        this.left = document.documentElement.offsetWidth - this.$els.dropdown.getBoundingClientRect().right - 25
+      }
+    }
+  },
+  events: {
+
+  },
+  ready () {
+    this.dealResObj (this.resobj)
+    let gen = saveGen(this)
+    return co(gen)
+  },
+  watch: {
+  }
+}
+</script>
+<style lang="less">
+#res-tree {
+  .list-group-item {
+    background-color: #FFF;
+    color: #000;
+    padding: 5px 10px;
+    border:0px;
+    white-space: nowrap;
+  }
+}
+#res-tree .list-group {
+  width: auto;
+  min-width: 100%;
+}
+.hide-text-overflow{
+  overflow: hidden;
+  text-overflow: ellipsis
+}
+.select-style {
+  border: 0px;
+  /*border-bottom: 2px solid #C9CCCF;*/
+  border: 1px solid #93B2D3;
+  border-radius: 0px;
+  color: #555;
+}
+</style>