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 | 46 +++++++++++++++++++++++++++++++++++-----------
1 files changed, 35 insertions(+), 11 deletions(-)
diff --git a/src/views/purchaseManage/purchase/index.vue b/src/views/purchaseManage/purchase/index.vue
index 4cf3246..2283fa2 100644
--- a/src/views/purchaseManage/purchase/index.vue
+++ b/src/views/purchaseManage/purchase/index.vue
@@ -53,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"
@@ -142,30 +148,31 @@
data() {
// 浜у搧淇℃伅
const productColumn = [
- { label: "浜у搧缂栧彿", prop: "productId", default: true },
- { label: "浜у搧鍚嶇О", prop: "productName" },
+ { label: "浜у搧缂栧彿", prop: "number", default: true },
+ { label: "浜у搧鍚嶇О", prop: "name" },
{ 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: "operationNumber", default: true },
{ label: "鏀惰揣浠撳簱", prop: "warehouseName" },
- { label: "浜у搧鍚嶇О", prop: "productName" },
- { label: "浜у搧缂栫爜", prop: "productId" },
+ { label: "浜у搧鍚嶇О", prop: "name" },
+ { label: "浜у搧缂栫爜", prop: "number" },
{ label: "鏁伴噺", prop: "amount" },
{ label: "鍏ュ簱鏃堕棿", prop: "overTime" },
{ label: "鏀惰揣浜�", prop: "principal" },
- { label: "鐘舵��", prop: "status" }
+ { label: "鐘舵��", prop: "status", isCallMethod: true, getCallMethod: this.getreceiveStatusStatus }
]
return {
purchaseStatusList: getDataByType("purchaseStatus"),
+ receiveStatusList: getDataByType("receiveStatus"),
tableLoading: false,
tableList: {}, // 鍒楄〃
selValueList: [],
@@ -253,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 {
@@ -347,7 +365,7 @@
number: "",
contact: "",
phone: "",
- signingDate: "",
+ signingDate: this.getCurrentDate(),
deliveryDate: "",
remark: "",
wholeDiscountType: null,
@@ -357,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
@@ -383,9 +408,8 @@
setTimeout(() => {
this.tableLoading = false
}, 3000)
- // this.editRow = row;
- // this.$refs.add.islook = true;
},
+
// 纭鍙戣揣
btnConfirm(row) {
let string = "鏄惁鎻愪氦锛�"
--
Gitblit v1.8.0