From bb71b47a43244e6db57cbc3cd0223bc5a64023d7 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 10 十一月 2023 10:40:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zycrm' into zycrm

---
 src/main/webapp/views/cstmr/cstmr_more.html |   58 +++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/src/main/webapp/views/cstmr/cstmr_more.html b/src/main/webapp/views/cstmr/cstmr_more.html
index 08e4c2a..8eaf4d1 100644
--- a/src/main/webapp/views/cstmr/cstmr_more.html
+++ b/src/main/webapp/views/cstmr/cstmr_more.html
@@ -52,7 +52,7 @@
             <div class="layui-card-body">
                 <div class="card-body-item">
                     <div class="header-sub">
-                        鐢佃瘽
+                        瀹㈡埛鐢佃瘽
                     </div>
                     <div class="header-desc" id="form-tel">
                         &nbsp;
@@ -61,7 +61,7 @@
 
                 <div class="card-body-item" style="width: 400px">
                     <div class="header-sub">
-                        璇︾粏鍦板潃
+                        瀹㈡埛璇︾粏鍦板潃
                     </div>
                     <div class="header-desc" id="form-addr">
                         &nbsp;
@@ -80,7 +80,7 @@
         </div>
         <div class="layui-row">
             <!-- 鍩烘湰淇℃伅 -->
-            <div class="layui-col-md9">
+            <div class="layui-col-md12">
                 <div class="layui-card">
                     <div class="layui-card-header">
                         鍩烘湰淇℃伅
@@ -107,12 +107,12 @@
                                     <input name="cstmrType$" class="layui-input" disabled />
                                 </div>
                             </div>
-                            <div class="layui-inline layui-col-md6">
-                                <label class="layui-form-label">瀹㈡埛鍏崇郴:</label>
-                                <div class="layui-input-block">
-                                    <input name="rela" class="layui-input" disabled/>
-                                </div>
-                            </div>
+<!--                            <div class="layui-inline layui-col-md6">-->
+<!--                                <label class="layui-form-label">瀹㈡埛鍏崇郴:</label>-->
+<!--                                <div class="layui-input-block">-->
+<!--                                    <input name="rela" class="layui-input" disabled/>-->
+<!--                                </div>-->
+<!--                            </div>-->
                             <div class="layui-inline layui-col-md6">
                                 <label class="layui-form-label">鐪佸競鍖�:</label>
                                 <div class="layui-input-block">
@@ -132,6 +132,18 @@
                                 </div>
                             </div>
                             <div class="layui-inline layui-col-md6">
+                                <label class="layui-form-label">瀹㈡埛琛屼笟:</label>
+                                <div class="layui-input-block">
+                                    <input name="industry" class="layui-input" disabled />
+                                </div>
+                            </div>
+                            <div class="layui-inline layui-col-md6">
+                                <label class="layui-form-label">浜у搧绫诲埆:</label>
+                                <div class="layui-input-block">
+                                    <input name="productCategory" class="layui-input" disabled />
+                                </div>
+                            </div>
+                            <div class="layui-inline layui-col-md12">
                                 <label class="layui-form-label">澶囨敞:</label>
                                 <div class="layui-input-block">
                                     <input name="remarks" class="layui-input" disabled />
@@ -170,20 +182,20 @@
                     </div>
                 </div>
             </div>
-            <!-- 璺熻繘浜� -->
-            <div class="layui-col-md3" style="width: 24%;margin-left: 1%">
-                <div class="layui-card">
-                    <div class="layui-card-header">
-                        <span>璺熻繘浜�</span>
-                        <span lay-filter="followerAdd" lay-submit style="float: right;cursor: pointer;">
-                            <i class="layui-icon" style="font-size: 20px;color: #1890ff;">&#xe61f;</i>
-                        </span>
-                    </div>
-                    <div class="layui-card-body">
-                        <table id="followersTable" lay-filter="followersTable"></table>
-                    </div>
-                </div>
-            </div>
+<!--            &lt;!&ndash; 璺熻繘浜� &ndash;&gt;-->
+<!--            <div class="layui-col-md3" style="width: 24%;margin-left: 1%">-->
+<!--                <div class="layui-card">-->
+<!--                    <div class="layui-card-header">-->
+<!--                        <span>璺熻繘浜�</span>-->
+<!--                        <span lay-filter="followerAdd" lay-submit style="float: right;cursor: pointer;">-->
+<!--                            <i class="layui-icon" style="font-size: 20px;color: #1890ff;">&#xe61f;</i>-->
+<!--                        </span>-->
+<!--                    </div>-->
+<!--                    <div class="layui-card-body">-->
+<!--                        <table id="followersTable" lay-filter="followersTable"></table>-->
+<!--                    </div>-->
+<!--                </div>-->
+<!--            </div>-->
         </div>
     </div>
 

--
Gitblit v1.9.1