diff --git a/src/api/accounting/voucher.js b/src/api/accounting/voucher.js index 8dee026f..1bf96f8e 100644 --- a/src/api/accounting/voucher.js +++ b/src/api/accounting/voucher.js @@ -18,12 +18,12 @@ export function updateVoucher(data) { }) } -// 归档会计凭证 -export function updateVoucherRecord(data) { +// 归档 +export function updateVoucherRecord(query) { return request({ - url: '/accounting/voucher/updateRecord', + url: '/archives/record/recordAssociation', method: 'put', - data: data + params: query }) } diff --git a/src/views/archives/prefile/index.vue b/src/views/archives/prefile/index.vue index 48062341..a012cf28 100644 --- a/src/views/archives/prefile/index.vue +++ b/src/views/archives/prefile/index.vue @@ -731,13 +731,14 @@ @@ -921,7 +922,7 @@ export default { fileType: "accounting_voucher", // 表单校验 rules: {}, - ids: [], // 选中id + ids: "", // 选中id fileData: "", //归档id fileTypeOptions: [], //档案类型 organizationList: [], //业务实体 @@ -1030,7 +1031,8 @@ export default { }, // 多选框选中数据 handleSelectionChange(selection) { - this.ids = selection.map((item) => item.id); + this.ids = selection.map((item) => item.id).join(","); + console.log(this.ids); this.multiple = !selection.length; }, // 归档 @@ -1142,10 +1144,11 @@ export default { }); }, handleCompanyChange(val) { - var data = this.organizationList.find((item) => item.id == val); - console.log(data); - this.form.caseNum = data.caseNum; - this.Fileform.caseNum = data.caseNum; + console.log(val); + this.form.companyId = val.id; + this.form.company = val.organizationName; + this.form.caseNum = val.caseNum; + this.Fileform.caseNum = val.caseNum; }, /** 提交按钮 */ submitForm() { @@ -1166,6 +1169,7 @@ export default { const data = { ids: this.ids, recordId: this.fileData, + recordType: this.fileType, }; // 归档调用接口 updateVoucherRecord(data).then((response) => { diff --git a/src/views/archives/record/index.vue b/src/views/archives/record/index.vue index a120b2a1..f7c4a025 100644 --- a/src/views/archives/record/index.vue +++ b/src/views/archives/record/index.vue @@ -9,22 +9,22 @@ v-show="showSearch" label-width="88px" > - { this.fileStatusOptions = res.data.list || []; }); + // 获取档案类型 + listData({ + pageNo: 1, + pageSize: 100, + dictType: "archives_file_type", + }).then((res) => { + this.fileTypeOptions = res.data.list || []; + }); }, // 全宗号修改事件 changeCaseNum() {