@lambo-design/workflow-approve 1.0.0-beta.24 → 1.0.0-beta.25
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 +2 -2
- package/src/portrait.vue +1456 -1380
- package/src/workflow-diagram.vue +12 -8
package/src/workflow-diagram.vue
CHANGED
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
<div slot="content">
|
|
8
8
|
<div class="notes-div">
|
|
9
9
|
<span class="notes-done-task">已办结点</span>
|
|
10
|
-
<span class="notes-todo-task"
|
|
10
|
+
<span class="notes-todo-task">在办结点</span>
|
|
11
11
|
<span class="notes-none-task">未办结点</span>
|
|
12
12
|
</div>
|
|
13
13
|
<div class="containers" :style="'height: '+canvasHeight+ 'px'">
|
|
@@ -28,17 +28,17 @@
|
|
|
28
28
|
</Collapse>
|
|
29
29
|
|
|
30
30
|
|
|
31
|
-
<Modal v-model="showDetail" :width="modelWidth" :footer-hide='true' title="审批详情">
|
|
31
|
+
<Modal v-model="showDetail" :width="modelWidth" :footer-hide='true' :title="detailDones[0] && detailDones[0].handleName ? detailDones[0].handleName + '详情' : '审批详情'">
|
|
32
32
|
<Card v-for="(item,index) in detailDones" :key="index" style="margin-bottom: 10px">
|
|
33
33
|
<Form :model="item" :label-width="140" class="compactForm">
|
|
34
34
|
<Row>
|
|
35
35
|
<i-col span="12" offset="0">
|
|
36
|
-
<FormItem label="审批节点：">
|
|
36
|
+
<FormItem :label="item.handleName ? item.handleName + '节点：' : '审批节点：'">
|
|
37
37
|
{{ item.taskName }}
|
|
38
38
|
</FormItem>
|
|
39
39
|
</i-col>
|
|
40
40
|
<i-col span="12" offset="0">
|
|
41
|
-
<FormItem label="
|
|
41
|
+
<FormItem :label="item.handleName ? item.handleName + '人：' : '审批人：'">
|
|
42
42
|
<Tooltip placement="bottom-end">
|
|
43
43
|
<span class="tooltip-text">{{ item.auditName }}</span>
|
|
44
44
|
<div slot="content" style="white-space: normal;">
|
|
@@ -52,7 +52,7 @@
|
|
|
52
52
|
</Row>
|
|
53
53
|
<Row>
|
|
54
54
|
<i-col span="12" offset="0">
|
|
55
|
-
<FormItem label="审批结果：">
|
|
55
|
+
<FormItem :label="item.handleName ? item.handleName + '结果：' : '审批结果：'">
|
|
56
56
|
<Tag color="green" v-if="item.auditResult == '30'">通过</Tag>
|
|
57
57
|
<Tag color="volcano" v-else-if="item.auditResult == '40'">驳回上一节点</Tag>
|
|
58
58
|
<Tag color="red" v-else-if="item.auditResult=='50'">驳回到原点</Tag>
|
|
@@ -67,14 +67,14 @@
|
|
|
67
67
|
<FormItem v-if="item.startDate" label="发起时间：">
|
|
68
68
|
{{ item.startDate }}
|
|
69
69
|
</FormItem>
|
|
70
|
-
<FormItem v-else label="审批时间：">
|
|
70
|
+
<FormItem v-else :label="item.handleName ? item.handleName + '时间：' : '审批时间：'">
|
|
71
71
|
{{ item.auditDate }}
|
|
72
72
|
</FormItem>
|
|
73
73
|
</i-col>
|
|
74
74
|
</Row>
|
|
75
75
|
<Row>
|
|
76
76
|
<i-col span="24" offset="0">
|
|
77
|
-
<FormItem v-if="item.auditComment" label="审批意见：">
|
|
77
|
+
<FormItem v-if="item.auditComment" :label="item.handleName ? item.handleName + '意见：' : '审批意见：'">
|
|
78
78
|
{{ item.auditComment }}
|
|
79
79
|
</FormItem>
|
|
80
80
|
</i-col>
|
|
@@ -122,7 +122,11 @@ export default {
|
|
|
122
122
|
},
|
|
123
123
|
tableName: {
|
|
124
124
|
type: String,
|
|
125
|
-
default: "
|
|
125
|
+
default: "流程跟踪表"
|
|
126
|
+
},
|
|
127
|
+
handleName: {
|
|
128
|
+
type: String,
|
|
129
|
+
default: "审批"
|
|
126
130
|
},
|
|
127
131
|
tableColumns: {
|
|
128
132
|
type: Array,
|