From 3592aa755d87de0e7d0c68379a3142ab3f8905c0 Mon Sep 17 00:00:00 2001 From: MO <448233645@qq.com> Date: Tue, 10 Oct 2023 15:05:10 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9=EF=BC=8C?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=AE=A4=E6=AC=BE=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/accounting/bankSlip/index.vue | 144 ++++++++++++++++++++---- src/views/accounting/flow/index.vue | 16 --- src/views/accounting/voucher/index.vue | 3 + 3 files changed, 127 insertions(+), 36 deletions(-) diff --git a/src/views/accounting/bankSlip/index.vue b/src/views/accounting/bankSlip/index.vue index b03715b1..e9720d3b 100644 --- a/src/views/accounting/bankSlip/index.vue +++ b/src/views/accounting/bankSlip/index.vue @@ -85,10 +85,10 @@ @keyup.enter.native="handleQuery" /> - + @@ -164,7 +164,7 @@ - + @@ -544,6 +601,8 @@ import { downloadXml, getBankSlipPageTime, } from "@/api/accounting/bankSlip"; +import { getAccessToken, getTenantId } from "@/utils/auth"; +import { listUser } from "@/api/system/user"; export default { name: "BankSlip", @@ -565,6 +624,7 @@ export default { // 是否显示弹出层 open: false, open1: false, + open2: false, // 查询参数 queryParams: { pageNo: 1, @@ -612,15 +672,25 @@ export default { password: null, inputPassword: null, }, + userOptions: [], //用户数据 // 表单参数 form: {}, + form1: {}, // 表单校验 rules: {}, + fileList: [], // 文件列表 + uploadUrl: + process.env.VUE_APP_BASE_API + "/admin-api/archives/flow/upload", // 上传地址地址 + headers: { + Authorization: "Bearer " + getAccessToken(), + "tenant-id": getTenantId(), + }, // 设置上传的请求头 time: "", }; }, created() { this.getList(); + this.getUserList(); }, methods: { /** 查询列表 */ @@ -643,6 +713,12 @@ export default { this.loading = false; }); }, + //获取用户 + getUserList() { + listUser().then((response) => { + this.userOptions = response.data.list; + }); + }, handleOneMonth() { this.time = 1; this.getList2(); @@ -664,6 +740,10 @@ export default { cancel1() { this.open1 = false; }, + /** 取消按钮 */ + cancel2() { + this.open2 = false; + }, /** 表单重置 */ reset() { this.form = { @@ -708,6 +788,13 @@ export default { archiveId: undefined, archiveState: undefined, password: undefined, + staffId: undefined, + staffName: undefined, + }; + this.form1 = { + id: undefined, + staffId: undefined, + staffName: undefined, }; this.resetForm("form"); }, @@ -737,6 +824,23 @@ export default { this.title = "修改银行回单"; }); }, + /** 认款按钮操作 */ + handleComfirm(val) { + this.form1.id = val.id; + this.open2 = true; + }, + handleSelectUser(val) { + this.form1.staffId = val.id; + this.form1.staffName = val.username; + }, + submitForm2() { + console.log(this.form1); + updateBankSlip(this.form1).then((response) => { + this.$modal.msgSuccess("认款成功"); + this.open2 = false; + this.getList(); + }); + }, /** 提交按钮 */ submitForm() { this.$refs["form"].validate((valid) => { diff --git a/src/views/accounting/flow/index.vue b/src/views/accounting/flow/index.vue index 6148c18f..fa35c57d 100644 --- a/src/views/accounting/flow/index.vue +++ b/src/views/accounting/flow/index.vue @@ -170,14 +170,6 @@ style="margin-top: 20px" > - - - - - - - - - - - - @@ -300,7 +285,6 @@ export default { // 是否显示弹出层 open: false, open1: false, - fileList: [], imgType: ".jpeg, .jpg, .png", // 查询参数 queryParams: { diff --git a/src/views/accounting/voucher/index.vue b/src/views/accounting/voucher/index.vue index 7b4bc287..da840549 100644 --- a/src/views/accounting/voucher/index.vue +++ b/src/views/accounting/voucher/index.vue @@ -313,6 +313,7 @@ width: 240px; height: 220px; cursor: pointer; + margin: 0 10px; " > @@ -328,6 +329,7 @@ width: 240px; height: 220px; cursor: pointer; + margin: 0 10px; " > @@ -365,6 +367,7 @@ width: 240px; height: 220px; cursor: pointer; + margin: 0 10px; " >