From 68410e197705df3298fb92213e657ac9ff9ede97 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期二, 22 八月 2023 17:00:11 +0800
Subject: [PATCH] 详情页产品统计修改
---
src/views/service/serviceContract/DetailServiceContract.vue | 4 ++--
src/views/sales/salesDetails/DetailSpecification.vue | 4 ++--
src/views/service/clientServiceOrder/DetailClientServiceOrder.vue | 2 +-
src/views/sales/refundForm/DetailRefundForm.vue | 4 ++--
src/views/sales/quotation/DetailQuotation.vue | 4 ++--
src/views/sales/salesReturn/DetailReturn.vue | 4 ++--
src/views/sales/subOrder/DetailSubOrder.vue | 4 ++--
src/components/makepager/CommonFormTableView.vue | 18 ++++++++++++++----
src/views/sales/contractManage/DetailContractManage.vue | 2 +-
src/views/sales/contractManage/AddContractManageDialog.vue | 2 +-
10 files changed, 29 insertions(+), 19 deletions(-)
diff --git a/src/components/makepager/CommonFormTableView.vue b/src/components/makepager/CommonFormTableView.vue
index 3981921..55fee16 100644
--- a/src/components/makepager/CommonFormTableView.vue
+++ b/src/components/makepager/CommonFormTableView.vue
@@ -46,7 +46,6 @@
v-else-if="item.productName"
label=" "
:prop="'tableData.' + scope.$index + '.' + item.prop"
- :rules="[{ required: item.isRequird ? true : false, message: '浜у搧鍚嶇О涓嶈兘涓虹┖' }]"
>
<div class="custom-name">
<el-autocomplete
@@ -130,7 +129,9 @@
<el-button size="small" type="primary" @click="add">鏂板</el-button>
<!-- <el-button size="small" type="primary" disabled>瀵煎叆鏄庣粏</el-button> -->
<el-button size="small" type="primary" @click="empty">娓呯┖</el-button>
- <el-button size="small" type="primary" @click="recalculate">閲嶇畻</el-button>
+ <el-button size="small" type="primary" @click="recalculate" :disabled="isRecalculate ? false : true"
+ >閲嶇畻</el-button
+ >
</div>
<div v-if="showSummary.total || showSummary.refundable" style="height: 42px; line-height: 42px">
<el-row :gutter="10">
@@ -199,12 +200,18 @@
title: "",
infomation: {}
},
- productIndex: 0
+ productIndex: 0,
+ isRecalculate: true
}
},
created() {
this.getProductList()
this.tableList = this.productTableList
+ if (this.tableList.tableData.length === 1 && this.tableList.tableData[0].name === "") {
+ this.isRecalculate = false
+ } else {
+ this.isRecalculate = true
+ }
},
computed: {},
methods: {
@@ -256,7 +263,7 @@
sums[index] = "灏忚:"
return
}
- const title = ["#"]
+ const title = ["#", "浜у搧鍚嶇О"]
// 鍘婚櫎鏌愪簺涓嶉渶瑕佽绠楃殑鏁版嵁
if (title.includes(column.label)) {
sums[index] = ""
@@ -323,6 +330,7 @@
},
// 娓呯┖
empty() {
+ this.isRecalculate = false
this.$emit("emptyProductClick")
},
// 閲嶇畻
@@ -353,6 +361,7 @@
},
handleSelectClient(item, prop, row) {
// this.clientId = item.id
+ this.isRecalculate = true
console.log(item, prop, row)
this.tableList.tableData.map((ite) => {
if (ite.name === item.name) {
@@ -372,6 +381,7 @@
selClient(item) {
console.log(item)
console.log(this.tableList.tableData)
+ this.isRecalculate = true
// this.editConfig.infomation.client_name = row.name
this.tableList.tableData.map((ite, index) => {
if (index === this.productIndex) {
diff --git a/src/views/sales/contractManage/AddContractManageDialog.vue b/src/views/sales/contractManage/AddContractManageDialog.vue
index 6333e49..b2e3135 100644
--- a/src/views/sales/contractManage/AddContractManageDialog.vue
+++ b/src/views/sales/contractManage/AddContractManageDialog.vue
@@ -307,7 +307,7 @@
member_id: data.memberId || 0,
number: data.number || "",
quotation_id: this.quotationId || 0,
- status_id: data.status_id || 0
+ status_id: data.statusId || 0
}
return params
},
diff --git a/src/views/sales/contractManage/DetailContractManage.vue b/src/views/sales/contractManage/DetailContractManage.vue
index 8309a5b..192b4e7 100644
--- a/src/views/sales/contractManage/DetailContractManage.vue
+++ b/src/views/sales/contractManage/DetailContractManage.vue
@@ -10,7 +10,7 @@
<template slot="title">
<div class="header">
<span class="header-label">鍗曟嵁缂栧彿</span>
- <span class="header-title">{{ detailConfig.infomation.name }}</span>
+ <span class="header-title">{{ detailConfig.infomation.number }}</span>
</div>
</template>
<div class="content">
diff --git a/src/views/sales/quotation/DetailQuotation.vue b/src/views/sales/quotation/DetailQuotation.vue
index dc5160e..3fbd54a 100644
--- a/src/views/sales/quotation/DetailQuotation.vue
+++ b/src/views/sales/quotation/DetailQuotation.vue
@@ -171,8 +171,8 @@
showSummary: {
show: true,
total: true,
- sumProp: ["other1", "other2", "other3", "other4"],
- mergeNumber: 3
+ sumProp: ["amount", "price", "total"],
+ mergeNumber: 1
},
productTableList: {},
addConfig: {}
diff --git a/src/views/sales/refundForm/DetailRefundForm.vue b/src/views/sales/refundForm/DetailRefundForm.vue
index 42422bb..cbe8be5 100644
--- a/src/views/sales/refundForm/DetailRefundForm.vue
+++ b/src/views/sales/refundForm/DetailRefundForm.vue
@@ -137,8 +137,8 @@
showSummary: {
show: true,
total: true,
- sumProp: ["other1", "other2", "other3", "other4"],
- mergeNumber: 3
+ sumProp: ["amount", "price", "total"],
+ mergeNumber: 1
},
productTableList: {}
}
diff --git a/src/views/sales/salesDetails/DetailSpecification.vue b/src/views/sales/salesDetails/DetailSpecification.vue
index 2667545..27f8f04 100644
--- a/src/views/sales/salesDetails/DetailSpecification.vue
+++ b/src/views/sales/salesDetails/DetailSpecification.vue
@@ -257,8 +257,8 @@
showSummary: {
show: true,
total: true,
- sumProp: ["other1", "other2", "other3", "other4"],
- mergeNumber: 3
+ sumProp: ["amount", "price", "total"],
+ mergeNumber: 1
},
productTableList: {},
addConfig: {}
diff --git a/src/views/sales/salesReturn/DetailReturn.vue b/src/views/sales/salesReturn/DetailReturn.vue
index 24b03ca..bd1d6f5 100644
--- a/src/views/sales/salesReturn/DetailReturn.vue
+++ b/src/views/sales/salesReturn/DetailReturn.vue
@@ -162,8 +162,8 @@
showSummary: {
show: true,
total: true,
- sumProp: ["other1", "other2", "other3", "other4"],
- mergeNumber: 3
+ sumProp: ["amount", "price", "total"],
+ mergeNumber: 1
},
productTableList: {},
addConfig: {}
diff --git a/src/views/sales/subOrder/DetailSubOrder.vue b/src/views/sales/subOrder/DetailSubOrder.vue
index 277c4a7..8638f95 100644
--- a/src/views/sales/subOrder/DetailSubOrder.vue
+++ b/src/views/sales/subOrder/DetailSubOrder.vue
@@ -120,8 +120,8 @@
showSummary: {
show: true,
total: true,
- sumProp: ["other1", "other2", "other3", "other4"],
- mergeNumber: 3
+ sumProp: ["amount", "price", "total"],
+ mergeNumber: 1
},
productTableList: {},
addConfig: {}
diff --git a/src/views/service/clientServiceOrder/DetailClientServiceOrder.vue b/src/views/service/clientServiceOrder/DetailClientServiceOrder.vue
index eb07bb8..7c3bdeb 100644
--- a/src/views/service/clientServiceOrder/DetailClientServiceOrder.vue
+++ b/src/views/service/clientServiceOrder/DetailClientServiceOrder.vue
@@ -10,7 +10,7 @@
<template slot="title">
<div class="header">
<span class="header-label">鏈嶅姟鍗曠紪鍙�</span>
- <span class="header-title">{{ detailConfig.infomation.number }}</span>
+ <span class="header-title">{{ detailConfig.infomation.serviceNumber }}</span>
</div>
</template>
<div class="content">
diff --git a/src/views/service/serviceContract/DetailServiceContract.vue b/src/views/service/serviceContract/DetailServiceContract.vue
index dcc2619..d92256d 100644
--- a/src/views/service/serviceContract/DetailServiceContract.vue
+++ b/src/views/service/serviceContract/DetailServiceContract.vue
@@ -200,8 +200,8 @@
showSummary: {
show: true,
total: true,
- sumProp: ["other1", "other2", "other3", "other4"],
- mergeNumber: 3
+ sumProp: ["amount", "price", "total"],
+ mergeNumber: 1
},
productTableList: {},
addConfig: {}
--
Gitblit v1.8.0