From 1f4bc9f584c07a0958747657b7353ccbd1d56b41 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期三, 16 八月 2023 17:39:00 +0800
Subject: [PATCH] bug修复及销售子单产品管理相关

---
 src/views/service/serviceContract/index.vue |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/views/service/serviceContract/index.vue b/src/views/service/serviceContract/index.vue
index 6c36084..180b8e7 100644
--- a/src/views/service/serviceContract/index.vue
+++ b/src/views/service/serviceContract/index.vue
@@ -125,7 +125,7 @@
           { label: "绛剧害鏃ユ湡", prop: "signTime" }, // 绛剧害鏃ユ湡
           { label: "鍚堝悓绫诲瀷", prop: "serviceContractType" }, // 鍚堝悓绫诲瀷
           { label: "鍚堝悓鐘舵��", prop: "serviceContractStatus" }, // 鍚堝悓鐘舵��
-          { label: "璐熻矗浜�", prop: "memberId" }, // 璐熻矗浜�
+          { label: "璐熻矗浜�", prop: "member_name" }, // 璐熻矗浜�
           { label: "浜у搧鍚嶇О", prop: "productName" }, // 浜у搧鍚嶇О
           { label: "鏈嶅姟寮�濮嬫棩", prop: "startTime" }, // 鏈嶅姟寮�濮嬫棩
           { label: "鏈嶅姟鍒版湡鏃�", prop: "endTime" }, // 鏈嶅姟鍒版湡鏃�
@@ -157,7 +157,8 @@
                   ...item,
                   client_name: item.client.name,
                   serviceContractStatus: item.serviceContractStatus.name,
-                  serviceContractType: item.serviceContractType.name
+                  serviceContractType: item.serviceContractType.name,
+                  member_name: item.member.username
                 }
               })
               this.tableList.tableInfomation = list || []
@@ -196,7 +197,11 @@
       console.log(row)
       this.editConfig.visible = true
       this.editConfig.title = "缂栬緫"
-      this.editConfig.infomation = { ...row }
+      this.editConfig.infomation = {
+        ...row,
+        contract_number: row.salesDetails.number,
+        quotation_number: row.quotation.number
+      }
     },
     // 鍒犻櫎
     delClick() {
@@ -237,7 +242,8 @@
         ...row.client,
         client_name: row.client.name,
         client_level: row.client.client_level.name,
-        client_status: row.client.client_status.name
+        client_status: row.client.client_status.name,
+        contact_name: row.contact.name
       }
     },
     // 鏈嶅姟鍚堝悓璇︽儏

--
Gitblit v1.8.0