n20-common-lib 1.3.54 → 1.3.55
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -29,6 +29,11 @@
|
|
|
29
29
|
>驳回</span
|
|
30
30
|
></template
|
|
31
31
|
>
|
|
32
|
+
<template v-else-if="item.result == status.invalid">
|
|
33
|
+
审批意见：<span class="n20-approval-reject"
|
|
34
|
+
>作废</span
|
|
35
|
+
></template
|
|
36
|
+
>
|
|
32
37
|
</div>
|
|
33
38
|
</div>
|
|
34
39
|
<div v-if="item.suggestion" class="n20-description-c">
|
|
@@ -81,7 +86,8 @@ export default {
|
|
|
81
86
|
submit: 1,
|
|
82
87
|
approval: 2,
|
|
83
88
|
reject: 3,
|
|
84
|
-
|
|
89
|
+
invalid: 4,
|
|
90
|
+
end: 5
|
|
85
91
|
})
|
|
86
92
|
},
|
|
87
93
|
approvalData: {
|
|
@@ -107,21 +113,21 @@ export default {
|
|
|
107
113
|
assignee: item.assignee,
|
|
108
114
|
suggestion: item.suggestion
|
|
109
115
|
}
|
|
110
|
-
|
|
116
|
+
|
|
117
|
+
if (item.taskName === '开始') {
|
|
118
|
+
_item.result = 1
|
|
119
|
+
} else if (item.taskName === '结束') {
|
|
120
|
+
_item.result = 5
|
|
121
|
+
} else if ('approvalState' in item) {
|
|
111
122
|
_item.result = item.approvalState
|
|
123
|
+
} else if (!item.endTime) {
|
|
124
|
+
_item.result = 0
|
|
125
|
+
} else if (item.rejectFlag === 1) {
|
|
126
|
+
_item.result = 3
|
|
112
127
|
} else {
|
|
113
|
-
|
|
114
|
-
_item.result = 1
|
|
115
|
-
} else if (item.taskName === '结束') {
|
|
116
|
-
_item.result = 4
|
|
117
|
-
} else if (!item.endTime) {
|
|
118
|
-
_item.result = 0
|
|
119
|
-
} else if (item.rejectFlag === 1) {
|
|
120
|
-
_item.result = 3
|
|
121
|
-
} else {
|
|
122
|
-
_item.result = 2
|
|
123
|
-
}
|
|
128
|
+
_item.result = 2
|
|
124
129
|
}
|
|
130
|
+
|
|
125
131
|
approvalData.push(_item)
|
|
126
132
|
})
|
|
127
133
|
this.approvalData.push(...approvalData)
|