From 5233bff9efb1830ea9b13661944637ee6d22e364 Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期一, 16 十月 2023 19:11:25 +0800
Subject: [PATCH] Merge branch 'dev' of ssh://192.168.5.5:29418/web/crm-web into dev

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

diff --git a/src/views/service/serviceContract/index.vue b/src/views/service/serviceContract/index.vue
index 5e1974b..7bc06b1 100644
--- a/src/views/service/serviceContract/index.vue
+++ b/src/views/service/serviceContract/index.vue
@@ -289,7 +289,9 @@
         quotation_number: row.quotation.number,
         currency: "浜烘皯甯�",
         sale_chance_name: row.SaleChance.name,
-        contact_name: row.contact.name
+        contact_name: row.contact.name,
+        serviceContractTypeId: row.serviceContractTypeId === 0 ? null : row.serviceContractTypeId,
+        serviceContractStatusId: row.serviceContractStatusId === 0 ? null : row.serviceContractStatusId
       }
     },
     // 鍒犻櫎

--
Gitblit v1.8.0