igb 1 неделя назад
Родитель
Сommit
3d853352be
1 измененных файлов с 115 добавлено и 123 удалено
  1. 115 123
      customers.php

+ 115 - 123
customers.php

@@ -430,6 +430,7 @@ if ($act == "postchk") {
     }
 }
 
+/*
 // 处理筛选条件
 $fliterQudao = $_GET['fliterQudao'] ?? '';
 $fliterDeal = $_GET['fliterDeal'] ?? '';
@@ -481,10 +482,11 @@ $ord = $_GET['Ord'] ?? '';
 
 $ordStr = !empty($ord) ? "$ord," : "";
 
+
 // 构建查询SQL - 修改为联合查询
 $sqlStr = "SELECT c.id, c.cs_code, c.cs_company, c.cs_country, c.cs_address, c.cs_from, 
            c.cs_deal, c.cs_addtime, c.cs_updatetime, c.cs_belong, c.cs_note, c.cs_claimFrom, 
-           c.cs_chain, c.cs_dealdate, c.cs_type, c.cs_belongclient, c.allowedit,
+           c.cs_chain, c.cs_dealdate, c.cs_type, c.cs_belongclient, c.allowedit,c.colortag,
            cc.id as contact_id, cc.contact_name,
            cc.tel_1, cc.tel_1_format, cc.tel_1_bu,
            cc.tel_2, cc.tel_2_format, cc.tel_2_bu,
@@ -539,7 +541,7 @@ if (!empty($keyscode)) {
 }
 
 $sqlStr .= " $fliterStr ORDER BY {$ordStr}c.cs_updatetime DESC";
-
+*/
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -713,58 +715,36 @@ $hrefstr = "?keys=" . $keys;
         <?php
         $sql = "SELECT c.id, c.cs_code, c.cs_company, c.cs_country, c.cs_address, c.cs_from, 
                 c.cs_deal, c.cs_addtime, c.cs_updatetime, c.cs_belong, c.cs_note, c.cs_claimFrom, 
-                c.cs_chain, c.cs_dealdate, c.cs_type, c.cs_belongclient, c.allowedit,c.colortag,
-                cc.id as contact_id, cc.contact_name,
-                cc.tel_1, cc.tel_1_format, cc.tel_1_bu,
-                cc.tel_2, cc.tel_2_format, cc.tel_2_bu,
-                cc.tel_3, cc.tel_3_format, cc.tel_3_bu,
-                cc.email_1, cc.email_1_bu,
-                cc.email_2, cc.email_2_bu,
-                cc.email_3, cc.email_3_bu,
-                cc.whatsapp_1, cc.whatsapp_1_format, cc.whatsapp_1_bu,
-                cc.whatsapp_2, cc.whatsapp_2_format, cc.whatsapp_2_bu,
-                cc.whatsapp_3, cc.whatsapp_3_format, cc.whatsapp_3_bu,
-                cc.wechat_1, cc.wechat_1_bu,
-                cc.wechat_2, cc.wechat_2_bu,
-                cc.wechat_3, cc.wechat_3_bu,
-                cc.linkedin_1, cc.linkedin_1_bu,
-                cc.linkedin_2, cc.linkedin_2_bu,
-                cc.linkedin_3, cc.linkedin_3_bu,
-                cc.facebook_1, cc.facebook_1_bu,
-                cc.facebook_2, cc.facebook_2_bu,
-                cc.facebook_3, cc.facebook_3_bu,
-                cc.alibaba_1, cc.alibaba_1_bu,
-                cc.alibaba_2, cc.alibaba_2_bu,
-                cc.alibaba_3, cc.alibaba_3_bu
+                c.cs_chain, c.cs_dealdate, c.cs_type, c.cs_belongclient, c.allowedit,c.colortag
                 FROM customer c 
-                LEFT JOIN customer_contact cc ON c.id = cc.customer_id
                 WHERE c.is_silent=0 AND c.cs_deal>0 AND c.cs_belong=" . (int)$_SESSION['employee_id'];
         
         $searchPattern = mysqli_real_escape_string($conn, $keyscode);
         if(!empty($searchPattern)) {
             $sql .= " AND (c.cs_code LIKE '%$searchPattern%' 
-                    OR cc.contact_name LIKE '%$searchPattern%' 
-                    OR cc.tel_1 LIKE '%$searchPattern%'
-                    OR cc.tel_2 LIKE '%$searchPattern%'
-                    OR cc.tel_3 LIKE '%$searchPattern%'
-                    OR cc.email_1 LIKE '%$searchPattern%'
-                    OR cc.email_2 LIKE '%$searchPattern%'
-                    OR cc.email_3 LIKE '%$searchPattern%'
-                    OR cc.wechat_1 LIKE '%$searchPattern%'
-                    OR cc.wechat_2 LIKE '%$searchPattern%'
-                    OR cc.wechat_3 LIKE '%$searchPattern%'
-                    OR cc.whatsapp_1_format LIKE '%$searchPattern%'
-                    OR cc.whatsapp_2_format LIKE '%$searchPattern%'
-                    OR cc.whatsapp_3_format LIKE '%$searchPattern%'
-                    OR cc.linkedin_1 LIKE '%$searchPattern%'
-                    OR cc.linkedin_2 LIKE '%$searchPattern%'
-                    OR cc.linkedin_3 LIKE '%$searchPattern%'
-                    OR cc.facebook_1 LIKE '%$searchPattern%'
-                    OR cc.facebook_2 LIKE '%$searchPattern%'
-                    OR cc.facebook_3 LIKE '%$searchPattern%'
-                    OR cc.alibaba_1 LIKE '%$searchPattern%'
-                    OR cc.alibaba_2 LIKE '%$searchPattern%'
-                    OR cc.alibaba_3 LIKE '%$searchPattern%'
+                    OR c.id IN (SELECT customer_id FROM customer_contact WHERE 
+                        contact_name LIKE '%$searchPattern%' OR
+                        tel_1 LIKE '%$searchPattern%' OR
+                        tel_2 LIKE '%$searchPattern%' OR
+                        tel_3 LIKE '%$searchPattern%' OR
+                        email_1 LIKE '%$searchPattern%' OR
+                        email_2 LIKE '%$searchPattern%' OR
+                        email_3 LIKE '%$searchPattern%' OR
+                        wechat_1 LIKE '%$searchPattern%' OR
+                        wechat_2 LIKE '%$searchPattern%' OR
+                        wechat_3 LIKE '%$searchPattern%' OR
+                        whatsapp_1_format LIKE '%$searchPattern%' OR
+                        whatsapp_2_format LIKE '%$searchPattern%' OR
+                        whatsapp_3_format LIKE '%$searchPattern%' OR
+                        linkedin_1 LIKE '%$searchPattern%' OR
+                        linkedin_2 LIKE '%$searchPattern%' OR
+                        linkedin_3 LIKE '%$searchPattern%' OR
+                        facebook_1 LIKE '%$searchPattern%' OR
+                        facebook_2 LIKE '%$searchPattern%' OR
+                        facebook_3 LIKE '%$searchPattern%' OR
+                        alibaba_1 LIKE '%$searchPattern%' OR
+                        alibaba_2 LIKE '%$searchPattern%' OR
+                        alibaba_3 LIKE '%$searchPattern%')
                     OR c.id IN (SELECT customerId FROM tagtable WHERE tagName LIKE '%$searchPattern%'))";
         }
         
@@ -843,83 +823,95 @@ $hrefstr = "?keys=" . $keys;
                 <div class="notepanel clear">
                     <div class="noteItem">联系方式</div>
                     <div class="lx">
-                        <div class="tel">
-                            <?php if(!empty($row['tel_1'])): ?>
-                                <div><?= $row['tel_1'] ?></div>
-                            <?php endif; ?>
-                            <?php if(!empty($row['tel_2'])): ?>
-                                <div><?= $row['tel_2'] ?></div>
-                            <?php endif; ?>
-                            <?php if(!empty($row['tel_3'])): ?>
-                                <div><?= $row['tel_3'] ?></div>
-                            <?php endif; ?>
-                        </div>
-                        <div class="mail">
-                            <?php if(!empty($row['email_1'])): ?>
-                                <div><a href="mailto:<?= $row['email_1'] ?>"><?= $row['email_1'] ?></a></div>
-                            <?php endif; ?>
-                            <?php if(!empty($row['email_2'])): ?>
-                                <div><a href="mailto:<?= $row['email_2'] ?>"><?= $row['email_2'] ?></a></div>
-                            <?php endif; ?>
-                            <?php if(!empty($row['email_3'])): ?>
-                                <div><a href="mailto:<?= $row['email_3'] ?>"><?= $row['email_3'] ?></a></div>
-                            <?php endif; ?>
-                        </div>
-                        <div class="whatsapp">
-                            <?php if(!empty($row['whatsapp_1'])): ?>
-                                <div><?= $row['whatsapp_1'] ?></div>
-                            <?php endif; ?>
-                            <?php if(!empty($row['whatsapp_2'])): ?>
-                                <div><?= $row['whatsapp_2'] ?></div>
-                            <?php endif; ?>
-                            <?php if(!empty($row['whatsapp_3'])): ?>
-                                <div><?= $row['whatsapp_3'] ?></div>
-                            <?php endif; ?>
-                        </div>
-                        <div class="wechat">
-                            <?php if(!empty($row['wechat_1'])): ?>
-                                <div><?= $row['wechat_1'] ?></div>
-                            <?php endif; ?>
-                            <?php if(!empty($row['wechat_2'])): ?>
-                                <div><?= $row['wechat_2'] ?></div>
-                            <?php endif; ?>
-                            <?php if(!empty($row['wechat_3'])): ?>
-                                <div><?= $row['wechat_3'] ?></div>
-                            <?php endif; ?>
-                        </div>
-                        <div class="linkedin">
-                            <?php if(!empty($row['linkedin_1'])): ?>
-                                <div><?= $row['linkedin_1'] ?></div>
-                            <?php endif; ?>
-                            <?php if(!empty($row['linkedin_2'])): ?>
-                                <div><?= $row['linkedin_2'] ?></div>
-                            <?php endif; ?>
-                            <?php if(!empty($row['linkedin_3'])): ?>
-                                <div><?= $row['linkedin_3'] ?></div>
-                            <?php endif; ?>
-                        </div>
-                        <div class="facebook">
-                            <?php if(!empty($row['facebook_1'])): ?>
-                                <div><?= $row['facebook_1'] ?></div>
-                            <?php endif; ?>
-                            <?php if(!empty($row['facebook_2'])): ?>
-                                <div><?= $row['facebook_2'] ?></div>
-                            <?php endif; ?>
-                            <?php if(!empty($row['facebook_3'])): ?>
-                                <div><?= $row['facebook_3'] ?></div>
-                            <?php endif; ?>
-                        </div>
-                        <div class="alibaba">
-                            <?php if(!empty($row['alibaba_1'])): ?>
-                                <div><?= $row['alibaba_1'] ?></div>
-                            <?php endif; ?>
-                            <?php if(!empty($row['alibaba_2'])): ?>
-                                <div><?= $row['alibaba_2'] ?></div>
-                            <?php endif; ?>
-                            <?php if(!empty($row['alibaba_3'])): ?>
-                                <div><?= $row['alibaba_3'] ?></div>
+                        <?php
+                        // Fetch all contacts for this customer
+                        $contact_sql = "SELECT * FROM customer_contact WHERE customer_id = " . $row['id'];
+                        $contact_result = mysqli_query($conn, $contact_sql);
+                        while ($contact = mysqli_fetch_assoc($contact_result)) {
+                        ?>
+                        <div class="contact-block">
+                            <?php if(!empty($contact['contact_name'])): ?>
+                                <div class="contact-name"><?= $contact['contact_name'] ?></div>
                             <?php endif; ?>
+                            <div class="tel">
+                                <?php if(!empty($contact['tel_1'])): ?>
+                                    <div><?= $contact['tel_1'] ?></div>
+                                <?php endif; ?>
+                                <?php if(!empty($contact['tel_2'])): ?>
+                                    <div><?= $contact['tel_2'] ?></div>
+                                <?php endif; ?>
+                                <?php if(!empty($contact['tel_3'])): ?>
+                                    <div><?= $contact['tel_3'] ?></div>
+                                <?php endif; ?>
+                            </div>
+                            <div class="mail">
+                                <?php if(!empty($contact['email_1'])): ?>
+                                    <div><a href="mailto:<?= $contact['email_1'] ?>"><?= $contact['email_1'] ?></a></div>
+                                <?php endif; ?>
+                                <?php if(!empty($contact['email_2'])): ?>
+                                    <div><a href="mailto:<?= $contact['email_2'] ?>"><?= $contact['email_2'] ?></a></div>
+                                <?php endif; ?>
+                                <?php if(!empty($contact['email_3'])): ?>
+                                    <div><a href="mailto:<?= $contact['email_3'] ?>"><?= $contact['email_3'] ?></a></div>
+                                <?php endif; ?>
+                            </div>
+                            <div class="whatsapp">
+                                <?php if(!empty($contact['whatsapp_1'])): ?>
+                                    <div><?= $contact['whatsapp_1'] ?></div>
+                                <?php endif; ?>
+                                <?php if(!empty($contact['whatsapp_2'])): ?>
+                                    <div><?= $contact['whatsapp_2'] ?></div>
+                                <?php endif; ?>
+                                <?php if(!empty($contact['whatsapp_3'])): ?>
+                                    <div><?= $contact['whatsapp_3'] ?></div>
+                                <?php endif; ?>
+                            </div>
+                            <div class="wechat">
+                                <?php if(!empty($contact['wechat_1'])): ?>
+                                    <div><?= $contact['wechat_1'] ?></div>
+                                <?php endif; ?>
+                                <?php if(!empty($contact['wechat_2'])): ?>
+                                    <div><?= $contact['wechat_2'] ?></div>
+                                <?php endif; ?>
+                                <?php if(!empty($contact['wechat_3'])): ?>
+                                    <div><?= $contact['wechat_3'] ?></div>
+                                <?php endif; ?>
+                            </div>
+                            <div class="linkedin">
+                                <?php if(!empty($contact['linkedin_1'])): ?>
+                                    <div><?= $contact['linkedin_1'] ?></div>
+                                <?php endif; ?>
+                                <?php if(!empty($contact['linkedin_2'])): ?>
+                                    <div><?= $contact['linkedin_2'] ?></div>
+                                <?php endif; ?>
+                                <?php if(!empty($contact['linkedin_3'])): ?>
+                                    <div><?= $contact['linkedin_3'] ?></div>
+                                <?php endif; ?>
+                            </div>
+                            <div class="facebook">
+                                <?php if(!empty($contact['facebook_1'])): ?>
+                                    <div><?= $contact['facebook_1'] ?></div>
+                                <?php endif; ?>
+                                <?php if(!empty($contact['facebook_2'])): ?>
+                                    <div><?= $contact['facebook_2'] ?></div>
+                                <?php endif; ?>
+                                <?php if(!empty($contact['facebook_3'])): ?>
+                                    <div><?= $contact['facebook_3'] ?></div>
+                                <?php endif; ?>
+                            </div>
+                            <div class="alibaba">
+                                <?php if(!empty($contact['alibaba_1'])): ?>
+                                    <div><?= $contact['alibaba_1'] ?></div>
+                                <?php endif; ?>
+                                <?php if(!empty($contact['alibaba_2'])): ?>
+                                    <div><?= $contact['alibaba_2'] ?></div>
+                                <?php endif; ?>
+                                <?php if(!empty($contact['alibaba_3'])): ?>
+                                    <div><?= $contact['alibaba_3'] ?></div>
+                                <?php endif; ?>
+                            </div>
                         </div>
+                        <?php } ?>
                     </div>
                     <div class="noteItem2">备注</div>
                     <div class="notecontent"><?= htmlUnCode($row['cs_note']) ?></div>