diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue index 2cbe932a9..4f1126628 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue @@ -261,6 +261,7 @@ export default { total: 0, pageSize: this.$store.getters.userInfo.configContent, listForm: { + fileIds: '', listType: "", //区分是哪个清单 listName: "", //清单名称 descriptionList: "", //清单说明 @@ -358,6 +359,11 @@ export default { this.listForm.applyUpdUserId = item.applyUpdUserId; this.listForm.jlUserId = item.jlUserId; this.listForm.zrUserId = item.zrUserId; + let filesId = [] + item.fileName.forEach(itemIds =>{ + filesId.push(itemIds.id) + }) + this.listForm.fileId = filesId.join(',') item.fileName.forEach(itemId => { this.fileIds = itemId.id this.getFileInfo(); diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue index e095c2f12..47fbb736a 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue @@ -204,7 +204,7 @@ tooltip-effect="dark" style="width: 100%" border - height="100%" + height="150%" :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}" @selection-change="selectedChange" @@ -233,7 +233,7 @@ @@ -283,13 +283,10 @@ export default { standModel: false, // 总数 total: 0, - // 当前页数 - pageNo: 1, // 查询未符合项整改数据库数据 queryUnqualidiedData: { - pageNo: 1, - pageSize: 10, - total: 0, + current: 1, + size: this.$store.getters.userInfo.configContent, closeState: '1', standId: '', standSerialNumber: '', // 标准号/名称 @@ -344,6 +341,12 @@ export default { //点击新增事件 addList() { dicTypeData().then(res => { + if (this.pageNo !== undefined) { + this.queryUnqualidiedData.current = this.pageNo + } + if (this.size !== undefined) { + this.queryUnqualidiedData.size = this.size + } this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 standUnqualified(this.queryUnqualidiedData).then(res => { this.unqualidiedData = res.data.records @@ -553,8 +556,9 @@ export default { this.pageNo = page this.getTableByPage() }, - pageSizeChange () { - this.getTableByPage() + pageSizeChange (pageSize) { + this.size = pageSize + this.getTableByPage(pageSize) }, } }