From e0d6d2ce159a060f6659df6d712cbcf036ad8ac0 Mon Sep 17 00:00:00 2001 From: MO <448233645@qq.com> Date: Tue, 10 Oct 2023 10:11:23 +0800 Subject: [PATCH 01/15] =?UTF-8?q?=E5=87=AD=E8=AF=81=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/accounting/attachment/index.vue | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/src/views/accounting/attachment/index.vue b/src/views/accounting/attachment/index.vue index 7f73bccc..8acf8d42 100644 --- a/src/views/accounting/attachment/index.vue +++ b/src/views/accounting/attachment/index.vue @@ -161,16 +161,19 @@ > - - - + + @@ -372,6 +375,11 @@ export default { this.form.fileName = res.data.name; this.form.fileSize = res.data.size; }, + //凭证选择 + handleSelectVoucher(val) { + this.form.voucherId = val.id; + this.form.voucherNum = val.voucherNum; + }, /** 提交按钮 */ submitForm() { this.$refs["form"].validate((valid) => { From 3dc223cabc56d16cbc299663d75172d27325626c Mon Sep 17 00:00:00 2001 From: MO <448233645@qq.com> Date: Tue, 10 Oct 2023 10:14:58 +0800 Subject: [PATCH 02/15] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/accounting/flow/index.vue | 39 ++++++++++++++++++++++------- 1 file changed, 30 insertions(+), 9 deletions(-) diff --git a/src/views/accounting/flow/index.vue b/src/views/accounting/flow/index.vue index 12381f61..6148c18f 100644 --- a/src/views/accounting/flow/index.vue +++ b/src/views/accounting/flow/index.vue @@ -77,7 +77,6 @@ - @@ -180,8 +179,22 @@ - - + + + + + @@ -205,11 +218,6 @@ - @@ -270,6 +278,7 @@ import { downloadXml, } from "@/api/accounting/flow"; import { getAccessToken, getTenantId } from "@/utils/auth"; +import { getVoucherPage } from "@/api/accounting/voucher"; export default { name: "Flow", @@ -328,10 +337,12 @@ export default { Authorization: "Bearer " + getAccessToken(), "tenant-id": getTenantId(), }, // 设置上传的请求头 + kjpzOptions: [], //会计凭证 }; }, created() { this.getList(); + this.getKJPZ(); }, methods: { /** 查询列表 */ @@ -344,6 +355,12 @@ export default { this.loading = false; }); }, + //获取会计凭证 + getKJPZ() { + getVoucherPage().then((res) => { + this.kjpzOptions = res.data.list || []; + }); + }, openLink(fileUrl) { window.open(fileUrl); }, @@ -352,7 +369,6 @@ export default { this.open = false; this.reset(); }, - /** 取消按钮 */ cancel1() { this.open1 = false; @@ -408,6 +424,11 @@ export default { this.title = "修改审批流程"; }); }, + //凭证选择 + handleSelectVoucher(val) { + this.form.voucherId = val.id; + this.form.voucherNum = val.voucherNum; + }, /** 提交按钮 */ submitForm() { this.$refs["form"].validate((valid) => { From a4d1e6a53f27937351eb1451ef3e678a3ae43483 Mon Sep 17 00:00:00 2001 From: MO <448233645@qq.com> Date: Tue, 10 Oct 2023 10:29:38 +0800 Subject: [PATCH 03/15] =?UTF-8?q?=E9=99=84=E4=BB=B6=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/accounting/voucher/index.vue | 76 +++----------------------- 1 file changed, 7 insertions(+), 69 deletions(-) diff --git a/src/views/accounting/voucher/index.vue b/src/views/accounting/voucher/index.vue index e3ec5eb8..073d2590 100644 --- a/src/views/accounting/voucher/index.vue +++ b/src/views/accounting/voucher/index.vue @@ -288,37 +288,18 @@ @tab-click="handleClick" > -
-
- -
-
- + + > +
@@ -337,27 +318,6 @@
-
@@ -430,7 +390,6 @@ import { getAttachmentPage } from "@/api/accounting/attachment"; import { getFlowPage } from "@/api/accounting/flow"; import { getInvoicesPage } from "@/api/accounting/invoices"; import { getBankSlipPage } from "@/api/accounting/bankSlip"; -import { getAccessToken, getTenantId } from "@/utils/auth"; export default { name: "Voucher", @@ -497,29 +456,11 @@ export default { depotId: null, cabinetId: null, }, - fileList1: [], // 文件列表 - fileList2: [], - fileList3: [], fjList1: [], fjList2: [], dzfpList1: [], dzfpList2: [], dzfpList3: [], - uploadUrl1: - process.env.VUE_APP_BASE_API + - "/admin-api/accounting/attachment/upload", // 附件上传地址 - uploadUrl2: - process.env.VUE_APP_BASE_API + "/admin-api//archives/flow/upload", // 审批流程上传地址 - uploadUrl3: - process.env.VUE_APP_BASE_API + - "/admin-api/accounting/invoices/identify", // 电子发票上传地址 - uploadUrl4: - process.env.VUE_APP_BASE_API + - "/admin-api/accounting/attachment/upload", // 银行回单上传地址 - headers: { - Authorization: "Bearer " + getAccessToken(), - "tenant-id": getTenantId(), - }, // 设置上传的请求头 // 表单参数 form: {}, // 表单校验 @@ -528,11 +469,11 @@ export default { siteOptions: [], //归档位置数据 siteArray: [], //归档位置选中值 typeOptions: [], //凭证类别 - url: "", showNull: "", showNul2: "", showNul3: true, showNul4: true, + fjUrl: "", }; }, created() { @@ -568,6 +509,7 @@ export default { } else { this.showNull = false; } + this.fjList1 = response.data.list; this.fjList2 = response.data.list.filter(function (item) { return item.suffix == "pdf"; }); @@ -576,10 +518,6 @@ export default { handleClickPdf(val) { window.open(val.fileUrl); }, - handleSuccess1(response, file, fileList) { - console.log(response, file, fileList); - this.getFJ(); - }, /** 查询审批流程 */ getSPLC(val) { // 执行查询 From 29aeb96abb1f4fe20c9ad8690cfbb621da738629 Mon Sep 17 00:00:00 2001 From: MO <448233645@qq.com> Date: Tue, 10 Oct 2023 10:36:59 +0800 Subject: [PATCH 04/15] =?UTF-8?q?=E8=AF=A6=E6=83=85=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/accounting/voucher/index.vue | 94 +++++++++++++------------- 1 file changed, 46 insertions(+), 48 deletions(-) diff --git a/src/views/accounting/voucher/index.vue b/src/views/accounting/voucher/index.vue index 073d2590..a95bdb13 100644 --- a/src/views/accounting/voucher/index.vue +++ b/src/views/accounting/voucher/index.vue @@ -289,7 +289,7 @@ >
-
+
-
+
+ + +
-
- +
+ +
-
+ -
+
+ + +