From 0469b178d59d2187fd704106e1b7146dce35bbc0 Mon Sep 17 00:00:00 2001 From: jishenghua <752718920@qq.com> Date: Mon, 17 Mar 2025 17:23:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8D=95=E6=8D=AE=E5=85=B3?= =?UTF-8?q?=E8=81=94=EF=BC=8C=E5=B8=A6=E4=B8=8A=E8=B4=A6=E6=88=B7=E5=92=8C?= =?UTF-8?q?=E9=94=80=E5=94=AE=E4=BA=BA=E5=91=98=E7=9A=84=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jshERP-web/src/views/bill/dialog/LinkBillList.vue | 6 +++++- jshERP-web/src/views/bill/modules/PurchaseBackModal.vue | 3 ++- jshERP-web/src/views/bill/modules/PurchaseInModal.vue | 3 ++- jshERP-web/src/views/bill/modules/SaleBackModal.vue | 4 +++- jshERP-web/src/views/bill/modules/SaleOutModal.vue | 4 +++- 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/jshERP-web/src/views/bill/dialog/LinkBillList.vue b/jshERP-web/src/views/bill/dialog/LinkBillList.vue index f3455f47b..d76178d60 100644 --- a/jshERP-web/src/views/bill/dialog/LinkBillList.vue +++ b/jshERP-web/src/views/bill/dialog/LinkBillList.vue @@ -131,6 +131,8 @@ selectType: 'list', linkNumber: '', organId: '', + accountId: '', + salesMan: '', discountMoney: '', deposit: '', remark: '', @@ -285,6 +287,8 @@ let record = this.selectBillRows[0] this.linkNumber = record.number this.organId = record.organId + this.accountId = record.accountId + this.salesMan = record.salesMan this.discountMoney = record.discountMoney this.deposit = record.changeAmount - record.finishDeposit this.remark = record.remark @@ -294,7 +298,7 @@ } else { if(this.selectedDetailRowKeys.length) { this.getSelectBillDetailRows() - this.$emit('ok', this.selectBillDetailRows, this.linkNumber, this.organId, this.discountMoney, this.deposit, this.remark, this.defaultDepotId) + this.$emit('ok', this.selectBillDetailRows, this.linkNumber, this.organId, this.discountMoney, this.deposit, this.remark, this.defaultDepotId, this.accountId, this.salesMan) this.close() } else { this.$message.warning('抱歉，请选择单据明细！') diff --git a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue index 2d6b68d1e..d2cf3a940 100644 --- a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue +++ b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue @@ -388,7 +388,7 @@ this.$refs.linkBillList.show('入库', '采购', '供应商', "1,2,3") this.$refs.linkBillList.title = "请选择采购入库" }, - linkBillListOk(selectBillDetailRows, linkNumber, organId, discountMoney, deposit, remark) { + linkBillListOk(selectBillDetailRows, linkNumber, organId, discountMoney, deposit, remark, depotId, accountId) { this.rowCanEdit = false this.materialTable.columns[1].type = FormTypes.normal this.changeFormTypes(this.materialTable.columns, 'preNumber', 1) @@ -426,6 +426,7 @@ 'discountMoney': discountMoney, 'discountLastMoney': discountLastMoney, 'changeAmount': discountLastMoney, + 'accountId': accountId, 'remark': remark }) }) diff --git a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue index 6e230b2c2..9ace64848 100644 --- a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue +++ b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue @@ -441,7 +441,7 @@ this.$refs.linkBillList.show('其它', '采购订单', '供应商', "1,3") this.$refs.linkBillList.title = "请选择采购订单" }, - linkBillListOk(selectBillDetailRows, linkNumber, organId, discountMoney, deposit, remark, depotId) { + linkBillListOk(selectBillDetailRows, linkNumber, organId, discountMoney, deposit, remark, depotId, accountId) { let that = this this.rowCanEdit = false this.materialTable.columns[1].type = FormTypes.normal @@ -486,6 +486,7 @@ 'discountLastMoney': discountLastMoney, 'deposit': deposit, 'changeAmount': changeAmount, + 'accountId': accountId, 'remark': remark }) }) diff --git a/jshERP-web/src/views/bill/modules/SaleBackModal.vue b/jshERP-web/src/views/bill/modules/SaleBackModal.vue index 3ab049104..293f37e67 100644 --- a/jshERP-web/src/views/bill/modules/SaleBackModal.vue +++ b/jshERP-web/src/views/bill/modules/SaleBackModal.vue @@ -398,7 +398,7 @@ this.$refs.linkBillList.show('出库', '销售', '客户', "1,2,3") this.$refs.linkBillList.title = "请选择销售出库" }, - linkBillListOk(selectBillDetailRows, linkNumber, organId, discountMoney, deposit, remark) { + linkBillListOk(selectBillDetailRows, linkNumber, organId, discountMoney, deposit, remark, depotId, accountId, salesMan) { this.rowCanEdit = false this.materialTable.columns[1].type = FormTypes.normal this.changeFormTypes(this.materialTable.columns, 'preNumber', 1) @@ -436,8 +436,10 @@ 'discountMoney': discountMoney, 'discountLastMoney': discountLastMoney, 'changeAmount': discountLastMoney, + 'accountId': accountId, 'remark': remark }) + this.personList.value = salesMan }) } }, diff --git a/jshERP-web/src/views/bill/modules/SaleOutModal.vue b/jshERP-web/src/views/bill/modules/SaleOutModal.vue index cfef8ea60..803c888a0 100644 --- a/jshERP-web/src/views/bill/modules/SaleOutModal.vue +++ b/jshERP-web/src/views/bill/modules/SaleOutModal.vue @@ -458,7 +458,7 @@ this.$refs.linkBillList.show('其它', '销售订单', '客户', "1,3") this.$refs.linkBillList.title = "请选择销售订单" }, - linkBillListOk(selectBillDetailRows, linkNumber, organId, discountMoney, deposit, remark, depotId) { + linkBillListOk(selectBillDetailRows, linkNumber, organId, discountMoney, deposit, remark, depotId, accountId, salesMan) { let that = this this.rowCanEdit = false this.materialTable.columns[1].type = FormTypes.normal @@ -503,8 +503,10 @@ 'discountLastMoney': discountLastMoney, 'deposit': deposit, 'changeAmount': changeAmount, + 'accountId': accountId, 'remark': remark }) + this.personList.value = salesMan }) //判断后进行仓库的切换 if(depotId) {