From 4e0a7bafec1785ce7158733762d2904e3fba7d57 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期三, 08 十一月 2023 18:49:26 +0800
Subject: [PATCH] 产品信息库存信息制造信息接口联调
---
src/api/sales/salesDetails.js | 14 +++++++
src/views/sales/salesDetails/index.vue | 82 +++++++++++++++++++++++++++-------------
2 files changed, 69 insertions(+), 27 deletions(-)
diff --git a/src/api/sales/salesDetails.js b/src/api/sales/salesDetails.js
index 642dc67..d01cdf9 100644
--- a/src/api/sales/salesDetails.js
+++ b/src/api/sales/salesDetails.js
@@ -32,3 +32,17 @@
data
})
}
+// 鑾峰彇浜у搧/搴撳瓨淇℃伅
+export function getProductInventoryInfo(number) {
+ return request({
+ url: `/api/salesDetails/getProductInventoryInfo/${number}`,
+ method: "get"
+ })
+}
+// 鑾峰彇鍒堕�犱俊鎭�
+export function getProductOrderInfo(number) {
+ return request({
+ url: `/api/product/getProductOrderInfo/${number}`,
+ method: "get"
+ })
+}
diff --git a/src/views/sales/salesDetails/index.vue b/src/views/sales/salesDetails/index.vue
index ba89cdc..bed23b9 100644
--- a/src/views/sales/salesDetails/index.vue
+++ b/src/views/sales/salesDetails/index.vue
@@ -119,7 +119,12 @@
<script>
import AddSalesDetailsDialog from "@/views/sales/salesDetails/AddSalesDetailsDialog"
-import { getSalesDetailsList, getDelSalesDetails } from "@/api/sales/salesDetails"
+import {
+ getSalesDetailsList,
+ getDelSalesDetails,
+ getProductInventoryInfo,
+ getProductOrderInfo
+} from "@/api/sales/salesDetails"
import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
import DetailSpecification from "@/views/sales/salesDetails/DetailSpecification"
import AddCollectionPlan from "@/views/other/payment/collectionPlan/AddCollectionPlan"
@@ -153,35 +158,35 @@
data() {
// 浜у搧淇℃伅
const productColumn = [
- { label: "浜у搧缂栧彿", prop: "number", default: true },
- { label: "浜у搧鍚嶇О", prop: "client_name" },
- { label: "鏁伴噺", prop: "signTime" },
- { label: "鍗曚綅", prop: "member_name" },
- { label: "鍙戣揣鍗�", prop: "outboundStatus" },
- { label: "鎵胯繍鍟�", prop: "receiveTotalAmount", price: true },
- { label: "杩愬崟鍙�", prop: "total", price: true },
- { label: "閿�鍞崟浠�", prop: "taxUnitPrice", isProductPrice: true },
- { label: "浠风◣鍚堣", prop: "priceTax", isProductTotal: true }
+ { label: "浜у搧缂栧彿", prop: "Id", default: true },
+ { label: "浜у搧鍚嶇О", prop: "Name" },
+ { label: "鏁伴噺", prop: "Amount" },
+ { label: "鍗曚綅", prop: "Unit" },
+ { label: "鍙戣揣鍗�", prop: "shipOrder" },
+ { label: "鎵胯繍鍟�", prop: "carrier" },
+ { label: "杩愬崟鍙�", prop: "waybillNumber" },
+ { label: "閿�鍞崟浠�", prop: "SalePrice", price: true },
+ { label: "浠风◣鍚堣", prop: "Valorem", price: true }
]
// 搴撳瓨淇℃伅
const inventoryColumn = [
- { label: "浜у搧缂栧彿", prop: "number", default: true },
- { label: "浜у搧鍚嶇О", prop: "client_name" },
- { label: "璁㈠崟鏁伴噺", prop: "signTime" },
- { label: "浠撳簱", prop: "member_name" },
- { label: "鍦ㄥ簱鏁伴噺", prop: "outboundStatus" },
- { label: "鍙敤搴撳瓨", prop: "receiveTotalAmount", price: true },
- { label: "鍗曚綅", prop: "total", price: true }
+ { 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: "number", default: true },
- { label: "浜у搧鍚嶇О", prop: "client_name" },
- { label: "璁㈠崟鐘舵��", prop: "signTime" },
- { label: "宸ュ崟缂栧彿", prop: "member_name" },
- { label: "宸ュ崟鐘舵��", prop: "outboundStatus" },
- { label: "璁″垝寮�濮嬫椂闂�", prop: "receiveTotalAmount", price: true },
- { label: "璁″垝缁撴潫鏃堕棿", prop: "total", price: true }
+ { 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: {},
@@ -368,8 +373,8 @@
this.pagerOptions.totalCount = res.data.count
if (res.data.count > 0) {
this.selectRow = this.tableList.tableInfomation.length > 0 ? this.tableList.tableInfomation[0] : {}
- // let row = this.tableList.tableInfomation[0];
- // this.getPointinspectionRecord(row.id);
+ let row = this.tableList.tableInfomation[0]
+ this.getProductInventoryInfo(row.number)
}
} else {
this.tableList.tableInfomation = []
@@ -384,6 +389,20 @@
this.tableList.tableInfomation = []
this.loading = false
})
+ },
+ // 鑾峰彇浜у搧/搴撳瓨淇℃伅
+ async getProductInventoryInfo(number) {
+ await getProductInventoryInfo(number).then((res) => {
+ console.log(res)
+ this.productTableList.tableInfomation = res.data
+ })
+ },
+ // 鑾峰彇鍒堕�犱俊鎭�
+ async getProductOrderInfo(number) {
+ await getProductOrderInfo(number).then((res) => {
+ console.log(res)
+ this.productTableList.tableInfomation = res.data
+ })
},
// 鎼滅储
onFilterSearch(searchText) {
@@ -493,6 +512,7 @@
this.tableBottomColumn = this.productColumn
this.showBottomCol = this.showProductCol
this.setBottomList()
+ this.getProductInventoryInfo(this.selectRow.number)
} else if (this.TabsIndex == 1) {
this.isClickProduct = false
this.isClickInventory = true
@@ -501,6 +521,7 @@
this.tableBottomColumn = this.inventoryColumn
this.showBottomCol = this.showInventoryCol
this.setBottomList()
+ this.getProductInventoryInfo(this.selectRow.number)
} else if (this.TabsIndex == 2) {
this.isClickProduct = false
this.isClickInventory = false
@@ -509,6 +530,7 @@
this.tableBottomColumn = this.makeColumn
this.showBottomCol = this.showMakeCol
this.setBottomList()
+ this.getProductOrderInfo(this.selectRow.number)
}
},
// 鐘舵��
@@ -519,7 +541,13 @@
tableRowClick(row, column, event) {
console.log(row, column, event)
this.selectRow = row
- // this.getPointinspectionRecord(row.id);
+ if (this.TabsIndex == 0) {
+ this.getProductInventoryInfo(this.selectRow.number)
+ } else if (this.TabsIndex == 1) {
+ this.getProductInventoryInfo(this.selectRow.number)
+ } else if (this.TabsIndex == 2) {
+ this.getProductOrderInfo(this.selectRow.number)
+ }
}
}
}
--
Gitblit v1.8.0