From c1adf27fbabbff1d76b60993521c765ef1ed79ef Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期二, 15 八月 2023 20:03:21 +0800
Subject: [PATCH] 新建客户管理 客户名称查重

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

diff --git a/src/views/service/serviceContract/DetailServiceContract.vue b/src/views/service/serviceContract/DetailServiceContract.vue
index f7b3d0d..677c90d 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>
@@ -83,9 +83,10 @@
               <div class="termsConditions">
                 <div class="content-title">{{ "鏉℃涓庢潯绾�" + "锛�" }}</div>
                 <div class="content-termsConditions">
-                  <ul>
+                  {{ "\n" + detailConfig.infomation.terms }}
+                  <!-- <ul>
                     <li v-for="(item, index) in Status.serviceContract" :key="index">{{ item }}</li>
-                  </ul>
+                  </ul> -->
                 </div>
               </div>
             </div>
@@ -109,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>
@@ -125,7 +126,7 @@
                 </li>
               </ul>
             </div>
-          </div>
+          </div> -->
           <!-- 浜у搧绠$悊 -->
           <div class="basic-info">
             <div class="basic-info-label" @click="expandClick('product')">
@@ -218,9 +219,9 @@
         },
         {
           leftStr: "璐熻矗浜�",
-          leftValue: item.memberId,
+          leftValue: item.member.username,
           rightStr: "鑱旂郴浜哄鍚�",
-          rightValue: item.contactId
+          rightValue: item.contact.name
         },
         {
           leftStr: "閿�鍞満浼�",
@@ -494,6 +495,7 @@
               align-items: center;
               font-size: 14px;
               font-family: PingFangSC;
+              min-height: 40px;
               // padding: 5px 0;
               .content-title {
                 width: 320px;
@@ -501,13 +503,14 @@
                 color: #555;
               }
               .content-termsConditions {
-                margin-left: 25px;
+                margin: 0px 25px 15px;
                 font-size: 13px;
                 color: #333;
-                li {
-                  margin: 5px 0;
-                  border-bottom: 0px solid #f9f9fb;
-                }
+                white-space: pre-wrap;
+                // li {
+                //   margin: 5px 0;
+                //   border-bottom: 0px solid #f9f9fb;
+                // }
               }
             }
           }

--
Gitblit v1.8.0