zpc --- 人员分组调整

src/components/ibiz-group-picker/ibiz-group-picker.vue

@@ -47,6 +47,22 @@ export default class IBizGroupPicker extends Vue {
      */  
     protected multiple: boolean = false;
 
+    /**
+     * 加载树url
+     *
+     * @type {*}
+     * @memberof IBizGroupPicker
+     */  
+    protected treeurl:any;
+
+    /**
+     * 加载人员url
+     *
+     * @type {*}
+     * @memberof IBizGroupPicker
+     */  
+    protected url:any;
+
     /**
      * 树数据集
      *
@@ -110,10 +126,9 @@ export default class IBizGroupPicker extends Vue {
      * @memberof IBizGroupPicker
      */  
     get showTree() {
-        if(this.viewParam.hasfilter && Object.is(this.viewData.srforgid, this.viewParam.filtervalue)) {
-            return false;
+        if(this.viewParam) {
+            return this.viewParam.showtree;
         }
-        return true;
     }
 
     /**
@@ -129,6 +144,8 @@ export default class IBizGroupPicker extends Vue {
         this.viewData = JSON.parse(this.viewdata);
         this.viewParam = JSON.parse(this.viewparam);
         this.multiple = this.viewParam.multiple;
+        this.treeurl = this.viewParam.treeurl;
+        this.url = this.viewParam.url;
         if (this.viewParam.selects) {
             this.viewParam.selects.forEach((select: any) => {
                 this.selects.push(select);
@@ -159,8 +176,9 @@ export default class IBizGroupPicker extends Vue {
      * @memberof IBizGroupPicker
      */  
     public loadTree() {
-        let orgid = this.viewParam.filtervalue?this.viewParam.filtervalue:"alls";
-        let get = Http.getInstance().get(`/ibzorganizations/${orgid}/suborg/ibzdepartments/picker`, true);
+        let orgid = this.viewParam.filtervalue;
+        let tempTreeUrl:string = this.treeurl.replace('${orgid}',orgid);
+        let get = Http.getInstance().get(tempTreeUrl, true);
         get.then((response: any) => {
             if(response.status === 200) {
                 this.treeItems = response.data;
@@ -177,7 +195,8 @@ export default class IBizGroupPicker extends Vue {
      * @memberof IBizGroupPicker
      */  
     public loadGroupData(key: string) {
-        let get = Http.getInstance().get(`/ibzorganizations/${key}/ibzemployees/picker`, true);
+        let tempUrl = this.url.replace('${selected-orgid}',key);
+        let get = Http.getInstance().get(tempUrl, true);
         get.then((response: any) => {
             if(response.status === 200) {
                 this.cardItems = response.data;

src/components/ibiz-group-select/ibiz-group-select.vue

@@ -32,13 +32,21 @@ export default class IBizGroupSelect extends Vue {
      */  
     @Prop() name!: string;
 
+    /**
+     * 树加载地址
+     *
+     * @type {*}
+     * @memberof IBizGroupSelect
+     */  
+    @Prop() treeurl?:boolean;
+
     /**
      * 数据接口地址
      *
      * @type {*}
      * @memberof IBizGroupSelect
      */  
-    @Prop() url?: string;
+    @Prop() url!: string;
 
     /**
      * 多选
@@ -175,10 +183,14 @@ export default class IBizGroupSelect extends Vue {
             }else{
                 filtervalue = context.srforgid;
             }
+        }else{
+            filtervalue = context.srforgid;
         }
         const param: any = {};
         Object.assign(param, {
-            hasfilter: this.filter ? true : false,
+            showtree: this.treeurl?true:false,
+            url:this.url,
+            treeurl:this.treeurl,
             filtervalue: filtervalue,
             multiple: this.multiple,
             selects: this.selects
@@ -199,7 +211,6 @@ export default class IBizGroupSelect extends Vue {
      * @memberof IBizGroupSelect
      */  
     public openViewClose(result: any) {
-        console.log(result)
         this.selects = [];
         if (result.datas && result.datas.length > 0) {
             this.selects = result.datas