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 @@
-
+