From 30198d2cac12b753b1bc3a4bb6e696cf57f5f39c Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期四, 17 八月 2023 18:46:59 +0800
Subject: [PATCH] 收款计划、收款单、销售发票列表及新增页面

---
 src/views/service/serviceContract/DetailServiceContract.vue |   40 +++++++++++++++++++++++++++-------------
 1 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/src/views/service/serviceContract/DetailServiceContract.vue b/src/views/service/serviceContract/DetailServiceContract.vue
index 02dbc24..2e0123b 100644
--- a/src/views/service/serviceContract/DetailServiceContract.vue
+++ b/src/views/service/serviceContract/DetailServiceContract.vue
@@ -43,7 +43,7 @@
                     <div class="content-data">{{ item.leftValue ? item.leftValue : "--" }}</div>
                   </div>
                   <div v-if="item.rightStr" class="right">
-                    <div class="content-title">{{ item.rightStr }}</div>
+                    <div class="content-title">{{ item.rightStr + "锛�" }}</div>
                     <div class="content-data">{{ item.rightValue ? item.rightValue : "--" }}</div>
                   </div>
                 </li>
@@ -65,7 +65,7 @@
                     <div class="content-data">{{ item.leftValue ? item.leftValue : "--" }}</div>
                   </div>
                   <div v-if="item.rightStr" class="right">
-                    <div class="content-title">{{ item.rightStr }}</div>
+                    <div class="content-title">{{ item.rightStr + "锛�" }}</div>
                     <div class="content-data">{{ item.rightValue ? item.rightValue : "--" }}</div>
                   </div>
                 </li>
@@ -110,7 +110,7 @@
             </div>
           </div>
           <!-- 闄勪欢淇℃伅 -->
-          <div class="basic-info">
+          <!-- <div class="basic-info">
             <div class="basic-info-label" @click="expandClick('annex')">
               <i v-if="isAnnexExpand" class="el-icon-arrow-down"></i>
               <i v-else class="el-icon-arrow-up"></i>
@@ -126,7 +126,7 @@
                 </li>
               </ul>
             </div>
-          </div>
+          </div> -->
           <!-- 浜у搧绠＄悊 -->
           <div class="basic-info">
             <div class="basic-info-label" @click="expandClick('product')">
@@ -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 {
@@ -200,11 +203,21 @@
         sumProp: ["other1", "other2", "other3", "other4"],
         mergeNumber: 3
       },
-      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
+    }
     this.setTableForm()
   },
   mounted() {},
@@ -219,9 +232,9 @@
         },
         {
           leftStr: "璐熻矗浜�",
-          leftValue: item.memberId,
+          leftValue: item.member.username,
           rightStr: "鑱旂郴浜哄鍚�",
-          rightValue: item.contactId
+          rightValue: item.contact.name
         },
         {
           leftStr: "閿�鍞満浼�",
@@ -300,7 +313,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") {
@@ -495,6 +508,7 @@
               align-items: center;
               font-size: 14px;
               font-family: PingFangSC;
+              min-height: 40px;
               // padding: 5px 0;
               .content-title {
                 width: 320px;

--
Gitblit v1.8.0