From f4ed5ae8873f65c36b5cf37be264f6ec1e154647 Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期三, 20 三月 2024 19:36:58 +0800
Subject: [PATCH] 合并分支冲突解决
---
src/views/purchaseManage/purchase/index.vue | 143 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 102 insertions(+), 41 deletions(-)
diff --git a/src/views/purchaseManage/purchase/index.vue b/src/views/purchaseManage/purchase/index.vue
index 85207f3..2283fa2 100644
--- a/src/views/purchaseManage/purchase/index.vue
+++ b/src/views/purchaseManage/purchase/index.vue
@@ -23,6 +23,8 @@
:table-list="tableList"
@selCommonClick="selCommonClick"
@selTableCol="selTableCol"
+ @tableRowClick="tableRowClick"
+ :selectClassRow="selectRow"
>
<template slot="tableButton">
<el-table-column label="鐘舵��" width="120">
@@ -51,6 +53,12 @@
<el-button type="text" size="small" @click="btnLook(scope.row)" style="margin-right: 5px"
>鏌ョ湅</el-button
>
+ <!-- <el-button type="text" size="small" @click="btnLook(scope.row)" style="margin-right: 5px"
+ >鍒拌揣纭</el-button
+ >
+ <el-button type="text" size="small" @click="btnLook(scope.row)" style="margin-right: 5px"
+ >鍘昏川妫�</el-button
+ > -->
<el-button
v-if="scope.row.status === 1"
type="text"
@@ -120,7 +128,13 @@
<script>
import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
-import { getPurchaseList, getPurchaseInfo, submitPurchase, deletePurchase } from "@/api/purchaseManage/purchase"
+import {
+ getPurchaseList,
+ getPurchaseInfo,
+ submitPurchase,
+ deletePurchase,
+ getOperationInfo
+} from "@/api/purchaseManage/purchase"
import DetailSupplier from "@/views/purchaseManage/purchase/DetailSupplier"
import AddPurchase from "@/views/purchaseManage/purchase/components/AddPurchase"
import { getSupplierList } from "@/api/supplierManage/supplier"
@@ -136,27 +150,29 @@
const productColumn = [
{ label: "浜у搧缂栧彿", prop: "number", default: true },
{ label: "浜у搧鍚嶇О", prop: "name" },
- { label: "瑙勬牸鍨嬪彿", prop: "desc" },
- { label: "閲囪喘鏁伴噺", prop: "purchaseAmount" },
- { label: "宸插彂璐ф暟閲�", prop: "margin" },
- { label: "宸插叆搴撴暟閲�", prop: "amount" },
+ { label: "瑙勬牸", prop: "specifications" },
+ { label: "鍨嬪彿", prop: "modelNumber" },
+ { label: "閲囪喘鏁伴噺", prop: "amount" },
+ { label: "宸插彂璐ф暟閲�", prop: "sendAmount" },
+ { label: "宸插叆搴撴暟閲�", prop: "overAmount" },
{ label: "鍗曚綅", prop: "unit" },
- { label: "閲囪喘鍗曚环", prop: "price", price: true },
+ { label: "閲囪喘鍗曚环", prop: "purchasePrice", price: true },
{ label: "浠风◣鍚堣", prop: "total", price: true }
]
// 鏀惰揣淇℃伅
const recriveColumn = [
- { label: "鍏ュ簱鍗曞彿", prop: "number", default: true },
- { label: "鏀惰揣浠撳簱", prop: "name" },
- { label: "浜у搧鍚嶇О", prop: "orderAmount" },
- { label: "浜у搧缂栫爜", prop: "invoice" },
- { label: "鏁伴噺", prop: "carrier" },
- { label: "鍏ュ簱鏃堕棿", prop: "waybill" },
- { label: "鏀惰揣浜�", prop: "warehouse" },
- { label: "鐘舵��", prop: "amount" }
+ { label: "鍏ュ簱鍗曞彿", prop: "operationNumber", default: true },
+ { label: "鏀惰揣浠撳簱", prop: "warehouseName" },
+ { label: "浜у搧鍚嶇О", prop: "name" },
+ { label: "浜у搧缂栫爜", prop: "number" },
+ { label: "鏁伴噺", prop: "amount" },
+ { label: "鍏ュ簱鏃堕棿", prop: "overTime" },
+ { label: "鏀惰揣浜�", prop: "principal" },
+ { label: "鐘舵��", prop: "status", isCallMethod: true, getCallMethod: this.getreceiveStatusStatus }
]
return {
purchaseStatusList: getDataByType("purchaseStatus"),
+ receiveStatusList: getDataByType("receiveStatus"),
tableLoading: false,
tableList: {}, // 鍒楄〃
selValueList: [],
@@ -195,7 +211,8 @@
showProductCol: [
"浜у搧缂栧彿",
"浜у搧鍚嶇О",
- "瑙勬牸鍨嬪彿",
+ "瑙勬牸",
+ "鍨嬪彿",
"閲囪喘鏁伴噺",
"宸插彂璐ф暟閲�",
"宸插叆搴撴暟閲�",
@@ -205,8 +222,9 @@
],
// 鏀惰揣淇℃伅
recriveColumn: recriveColumn,
- showReceiveCol: ["鍏ュ簱鍗曞彿", "鏀惰揣浠撳簱", "浜у搧鍚嶇О", "浜у搧缂栧彿", "鏁伴噺", "鍏ュ簱鏃堕棿", "鏀惰揣浜�", "鐘舵��"],
- loading: false
+ showReceiveCol: ["鍏ュ簱鍗曞彿", "鏀惰揣浠撳簱", "浜у搧鍚嶇О", "浜у搧缂栫爜", "鏁伴噺", "鍏ュ簱鏃堕棿", "鏀惰揣浜�", "鐘舵��"],
+ loading: false,
+ selectRow: {}
}
},
created() {
@@ -242,6 +260,17 @@
for (let i in this.purchaseStatusList) {
if (this.purchaseStatusList[i].id == val) {
return this.purchaseStatusList[i].name
+ }
+ }
+ } else {
+ return "--"
+ }
+ },
+ getreceiveStatusStatus(val) {
+ if (val) {
+ for (let i in this.receiveStatusList) {
+ if (this.receiveStatusList[i].id == val) {
+ return this.receiveStatusList[i].name
}
}
} else {
@@ -289,6 +318,10 @@
})
this.tableList.tableInfomation = list || []
this.pagerOptions.totalCount = res.data.total
+ if (res.data.total > 0) {
+ this.selectRow = this.tableList.tableInfomation.length > 0 ? this.tableList.tableInfomation[0] : {}
+ this.tableRowClick(this.selectRow)
+ }
}
})
.catch((err) => {
@@ -332,7 +365,7 @@
number: "",
contact: "",
phone: "",
- signingDate: "",
+ signingDate: this.getCurrentDate(),
deliveryDate: "",
remark: "",
wholeDiscountType: null,
@@ -342,7 +375,14 @@
realTotalPrice: 0
}
},
-
+ // 鑾峰彇褰撳墠鏃ユ湡
+ getCurrentDate() {
+ let now = new Date()
+ let year = now.getFullYear()
+ let month = now.getMonth() + 1
+ let day = now.getDate()
+ return year + "-" + month + "-" + day
+ },
// 缂栬緫
btnEdit(row) {
this.editConfig.detailEnter = false
@@ -368,9 +408,8 @@
setTimeout(() => {
this.tableLoading = false
}, 3000)
- // this.editRow = row;
- // this.$refs.add.islook = true;
},
+
// 纭鍙戣揣
btnConfirm(row) {
let string = "鏄惁鎻愪氦锛�"
@@ -490,6 +529,29 @@
this.tableLoading = false
}, 3000)
},
+ // top 琛岀偣鍑�
+ tableRowClick(row) {
+ this.selectRow = row
+ if (row.status == 1 && this.TabsIndex == 0) {
+ getPurchaseInfo({ id: row.id }).then((res) => {
+ if (res.code == 200) {
+ this.productTableList.tableInfomation = res.data.productList
+ } else {
+ this.$message.error(res.msg ? res.msg + "," : "" + "鑾峰彇淇℃伅澶辫触锛�")
+ }
+ })
+ } else if (this.TabsIndex == 1 && row.status == 1) {
+ this.productTableList.tableInfomation = []
+ } else {
+ getOperationInfo({ id: row.id }).then((res) => {
+ if (res.code == 200) {
+ this.productTableList.tableInfomation = res.data
+ } else {
+ this.$message.error(res.msg ? res.msg + "," : "" + "鑾峰彇淇℃伅澶辫触锛�")
+ }
+ })
+ }
+ },
// bom 鍒楄〃
setBottomList() {
this.productTableList = {
@@ -529,11 +591,7 @@
this.tableBottomColumn = this.recriveColumn
this.showBottomCol = this.showReceiveCol
this.setBottomList()
- // if (this.selectRow.status == 1) {
- // this.productTableList.tableInfomation = []
- // } else {
this.getProductInventoryInfo(this.selectRow)
- // }
}
},
// 鐘舵��
@@ -543,22 +601,25 @@
// 鑾峰彇浜у搧/鏀惰揣淇℃伅
async getProductInventoryInfo(row) {
console.log(row)
- // if (this.TabsIndex == 0 || row.status == 1) {
- // this.productTableList.tableInfomation = row.products || []
- // } else {
- // if (row.number) {
- // this.loading = true
- // await getProductInventoryInfo(row.number)
- // .then((res) => {
- // this.productTableList.tableInfomation = res.data?.length > 0 ? res.data : []
- // this.loading = false
- // })
- // .catch(() => {
- // this.productTableList.tableInfomation = []
- // this.loading = false
- // })
- // }
- // }
+ if (this.TabsIndex == 0 && row.status == 1) {
+ getPurchaseInfo({ id: row.id }).then((res) => {
+ if (res.code == 200) {
+ this.productTableList.tableInfomation = res.data.productList
+ } else {
+ this.$message.error(res.msg ? res.msg + "," : "" + "鑾峰彇淇℃伅澶辫触锛�")
+ }
+ })
+ } else if (this.TabsIndex == 1 && row.status == 1) {
+ this.productTableList.tableInfomation = []
+ } else {
+ getOperationInfo({ id: row.id }).then((res) => {
+ if (res.code == 200) {
+ this.productTableList.tableInfomation = res.data
+ } else {
+ this.$message.error(res.msg ? res.msg + "," : "" + "鑾峰彇淇℃伅澶辫触锛�")
+ }
+ })
+ }
}
}
}
--
Gitblit v1.8.0