n20-common-lib 2.2.29 → 2.2.30

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.2.29",
+  "version": "2.2.30",
   "private": false,
   "main": "src/index.js",
   "scripts": {

package/src/components/ApprovalRecord/approvalImg.vue

@@ -69,7 +69,7 @@ export default {
             let addTaskPre = {}
             for (let k in res.data.addTask) {
               let item = res.data.addTask[k]
-              let addTaskPreItem = item.filter((c) => /@2@addTaskType$/.test(c.addTaskDefId))
+              let addTaskPreItem = item.filter((c) => /@2@addTaskType/.test(c.addTaskDefId))
 
               if (addTaskPreItem.length) {
                 addTaskPre[k] = addTaskPreItem

package/src/components/ApprovalRecord/approvalImgPro/index.vue

@@ -198,24 +198,25 @@ export default {
         this.setTaskRecord(obj)
       })
 
+      // 非加签节点添加事件
       currentActivityIdList.forEach((currentActivityId) => {
         let assignee = currAssMap[currentActivityId]
         let assigneeEnd = taskDefIdMap[currentActivityId]
-        taskDefIdMap[currentActivityId] = undefined
-
         let task = this.svgW.querySelector(`[data-element-id="${currentActivityId}"]`)
         if (task) {
           task.classList.add('activiti-node-at')
-          !currentActivityId.includes('@addTaskType') && this.addEvent(task, { assignee, assigneeEnd }, 'pending')
-          // this.addEvent(task, { assignee, assigneeEnd }, 'pending')
+          if (!currentActivityId.includes('@addTaskType')) {
+            this.addEvent(task, { assignee, assigneeEnd }, 'pending')
+          }
         }
       })
       for (let k in taskDefIdMap) {
-        if (taskDefIdMap[k]) {
+        if (!currentActivityIdList.includes(k)) {
           let taskK = this.svgW.querySelector(`[data-element-id="${k}"]`)
           if (taskK) {
-            !k.includes('@addTaskType') && this.addEvent(taskK, taskDefIdMap[k])
-            // this.addEvent(taskK, taskDefIdMap[k])
+            if (!k.includes('@addTaskType')) {
+              this.addEvent(taskK, taskDefIdMap[k])
+            }
           }
         }
       }
@@ -475,7 +476,16 @@ export default {
           if (el.currentTarget.getAttribute('class').includes('activiti-node-reject')) {
             list.forEach((c) => (c.examineType = 'reject'))
           }
-          this.addTaskList = list
+
+          // 合并驳回再次加签的节点
+          let _list = []
+          list.forEach((item) => {
+            if (!_list.some((_item) => _item.addTaskDefId === item.addTaskDefId)) {
+              _list.push(item)
+            }
+          })
+
+          this.addTaskList = _list
           this.addTaskV = false
           this.$nextTick(() => {
             this.$refs['addTask-pop'].doDestroy()