From b76f9d153dd40cef8864cecd168242850679047d Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期五, 18 八月 2023 20:29:36 +0800
Subject: [PATCH] bug修复
---
src/views/service/serviceContract/AddServiceContractDialog.vue | 12 -----
src/components/makepager/TableCommonView.vue | 47 ++++++++++++++++++++++-
src/views/sales/subOrder/index.vue | 7 ++-
src/views/client/followupRecords/index.vue | 4 +-
src/views/sales/salesDetails/AddSalesDetailsDialog.vue | 12 +++++
src/views/other/payment/saleInvoice/index.vue | 4 +-
src/views/sales/salesReturn/AddSalesReturnDialog.vue | 12 -----
src/views/sales/refundForm/AddRefundFormDialog.vue | 2
src/views/sales/quotation/index.vue | 2
src/views/sales/salesDetails/index.vue | 7 ++-
10 files changed, 73 insertions(+), 36 deletions(-)
diff --git a/src/components/makepager/TableCommonView.vue b/src/components/makepager/TableCommonView.vue
index e390ee3..342cc71 100644
--- a/src/components/makepager/TableCommonView.vue
+++ b/src/components/makepager/TableCommonView.vue
@@ -92,11 +92,21 @@
</ul>
<div v-else class="no-product">{{ "--" }}</div>
</div>
- <div v-else-if="item.isProductCommon" class="product-view">
+ <div v-else-if="item.isProductPrice" class="product-view">
<ul v-if="scope.row.products && scope.row.products.length > 0">
<li v-for="(item, index) in scope.row.products" :key="index">
<div :class="scope.row.products.length === 1 ? 'name-view no-bottom' : 'name-view'">
- {{ item.prop === "price" ? item.price : item.total }}
+ {{ item.price }}
+ </div>
+ </li>
+ </ul>
+ <div v-else class="no-product">{{ "--" }}</div>
+ </div>
+ <div v-else-if="item.isProductTotal" class="product-view">
+ <ul v-if="scope.row.products && scope.row.products.length > 0">
+ <li v-for="(item, index) in scope.row.products" :key="index">
+ <div :class="scope.row.products.length === 1 ? 'name-view no-bottom' : 'name-view'">
+ {{ item.total }}
</div>
</li>
</ul>
@@ -194,6 +204,39 @@
}
}, 0)
sums[index + 1]
+ if (column.property === "taxUnitPrice") {
+ let sumPrice = 0
+ this.tableList.tableInfomation.map((item) => {
+ item.products.map((val) => {
+ console.log(val.price)
+ sumPrice += parseFloat(val.price)
+ })
+ })
+ console.log((sums[index + 1] = sumPrice))
+ console.log(sumPrice)
+ }
+ if (column.property === "priceTax") {
+ let sumPrice = 0
+ this.tableList.tableInfomation.map((item) => {
+ item.products.map((val) => {
+ console.log(val.price)
+ sumPrice += parseFloat(val.total)
+ })
+ })
+ console.log((sums[index + 1] = sumPrice))
+ console.log(sumPrice)
+ }
+ if (column.property === "productAmount") {
+ let sumPrice = 0
+ this.tableList.tableInfomation.map((item) => {
+ item.products.map((val) => {
+ console.log(val.price)
+ sumPrice += parseFloat(val.amount)
+ })
+ })
+ console.log((sums[index + 1] = sumPrice))
+ console.log(sumPrice)
+ }
}
})
// console.log(sums)
diff --git a/src/views/client/followupRecords/index.vue b/src/views/client/followupRecords/index.vue
index 9922a00..c5710b0 100644
--- a/src/views/client/followupRecords/index.vue
+++ b/src/views/client/followupRecords/index.vue
@@ -185,8 +185,8 @@
contact_name: item.contact.name,
client_status: item.client_status.name,
phone: item.contact.phone,
- member_name: item.member.username
- // contact_information_name: item.contact_information.name
+ member_name: item.member.username,
+ contact_information_name: item.contact_information.name
}
})
this.tableList.tableInfomation = list || []
diff --git a/src/views/other/payment/saleInvoice/index.vue b/src/views/other/payment/saleInvoice/index.vue
index 346233e..2e26681 100644
--- a/src/views/other/payment/saleInvoice/index.vue
+++ b/src/views/other/payment/saleInvoice/index.vue
@@ -135,8 +135,8 @@
{ label: "閿�鍞礋璐ｄ汉", prop: "principalId" },
{ label: "浜у搧鍚嶇О", prop: "name", isProductName: true },
{ label: "鏁伴噺", prop: "amount", isProductAmount: true },
- { label: "鍚◣鍗曚环", prop: "price", isProductCommon: true },
- { label: "浠风◣鍚堣", prop: "total", isProductCommon: true }
+ { label: "鍚◣鍗曚环", prop: "price", isProductPrice: true },
+ { label: "浠风◣鍚堣", prop: "total", isProductTotal: true }
]
}
this.searchOptions = []
diff --git a/src/views/sales/quotation/index.vue b/src/views/sales/quotation/index.vue
index 721cba3..fbaaf6f 100644
--- a/src/views/sales/quotation/index.vue
+++ b/src/views/sales/quotation/index.vue
@@ -146,7 +146,7 @@
// { label: "鍚堣", prop: "total" }, // 鍚堣
{ label: "浜у搧鍚嶇О", prop: "productName", isProductName: true },
{ label: "鏁伴噺", prop: "productNumber", isProductAmount: true },
- { label: "浠风◣鍚堣", prop: "priceTax", isProductCommon: true }
+ { label: "浠风◣鍚堣", prop: "priceTax", isProductTotal: true }
]
}
this.searchOptions = []
diff --git a/src/views/sales/refundForm/AddRefundFormDialog.vue b/src/views/sales/refundForm/AddRefundFormDialog.vue
index 41b7f0d..426fbd3 100644
--- a/src/views/sales/refundForm/AddRefundFormDialog.vue
+++ b/src/views/sales/refundForm/AddRefundFormDialog.vue
@@ -385,7 +385,7 @@
isInvoice: data.isInvoice || "",
memberId: data.memberId || 0,
number: data.number || "",
- products: data.products || [],
+ products: this.tableData,
reason: data.reason || "",
refundDate: data.refundDate || "",
refundMethod: data.refundMethod || ""
diff --git a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
index b019896..22497dc 100644
--- a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
+++ b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
@@ -180,7 +180,14 @@
</el-col>
<el-col :span="12">
<el-form-item label="鐗╂祦璐圭敤" prop="logisticCost">
- <el-input v-model="editConfig.infomation.logisticCost"></el-input>
+ <el-input-number
+ v-model="editConfig.infomation.logisticCost"
+ placeholder="璇疯緭鍏�"
+ :min="0"
+ :precision="2"
+ :controls="false"
+ style="width: 100%; margin-right: 5px"
+ ></el-input-number>
</el-form-item>
</el-col>
</el-row>
@@ -692,6 +699,9 @@
height: 55px;
line-height: 55px;
}
+ .el-input__inner {
+ text-align: left;
+ }
}
}
</style>
diff --git a/src/views/sales/salesDetails/index.vue b/src/views/sales/salesDetails/index.vue
index e7b4149..1d673c7 100644
--- a/src/views/sales/salesDetails/index.vue
+++ b/src/views/sales/salesDetails/index.vue
@@ -112,6 +112,7 @@
"uninvoicedAmount",
"number",
"unOutoundNo",
+ "taxUnitPrice",
"priceTax"
],
mergeNumber: 6
@@ -154,7 +155,7 @@
{ label: "瀹㈡埛鍚嶇О", prop: "client_name", isClientClick: true },
{ label: "绛剧害鏃ユ湡", prop: "signTime", width: 150 },
{ label: "閿�鍞礋璐ｄ汉", prop: "member_name" },
- { label: "鍑哄簱鐘舵��", prop: "outboundStatus" },
+ // { label: "鍑哄簱鐘舵��", prop: "outboundStatus" },
{ label: "宸叉敹鎬婚", prop: "receiveTotalAmount", price: true },
{ label: "鍚堣", prop: "total", price: true },
{ label: "搴旀敹浣欓", prop: "amountReceivable", price: true },
@@ -162,8 +163,8 @@
{ label: "鏈紑绁ㄩ噾棰�", prop: "uninvoicedAmount", price: true },
{ label: "浜у搧鍚嶇О", prop: "productName", isProductName: true },
{ label: "鏁伴噺", prop: "productNumber", isProductAmount: true },
- { label: "閿�鍞崟浠�", prop: "taxUnitPrice", isProductCommon: true },
- { label: "浠风◣鍚堣", prop: "priceTax", isProductCommon: true }
+ { label: "閿�鍞崟浠�", prop: "taxUnitPrice", isProductPrice: true },
+ { label: "浠风◣鍚堣", prop: "priceTax", isProductTotal: true }
]
}
this.searchOptions = []
diff --git a/src/views/sales/salesReturn/AddSalesReturnDialog.vue b/src/views/sales/salesReturn/AddSalesReturnDialog.vue
index 90aae43..fc3c689 100644
--- a/src/views/sales/salesReturn/AddSalesReturnDialog.vue
+++ b/src/views/sales/salesReturn/AddSalesReturnDialog.vue
@@ -341,17 +341,7 @@
clientId: data.clientId || 0,
memberId: data.memberId || 0,
number: data.number || "",
- products: [
- {
- amount: 0,
- desc: "",
- id: 0,
- name: "",
- number: "",
- price: 0,
- total: 0
- }
- ],
+ products: this.tableData,
reason: data.reason || "",
repository: data.repository || "",
returnDate: data.returnDate || "",
diff --git a/src/views/sales/subOrder/index.vue b/src/views/sales/subOrder/index.vue
index 1b473a3..1a0baab 100644
--- a/src/views/sales/subOrder/index.vue
+++ b/src/views/sales/subOrder/index.vue
@@ -20,8 +20,8 @@
</div>
<TableCommonView
ref="tableListRef"
- :show-summary="showSummary"
:table-list="tableList"
+ :show-summary="showSummary"
:select-box="!isDetail"
@selClientClick="selClientClick"
@selMasterClick="selMasterClick"
@@ -109,7 +109,7 @@
},
showSummary: {
show: true,
- sumProp: ["number1"],
+ sumProp: ["productAmount"],
mergeNumber: 6
},
subOrderDeail: {
@@ -311,5 +311,8 @@
.el-table__header th {
height: 48px;
}
+ .el-table__footer-wrapper tbody td.el-table__cell {
+ height: 48px;
+ }
}
</style>
diff --git a/src/views/service/serviceContract/AddServiceContractDialog.vue b/src/views/service/serviceContract/AddServiceContractDialog.vue
index 9791014..f3de9ef 100644
--- a/src/views/service/serviceContract/AddServiceContractDialog.vue
+++ b/src/views/service/serviceContract/AddServiceContractDialog.vue
@@ -569,17 +569,7 @@
endTime: data.endTime || "",
memberId: data.memberId || 0,
number: data.number || "",
- products: [
- {
- amount: 0,
- desc: "",
- id: 0,
- name: "",
- number: "",
- price: 0,
- total: 0
- }
- ],
+ products: this.tableData,
quotationId: this.quotationId || 0,
remark: data.remark || "",
saleChanceId: this.saleChanceId || 0,
--
Gitblit v1.8.0