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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambo-design/workflow-approve",
-  "version": "1.0.0-beta.19",
+  "version": "1.0.0-beta.20",
   "description": "",
   "main": "index.js",
   "author": "lambo",

package/src/components/assignee-box.vue

@@ -70,7 +70,11 @@ export default {
   },
   data() {
     return {
+      id: '',
+      helpBoxType: 'transferCurTask',
       loading: false,
+      organTreeType: '00',
+      permScope: 'all',
       modalBoxShow: false,
       dataUrl:'',
       helpBoxColumns: [
@@ -104,9 +108,9 @@ export default {
       tableSearchParams: {},
     };
   },
-  created () {
+ /* created () {
     this.init()
-  },
+  },*/
   computed: {
 
     tableColumn () {
@@ -159,11 +163,24 @@ export default {
   },
   inject: ['toBeDoneListDoSearch'],
   methods: {
-    init () {
+    init (organTreeType) {
       let self = this
-      self.getRootData()
+      self.organTreeType = organTreeType
+      self.getRootData(organTreeType)
     },
-    toggleShowHelpBox() {
+    toggleShowHelpBox(organTreeType, permScope, helpBoxType, id) {
+      this.id = id
+      this.helpBoxType = helpBoxType
+      this.organTreeType = organTreeType
+      if (permScope && permScope !== 'all'){
+        let userPermScope = permScope.substring(permScope.indexOf("U:"))
+        userPermScope = userPermScope.substring(2, userPermScope.indexOf(","))
+        if (userPermScope.length > 0) {
+          userPermScope = userPermScope.split(';')
+          this.permScope = userPermScope
+        }
+      }
+      this.getRootData(organTreeType)
       this.modalBoxShow = !this.modalBoxShow;
     },
 
@@ -176,35 +193,39 @@ export default {
         self.$Message.info('办理人只能选择一条记录！')
         this.$emit('update-selected', ''); // 触发事件并传递 userId
       } 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 (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);
-            }
+        let idSelectedArr = self.idSelectedArr[0].split(',')
+        if (self.helpBoxType === 'transferCurTask'){
+          let auditResult = {
+            code: self.data.auditResult,
+            name: self.data.auditResultName,
           }
-        })
+          self.data.selectedUserId=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 (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);
+              }
+            }
+          })
+        } else {
+          self.$emit('update-next-node-assignee', idSelectedArr[0], idSelectedArr[1], self.id);
+        }
       }
       this.modalBoxShow = false;
     },
 
-
     doSearch: function () {
       this.tableSearchParams = Object.assign({}, this.form)
     },
@@ -216,7 +237,7 @@ export default {
         this.$refs.selection.selectAll(false);
       }
       for (let item of selection) {
-        self.idSelectedArr.push(item.userId)
+        self.idSelectedArr.push(item.userId + ',' + item.userName)
       }
     },
     loadData (node, callback) {
@@ -226,10 +247,13 @@ export default {
         }
       })
     },
-    getRootData () {
+    getRootData (organTreeType) {
       let self = this
       let childs = []
-      ajax.get(this.upmsServerContext + '/manage/ucOrgan/getOrgRootTree').then(function (resp) {
+      let params = {
+        treeTypeId: organTreeType
+      }
+      ajax.get(this.upmsServerContext + '/manage/ucOrgan/getOrgRootTree', {params: params}).then(function (resp) {
         if (resp.data.code === 1) {
           let data = resp.data.data
           if (data.length > 0) {
@@ -259,13 +283,14 @@ export default {
       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
@@ -299,14 +324,15 @@ 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.organTitle = self.currentNode.title
 
-          self.dataUrl =this.upmsServerContext+ '/manage/user/list'
+          let permScope = self.permScope ? self.permScope : 'all'
+          self.dataUrl =self.smartFlowServerContext+ '/manage/processDesign/getAssigneeList?orgTreeType=' + self.organTreeType + "&permScopeList=" + permScope
           self.doSearch()
 
           if (node[0].children.length <= 0) {
@@ -323,7 +349,9 @@ export default {
     },
 
     onCancel () {
-      this.$emit('update-selected', ''); // 触发事件并传递 userId
+      if (this.helpBoxType === 'transferCurTask'){
+        this.$emit('update-selected', ''); // 触发事件并传递 userId
+      }
       this.modalBoxShow = false;
 
     },