From 54892d8e259d14cd29e93d6ed43b8ad57a5b7cbf Mon Sep 17 00:00:00 2001
From: Kyle <succpeking@hotmail.com>
Date: Mon, 10 Sep 2018 15:44:29 +0800
Subject: [PATCH] =?UTF-8?q?#60=20=E8=81=94=E7=B3=BB=E4=BA=BAUI=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../apps/agent/calloutcontact/edit.html       | 77 ++++++++++---------
 .../templates/apps/business/contacts/add.html |  6 +-
 .../apps/business/contacts/detail.html        | 58 +++++++-------
 3 files changed, 76 insertions(+), 65 deletions(-)

diff --git a/contact-center/app/src/main/resources/templates/apps/agent/calloutcontact/edit.html b/contact-center/app/src/main/resources/templates/apps/agent/calloutcontact/edit.html
index 9ced18a8..03035a7b 100644
--- a/contact-center/app/src/main/resources/templates/apps/agent/calloutcontact/edit.html
+++ b/contact-center/app/src/main/resources/templates/apps/agent/calloutcontact/edit.html
@@ -143,14 +143,15 @@
 							</div>
 						</div>
 					</div>
-				</div>
-			</div>
-		</div>
 
-		<div class="layui-form-button" style="position: inherit;">
-			<div class="layui-button-block">
-				<button class="layui-btn" lay-submit lay-filter="formDemo">立即更新</button>
-				<button type="reset" class="layui-btn layui-btn-primary">重置</button>
+<div class="layui-form-button" style="position: inherit;">
+    <div class="layui-button-block">
+        <button class="layui-btn" lay-submit lay-filter="formDemo">立即更新</button>
+        <button type="reset" class="layui-btn layui-btn-primary">重置</button>
+    </div>
+</div>
+				</div>
+
 			</div>
 		</div>
 	</form>
@@ -172,15 +173,17 @@
             border: solid 1px #CCCCCC;
         }
     </style>
-    <div class="box-body ukefu-im-theme" style="margin-top: 20px;border-bottom: 1px solid white;">
+    <div class="box-body ukefu-im-theme">
         <div class="uk-layui-form">
             <div class="layui-collapse">
-                <h2 class="layui-colla-title">标签</h2>
-                <div class="layui-colla-content layui-show">
-                    <div class="layui-form-item">
-                        <div class="layui-inline">
-                            <label class="layui-form-label" style="text-align: left;">已有标签：</label>
-                            <div id="contactTags" class="layui-input-inline" style="width: 100%;">
+                <div class="layui-colla-item">
+                    <h2 class="layui-colla-title">标签</h2>
+                    <div class="layui-colla-content layui-show">
+                        <div class="layui-form-item">
+                            <div class="layui-inline">
+                                <label class="layui-form-label" style="text-align: left;">已有标签：</label>
+                                <div id="contactTags" class="layui-input-inline" style="width: 100%;">
+                                </div>
                             </div>
                         </div>
                     </div>
@@ -188,32 +191,34 @@
             </div>
         </div>
     </div>
-    <div class="box-body ukefu-im-theme" style="margin-top: 20px;">
+    <div class="box-body ukefu-im-theme">
         <div class="uk-layui-form">
             <div class="layui-collapse">
-                <h2 class="layui-colla-title">笔记</h2>
-                <div class="layui-colla-content layui-show">
-                    <div class="layui-form-item">
-                        <label class="layui-form-label" style="text-align: left;">笔记分类：</label>
-                        <div class="layui-input-inline">
-                            <select id="notesCategory" name="notesCategory" lay-filter="category" required lay-verify="required" style="display: inline">
-                                <option value="callout">外呼</option>
-                                <option value="callin">呼入</option>
-                                <option value="webim">WebIM</option>
-                            </select>
-                        </div>
-                    </div>
-                    <div class="layui-form-item">
-                        <div class="layui-inline">
-                            <label class="layui-form-label" style="text-align: left;">内容：</label>
-                            <div class="layui-input-inline" style="width: 174%;">
-                                <textarea id="notesContent" name="notes" class="layui-textarea" ></textarea>
+                <div class="layui-colla-item">
+                    <h2 class="layui-colla-title">笔记</h2>
+                    <div class="layui-colla-content layui-show">
+                        <div class="layui-form-item">
+                            <label class="layui-form-label" style="text-align: left;">笔记分类：</label>
+                            <div class="layui-input-inline">
+                                <select id="notesCategory" name="notesCategory" lay-filter="category" required lay-verify="required" style="display: inline">
+                                    <option value="callout">外呼</option>
+                                    <option value="callin">呼入</option>
+                                    <option value="webim">网页</option>
+                                </select>
                             </div>
                         </div>
-                    </div>
-                    <div class="layui-form-item">
-                        <div class="layui-button-inline" style="float: left;">
-                            <button class="layui-btn" lay-submit lay-filter="notesbtn" id="notesAddBtn">立即添加</button>
+                        <div class="layui-form-item">
+                            <div class="layui-inline">
+                                <label class="layui-form-label" style="text-align: left;">内容：</label>
+                                <div class="layui-input-inline" style="width: 174%;">
+                                    <textarea id="notesContent" name="notes" class="layui-textarea" ></textarea>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="layui-form-item">
+                            <div class="layui-button-inline" style="float: left;">
+                                <button class="layui-btn" lay-submit lay-filter="notesbtn" id="notesAddBtn">立即添加</button>
+                            </div>
                         </div>
                     </div>
                 </div>
diff --git a/contact-center/app/src/main/resources/templates/apps/business/contacts/add.html b/contact-center/app/src/main/resources/templates/apps/business/contacts/add.html
index 01d6abb5..4a0a2963 100644
--- a/contact-center/app/src/main/resources/templates/apps/business/contacts/add.html
+++ b/contact-center/app/src/main/resources/templates/apps/business/contacts/add.html
@@ -20,7 +20,7 @@
 						<div class="layui-inline">
 							<label class="layui-form-label" style="width:60px;line-height: 35px;">类型：</label>
 							<div class="layui-input-inline" style="width:218px;margin-right:0px;padding-top:9px;">
-								<@select "com.dic.contacts.ckind" "ckind" ckind!'' "lay-ignore required lay-verify='required' "/>
+                                <@select "com.dic.contacts.ckind" "ckind" ckind!'' "lay-ignore required lay-verify='required' "/>
 							</div>
 						</div>
 					</div>
@@ -142,7 +142,7 @@
 		</div>
 	</form>
 </div>
-
+<script src="/js/moment.min.js"></script>
 <script>
 	//Demo
 	$('#province').change(function(){
@@ -167,6 +167,8 @@
 	layui.use('element', function(){
 		var element = layui.element();
 	});
+
+    $("#getdate").val(moment().format('YYYY-MM-DD'));
 	layui.use('laydate', function() {
 		var laydate = layui.laydate;
 
diff --git a/contact-center/app/src/main/resources/templates/apps/business/contacts/detail.html b/contact-center/app/src/main/resources/templates/apps/business/contacts/detail.html
index 565c155e..db95ee2b 100644
--- a/contact-center/app/src/main/resources/templates/apps/business/contacts/detail.html
+++ b/contact-center/app/src/main/resources/templates/apps/business/contacts/detail.html
@@ -144,12 +144,14 @@
                     <div class="box-body ukefu-im-theme" style="margin-top: 20px;">
                         <div class="uk-layui-form">
                             <div class="layui-collapse">
-                                <h2 class="layui-colla-title">标签</h2>
-                                <div class="layui-colla-content layui-show">
-                                    <div class="layui-form-item">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="text-align: left;">已有标签：</label>
-                                            <div id="contactTags" class="layui-input-inline" style="width: 100%;">
+                                <div class="layui-colla-item">
+                                    <h2 class="layui-colla-title">标签</h2>
+                                    <div class="layui-colla-content layui-show">
+                                        <div class="layui-form-item">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="text-align: left;">已有标签：</label>
+                                                <div id="contactTags" class="layui-input-inline" style="width: 100%;">
+                                                </div>
                                             </div>
                                         </div>
                                     </div>
@@ -160,29 +162,31 @@
                     <div class="box-body ukefu-im-theme" style="margin-top: 20px;">
                         <div class="uk-layui-form">
                             <div class="layui-collapse">
-                                <h2 class="layui-colla-title">笔记</h2>
-                                <div class="layui-colla-content layui-show">
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label" style="text-align: left;">笔记分类：</label>
-                                        <div class="layui-input-inline">
-                                            <select id="notesCategory" name="notesCategory" lay-filter="category" required lay-verify="required" style="display: inline">
-                                                <option value="callout">外呼</option>
-                                                <option value="callin">呼入</option>
-                                                <option value="webim">WebIM</option>
-                                            </select>
-                                        </div>
-                                    </div>
-                                    <div class="layui-form-item">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="text-align: left;">内容：</label>
-                                            <div class="layui-input-inline" style="width: 149%;">
-                                                <textarea id="notesContent" name="notes" class="layui-textarea" ></textarea>
+                                <div class="layui-colla-item">
+                                    <h2 class="layui-colla-title">笔记</h2>
+                                    <div class="layui-colla-content layui-show">
+                                        <div class="layui-form-item">
+                                            <label class="layui-form-label" style="text-align: left;">笔记分类：</label>
+                                            <div class="layui-input-inline">
+                                                <select id="notesCategory" name="notesCategory" lay-filter="category" required lay-verify="required" style="display: inline">
+                                                    <option value="callout">外呼</option>
+                                                    <option value="callin">呼入</option>
+                                                    <option value="webim">网页</option>
+                                                </select>
                                             </div>
                                         </div>
-                                    </div>
-                                    <div class="layui-form-item">
-                                        <div class="layui-button-inline" style="float: right;">
-                                            <button class="layui-btn" lay-submit lay-filter="notesbtn" id="notesAddBtn">立即添加</button>
+                                        <div class="layui-form-item">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="text-align: left;">内容：</label>
+                                                <div class="layui-input-inline" style="width: 149%;">
+                                                    <textarea id="notesContent" name="notes" class="layui-textarea" ></textarea>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <div class="layui-button-inline" style="float: right;">
+                                                <button class="layui-btn" lay-submit lay-filter="notesbtn" id="notesAddBtn">立即添加</button>
+                                            </div>
                                         </div>
                                     </div>
                                 </div>