diff --git a/ruoyi-ui/src/api/ehs/ehsDocTransfer.js b/ruoyi-ui/src/api/ehs/ehsDocTransfer.js index 67a4a4a..9e48463 100644 --- a/ruoyi-ui/src/api/ehs/ehsDocTransfer.js +++ b/ruoyi-ui/src/api/ehs/ehsDocTransfer.js @@ -17,6 +17,15 @@ export function getEhsDocTransfer(id) { }) } +// 查询公文流转记录 +export function listTransferRecord(query) { + return request({ + url: '/ehs/ehsDocTransfer/list', + method: 'get', + params: query + }) +} + // 新增公文流转 export function addEhsDocTransfer(data) { return request({ diff --git a/ruoyi-ui/src/views/ehs/ehsDocument/index.vue b/ruoyi-ui/src/views/ehs/ehsDocument/index.vue index fc9db45..1b0cc91 100644 --- a/ruoyi-ui/src/views/ehs/ehsDocument/index.vue +++ b/ruoyi-ui/src/views/ehs/ehsDocument/index.vue @@ -279,6 +279,13 @@ + @@ -339,6 +346,7 @@ import { import { addEhsDocTransfer, listEhsDocTransfer, + listTransferRecord, lendEhsDoc, returnEhsDoc, } from "@/api/ehs/ehsDocTransfer"; @@ -366,16 +374,20 @@ export default { total: 0, // 公文管理表格数据 ehsDocumentList: [], - // 公文流转记录数据 - ehsDocTransferList: [], // 弹出层标题 title: "", - title1: "", title2: "", // 是否显示弹出层 open: false, - open1: false, open2: false, + // 弹框的数据 + documentId: null, + open1: false, + title1: "", + ehsDocTransferList: [],// 公文流转记录数据 + totalDetail: 0,// 弹框的总条数 + pageNum: 1,// 弹框当前页 + pageSize: 10,// 弹框的每页显示条数 // 查询参数 queryParams: { pageNum: 1, @@ -498,16 +510,17 @@ export default { }, /** 流转记录按钮操作 */ transferRecord(row) { - this.reset(); - const id = row.id || this.ids; - /** 查询公文流转记录 */ - getDocTransferById(id).then((response) => { - this.open1 = true; - this.loading = true; - this.title1 = "流转记录"; - this.ehsDocTransferList = response.rows; - //this.total1 = response.total; - this.loading = false; + this.open1 = true; + this.documentId = row.id; + this.getTransferRecord(); + }, + getTransferRecord() { + this.loading = true; + this.title1 = "流转记录"; + listTransferRecord({"pageNum" : this.pageNum, "pageSize": this.pageSize,"documentId":this.documentId}).then(response => { + this.ehsDocTransferList = response.rows; + this.totalDetail = response.total; + this.loading = false; }); }, /** 提交按钮 */