From 1aa15bbe856c0980faadc3b45869f50f46170d72 Mon Sep 17 00:00:00 2001
From: guoxing <1369478551@qq.com>
Date: Tue, 20 Aug 2024 11:52:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=87=BA=E5=BA=93=E7=AE=A1?=
=?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../outStorage/alreadyOutStorage/index.vue | 74 +++++++++++++++----
src/views/outStorage/toAllocated/index.vue | 67 +++++++++++++----
src/views/outStorage/toOutStorage/index.vue | 73 ++++++++++++++----
src/views/outStorage/zeroPicking/index.vue | 73 ++++++++++++++----
4 files changed, 231 insertions(+), 56 deletions(-)
diff --git a/src/views/outStorage/alreadyOutStorage/index.vue b/src/views/outStorage/alreadyOutStorage/index.vue
index d4a5f15..a31edaf 100644
--- a/src/views/outStorage/alreadyOutStorage/index.vue
+++ b/src/views/outStorage/alreadyOutStorage/index.vue
@@ -128,7 +128,7 @@
-
+
@@ -278,7 +278,7 @@
开票总金额
-
@@ -513,7 +513,9 @@
first: [],
two: [],
three: {},
- four: {},
+ four: {
+ detailsList: []
+ },
five: {},
six: []
},
@@ -529,6 +531,21 @@
this.init()
this.loadList()
},
+ computed: {
+ // 开票金额
+ totalQuantity() {
+ let quantity = 0
+ if (this.from.four.detailsList.length > 0) {
+ this.from.four.detailsList.forEach((e) => {
+ quantity += Number(e.salesAmount)
+ })
+ }
+
+ this.from.four.totalAmount = quantity
+
+ return quantity
+ },
+ },
methods: {
init() {
@@ -592,7 +609,9 @@
}
// 发票信息
if (table.name == 'four') {
- this.from.four = {}
+ this.from.four = {
+ detailsList: []
+ }
req.orderInvoiveDetail({
sid: this.rowItemSid
}).then((resp) => {
@@ -696,7 +715,9 @@
first: [],
two: [],
three: {},
- four: {},
+ four: {
+ detailsList: []
+ },
five: {},
six: []
}
@@ -837,7 +858,13 @@
},
saveInvoice() {
req.saveOrderInvoive(this.from.four).then((resp) => {
-
+ if (res.success) {
+ this.$message({
+ type: 'success',
+ message: '保存成功',
+ showClose: true
+ })
+ }
}).catch(() => {})
},
chooseGoods() {
@@ -864,16 +891,25 @@
const choose = this.carrierList.filter((item) => item.dictKey == val)
console.log('>>>>>>>>>selectCarrier', choose)
- row.carrier = choose[0].dictValue
- row.carrierSid = choose[0].dictKey
+ row.carrierValue = choose[0].dictValue
+ row.carrierKey = choose[0].dictKey
var query = {
sid: row.sid,
- carrier: row.carrier,
- carrierSid: row.carrierSid,
+ carrierValue: row.carrierValue,
+ carrierKey: row.carrierKey,
userSid: window.sessionStorage.getItem('userSid')
}
- req.updateCarrier(query).then((res) => {})
+ req.updateCarrier(query).then((res) => {
+ if (res.success) {
+ this.$message({
+ type: 'success',
+ message: '保存成功',
+ showClose: true
+ })
+ }
+
+ })
},
itemWaybillNumber(row) {
console.log("itemWaybillNumber", row);
@@ -883,7 +919,15 @@
waybillNumber: row.waybillNumber,
userSid: window.sessionStorage.getItem('userSid')
}
- req.updateWaybillNumber(query).then((res) => {})
+ req.updateWaybillNumber(query).then((res) => {
+ if (res.success) {
+ this.$message({
+ type: 'success',
+ message: '保存成功',
+ showClose: true
+ })
+ }
+ })
},
showStock(row) {
@@ -930,8 +974,9 @@
"count": item.count,
"rackSid": item.rackSid,
"rackCode": item.rackCode,
- "inventorySid": item.sid,
- "initialCount": item.initialCount
+ "inventorySid": item.inventorySid,
+ "initialCount": item.initialCount,
+ "locationSid": item.locationSid,
})
}
}
@@ -941,6 +986,7 @@
if (res.success) {
this.dialogVisible2 = false
+ this.loadList()
} else {
// 根据resp.code进行异常情况处理
}
diff --git a/src/views/outStorage/toAllocated/index.vue b/src/views/outStorage/toAllocated/index.vue
index b9b99b8..866a742 100644
--- a/src/views/outStorage/toAllocated/index.vue
+++ b/src/views/outStorage/toAllocated/index.vue
@@ -74,7 +74,7 @@
-
+
@@ -224,7 +224,7 @@
开票总金额
-
@@ -457,12 +457,14 @@
first: [],
two: [],
three: {},
- four: {},
+ four: {
+ detailsList: []
+ },
five: {},
six: []
},
goodsList: [],
- goodsStockList: []
+ goodsStockList: [],
}
},
@@ -473,6 +475,21 @@
this.init()
this.loadList()
},
+ computed: {
+ // 开票金额
+ totalQuantity() {
+ let quantity = 0
+ if (this.from.four.detailsList.length > 0) {
+ this.from.four.detailsList.forEach((e) => {
+ quantity += Number(e.salesAmount)
+ })
+ }
+
+ this.from.four.totalAmount = quantity
+
+ return quantity
+ },
+ },
methods: {
init() {
@@ -543,7 +560,9 @@
}
// 发票信息
if (table.name == 'four') {
- this.from.four = {}
+ this.from.four = {
+ detailsList: []
+ }
req.orderInvoiveDetail({
sid: this.rowItemSid
}).then((resp) => {
@@ -655,7 +674,9 @@
first: [],
two: [],
three: {},
- four: {},
+ four: {
+ detailsList: []
+ },
five: {},
six: []
}
@@ -834,16 +855,24 @@
const choose = this.carrierList.filter((item) => item.dictKey == val)
console.log('>>>>>>>>>selectCarrier', choose)
- row.carrier = choose[0].dictValue
- row.carrierSid = choose[0].dictKey
+ row.carrierValue = choose[0].dictValue
+ row.carrierKey = choose[0].dictKey
var query = {
sid: row.sid,
- carrier: row.carrier,
- carrierSid: row.carrierSid,
+ carrierValue: row.carrierValue,
+ carrierKey: row.carrierKey,
userSid: window.sessionStorage.getItem('userSid')
}
- req.updateCarrier(query).then((res) => {})
+ req.updateCarrier(query).then((res) => {
+ if (res.success) {
+ this.$message({
+ type: 'success',
+ message: '保存成功',
+ showClose: true
+ })
+ }
+ })
},
itemWaybillNumber(row) {
console.log("itemWaybillNumber", row);
@@ -853,7 +882,15 @@
waybillNumber: row.waybillNumber,
userSid: window.sessionStorage.getItem('userSid')
}
- req.updateWaybillNumber(query).then((res) => {})
+ req.updateWaybillNumber(query).then((res) => {
+ if (res.success) {
+ this.$message({
+ type: 'success',
+ message: '保存成功',
+ showClose: true
+ })
+ }
+ })
},
showStock(row) {
@@ -900,8 +937,9 @@
"count": item.count,
"rackSid": item.rackSid,
"rackCode": item.rackCode,
- "inventorySid": item.sid,
- "initialCount": item.initialCount
+ "inventorySid": item.inventorySid,
+ "initialCount": item.initialCount,
+ "locationSid": item.locationSid,
})
}
}
@@ -911,6 +949,7 @@
if (res.success) {
this.dialogVisible2 = false
+ this.loadList()
} else {
// 根据resp.code进行异常情况处理
}
diff --git a/src/views/outStorage/toOutStorage/index.vue b/src/views/outStorage/toOutStorage/index.vue
index eb9ad54..5cffb90 100644
--- a/src/views/outStorage/toOutStorage/index.vue
+++ b/src/views/outStorage/toOutStorage/index.vue
@@ -74,7 +74,7 @@
-
+
@@ -224,7 +224,7 @@
开票总金额
-
@@ -458,7 +458,9 @@
first: [],
two: [],
three: {},
- four: {},
+ four: {
+ detailsList: []
+ },
five: {},
six: []
},
@@ -474,6 +476,21 @@
this.init()
this.loadList()
},
+ computed: {
+ // 开票金额
+ totalQuantity() {
+ let quantity = 0
+ if (this.from.four.detailsList.length > 0) {
+ this.from.four.detailsList.forEach((e) => {
+ quantity += Number(e.salesAmount)
+ })
+ }
+
+ this.from.four.totalAmount = quantity
+
+ return quantity
+ },
+ },
methods: {
init() {
@@ -537,7 +554,9 @@
}
// 发票信息
if (table.name == 'four') {
- this.from.four = {}
+ this.from.four = {
+ detailsList: []
+ }
req.orderInvoiveDetail({
sid: this.rowItemSid
}).then((resp) => {
@@ -640,7 +659,9 @@
first: [],
two: [],
three: {},
- four: {},
+ four: {
+ detailsList: []
+ },
five: {},
six: []
}
@@ -788,7 +809,13 @@
},
saveInvoice() {
req.saveOrderInvoive(this.from.four).then((resp) => {
-
+ if (res.success) {
+ this.$message({
+ type: 'success',
+ message: '保存成功',
+ showClose: true
+ })
+ }
}).catch(() => {})
},
chooseGoods() {
@@ -815,16 +842,24 @@
const choose = this.carrierList.filter((item) => item.dictKey == val)
console.log('>>>>>>>>>selectCarrier', choose)
- row.carrier = choose[0].dictValue
- row.carrierSid = choose[0].dictKey
+ row.carrierValue = choose[0].dictValue
+ row.carrierKey = choose[0].dictKey
var query = {
sid: row.sid,
- carrier: row.carrier,
- carrierSid: row.carrierSid,
+ carrierValue: row.carrierValue,
+ carrierKey: row.carrierKey,
userSid: window.sessionStorage.getItem('userSid')
}
- req.updateCarrier(query).then((res) => {})
+ req.updateCarrier(query).then((res) => {
+ if (res.success) {
+ this.$message({
+ type: 'success',
+ message: '保存成功',
+ showClose: true
+ })
+ }
+ })
},
itemWaybillNumber(row) {
console.log("itemWaybillNumber", row);
@@ -834,7 +869,15 @@
waybillNumber: row.waybillNumber,
userSid: window.sessionStorage.getItem('userSid')
}
- req.updateWaybillNumber(query).then((res) => {})
+ req.updateWaybillNumber(query).then((res) => {
+ if (res.success) {
+ this.$message({
+ type: 'success',
+ message: '保存成功',
+ showClose: true
+ })
+ }
+ })
},
showStock(row) {
@@ -880,8 +923,9 @@
"count": item.count,
"rackSid": item.rackSid,
"rackCode": item.rackCode,
- "inventorySid": item.sid,
- "initialCount": item.initialCount
+ "inventorySid": item.inventorySid,
+ "initialCount": item.initialCount,
+ "locationSid": item.locationSid,
})
}
}
@@ -891,6 +935,7 @@
if (res.success) {
this.dialogVisible2 = false
+ this.loadList()
} else {
// 根据resp.code进行异常情况处理
}
diff --git a/src/views/outStorage/zeroPicking/index.vue b/src/views/outStorage/zeroPicking/index.vue
index d8f7565..4c94ce9 100644
--- a/src/views/outStorage/zeroPicking/index.vue
+++ b/src/views/outStorage/zeroPicking/index.vue
@@ -74,7 +74,7 @@
-
+
@@ -224,7 +224,7 @@
开票总金额
-
@@ -465,7 +465,9 @@
first: [],
two: [],
three: {},
- four: {},
+ four: {
+ detailsList: []
+ },
five: {},
six: []
},
@@ -481,6 +483,21 @@
this.init()
this.loadList()
},
+ computed: {
+ // 开票金额
+ totalQuantity() {
+ let quantity = 0
+ if (this.from.four.detailsList.length > 0) {
+ this.from.four.detailsList.forEach((e) => {
+ quantity += Number(e.salesAmount)
+ })
+ }
+
+ this.from.four.totalAmount = quantity
+
+ return quantity
+ },
+ },
methods: {
init() {
@@ -544,7 +561,9 @@
}
// 发票信息
if (table.name == 'four') {
- this.from.four = {}
+ this.from.four = {
+ detailsList: []
+ }
req.orderInvoiveDetail({
sid: this.rowItemSid
}).then((resp) => {
@@ -650,7 +669,9 @@
first: [],
two: [],
three: {},
- four: {},
+ four: {
+ detailsList: []
+ },
five: {},
six: []
}
@@ -842,7 +863,13 @@
},
saveInvoice() {
req.saveOrderInvoive(this.from.four).then((resp) => {
-
+ if (res.success) {
+ this.$message({
+ type: 'success',
+ message: '保存成功',
+ showClose: true
+ })
+ }
}).catch(() => {})
},
chooseGoods() {
@@ -869,16 +896,24 @@
const choose = this.carrierList.filter((item) => item.dictKey == val)
console.log('>>>>>>>>>selectCarrier', choose)
- row.carrier = choose[0].dictValue
- row.carrierSid = choose[0].dictKey
+ row.carrierValue = choose[0].dictValue
+ row.carrierKey = choose[0].dictKey
var query = {
sid: row.sid,
- carrier: row.carrier,
- carrierSid: row.carrierSid,
+ carrierValue: row.carrierValue,
+ carrierKey: row.carrierKey,
userSid: window.sessionStorage.getItem('userSid')
}
- req.updateCarrier(query).then((res) => {})
+ req.updateCarrier(query).then((res) => {
+ if (res.success) {
+ this.$message({
+ type: 'success',
+ message: '保存成功',
+ showClose: true
+ })
+ }
+ })
},
itemWaybillNumber(row) {
console.log("itemWaybillNumber", row);
@@ -888,7 +923,15 @@
waybillNumber: row.waybillNumber,
userSid: window.sessionStorage.getItem('userSid')
}
- req.updateWaybillNumber(query).then((res) => {})
+ req.updateWaybillNumber(query).then((res) => {
+ if (res.success) {
+ this.$message({
+ type: 'success',
+ message: '保存成功',
+ showClose: true
+ })
+ }
+ })
},
showStock(row) {
@@ -935,8 +978,9 @@
"count": item.count,
"rackSid": item.rackSid,
"rackCode": item.rackCode,
- "inventorySid": item.sid,
- "initialCount": item.initialCount
+ "inventorySid": item.inventorySid,
+ "initialCount": item.initialCount,
+ "locationSid": item.locationSid,
})
}
}
@@ -946,6 +990,7 @@
if (res.success) {
this.dialogVisible2 = false
+ this.loadList()
} else {
// 根据resp.code进行异常情况处理
}