From 1249ca8ff44f8de7992fdb5866eae19613d606c3 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期三, 16 八月 2023 19:37:49 +0800
Subject: [PATCH] 详情页联调

---
 src/views/service/clientServiceOrder/DetailClientServiceOrder.vue |   40 ++++++++++++++++++++++++++--------------
 1 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/src/views/service/clientServiceOrder/DetailClientServiceOrder.vue b/src/views/service/clientServiceOrder/DetailClientServiceOrder.vue
index d7446de..8eaf37b 100644
--- a/src/views/service/clientServiceOrder/DetailClientServiceOrder.vue
+++ b/src/views/service/clientServiceOrder/DetailClientServiceOrder.vue
@@ -40,8 +40,8 @@
                     <div class="content-title">{{ item.leftStr + "锛�" }}</div>
                     <div class="content-data">{{ item.leftValue ? item.leftValue : "--" }}</div>
                   </div>
-                  <div class="right">
-                    <div class="content-title">{{ item.rightStr }}</div>
+                  <div v-if="item.rightStr" class="right">
+                    <div class="content-title">{{ item.rightStr + "锛�" }}</div>
                     <div class="content-data">{{ item.rightValue ? item.rightValue : "--" }}</div>
                   </div>
                 </li>
@@ -62,8 +62,8 @@
                     <div class="content-title">{{ item.leftStr + "锛�" }}</div>
                     <div class="content-data">{{ item.leftValue ? item.leftValue : "--" }}</div>
                   </div>
-                  <div class="right">
-                    <div class="content-title">{{ item.rightStr }}</div>
+                  <div v-if="item.rightStr" class="right">
+                    <div class="content-title">{{ item.rightStr + "锛�" }}</div>
                     <div class="content-data">{{ item.rightValue ? item.rightValue : "--" }}</div>
                   </div>
                 </li>
@@ -84,8 +84,8 @@
                     <div class="content-title">{{ item.leftStr + "锛�" }}</div>
                     <div class="content-data">{{ item.leftValue ? item.leftValue : "--" }}</div>
                   </div>
-                  <div class="right">
-                    <div class="content-title">{{ item.rightStr }}</div>
+                  <div v-if="item.rightStr" class="right">
+                    <div class="content-title">{{ item.rightStr + "锛�" }}</div>
                     <div class="content-data">{{ item.rightValue ? item.rightValue : "--" }}</div>
                   </div>
                 </li>
@@ -183,7 +183,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>
@@ -199,7 +199,7 @@
                 </li>
               </ul>
             </div>
-          </div>
+          </div> -->
           <!-- 绛惧瓧纭 -->
           <div class="basic-info">
             <div class="basic-info-label" @click="expandClick('signConfim')">
@@ -261,7 +261,7 @@
           <!-- <Contacts :isDetail="true" /> -->
         </div>
         <div v-if="activeName === 'followup'" class="second">
-          <ServiceFollowup :isDetail="true" />
+          <ServiceFollowup :isDetail="true" :add-config="addConfig" />
         </div>
       </div>
     </el-drawer>
@@ -311,12 +311,24 @@
       isServiceContractExpand: true, // 鏈嶅姟鍚堝悓淇℃伅
       serviceContractList: [],
       isHistoryExpand: true, // 瀹㈡埛鏈嶅姟鍗曞巻鍙茶褰�
-      historyList: []
+      historyList: [],
+      addConfig: {}
     }
   },
   created() {
     this.setData()
     this.setTable()
+    console.log(this.detailConfig.infomation.contact_name)
+    this.addConfig = {
+      keyword: this.detailConfig.infomation.serviceNumber,
+      keywordType: "瀹㈡埛鏈嶅姟鍗�",
+      client_name: this.detailConfig.infomation.client_name,
+      clientId: this.detailConfig.infomation.clientId,
+      contactId: this.detailConfig.infomation.contactId,
+      contact_name: this.detailConfig.infomation.contact_name,
+      service_number: this.detailConfig.infomation.serviceNumber,
+      serviceId: this.detailConfig.infomation.id
+    }
   },
   mounted() {},
   methods: {
@@ -345,7 +357,7 @@
         },
         {
           leftStr: "鏈嶅姟鍚堝悓",
-          leftValue: data.Contract.number,
+          leftValue: data.ServiceContract.number,
           rightStr: "鏁呴殰绫诲埆",
           rightValue: data.FaultType.name
         },
@@ -353,13 +365,13 @@
           leftStr: "涓婚",
           leftValue: data.subject,
           rightStr: "鍚堝悓璁㈠崟",
-          rightValue: data.OrderManage.number
+          rightValue: data.SalesDetails.number
         },
         {
           leftStr: "浜у搧绫诲埆",
           leftValue: "",
           rightStr: "浜у搧鍚嶇О",
-          rightValue: data.Product.name
+          rightValue: data.productName
         },
         {
           leftStr: "鏈嶅姟鏂瑰紡",
@@ -395,7 +407,7 @@
       this.dynamicInfoList = [
         {
           leftStr: "澶勭悊鐘舵��",
-          leftValue: data.status,
+          leftValue: data.serviceOrderStatusId,
           rightStr: "鏈�鏂板垎閰嶆椂闂�",
           rightValue: ""
         },

--
Gitblit v1.8.0