From 88e42f94b4974f2cd01db617bcd7c401953e2a11 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期三, 27 三月 2024 15:17:32 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/web/SRM
---
src/views/purchaseManage/purchase/index.vue | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/src/views/purchaseManage/purchase/index.vue b/src/views/purchaseManage/purchase/index.vue
index f096fc5..9b7ca55 100644
--- a/src/views/purchaseManage/purchase/index.vue
+++ b/src/views/purchaseManage/purchase/index.vue
@@ -175,9 +175,9 @@
data() {
// 浜у搧淇℃伅
const productColumn = [
- { label: "浜у搧缂栧彿", prop: "productId", default: true },
- { label: "浜у搧鍚嶇О", prop: "productName" },
- { label: "瑙勬牸", prop: "specs" },
+ { label: "浜у搧缂栧彿", prop: "number", default: true },
+ { label: "浜у搧鍚嶇О", prop: "name" },
+ { label: "瑙勬牸", prop: "specifications" },
{ label: "鍨嬪彿", prop: "modelNumber" },
{ label: "閲囪喘鏁伴噺", prop: "amount" },
{ label: "宸插彂璐ф暟閲�", prop: "sendAmount" },
@@ -481,7 +481,10 @@
if (!row.supplierName) {
this.btnEdit(row)
} else {
- newSubmitPurchase(row.id).then((response) => {
+ newSubmitPurchase({
+ id: Number(row.id),
+ status: 4
+ }).then((response) => {
if (response.code === 200) {
this.$message.success("鎻愪氦鎴愬姛")
this.getData()
@@ -504,7 +507,10 @@
type: "warning"
}).then(
() => {
- newSubmitPurchase(Number(row.id)).then((response) => {
+ newSubmitPurchase({
+ id: Number(row.id),
+ status: 5
+ }).then((response) => {
if (response.code === 200) {
this.$message.success("宸插彇娑�")
this.getData()
@@ -599,7 +605,7 @@
// top 琛岀偣鍑�
tableRowClick(row) {
this.selectRow = row
- if (row.status == 1 && this.TabsIndex == 0) {
+ if (this.TabsIndex == 0) {
getPurchaseInfo({ id: row.id }).then((res) => {
if (res.code == 200) {
this.productTableList.tableInfomation = res.data.productList
@@ -676,6 +682,7 @@
this.setBottomList()
this.getProductInventoryInfo(this.selectRow)
} else if (this.TabsIndex == 2) {
+ console.log("鍏ュ簱")
// 鍏ュ簱淇℃伅鍒楄〃
this.tableBottomColumn = this.inLibraryColumn
this.showBottomCol = this.inLibraryCol
@@ -705,7 +712,7 @@
},
// 鑾峰彇浜у搧/鏀惰揣淇℃伅
async getProductInventoryInfo(row) {
- if (this.TabsIndex == 0 && row.status == 1) {
+ if (this.TabsIndex == 0) {
getPurchaseInfo({ id: row.id }).then((res) => {
if (res.code == 200) {
this.productTableList.tableInfomation = res.data.productList
--
Gitblit v1.8.0