From bfdfa889a0b18e5f30b8c50829680cd88bc10b6a Mon Sep 17 00:00:00 2001 From: jishenghua <752718920@qq.com> Date: Thu, 9 May 2024 00:43:33 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E5=8D=95=E6=8D=AE=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E7=BC=96=E5=8F=B7=E6=94=B9=E4=B8=BA=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E7=BC=96=E8=BE=91=EF=BC=8C=E6=96=B9=E4=BE=BF=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jshERP-web/src/views/bill/mixins/BillModalMixin.js | 1 + jshERP-web/src/views/bill/modules/AllocationOutModal.vue | 3 +-- jshERP-web/src/views/bill/modules/AssembleModal.vue | 3 +-- jshERP-web/src/views/bill/modules/DisassembleModal.vue | 3 +-- jshERP-web/src/views/bill/modules/OtherInModal.vue | 3 +-- jshERP-web/src/views/bill/modules/OtherOutModal.vue | 3 +-- jshERP-web/src/views/bill/modules/PurchaseApplyModal.vue | 3 +-- jshERP-web/src/views/bill/modules/PurchaseBackModal.vue | 3 +-- jshERP-web/src/views/bill/modules/PurchaseInModal.vue | 3 +-- jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue | 3 +-- jshERP-web/src/views/bill/modules/RetailBackModal.vue | 3 +-- jshERP-web/src/views/bill/modules/RetailOutModal.vue | 3 +-- jshERP-web/src/views/bill/modules/SaleBackModal.vue | 3 +-- jshERP-web/src/views/bill/modules/SaleOrderModal.vue | 3 +-- jshERP-web/src/views/bill/modules/SaleOutModal.vue | 3 +-- jshERP-web/src/views/financial/modules/AdvanceInModal.vue | 2 +- jshERP-web/src/views/financial/modules/GiroModal.vue | 2 +- jshERP-web/src/views/financial/modules/ItemInModal.vue | 2 +- jshERP-web/src/views/financial/modules/ItemOutModal.vue | 2 +- jshERP-web/src/views/financial/modules/MoneyInModal.vue | 2 +- jshERP-web/src/views/financial/modules/MoneyOutModal.vue | 2 +- 21 files changed, 21 insertions(+), 34 deletions(-) diff --git a/jshERP-web/src/views/bill/mixins/BillModalMixin.js b/jshERP-web/src/views/bill/mixins/BillModalMixin.js index 1741df04..919dfdea 100644 --- a/jshERP-web/src/views/bill/mixins/BillModalMixin.js +++ b/jshERP-web/src/views/bill/mixins/BillModalMixin.js @@ -80,6 +80,7 @@ export const BillModalMixin = { addInit(amountNum) { getAction('/sequence/buildNumber').then((res) => { if (res && res.code === 200) { + this.model.defaultNumber = amountNum + res.data.defaultNumber this.form.setFieldsValue({'number':amountNum + res.data.defaultNumber}) } }) diff --git a/jshERP-web/src/views/bill/modules/AllocationOutModal.vue b/jshERP-web/src/views/bill/modules/AllocationOutModal.vue index 2ff002e0..2e015f6a 100644 --- a/jshERP-web/src/views/bill/modules/AllocationOutModal.vue +++ b/jshERP-web/src/views/bill/modules/AllocationOutModal.vue @@ -26,7 +26,7 @@ - + @@ -225,7 +225,6 @@ let detailArr = allValues.tablesValue[0].values billMain.type = '出库' billMain.subType = '调拨' - billMain.defaultNumber = billMain.number for(let item of detailArr){ totalPrice += item.allPrice-0 } diff --git a/jshERP-web/src/views/bill/modules/AssembleModal.vue b/jshERP-web/src/views/bill/modules/AssembleModal.vue index f71e6a52..0d98af73 100644 --- a/jshERP-web/src/views/bill/modules/AssembleModal.vue +++ b/jshERP-web/src/views/bill/modules/AssembleModal.vue @@ -26,7 +26,7 @@ - + @@ -223,7 +223,6 @@ let detailArr = allValues.tablesValue[0].values billMain.type = '其它' billMain.subType = '组装单' - billMain.defaultNumber = billMain.number for(let item of detailArr){ totalPrice += item.allPrice-0 } diff --git a/jshERP-web/src/views/bill/modules/DisassembleModal.vue b/jshERP-web/src/views/bill/modules/DisassembleModal.vue index 8acafbeb..12e55c06 100644 --- a/jshERP-web/src/views/bill/modules/DisassembleModal.vue +++ b/jshERP-web/src/views/bill/modules/DisassembleModal.vue @@ -26,7 +26,7 @@ - + @@ -222,7 +222,6 @@ let detailArr = allValues.tablesValue[0].values billMain.type = '其它' billMain.subType = '拆卸单' - billMain.defaultNumber = billMain.number for(let item of detailArr){ totalPrice += item.allPrice-0 } diff --git a/jshERP-web/src/views/bill/modules/OtherInModal.vue b/jshERP-web/src/views/bill/modules/OtherInModal.vue index 3eafca5d..63b3ece8 100644 --- a/jshERP-web/src/views/bill/modules/OtherInModal.vue +++ b/jshERP-web/src/views/bill/modules/OtherInModal.vue @@ -42,7 +42,7 @@ - + @@ -277,7 +277,6 @@ let detailArr = allValues.tablesValue[0].values billMain.type = '入库' billMain.subType = '其它' - billMain.defaultNumber = billMain.number for(let item of detailArr){ totalPrice += item.allPrice-0 } diff --git a/jshERP-web/src/views/bill/modules/OtherOutModal.vue b/jshERP-web/src/views/bill/modules/OtherOutModal.vue index ece47e47..5e323894 100644 --- a/jshERP-web/src/views/bill/modules/OtherOutModal.vue +++ b/jshERP-web/src/views/bill/modules/OtherOutModal.vue @@ -42,7 +42,7 @@ - + @@ -277,7 +277,6 @@ let detailArr = allValues.tablesValue[0].values billMain.type = '出库' billMain.subType = '其它' - billMain.defaultNumber = billMain.number for(let item of detailArr){ totalPrice += item.allPrice-0 } diff --git a/jshERP-web/src/views/bill/modules/PurchaseApplyModal.vue b/jshERP-web/src/views/bill/modules/PurchaseApplyModal.vue index abe416a5..13aec36a 100644 --- a/jshERP-web/src/views/bill/modules/PurchaseApplyModal.vue +++ b/jshERP-web/src/views/bill/modules/PurchaseApplyModal.vue @@ -30,7 +30,7 @@ - + @@ -244,7 +244,6 @@ let detailArr = allValues.tablesValue[0].values billMain.type = '其它' billMain.subType = '请购单' - billMain.defaultNumber = billMain.number for(let item of detailArr){ totalPrice += item.allPrice-0 } diff --git a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue index cb2a85f0..fa1f59cd 100644 --- a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue +++ b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue @@ -42,7 +42,7 @@ - + @@ -349,7 +349,6 @@ let detailArr = allValues.tablesValue[0].values billMain.type = '出库' billMain.subType = '采购退货' - billMain.defaultNumber = billMain.number for(let item of detailArr){ totalPrice += item.allPrice-0 } diff --git a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue index 4c65f3f9..df9f73ef 100644 --- a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue +++ b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue @@ -47,7 +47,7 @@ - + @@ -398,7 +398,6 @@ let detailArr = allValues.tablesValue[0].values billMain.type = '入库' billMain.subType = '采购' - billMain.defaultNumber = billMain.number for(let item of detailArr){ totalPrice += item.allPrice-0 } diff --git a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue index 518a7ba6..18416fbe 100644 --- a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue +++ b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue @@ -47,7 +47,7 @@ - + @@ -356,7 +356,6 @@ let detailArr = allValues.tablesValue[0].values billMain.type = '其它' billMain.subType = '采购订单' - billMain.defaultNumber = billMain.number for(let item of detailArr){ item.depotId = '' //订单不需要仓库 totalPrice += item.allPrice-0 diff --git a/jshERP-web/src/views/bill/modules/RetailBackModal.vue b/jshERP-web/src/views/bill/modules/RetailBackModal.vue index e37c5f33..febb9849 100644 --- a/jshERP-web/src/views/bill/modules/RetailBackModal.vue +++ b/jshERP-web/src/views/bill/modules/RetailBackModal.vue @@ -42,7 +42,7 @@ - + @@ -331,7 +331,6 @@ let detailArr = allValues.tablesValue[0].values billMain.type = '入库' billMain.subType = '零售退货' - billMain.defaultNumber = billMain.number for(let item of detailArr){ totalPrice += item.allPrice-0 } diff --git a/jshERP-web/src/views/bill/modules/RetailOutModal.vue b/jshERP-web/src/views/bill/modules/RetailOutModal.vue index 65b1da3b..87856219 100644 --- a/jshERP-web/src/views/bill/modules/RetailOutModal.vue +++ b/jshERP-web/src/views/bill/modules/RetailOutModal.vue @@ -47,7 +47,7 @@ - + @@ -341,7 +341,6 @@ let detailArr = allValues.tablesValue[0].values billMain.type = '出库' billMain.subType = '零售' - billMain.defaultNumber = billMain.number for(let item of detailArr){ totalPrice += item.allPrice-0 } diff --git a/jshERP-web/src/views/bill/modules/SaleBackModal.vue b/jshERP-web/src/views/bill/modules/SaleBackModal.vue index a5ee1e3e..2581a118 100644 --- a/jshERP-web/src/views/bill/modules/SaleBackModal.vue +++ b/jshERP-web/src/views/bill/modules/SaleBackModal.vue @@ -42,7 +42,7 @@ - + @@ -357,7 +357,6 @@ let detailArr = allValues.tablesValue[0].values billMain.type = '入库' billMain.subType = '销售退货' - billMain.defaultNumber = billMain.number for(let item of detailArr){ totalPrice += item.allPrice-0 } diff --git a/jshERP-web/src/views/bill/modules/SaleOrderModal.vue b/jshERP-web/src/views/bill/modules/SaleOrderModal.vue index 2c26af5d..138ddb90 100644 --- a/jshERP-web/src/views/bill/modules/SaleOrderModal.vue +++ b/jshERP-web/src/views/bill/modules/SaleOrderModal.vue @@ -48,7 +48,7 @@ - + @@ -332,7 +332,6 @@ let detailArr = allValues.tablesValue[0].values billMain.type = '其它' billMain.subType = '销售订单' - billMain.defaultNumber = billMain.number for(let item of detailArr){ item.depotId = '' //订单不需要仓库 totalPrice += item.allPrice-0 diff --git a/jshERP-web/src/views/bill/modules/SaleOutModal.vue b/jshERP-web/src/views/bill/modules/SaleOutModal.vue index fb1aa2ab..d315f682 100644 --- a/jshERP-web/src/views/bill/modules/SaleOutModal.vue +++ b/jshERP-web/src/views/bill/modules/SaleOutModal.vue @@ -48,7 +48,7 @@ - + @@ -417,7 +417,6 @@ let detailArr = allValues.tablesValue[0].values billMain.type = '出库' billMain.subType = '销售' - billMain.defaultNumber = billMain.number for(let item of detailArr){ totalPrice += item.allPrice-0 } diff --git a/jshERP-web/src/views/financial/modules/AdvanceInModal.vue b/jshERP-web/src/views/financial/modules/AdvanceInModal.vue index 783fc183..03b7a287 100644 --- a/jshERP-web/src/views/financial/modules/AdvanceInModal.vue +++ b/jshERP-web/src/views/financial/modules/AdvanceInModal.vue @@ -36,7 +36,7 @@ - + diff --git a/jshERP-web/src/views/financial/modules/GiroModal.vue b/jshERP-web/src/views/financial/modules/GiroModal.vue index e4ca57da..6d46c9ce 100644 --- a/jshERP-web/src/views/financial/modules/GiroModal.vue +++ b/jshERP-web/src/views/financial/modules/GiroModal.vue @@ -26,7 +26,7 @@ - + diff --git a/jshERP-web/src/views/financial/modules/ItemInModal.vue b/jshERP-web/src/views/financial/modules/ItemInModal.vue index 48e1889d..47fa3636 100644 --- a/jshERP-web/src/views/financial/modules/ItemInModal.vue +++ b/jshERP-web/src/views/financial/modules/ItemInModal.vue @@ -36,7 +36,7 @@ - + diff --git a/jshERP-web/src/views/financial/modules/ItemOutModal.vue b/jshERP-web/src/views/financial/modules/ItemOutModal.vue index ffee3a07..6e67c1d7 100644 --- a/jshERP-web/src/views/financial/modules/ItemOutModal.vue +++ b/jshERP-web/src/views/financial/modules/ItemOutModal.vue @@ -36,7 +36,7 @@ - + diff --git a/jshERP-web/src/views/financial/modules/MoneyInModal.vue b/jshERP-web/src/views/financial/modules/MoneyInModal.vue index 375929a1..3706ec07 100644 --- a/jshERP-web/src/views/financial/modules/MoneyInModal.vue +++ b/jshERP-web/src/views/financial/modules/MoneyInModal.vue @@ -42,7 +42,7 @@ - + diff --git a/jshERP-web/src/views/financial/modules/MoneyOutModal.vue b/jshERP-web/src/views/financial/modules/MoneyOutModal.vue index 462a5011..d18ac852 100644 --- a/jshERP-web/src/views/financial/modules/MoneyOutModal.vue +++ b/jshERP-web/src/views/financial/modules/MoneyOutModal.vue @@ -42,7 +42,7 @@ - +