From b7968858014ab02aa91e52e63c2a266963d3a8f9 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期四, 24 八月 2023 18:06:22 +0800
Subject: [PATCH] 4807 4812）
---
src/views/sales/salesDetails/DetailSpecification.vue | 51 +++++++++++++++++----------------------------------
1 files changed, 17 insertions(+), 34 deletions(-)
diff --git a/src/views/sales/salesDetails/DetailSpecification.vue b/src/views/sales/salesDetails/DetailSpecification.vue
index 24c8b48..eacde64 100644
--- a/src/views/sales/salesDetails/DetailSpecification.vue
+++ b/src/views/sales/salesDetails/DetailSpecification.vue
@@ -191,13 +191,13 @@
</div>
</div>
<div v-if="activeName === 'collection'" class="second">
- <!-- <FollowupRecords :isDetail="true" /> -->
+ <CollectionPlan :isDetail="true" :add-config="addConfig" :source-type="1" />
</div>
<div v-if="activeName === 'receipt'" class="second">
- <!-- <FollowupRecords :isDetail="true" /> -->
+ <Receipt :isDetail="true" :add-config="addConfig" :source-type="1" />
</div>
<div v-if="activeName === 'invoice'" class="second">
- <!-- <FollowupRecords :isDetail="true" /> -->
+ <SaleInvoice :isDetail="true" :add-config="addConfig" :source-type="1" />
</div>
<div v-if="activeName === 'return'" class="second">
<SalesReturn :isDetail="true" :add-config="addConfig" />
@@ -219,6 +219,9 @@
import RefundForm from "@/views/sales/refundForm"
import Status from "@/common/const/salesFixedStatus"
import CommonFormTableView from "@/components/makepager/CommonFormTableView"
+import CollectionPlan from "@/views/other/payment/collectionPlan"
+import Receipt from "@/views/other/payment/receipt"
+import SaleInvoice from "@/views/other/payment/saleInvoice"
export default {
name: "DetailSpecification",
props: {
@@ -232,7 +235,7 @@
}
}
},
- components: { SalesReturn, ServiceContract, RefundForm, CommonFormTableView },
+ components: { SalesReturn, ServiceContract, RefundForm, CommonFormTableView, CollectionPlan, Receipt, SaleInvoice },
computed: {},
data() {
return {
@@ -254,8 +257,8 @@
showSummary: {
show: true,
total: true,
- sumProp: ["other1", "other2", "other3", "other4"],
- mergeNumber: 3
+ sumProp: ["amount", "price", "total"],
+ mergeNumber: 1
},
productTableList: {},
addConfig: {}
@@ -336,7 +339,7 @@
leftStr: "鍒涘缓浜�",
leftValue: "",
rightStr: "鍒涘缓鏃堕棿",
- rightValue: ""
+ rightValue: item.createTime
}
]
this.deliveryInfoList = [
@@ -356,7 +359,7 @@
this.dynamicInfoList = [
{
leftStr: "淇敼鏃堕棿",
- leftValue: "",
+ leftValue: item.updateTime,
rightStr: "鍑哄簱鐘舵��",
rightValue: ""
},
@@ -408,33 +411,13 @@
},
setTableForm() {
this.productTableList = {
- tableData: [
- {
- id: "1",
- productName: "涓婃捣鏈夐檺鍏徃",
- other0: "ZDYBD03-1",
- other1: "12",
- other2: "5.00",
- other4: "3.00",
- other3: "2.00"
- }
- ],
+ tableData: this.detailConfig.infomation.products,
tableColumn: [
- { label: "#", prop: "id", width: 40 },
- { label: "鍚◣鍗曚环", prop: "other9", input: true },
- { label: "浜у搧鍚嶇О", prop: "productName", input: true, isRequird: true },
- { label: "浜у搧缂栧彿", prop: "other0" },
- { label: "鏁伴噺", prop: "other1", input: true, isRequird: true },
- { label: "鎶樻墸鐜�(%)", prop: "other6", input: true },
- { label: "涓嶅惈绋庡崟浠�", prop: "other7", input: true },
- { label: "鎶樻墸棰�", prop: "other2" },
- { label: "绋�(閿�鍞�)", prop: "other7", input: true },
- { label: "瀹為檯鍚◣鍗曚环", prop: "other3" },
- { label: "涓嶅惈绋庨噾棰�", prop: "other4" },
- { label: "浠风◣鍚堣", prop: "other3", input: true },
- { label: "鎻忚堪", prop: "other8" },
- { label: "婧愬崟绫诲瀷", prop: "other5" },
- { label: "婧愬崟", prop: "other6" }
+ { label: "浜у搧鍚嶇О", prop: "name", productName: true, isRequird: true },
+ { label: "浜у搧缂栧彿", prop: "number" },
+ { label: "鏁伴噺", prop: "amount", inputNumber: true, isRequird: true },
+ { label: "閿�鍞崟浠�", prop: "price", inputFloat: true },
+ { label: "浠风◣鍚堣", prop: "total", inputFloat: true }
]
}
}
--
Gitblit v1.8.0