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

package/src/components/history.vue

@@ -58,6 +58,8 @@
                                       v-else-if="item.auditResult === '40'">驳回上一节点</span>
                                 <span style="color: #ed4014; font-size: 13px;"
                                       v-else-if="item.auditResult === '50'">驳回到原点</span>
+                                <span style="color: #ed4014; font-size: 13px;"
+                                      v-else-if="item.auditResult === '51'">流程终止</span>
                                 <span style="color: #ed4014; font-size: 13px;"
                                       v-else-if="item.auditResult === '60'">撤回</span>
                                 <span style="color: #19be6b; font-size: 13px;"

package/src/portrait.vue

@@ -430,7 +430,8 @@ export default {
       hisNode: [],
       processHistory: [],
       permScope: '',
-      organTreeType: '',
+      organTreeType: '00',
+      defaultOrganTreeType: '00',
       ruleValidate: {
         auditOpinion: [{required: true, trigger: "blur", message: "审批意见不能为空"}],
         assignee: [{required: true, trigger: "blur", message: "办理人不能为空"}],
@@ -678,7 +679,8 @@ export default {
             .then(resp => {
               let data = resp.data.data.rows
               self.permScope = data[0].permScope
-              self.organTreeType = data[0].organTreeType
+              self.defaultOrganTreeType = data[0].organTreeType ? data[0].organTreeType : '00'
+              self.getNodeOrganTreeType(procType)
             }).catch(err => {
             console.log(err);
           })
@@ -689,6 +691,23 @@ export default {
         console.log(err)
       })
     },
+    getNodeOrganTreeType(procType){
+      const self = this
+      let param = {
+        procType: procType,
+        procId: this.procId,
+        taskNode: this.taskNode
+      }
+      ajax.get(self.smartFlowServerContext + "/manage/processTodo/getNodeOrganTreeType", {params: param}).then(function (resp) {
+        if (resp.data.code === '200') {
+          self.organTreeType = resp.data.data ? resp.data.data : self.defaultOrganTreeType
+        } else {
+          self.$Message.error(resp.data.message)
+        }
+      }).catch((err) => {
+        console.log(err)
+      })
+    },
     getDoneTaskId() {
       const self = this
       let param = {
@@ -770,6 +789,7 @@ export default {
             nextNodeForm = {
               id: data[i].id,
               name: data[i].name,
+              orgTreeType: data[i].orgTreeType,
               assignee: data[i].assignee ? data[i].assignee.id : '',
               assigneeName: data[i].assignee ? data[i].assignee.name : '',
               candidateGroups: '',
@@ -1245,8 +1265,12 @@ export default {
         }
         item.assignee ? acc[item.id].assignee = item.assignee : ''
         item.candidateGroups ? acc[item.id].candidateGroup = item.candidateGroups : ''
-        let timeLimit = 'expireTime:' + item.remainDay + "D" + item.remainTime + "H" + ";warningTime:" + item.inAdvanceDay + "D" + item.inAdvanceTime + "H;" + "handleType:" + item.processing;
-        !(item.remainDay === 0 && item.remainTime === 0 && item.inAdvanceDay === 0 && item.inAdvanceTime === 0) ? acc[item.id].timeLimit = timeLimit : ''
+        if(!(item.remainDay === 0 && item.remainTime === 0 && item.inAdvanceDay === 0 && item.inAdvanceTime === 0)) {
+          let timeLimit = 'expireTime:' + parseInt(item.remainDay) + "D" + parseInt(item.remainTime) + "H" + ";warningTime:" + parseInt(item.inAdvanceDay) + "D" + parseInt(item.inAdvanceTime) + "H;" + "handleType:" + item.processing;
+          acc[item.id].timeLimit = timeLimit
+        } else {
+          acc[item.id].timeLimit = ''
+        }
         oldSettings = self.nextNodesOldSettings.filter(oldSetting => oldSetting.id === item.id)[0]
         if (oldSettings.assignee !== item.assignee || self.checkGroupsUpdate(oldSettings.candidates, item.candidateGroups) || self.checkTimeLimitUpdate(oldSettings.timeLimit, timeLimit)) {
           acc[item.id].needUpdate = 'true'
@@ -1295,10 +1319,14 @@ export default {
       return false
     },
     readingRangeClick(item) {
-      this.$refs.assigneeHelpBox.toggleShowHelpBox(this.organTreeType, this.permScope, 'transferNextTask', item.id)
+      let permScope = item.organTreeType === this.defaultOrganTreeType ? this.permScope : 'all'
+      let orgTreeType = item.orgTreeType ? item.orgTreeType : this.defaultOrganTreeType
+      this.$refs.assigneeHelpBox.toggleShowHelpBox(orgTreeType, permScope, 'transferNextTask', item.id)
     },
     candidateGroupsReadingRangeClick(item) {
-      this.$refs.candidateGroupsHelpBox.toggleShowHelpBox(this.permScope, item.candidates, this.organTreeType, item.id);
+      let permScope = item.organTreeType === this.defaultOrganTreeType ? this.permScope : 'all'
+      let orgTreeType = item.orgTreeType ? item.orgTreeType : this.defaultOrganTreeType
+      this.$refs.candidateGroupsHelpBox.toggleShowHelpBox(permScope, item.candidates, orgTreeType, item.id);
     },
     updateCandGroups(newCandGroups, nameStr, detail, nodeId){
       let oldSettings = this.nextNodesOldSettings.filter(item => item.id === nodeId)[0]