From b169e0fe3ecad3713880626bd6152c58d8ed4222 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期二, 10 十月 2023 19:59:57 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/crm-web into wn

---
 src/views/service/serviceContract/DetailServiceContract.vue |   70 ++++++++++++++++-------------------
 1 files changed, 32 insertions(+), 38 deletions(-)

diff --git a/src/views/service/serviceContract/DetailServiceContract.vue b/src/views/service/serviceContract/DetailServiceContract.vue
index b417634..75e7a1e 100644
--- a/src/views/service/serviceContract/DetailServiceContract.vue
+++ b/src/views/service/serviceContract/DetailServiceContract.vue
@@ -145,16 +145,16 @@
           </div>
         </div>
         <div v-if="activeName === 'collection'" class="second">
-          <!-- <FollowupRecords :isDetail="true" /> -->
+          <CollectionPlan :isDetail="true" :add-config="addConfig" :source-type="2" />
         </div>
         <div v-if="activeName === 'receipt'" class="second">
-          <!-- <FollowupRecords :isDetail="true" /> -->
+          <Receipt :isDetail="true" :add-config="addConfig" :source-type="2" />
         </div>
         <div v-if="activeName === 'clientService'" class="second">
-          <ClientServiceOrder :isDetail="true" />
+          <ClientServiceOrder :isDetail="true" :add-config="addConfig" />
         </div>
         <div v-if="activeName === 'invoice'" class="second">
-          <!-- <FollowupRecords :isDetail="true" /> -->
+          <SaleInvoice :isDetail="true" :add-config="addConfig" :source-type="2" />
         </div>
       </div>
     </el-drawer>
@@ -165,6 +165,9 @@
 import ClientServiceOrder from "@/views/service/clientServiceOrder"
 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: {
@@ -178,7 +181,7 @@
       }
     }
   },
-  components: { ClientServiceOrder, CommonFormTableView },
+  components: { ClientServiceOrder, CommonFormTableView, CollectionPlan, Receipt, SaleInvoice },
   computed: {},
   data() {
     return {
@@ -197,14 +200,25 @@
       showSummary: {
         show: true,
         total: true,
-        sumProp: ["other1", "other2", "other3", "other4"],
-        mergeNumber: 3
+        sumProp: ["amount", "price", "total"],
+        mergeNumber: 1
       },
-      productTableList: {}
+      productTableList: {},
+      addConfig: {}
     }
   },
   created() {
     this.setData(this.detailConfig.infomation)
+    this.addConfig = {
+      keywordType: "鏈嶅姟鍚堝悓",
+      keyword: this.detailConfig.infomation.number,
+      id: this.detailConfig.infomation.id,
+      client_name: this.detailConfig.infomation.client.name,
+      contact_name: this.detailConfig.infomation.contact_name,
+      client_id: this.detailConfig.infomation.client_id,
+      contact_id: this.detailConfig.infomation.contact_id,
+      amountTotal: this.detailConfig.infomation.amountTotal
+    }
     this.setTableForm()
   },
   mounted() {},
@@ -219,9 +233,9 @@
         },
         {
           leftStr: "璐熻矗浜�",
-          leftValue: item.memberId,
+          leftValue: item.member.username,
           rightStr: "鑱旂郴浜哄鍚�",
-          rightValue: item.contactId
+          rightValue: item.contact.name
         },
         {
           leftStr: "閿�鍞満浼�",
@@ -255,7 +269,7 @@
         },
         {
           leftStr: "鍒涘缓鏃堕棿",
-          leftValue: "",
+          leftValue: item.createTime,
           rightStr: "鏁伴噺鍚堣",
           rightValue: ""
         }
@@ -300,7 +314,7 @@
       if (value === "basic") {
         this.isBasicExpand = !this.isBasicExpand
       } else if (value === "dynamic") {
-        this.isDynamicExpand = !this.isLabelExpand
+        this.isDynamicExpand = !this.isDynamicExpand
       } else if (value === "delivery") {
         this.isDeliveryExpand = !this.isDeliveryExpand
       } else if (value === "termsConditions") {
@@ -315,33 +329,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