@lambo-design/workflow-approve 1.0.0-beta.11 → 1.0.0-beta.111

package/src/components/assignee-box.vue

@@ -1,30 +1,48 @@
 <template>
   <div>
-    <Modal v-model="modalBoxShow" width="1217" title="选择办理人"  @on-ok="onOk" @on-cancel="onCancel" loading>
+    <Modal v-model="modalBoxShow" width="1217" :title="title"  @on-ok="onOk" @on-cancel="onCancel" loading>
       <div class="org-info">
-        <div class="org-tree">
-          <Tree :data="treeData" :load-data="loadData" @on-select-change="selectChange" > </Tree>
+        <div class="org-tree" v-if="!useTransferRangeUsers">
+          <div class="tree-content">
+            <div v-if="treeData.length === 0">暂无数据</div>
+            <Tree v-else v-for="(item,index) in treeData" :key="index" :data="item" ref="treeBM"
+                  :load-data="loadData" @on-select-change="selectChange"></Tree>
+<!--            <Tree :data="treeData" :load-data="loadData" @on-select-change="selectChange"></Tree>-->
+          </div>
         </div>
         <div class="org-detil">
-          <LamboPagingTable ref="selection" :dataUrl="dataUrl" :columns="tableColumn" :searchParams="tableSearchParams"
-                            @on-selection-change="onSelectionChange">
-            <div slot="search">
-              <Form :label-width="80">
-                <FormItem label="账号">
-                  <Input v-model="form.userId" placeholder="按账号搜索" />
-                </FormItem>
-                <FormItem label="姓名">
-                  <Input v-model="form.userName" placeholder="按姓名搜索" />
-                </FormItem>
-                <FormItem label="是否管理员" prop="isAdmin" :labelWidth="100">
-                  <RadioGroup v-model="form.isAdmin">
-                    <Radio label="">全部</Radio>
-                    <Radio label="1">是</Radio>
-                    <Radio label="0">否</Radio>
-                  </RadioGroup>
-                </FormItem>
+          <LamboPagingTable :key="useTransferRangeUsers" ref="selection" highlight-row :data="tableData" :dataUrl="dataUrl" :columns="tableColumn" :searchParams="tableSearchParams" :height="tableHeight"
+                            @on-selection-change="onSelectionChange" @on-current-change="onCurrentChange" :page-disable="useTransferRangeUsers" :showTableOption="!useTransferRangeUsers">
+            <div slot="search" v-if="!useTransferRangeUsers">
+              <Form :label-width="60" label-colon>
+                <Row>
+                  <Col span="6">
+                    <FormItem label="账号">
+                      <Input v-model="form.userId" placeholder="按账号搜索" />
+                    </FormItem>
+                  </Col>
+                  <Col span="6">
+                    <FormItem label="姓名">
+                      <Input v-model="form.userName" placeholder="按姓名搜索" />
+                    </FormItem>
+                  </Col>
+                  <Col span="8">
+                    <FormItem label="是否管理员" prop="isAdmin" :labelWidth="100">
+                      <RadioGroup v-model="form.isAdmin">
+                        <Radio label="">全部</Radio>
+                        <Radio label="1">是</Radio>
+                        <Radio label="0">否</Radio>
+                      </RadioGroup>
+                    </FormItem>
+                  </Col>
+                  <Col span="4">
+                    <FormItem >
+                       <Button type="primary" icon="ios-search" @click="doSearch">查询</Button>
+                    </FormItem>
+                  </Col>
+                </Row>
+
                 <FormItem>
-                  <Button type="primary" icon="ios-search" @click="doSearch">查询</Button>
                 </FormItem>
               </Form>
             </div>
@@ -67,12 +85,27 @@ export default {
       type: String,
       default: '/api/upms-server',
     },
+    //是否展示操作按钮二次弹框
+    showConfirmBox: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
   },
   data() {
     return {
+      id: '',
+      title: '选择办理人',
+      helpBoxType: 'auditTo82',
+      ucAdapterType: 'x1',
+      useTransferRangeUsers: false,
+      useTransferRangeOrgan: false,
       loading: false,
+      organTreeType: '00',
+      permScope: 'all',
       modalBoxShow: false,
       dataUrl:'',
+      tableData:[],
       helpBoxColumns: [
         {
           title: "用户ID",
@@ -105,20 +138,25 @@ export default {
     };
   },
   created () {
-    this.init()
+    this.getSystemConfig()
   },
   computed: {
-
+    tableHeight(){
+      return this.useTransferRangeUsers ? 600 : 0
+    },
     tableColumn () {
       let columns = []
       let self = this
-      columns.push({
-        title: '#',
-        key: 'selectId',
-        type: 'selection',
-        align: 'center',
-        width: 55
-      })
+      // 加签/选择候选人可多选
+      if (this.helpBoxType === 'addMultitaskInstance' || this.helpBoxType === 'appointHandlerWithCandGroups'){
+        columns.push({
+          title: '#',
+          key: 'selectId',
+          type: 'selection',
+          align: 'center',
+          width: 55
+        })
+      }
       columns.push({
         title: '账号',
         key: 'userId',
@@ -131,92 +169,221 @@ export default {
         sortField: 'user_name',
         sortable: 'custom'
       })
+
+      if (self.useTransferRangeUsers && self.ucAdapterType == 'x1'){
+        columns.push({
+          title: '联系电话',
+          key: 'tel',
+          sortField: 'tel',
+          sortable: 'custom'
+        })
+      }
       columns.push({
         title: '部门名称',
         key: 'organName',
         sortField: 'organ_name',
         sortable: 'custom'
       })
-      columns.push({
-        title: '状态',
-        key: 'status',
-        sortable: 'custom',
-        align: 'center',
-        width: 100,
-        render: function (h, param) {
-          let state = param.row.status
-          if (state === '00') {
-            state = '正常'
-          } else {
-            state = '锁定'
-          }
-          return h('span', state)
+      if (self.useTransferRangeUsers && self.ucAdapterType == 'x1'){
+        columns.push({
+          title: '公司名称',
+          key: 'comName',
+          sortField: 'com_name',
+          sortable: 'custom'
+        })
+      }
+      if (!self.useTransferRangeUsers){
+        {
+          columns.push({
+            title: '状态',
+            key: 'status',
+            sortable: 'custom',
+            align: 'center',
+            width: 100,
+            render: function (h, param) {
+              let state = param.row.status
+              if (state === '00') {
+                state = '正常'
+              } else {
+                state = '锁定'
+              }
+              return h('span', state)
+            }
+          })
         }
-      })
+      }
 
       return columns
     }
   },
   inject: ['toBeDoneListDoSearch'],
   methods: {
-    init () {
+    init (organTreeType) {
       let self = this
-      self.getRootData()
+      self.organTreeType = organTreeType
+      self.getRootData(organTreeType)
+    },
+    clearData(){
+      this.idSelectedArr = []
+      this.useTransferRangeUsers = false
+      //清除表格数据
+      this.doSearch()
     },
-    toggleShowHelpBox() {
+    toggleShowHelpBox(organTreeType, permScope, helpBoxType, id, data) {
+      this.clearData()
+      this.id = id
+      this.helpBoxType = helpBoxType
+      this.organTreeType = organTreeType
+      if (helpBoxType === 'appointHandlerWithCandGroups'){
+        this.title = '选择候选人'
+      }
+      if (data && (data.orgList || data.userList)){
+        const {orgList, userList} = data
+        if (orgList && orgList.length > 0){
+          this.useTransferRangeOrgan = true
+          let childs = []
+          orgList.forEach(item => {
+            let obj = {}
+            obj.organId = item.orgId
+            obj.title = item.orgName
+            obj.name = item.orgName
+            obj.code = item.orgCode
+            obj.loading = false
+            obj.children = []
+            obj.hasChild = true
+            childs.push(obj)
+          })
+          this.treeData.push(childs)
+          const codesSeen = new Map();
+          this.treeData = this.treeData.reduce((acc, item, index) => {
+            if (!codesSeen.has(item.code)) {
+              codesSeen.set(item.code, index);
+              acc.push(item);
+            }
+            return acc;
+          }, []);
+          this.selectChange(this.treeData[0])
+          this.modalBoxShow = !this.modalBoxShow;
+          this.$forceUpdate()
+          return
+        }
+        if (userList && userList.length > 0){
+          this.treeData = []
+          this.useTransferRangeUsers = true
+          this.tableData = userList.map(item => {
+            return {
+              ...item,
+              organName: item.deptName,
+              status: '00'
+            }
+          })
+          this.modalBoxShow = !this.modalBoxShow;
+          this.$forceUpdate()
+          return
+        }
+      }
+      this.permScope = permScope
+      if (permScope && permScope !== 'all'){
+        this.getOrgTreeByProType(this.permScope, this.organTreeType)
+      } else {
+        this.permScopeList = 'all'
+        this.getRootData(organTreeType)
+      }
       this.modalBoxShow = !this.modalBoxShow;
+      this.$forceUpdate()
     },
 
     onOk(){
       let self = this
       let idSelectedArr = self.idSelectedArr
+      if (self.idSelectedArr.length === 0) {
+        self.onCancel()
+        return
+      }
       self.loading = true
-      if (idSelectedArr.length > 1) {
-        self.loading = false
-        self.$Message.info('办理人只能选择一条记录！')
-        this.$emit('update-selected', ''); // 触发事件并传递 userId
+      if (self.helpBoxType ==='addMultitaskInstance'){
+        idSelectedArr = [...new Set(idSelectedArr)]
+        const assingeeList = idSelectedArr.map(item => item.split(',')[0])
+        self.$emit('add-multitask-instance', assingeeList);
+      }else if (self.helpBoxType ==='appointHandlerWithCandGroups'){
+        idSelectedArr = [...new Set(idSelectedArr)]
+        self.$emit('appoint-handler-with-candGroups', idSelectedArr, self.id);
       } else {
-        let auditResult = {
-          code: self.data.auditResult,
-          name: self.data.auditResultName,
-        }
-        self.data.selectedUserId=self.idSelectedArr[0];
-        console.log("self.data:",self.data);
-        let url = this.smartFlowServerContext + '/manage/processTodo/audit'
-        ajax.post(url, self.data).then(function (resp) {
-          let result = resp.data
-          if (result.code == '200') {
-            self.loading = false
-            self.$Message.success(result.message);
-            if (this.executionCompleted) {
-              this.executionCompleted(true, self.data.instanceId, self.data.taskId, auditResult, self.data.taskId);
+        if (idSelectedArr.length > 1) {
+          self.loading = false
+          self.$Message.info('办理人只能选择一条记录！')
+          this.$emit('update-selected', ''); // 触发事件并传递 userId
+        } else {
+          let idSelectedArr = self.idSelectedArr[0].split(',')
+          if (self.helpBoxType === 'auditTo82'){
+            let auditResult = {
+              code: self.data.auditResult,
+              name: self.data.auditResultName,
             }
-            self.toBeDoneListDoSearch();
-          } else {
-            self.loading = false
-            self.$Message.error(result.message)
-            if (this.executionCompleted) {
-              this.executionCompleted(false, null, null, auditResult, self.data.taskId);
+            if (!self.showConfirmBox){
+              self.execute(auditResult)
+              return;
             }
+            self.$Modal.confirm({
+              title: '提示',
+              content: '确定要' + auditResult.name + '吗？',
+              onOk: () => {
+                self.execute(auditResult)
+              },
+              onCancel: () => {
+                self.loading = false
+                self.disable = false
+              }
+            })
+          } else if (self.helpBoxType === 'delegateTask'){
+            self.$emit('delegate-task-assignee', idSelectedArr[0]);
+          } else {
+            self.$emit('update-next-node-assignee', idSelectedArr[0], idSelectedArr[1], self.id);
           }
-        })
+        }
       }
       this.modalBoxShow = false;
     },
-
-
+    execute(auditResult){
+      const self = this
+      self.data.selectedUserId=idSelectedArr[0];
+      let url = this.smartFlowServerContext + '/manage/processTodo/audit'
+      ajax.post(url, self.data).then(function (resp) {
+        let result = resp.data
+        if (result.code == '200') {
+          self.loading = false
+          self.$Message.success(result.message);
+          if (self.executionCompleted) {
+            self.executionCompleted(true, self.data.instanceId, self.data.taskId, auditResult, self.data.taskId);
+          }
+          self.toBeDoneListDoSearch();
+        } else {
+          self.loading = false
+          self.$Message.error(result.message)
+          if (self.executionCompleted) {
+            self.executionCompleted(false, null, null, auditResult, self.data.taskId);
+          }
+        }
+      })
+    },
     doSearch: function () {
       this.tableSearchParams = Object.assign({}, this.form)
     },
+    // 加签、选择下一环节候选人
     onSelectionChange: function (selection) {
       let self = this
-      self.idSelectedArr = []
-      if (selection.length > 1) {
-        self.$Message.info('只能选择一条记录！')
-        this.$refs.selection.selectAll(false);
+      if (self.helpBoxType === 'addMultitaskInstance' || self.helpBoxType === 'appointHandlerWithCandGroups') {
+        for (let item of selection) {
+          self.idSelectedArr.push(item.userId + ',' + item.userName)
+        }
       }
-      for (let item of selection) {
-        self.idSelectedArr.push(item.userId)
+    },
+    // 转办、委派、选择下一环节办理人
+    onCurrentChange(selection) {
+      let self = this
+      if (self.helpBoxType !== 'addMultitaskInstance' && self.helpBoxType !== 'appointHandlerWithCandGroups') {
+        self.idSelectedArr = []
+        self.idSelectedArr.push(selection.userId + ',' + selection.userName)
       }
     },
     loadData (node, callback) {
@@ -226,50 +393,332 @@ export default {
         }
       })
     },
-    getRootData () {
+    getRootData (organTreeType) {
       let self = this
-      let childs = []
-      ajax.get(this.upmsServerContext + '/manage/ucOrgan/getOrgRootTree').then(function (resp) {
-        if (resp.data.code === 1) {
-          let data = resp.data.data
-          if (data.length > 0) {
-            data.forEach(item => {
-              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
-              childs.push(obj)
+      let hostChilds = []
+      if (self.ucAdapterType === 'x1'){
+        let parentId = organTreeType == '00' ? 'rootId' : '0'
+        ajax.get(self.smartFlowServerContext + '/manage/organ/getOrgSubNodes', {
+          params: {
+            code: parentId,
+            orgTreeType: organTreeType
+          }
+        }).then(resp => {
+          if (resp.data.code === 200) {
+            let data = resp.data.data
+            if (data.length > 0) {
+              data.forEach(item => {
+                let obj = {}
+                obj.type = item.organType
+                obj.id = item.id
+                obj.organId = 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
+                hostChilds.push(obj)
+              })
+              self.treeData.push(hostChilds)
+              const codesSeen = new Map();
+              self.treeData = self.treeData.reduce((acc, item, index) => {
+                if (!codesSeen.has(item.code)) {
+                  codesSeen.set(item.code, index);
+                  acc.push(item);
+                }
+                return acc;
+              }, []);
+              self.selectChange(self.treeData[0])
+            }
+          }
+        }).catch(err => {
+          console.log(err);
+        })
+      } else {
+        ajax.get(self.smartFlowServerContext + '/manage/bizorgan/getOrgRootTree?bizOrganTreeType=' + organTreeType).then(resp => {
+          if (resp.data.code === 200) {
+            let data = resp.data.data
+            if (data.length > 0) {
+              for (let i = 0; i < data.length; i++) {
+                {
+                  let obj = {}
+                  obj.type = data[i].bizOrganType
+                  obj.id = data[i].id
+                  obj.organId = data[i].bizOrganId
+                  obj.orders = data[i].orders
+                  obj.title = data[i].bizOrganName
+                  obj.name = data[i].bizOrganName
+                  obj.com = data[i].bizOrganId
+                  obj.code = data[i].bizOrganCode
+                  obj.loading = false
+                  obj.children = []
+                  obj.hasChild = true
+                  hostChilds.push(obj)
+                  self.treeData.push(hostChilds);
+                  const codesSeen = new Map();
+                  self.treeData = self.treeData.reduce((acc, item, index) => {
+                    if (!codesSeen.has(item.code)) {
+                      codesSeen.set(item.code, index);
+                      acc.push(item);
+                    }
+                    return acc;
+                  }, []);
+                }
+              }
+              self.selectChange(self.treeData[0])
+            }
+          }
+        }).catch(err => {
+          console.log(err);
+        })
+      }
+    },
+    async getOrgTreeByProType(permScope, organTreeType){
+      let self = this
+      let userPermScope = permScope.substring(permScope.indexOf("U:"))
+      userPermScope = userPermScope.substring(2, userPermScope.indexOf(","))
+      let permScopeTwo = userPermScope.split(';')
+      if (permScopeTwo.length > 0 && permScopeTwo[0]){
+        self.permScopeList = 'U:' + userPermScope + ','
+        let promises = []
+        for (let i = 0; i < permScopeTwo.length; i++) {
+          let promise = ajax.get(self.smartFlowServerContext + "/manage/user/get/" + permScopeTwo[i] + '?treeType=' + organTreeType)
+            .then(resp => {
+              if (resp.data.code === 200) {
+                return resp.data.data.organCode
+              }
+            })
+          promises.push(promise)
+        }
+        Promise.all(promises).then(async (result) => {
+          const uniqueResults = [...new Set(result.filter(Boolean))];
+          permScope = uniqueResults.join(';');
+          self.treeData = await this.getOrganTreeByProType(permScope, permScope, organTreeType);
+          self.selectChange(self.treeData[0])
+        })
+      } else {
+        //对于流程类型中没有规定人员范围但规定组织范围的情况
+        self.treeData = await this.getOrganTreeByProType(permScope, permScope.substring(2, permScope.indexOf(",")), organTreeType);
+        self.selectChange(self.treeData[0])
+      }
+    },
+    getOrganTreeByProType(row, permScope, organTreeType) {
+      const self = this
+      return new Promise((resolve, reject) => {
+        let organTree = [];
+        let childsTree = [];
+        if (permScope && permScope.length > 0) {
+          let params = {
+            orgTreeType: organTreeType,
+          };
+          permScope = permScope.split(';');
+
+          const requests = permScope.map(perm => {
+            return ajax.get(self.smartFlowServerContext + '/manage/organ/get/' + perm, { params: params })
+              .then(resp => {
+                if (resp.data.code === 200) {
+                  return resp.data.data;
+                } else {
+                  return [];
+                }
+              })
+              .catch(err => {
+                console.error(err);
+                return [];
+              });
+          });
+
+          Promise.all(requests)
+            .then(results => {
+              let tree
+              if (self.ucAdapterType === 'x1'){
+                tree = self.x1OrganTree(results)
+              } else {
+                tree = self.scOrganTree(results)
+              }
+              for (let value of tree) {
+                self.formatOrganTree(value, childsTree, organTreeType)
+              }
+
+              organTree.push(childsTree);
+              const codesSeen = new Map();
+              organTree = organTree.reduce((acc, item, index) => {
+                if (!codesSeen.has(item.code)) {
+                  codesSeen.set(item.code, index);
+                  acc.push(item);
+                }
+                return acc;
+              }, []);
+              resolve(organTree);
             })
+            .catch(err => {
+              reject(err);
+            });
+        } else {
+          resolve([]);
+        }
+      });
+    },
+    x1OrganTree(results){
+      const nodeMap = new Map();
+      results.forEach(item => {
+        const organCode = item.organCode
+        const organStruPath = item.organStruPath
+        const parts = organStruPath.split('#').filter(p => p);
+        let currentNode = nodeMap.get(organCode) || { organCode, organStruPath, item, children: []};
+        currentNode.parts = parts;
+        nodeMap.set(organCode, currentNode);
+      });
+      nodeMap.forEach(node => {
+        const { organCode, parts } = node;
+        let parentCode = null;
+        for (let i = 0; i < parts.length - 1; i++) {
+          parentCode = parts[i];
+          const parentNode = nodeMap.get(parentCode);
 
-            childs[0].selected = true
-            self.selectChange(childs)
+          if (parentNode) {
+            if (parentNode.organId === node.item.parentId && !parentNode.children.some(child => child.organCode === organCode)) {
+              parentNode.children.push(node);
+            } else {
+              // 如果直接父节点不在流程类型范围内但祖宗节点在
+              let children = parentNode.children;
+              for (let j = i + 1; j < parts.length - 1; j++) {
+                const partCode = parts[j];
+                let existingChild = children.find(child => child.organCode === partCode);
+
+                if (!existingChild) {
+                  existingChild = { organCode: partCode, children: [] };
+                  children.push(existingChild);
+                }
+                children = existingChild.children;
+              }
+              // 将当前节点添加到最后一个子节点的 children 中
+              children.push(node);
+            }
+            nodeMap.delete(organCode);
+            break;
           }
-          self.treeData = childs
         }
-      })
+
+      });
+      return nodeMap.values()
+    },
+    scOrganTree(results){
+      const nodeMap = new Map();
+      results.forEach(item => {
+        const organId = item.organId
+        const parentId = item.parentId
+        let currentNode = nodeMap.get(organId) || { organId, parentId, item, children: []};
+        nodeMap.set(organId, currentNode);
+      });
+      const tree = [];
+      nodeMap.forEach((node, organId) => {
+        const parentId = node.parentId;
+
+        // 如果有父节点，则将当前节点添加到父节点的 children 数组中
+        if (parentId && nodeMap.has(parentId)) {
+          const parentNode = nodeMap.get(parentId);
+          parentNode.children.push(node);
+        } else {
+          tree.push(node);
+        }
+      });
+      return tree
+    },
+    formatOrganTree(nodeMap, childsTree, organTreeType){
+      const self = this
+      let obj = {}
+      if (nodeMap.item){
+        obj = {
+          type: nodeMap.item.organType,
+          id: nodeMap.item.id,
+          organId: nodeMap.item.organId,
+          orders: nodeMap.item.orders,
+          title: nodeMap.item.organName,
+          name: nodeMap.item.organName,
+          com: nodeMap.item.organId,
+          code: nodeMap.item.organCode,
+          loading: false,
+          checked: false,
+          hasChild: true,
+          children: [],
+        };
+        if (nodeMap.children && nodeMap.children.length > 0){
+          for (let child of nodeMap.children){
+            self.formatOrganTree(child, obj.children, organTreeType)
+          }
+        }
+        childsTree.push(obj);
+      } else {
+        let params = {
+          orgTreeType: organTreeType,
+        }
+        ajax.get(self.smartFlowServerContext + '/manage/organ/get/' + nodeMap.organCode, { params: params })
+          .then(resp => {
+            if (resp.data.code === 200) {
+              let data = resp.data.data
+              obj = {
+                type: data.organType,
+                id: data.id,
+                organId: data.organId,
+                orders: data.orders,
+                title: data.organName,
+                name: data.organName,
+                com: data.organId,
+                code: data.organCode,
+                loading: false,
+                disabled: true,
+                checked: false,
+                hasChild: true,
+                children: [],
+                render: (h, { root, node, data }) => {
+                  return h('span', {
+                    style: {
+                      display: 'inline-block',
+                      color: '#b9bbc0',
+                      width: '100%'
+                    }
+                  }, [
+                    h('span', [
+                      h('span', data.title)
+                    ])
+                  ]);
+                },
+              }
+              if (nodeMap.children && nodeMap.children.length > 0){
+                for (let child of nodeMap.children){
+                  self.formatOrganTree(child, obj.children, organTreeType)
+                }
+              }
+              childsTree.push(obj);
+            }
+          })
+          .catch(err => {
+            console.error(err);
+            return [];
+          })
+      }
     },
     getData (node, callback) {
       let self = this
       ajax.get(this.upmsServerContext + '/manage/ucOrgan/getOrgSubNodes', {
         params: {
-          organCode: node.code
+          organCode: node.code,
+          orgTreeType: self.organTreeType
         }
       }).then(function (resp) {
         const childs = []
         if (resp.data.code === 1) {
           let nodeDatas = resp.data.data
-          if (nodeDatas.length > 0) {
+          if (nodeDatas && nodeDatas.length > 0) {
             nodeDatas.forEach(item => {
               let obj = {}
               obj.type = item.organType
-              obj.id = item.organId
+              obj.id = item.id
+              obj.organId = item.organId
               obj.orders = item.orders
               obj.title = item.organName
               obj.name = item.organName
@@ -299,14 +748,22 @@ export default {
     },
     selectChange (node) {
       let self = this
-      if (node.length > 0) {
+      if (node && node.length > 0) {
         if (self.currentNode !== node[0]) {
           self.currentNode = node[0]
 
-          self.form.organId = self.currentNode.id
+          self.form.organId = self.currentNode.organId
           self.form.organTitle = self.currentNode.title
 
-          self.dataUrl =this.upmsServerContext+ '/manage/user/list'
+          let permScopeList = self.permScopeList
+          if (permScopeList !== 'all'){
+            permScopeList += 'O:' + self.currentNode.code
+          }
+          self.dataUrl =self.smartFlowServerContext+ '/manage/user/getAssigneeList?orgTreeType=' + self.organTreeType + "&permScopeList=" + permScopeList
+
+          if (this.useTransferRangeOrgan){
+            self.dataUrl = self.upmsServerContext+ '/manage/user/list?orgTreeType=' + self.organTreeType
+          }
           self.doSearch()
 
           if (node[0].children.length <= 0) {
@@ -323,11 +780,24 @@ export default {
     },
 
     onCancel () {
-      this.$emit('update-selected', ''); // 触发事件并传递 userId
+      if (this.helpBoxType === 'auditTo82'){
+        this.$emit('update-selected', ''); // 触发事件并传递 userId
+      }
       this.modalBoxShow = false;
 
     },
 
+    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);
+      })
+    },
 
   },
 };
@@ -336,10 +806,15 @@ export default {
 <style lang="less" scope>
 .org-info{
   display: flex;
+  max-height: 700px;
   .org-tree {
     width: 265px;
     min-height: 450px;
     border-right: 1px solid #dcdee2;
+    .tree-content {
+      height: 100%;
+      overflow-y: auto;
+    }
   }
 
   .org-detil {