|
@@ -248,7 +248,7 @@
|
|
</div>
|
|
</div>
|
|
<div id="execute-div" v-if="showExecute">
|
|
<div id="execute-div" v-if="showExecute">
|
|
<h4>执行详情</h4>
|
|
<h4>执行详情</h4>
|
|
- <el-descriptions title="" border>
|
|
|
|
|
|
+ <el-descriptions title="" border :column="1">
|
|
<el-descriptions-item label="附件">
|
|
<el-descriptions-item label="附件">
|
|
<span v-if="!executeDisabled">
|
|
<span v-if="!executeDisabled">
|
|
<el-upload
|
|
<el-upload
|
|
@@ -318,6 +318,17 @@
|
|
</el-table-column>
|
|
</el-table-column>
|
|
</el-table>
|
|
</el-table>
|
|
</el-descriptions-item>
|
|
</el-descriptions-item>
|
|
|
|
+ <el-descriptions-item label="驳回历史">
|
|
|
|
+ <el-table :data="rejectList" border v-loading="historyLoading" style="width: 100%;">
|
|
|
|
+ <el-table-column prop="result" header-align="center" align="center"
|
|
|
|
+ :label="$t('验证结果')"></el-table-column>
|
|
|
|
+ <el-table-column prop="comment" header-align="center" align="center"
|
|
|
|
+ :label="$t('备注')"></el-table-column>
|
|
|
|
+ <el-table-column prop="userName" header-align="center" align="center" :label="$t('验证人')"></el-table-column>
|
|
|
|
+ <el-table-column prop="taskEndTime" header-align="center" align="center"
|
|
|
|
+ :label="$t('提交日期')"></el-table-column>
|
|
|
|
+ </el-table>
|
|
|
|
+ </el-descriptions-item>
|
|
</el-descriptions>
|
|
</el-descriptions>
|
|
</div>
|
|
</div>
|
|
<div id="inspect-div" v-if="showInspect">
|
|
<div id="inspect-div" v-if="showInspect">
|
|
@@ -527,6 +538,7 @@ export default {
|
|
visible: false,
|
|
visible: false,
|
|
//流转列表
|
|
//流转列表
|
|
historyList: [],
|
|
historyList: [],
|
|
|
|
+ rejectList: [],
|
|
historyLoading: true,
|
|
historyLoading: true,
|
|
taskName: '',
|
|
taskName: '',
|
|
rules: {
|
|
rules: {
|
|
@@ -755,6 +767,20 @@ export default {
|
|
// 查询流转详情
|
|
// 查询流转详情
|
|
getHistorylist({processId: processId}).then(response => {
|
|
getHistorylist({processId: processId}).then(response => {
|
|
this.historyList = response.rows;
|
|
this.historyList = response.rows;
|
|
|
|
+ this.rejectList = [];
|
|
|
|
+ for (let i = 0; i < response.rows.length; i++) {
|
|
|
|
+ if(response.rows[i].comment != null) {
|
|
|
|
+ if (response.rows[i].comment.indexOf("驳回") != -1) {
|
|
|
|
+ let reject = {};
|
|
|
|
+ reject.result = response.rows[i].comment.split(",")[0];
|
|
|
|
+ reject.comment = response.rows[i].comment.split(",")[1];
|
|
|
|
+ reject.userName = response.rows[i].userName;
|
|
|
|
+ reject.taskEndTime = response.rows[i].taskEndTime;
|
|
|
|
+ this.rejectList.push(reject);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ }
|
|
this.historyLoading = false
|
|
this.historyLoading = false
|
|
});
|
|
});
|
|
// 加载登记人班组字典
|
|
// 加载登记人班组字典
|