|
@@ -7,8 +7,8 @@
|
|
|
>{{ scope.row.operateTime | timestampFilter }}
|
|
|
</span>
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="operateName" label="提交人"></el-table-column>
|
|
|
- <el-table-column prop="reviewStatus" label="下级审核人">
|
|
|
+ <el-table-column prop="submitUserName" label="提交人"></el-table-column>
|
|
|
+ <el-table-column prop="approveUsers" label="下级审核人">
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
</div>
|
|
@@ -24,25 +24,33 @@ import { taskApplySubmitHistory } from "../api";
|
|
|
export default {
|
|
|
name: "apply-submit-history",
|
|
|
props: {
|
|
|
- flowId: {
|
|
|
+ examTaskId: {
|
|
|
type: String,
|
|
|
default: ""
|
|
|
}
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
- submitHistory: [],
|
|
|
- latestHistory: null
|
|
|
+ submitHistory: []
|
|
|
};
|
|
|
},
|
|
|
mounted() {
|
|
|
- // this.getData();
|
|
|
+ this.getData();
|
|
|
},
|
|
|
methods: {
|
|
|
async getData() {
|
|
|
- if (!this.flowId) return;
|
|
|
- this.submitHistory = await taskApplySubmitHistory(this.flowId);
|
|
|
- this.latestHistory = this.submitHistory[0];
|
|
|
+ if (!this.examTaskId) return;
|
|
|
+ const data = await taskApplySubmitHistory(this.examTaskId);
|
|
|
+ const result = data || [];
|
|
|
+ this.submitHistory = result.map(item => {
|
|
|
+ return {
|
|
|
+ operateTime: item.submitUser.createTime,
|
|
|
+ submitUserName: `${item.submitUser.realName}(${item.submitUser.orgName})`,
|
|
|
+ approveUsers: item.approveUserList
|
|
|
+ .map(user => `${user.realName}(${user.orgName})`)
|
|
|
+ .join(",")
|
|
|
+ };
|
|
|
+ });
|
|
|
}
|
|
|
}
|
|
|
};
|