From 2c687f86a2fdd8bdffc3ac8ce04eca1126646288 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期一, 13 十一月 2023 16:14:54 +0800
Subject: [PATCH] 所有涉及到产品的增加单位回显、收款计划增加金额不能为零、销售明细单未确认状态显示修改
---
src/views/sales/salesDetails/index.vue | 71 +++++++++++++++++++----------------
1 files changed, 38 insertions(+), 33 deletions(-)
diff --git a/src/views/sales/salesDetails/index.vue b/src/views/sales/salesDetails/index.vue
index f1e49e6..5b8ea21 100644
--- a/src/views/sales/salesDetails/index.vue
+++ b/src/views/sales/salesDetails/index.vue
@@ -160,35 +160,35 @@
data() {
// 浜у搧淇℃伅
const productColumn = [
- { label: "浜у搧缂栧彿", prop: "Id", default: true },
- { label: "浜у搧鍚嶇О", prop: "Name" },
- { label: "鏁伴噺", prop: "Amount" },
- { label: "鍗曚綅", prop: "Unit" },
- { label: "鍙戣揣鍗�", prop: "shipOrder" },
+ { label: "浜у搧缂栧彿", prop: "id", default: true },
+ { label: "浜у搧鍚嶇О", prop: "name" },
+ { label: "鏁伴噺", prop: "amount" },
+ { label: "鍗曚綅", prop: "unit" },
+ { label: "鍙戣揣鍗�", prop: "invoice" },
{ label: "鎵胯繍鍟�", prop: "carrier" },
{ label: "杩愬崟鍙�", prop: "waybillNumber" },
- { label: "閿�鍞崟浠�", prop: "SalePrice", price: true },
- { label: "浠风◣鍚堣", prop: "Valorem", price: true }
+ { label: "閿�鍞崟浠�", prop: "salePrice", price: true },
+ { label: "浠风◣鍚堣", prop: "valorem", price: true }
]
// 搴撳瓨淇℃伅
const inventoryColumn = [
- { label: "浜у搧缂栧彿", prop: "Id", default: true },
- { label: "浜у搧鍚嶇О", prop: "Name" },
- { label: "璁㈠崟鏁伴噺", prop: "OrderAmount" },
- { label: "浠撳簱", prop: "Warehouse" },
- { label: "鍦ㄥ簱鏁伴噺", prop: "Amount" },
- { label: "鍙敤搴撳瓨", prop: "AvailableNumber" },
- { label: "鍗曚綅", prop: "Unit" }
+ { label: "浜у搧缂栧彿", prop: "id", default: true },
+ { label: "浜у搧鍚嶇О", prop: "name" },
+ { label: "璁㈠崟鏁伴噺", prop: "orderAmount" },
+ { label: "浠撳簱", prop: "warehouse" },
+ { label: "鍦ㄥ簱鏁伴噺", prop: "amount" },
+ { label: "鍙敤搴撳瓨", prop: "availableNumber" },
+ { label: "鍗曚綅", prop: "unit" }
]
// 鍒堕�犱俊鎭�
const makeColumn = [
- { label: "鐢熶骇璁㈠崟", prop: "OrderId", default: true },
- { label: "浜у搧鍚嶇О", prop: "ProductName" },
- { label: "璁㈠崟鐘舵��", prop: "OrderStatus" },
- { label: "宸ュ崟缂栧彿", prop: "WorkOrderId" },
- { label: "宸ュ崟鐘舵��", prop: "WorkOrderStatus" },
- { label: "璁″垝寮�濮嬫椂闂�", prop: "StartTime" },
- { label: "璁″垝缁撴潫鏃堕棿", prop: "EndTime" }
+ { label: "鐢熶骇璁㈠崟", prop: "orderId", default: true },
+ { label: "浜у搧鍚嶇О", prop: "productName" },
+ { label: "璁㈠崟鐘舵��", prop: "orderStatus" },
+ { label: "宸ュ崟缂栧彿", prop: "workOrderId" },
+ { label: "宸ュ崟鐘舵��", prop: "workOrderStatus" },
+ { label: "璁″垝寮�濮嬫椂闂�", prop: "startTime" },
+ { label: "璁″垝缁撴潫鏃堕棿", prop: "endTime" }
]
return {
tableList: {},
@@ -202,7 +202,7 @@
show: false,
sumProp: [
"receiveTotalAmount",
- "total",
+ "amountTotal",
"amountReceivable",
"invoicedAmount",
"uninvoicedAmount",
@@ -240,7 +240,7 @@
{ label: "绛剧害鏃ユ湡", prop: "signTime" },
{ label: "浜や粯鏃ユ湡", prop: "deliveryDate" },
{ label: "璁㈠崟鏉ユ簮", prop: "source" },
- { label: "鍚堣", prop: "total", price: true },
+ { label: "鍚堣", prop: "amountTotal", price: true },
{ label: "鐘舵��", prop: "status", isCallMethod: true, getCallMethod: this.getStatus }
],
showCol: ["璁㈠崟缂栧彿", "閿�鍞礋璐ｄ汉", "绛剧害鏃ユ湡", "浜や粯鏃ユ湡", "璁㈠崟鏉ユ簮", "鍚堣", "鐘舵��"],
@@ -375,7 +375,7 @@
if (res.data.count > 0) {
this.selectRow = this.tableList.tableInfomation.length > 0 ? this.tableList.tableInfomation[0] : {}
let row = this.tableList.tableInfomation[0]
- this.getProductInventoryInfo(row.number)
+ this.getProductInventoryInfo(row)
}
} else {
this.tableList.tableInfomation = []
@@ -392,11 +392,16 @@
})
},
// 鑾峰彇浜у搧/搴撳瓨淇℃伅
- async getProductInventoryInfo(number) {
- await getProductInventoryInfo(number).then((res) => {
- console.log(res)
- this.productTableList.tableInfomation = res.data
- })
+ async getProductInventoryInfo(row) {
+ console.log(row.status, "鐘舵��", row)
+ if (row.status === 1) {
+ this.productTableList.tableInfomation = row.products
+ } else {
+ await getProductInventoryInfo(row.number).then((res) => {
+ console.log(res)
+ this.productTableList.tableInfomation = res.data
+ })
+ }
},
// 鑾峰彇鍒堕�犱俊鎭�
async getProductOrderInfo(number) {
@@ -537,7 +542,7 @@
this.tableBottomColumn = this.productColumn
this.showBottomCol = this.showProductCol
this.setBottomList()
- this.getProductInventoryInfo(this.selectRow.number)
+ this.getProductInventoryInfo(this.selectRow)
} else if (this.TabsIndex == 1) {
this.isClickProduct = false
this.isClickInventory = true
@@ -546,7 +551,7 @@
this.tableBottomColumn = this.inventoryColumn
this.showBottomCol = this.showInventoryCol
this.setBottomList()
- this.getProductInventoryInfo(this.selectRow.number)
+ this.getProductInventoryInfo(this.selectRow)
} else if (this.TabsIndex == 2) {
this.isClickProduct = false
this.isClickInventory = false
@@ -567,9 +572,9 @@
console.log(row, column, event)
this.selectRow = row
if (this.TabsIndex == 0) {
- this.getProductInventoryInfo(this.selectRow.number)
+ this.getProductInventoryInfo(this.selectRow)
} else if (this.TabsIndex == 1) {
- this.getProductInventoryInfo(this.selectRow.number)
+ this.getProductInventoryInfo(this.selectRow)
} else if (this.TabsIndex == 2) {
this.getProductOrderInfo(this.selectRow.number)
}
--
Gitblit v1.8.0