|
|
@@ -11,7 +11,7 @@
|
|
11
|
11
|
<!--表单信息-->
|
|
12
|
12
|
<el-tab-pane label="表单信息" name="1">
|
|
13
|
13
|
<el-col :span="16" :offset="4">
|
|
14
|
|
- <v-form-render ref="vFormRef"/>
|
|
|
14
|
+ <v-form-render ref="vFormRef" />
|
|
15
|
15
|
<div style="margin-left:10%;margin-bottom: 20px;font-size: 14px;">
|
|
16
|
16
|
<el-button type="primary" @click="handleComplete">审 批</el-button>
|
|
17
|
17
|
</div>
|
|
|
@@ -24,13 +24,9 @@
|
|
24
|
24
|
<el-col :span="16" :offset="4">
|
|
25
|
25
|
<div class="block">
|
|
26
|
26
|
<el-timeline>
|
|
27
|
|
- <el-timeline-item
|
|
28
|
|
- v-for="(item,index ) in flowRecordList"
|
|
29
|
|
- :key="index"
|
|
30
|
|
- :icon="setIcon(item.finishTime)"
|
|
31
|
|
- :color="setColor(item.finishTime)"
|
|
32
|
|
- >
|
|
33
|
|
- <p style="font-weight: 700">{{ item.taskName }}</p>
|
|
|
27
|
+ <el-timeline-item v-for="(item,index ) in flowRecordList" :key="index" :icon="setIcon(item.finishTime)"
|
|
|
28
|
+ :color="setColor(item.finishTime)">
|
|
|
29
|
+ <p style="font-weight: 700" class="el-timeline-item-p">{{ item.taskName }}</p>
|
|
34
|
30
|
<el-card :body-style="{ padding: '10px' }">
|
|
35
|
31
|
<el-descriptions class="margin-top" :column="1" size="small" border>
|
|
36
|
32
|
<el-descriptions-item v-if="item.assigneeName" label-class-name="my-label">
|
|
|
@@ -67,7 +63,7 @@
|
|
67
|
63
|
</el-tab-pane>
|
|
68
|
64
|
<!--流程图-->
|
|
69
|
65
|
<el-tab-pane label="流程图" name="3">
|
|
70
|
|
- <bpmn-viewer :flowData="flowData" :procInsId="taskForm.procInsId"/>
|
|
|
66
|
+ <bpmn-viewer :flowData="flowData" :procInsId="taskForm.procInsId" />
|
|
71
|
67
|
</el-tab-pane>
|
|
72
|
68
|
</el-tabs>
|
|
73
|
69
|
<!--审批任务-->
|
|
|
@@ -78,8 +74,8 @@
|
|
78
|
74
|
<flow-role v-if="checkSendRole" @handleRoleSelect="handleRoleSelect"></flow-role>
|
|
79
|
75
|
</el-form-item>
|
|
80
|
76
|
<el-form-item label="处理意见" label-width="80px" prop="comment"
|
|
81
|
|
- :rules="[{ required: true, message: '请输入处理意见', trigger: 'blur' }]">
|
|
82
|
|
- <el-input type="textarea" v-model="taskForm.comment" placeholder="请输入处理意见"/>
|
|
|
77
|
+ :rules="[{ required: true, message: '请输入处理意见', trigger: 'blur' }]">
|
|
|
78
|
+ <el-input type="textarea" v-model="taskForm.comment" placeholder="请输入处理意见" />
|
|
83
|
79
|
</el-form-item>
|
|
84
|
80
|
</el-form>
|
|
85
|
81
|
<span slot="footer" class="dialog-footer">
|
|
|
@@ -92,36 +88,30 @@
|
|
92
|
88
|
<el-form ref="taskForm" :model="taskForm" label-width="80px">
|
|
93
|
89
|
<el-form-item label="退回节点" prop="targetKey">
|
|
94
|
90
|
<el-radio-group v-model="taskForm.targetKey">
|
|
95
|
|
- <el-radio-button
|
|
96
|
|
- v-for="item in returnTaskList"
|
|
97
|
|
- :key="item.id"
|
|
98
|
|
- :label="item.id"
|
|
99
|
|
- >{{ item.name }}
|
|
|
91
|
+ <el-radio-button v-for="item in returnTaskList" :key="item.id" :label="item.id">{{ item.name }}
|
|
100
|
92
|
</el-radio-button>
|
|
101
|
93
|
</el-radio-group>
|
|
102
|
94
|
</el-form-item>
|
|
103
|
|
- <el-form-item label="退回意见" prop="comment"
|
|
104
|
|
- :rules="[{ required: true, message: '请输入意见', trigger: 'blur' }]">
|
|
105
|
|
- <el-input style="width: 50%" type="textarea" v-model="taskForm.comment" placeholder="请输入意见"/>
|
|
|
95
|
+ <el-form-item label="退回意见" prop="comment" :rules="[{ required: true, message: '请输入意见', trigger: 'blur' }]">
|
|
|
96
|
+ <el-input style="width: 50%" type="textarea" v-model="taskForm.comment" placeholder="请输入意见" />
|
|
106
|
97
|
</el-form-item>
|
|
107
|
98
|
</el-form>
|
|
108
|
99
|
<span slot="footer" class="dialog-footer">
|
|
109
|
|
- <el-button @click="returnOpen = false">取 消</el-button>
|
|
110
|
|
- <el-button type="primary" @click="taskReturn">确 定</el-button>
|
|
111
|
|
- </span>
|
|
|
100
|
+ <el-button @click="returnOpen = false">取 消</el-button>
|
|
|
101
|
+ <el-button type="primary" @click="taskReturn">确 定</el-button>
|
|
|
102
|
+ </span>
|
|
112
|
103
|
</el-dialog>
|
|
113
|
104
|
<!--驳回流程-->
|
|
114
|
105
|
<el-dialog :title="rejectTitle" :visible.sync="rejectOpen" width="40%" append-to-body>
|
|
115
|
106
|
<el-form ref="taskForm" :model="taskForm" label-width="80px">
|
|
116
|
|
- <el-form-item label="驳回意见" prop="comment"
|
|
117
|
|
- :rules="[{ required: true, message: '请输入意见', trigger: 'blur' }]">
|
|
118
|
|
- <el-input style="width: 50%" type="textarea" v-model="taskForm.comment" placeholder="请输入意见"/>
|
|
|
107
|
+ <el-form-item label="驳回意见" prop="comment" :rules="[{ required: true, message: '请输入意见', trigger: 'blur' }]">
|
|
|
108
|
+ <el-input style="width: 50%" type="textarea" v-model="taskForm.comment" placeholder="请输入意见" />
|
|
119
|
109
|
</el-form-item>
|
|
120
|
110
|
</el-form>
|
|
121
|
111
|
<span slot="footer" class="dialog-footer">
|
|
122
|
|
- <el-button @click="rejectOpen = false">取 消</el-button>
|
|
123
|
|
- <el-button type="primary" @click="taskReject">确 定</el-button>
|
|
124
|
|
- </span>
|
|
|
112
|
+ <el-button @click="rejectOpen = false">取 消</el-button>
|
|
|
113
|
+ <el-button type="primary" @click="taskReject">确 定</el-button>
|
|
|
114
|
+ </span>
|
|
125
|
115
|
</el-dialog>
|
|
126
|
116
|
</el-card>
|
|
127
|
117
|
</div>
|
|
|
@@ -458,4 +448,7 @@ export default {
|
|
458
|
448
|
.my-label {
|
|
459
|
449
|
background: #E1F3D8;
|
|
460
|
450
|
}
|
|
|
451
|
+.el-timeline-item-p {
|
|
|
452
|
+ color: #ffffff;
|
|
|
453
|
+}
|
|
461
|
454
|
</style>
|
liying333