From eba44bb7610239097167d01ba0564362d86a51bb Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 06 十月 2023 10:10:42 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/cstmr/cstmr.js | 23 +++++++----
src/main/webapp/views/cstmr/cstmr.html | 25 ++++++------
src/main/webapp/static/layui/lay/modules/formDesigner/coolForm.css | 10 +++++
src/main/webapp/views/home/dashboard.html | 3 -
4 files changed, 37 insertions(+), 24 deletions(-)
diff --git a/src/main/webapp/static/js/cstmr/cstmr.js b/src/main/webapp/static/js/cstmr/cstmr.js
index e15803f..1c5069d 100644
--- a/src/main/webapp/static/js/cstmr/cstmr.js
+++ b/src/main/webapp/static/js/cstmr/cstmr.js
@@ -143,15 +143,15 @@
// ,{field: 'hostId$', align: 'center',title: '鎵�灞炲晢鎴�'},
{field: 'name', align: 'left',title: '瀹㈡埛鍚嶇О', style: 'color: #1890ff;cursor:pointer', event: 'more', width: 350}
,{field: 'simple', align: 'left',title: '瀹㈡埛绠�绉�', hide: true}
- ,{field: 'uuid', align: 'left',title: '瀹㈡埛浠ｅ彿'}
- ,{field: 'addr', align: 'left',title: '璇︾粏鍦板潃', templet:function(d){return emptyShow(d.addr)}}
- ,{field: 'tel', align: 'left',title: '鐢佃瘽', templet:function(d){return emptyShow(d.tel)}}
- ,{field: 'remarks', align: 'left',title: '澶囨敞', templet:function(d){return emptyShow(d.remarks)}}
- ,{field: 'cstmrType$', align: 'left',title: '瀹㈡埛绫诲埆'}
- ,{field: 'industry', align: 'left',title: '瀹㈡埛琛屼笟'}
- ,{field: 'productCategory', align: 'left',title: '浜у搧绫诲埆'}
- ,{field: 'userId$', align: 'left',title: '娣诲姞浜哄憳'}
- ,{field: 'createTime$', align: 'left',title: '娣诲姞鏃堕棿'}
+ ,{field: 'uuid', align: 'left',title: '瀹㈡埛浠ｅ彿', hide: false}
+ ,{field: 'addr', align: 'left',title: '璇︾粏鍦板潃', hide: false, templet:function(d){return emptyShow(d.addr)}}
+ ,{field: 'tel', align: 'left',title: '鐢佃瘽', hide: false, templet:function(d){return emptyShow(d.tel)}}
+ ,{field: 'remarks', align: 'left',title: '澶囨敞', hide: false, templet:function(d){return emptyShow(d.remarks)}}
+ ,{field: 'cstmrType$', align: 'left',title: '瀹㈡埛绫诲埆', hide: false}
+ ,{field: 'industry', align: 'left',title: '瀹㈡埛琛屼笟', hide: false}
+ ,{field: 'productCategory', align: 'left',title: '浜у搧绫诲埆', hide: false}
+ ,{field: 'userId$', align: 'left',title: '娣诲姞浜哄憳', hide: true}
+ ,{field: 'createTime$', align: 'left',title: '娣诲姞鏃堕棿', hide: false}
,{field: 'deptId$', align: 'left',title: '鎵�灞為儴闂�', hide: true}
,{field: 'rela', align: 'left',title: '瀹㈡埛鍏崇郴', hide: true}
,{field: 'contacts', align: 'left',title: '瀹㈡埛鑱旂郴浜�', hide: true}
@@ -268,10 +268,15 @@
content: $('#editDialog').html(),
success: function (layero, dIndex) {
let loadNameXml = loadNameXmlSel()
+ let method = mData?'update':'add';
if (mData) {
$('#cascaderVal').val(mData.pcd);
if (mData.name) { loadNameXml.setValue([{name: mData.name, value: mData.name}]); }
}
+ if (method === 'update'){
+ var directorNone = document.getElementById("directorNone");
+ directorNone.style.display = "block";
+ }
form.verify({
name: function(value, item){
var min = item.getAttribute('lay-min');
diff --git a/src/main/webapp/static/layui/lay/modules/formDesigner/coolForm.css b/src/main/webapp/static/layui/lay/modules/formDesigner/coolForm.css
index 98eb29b..5820ebf 100644
--- a/src/main/webapp/static/layui/lay/modules/formDesigner/coolForm.css
+++ b/src/main/webapp/static/layui/lay/modules/formDesigner/coolForm.css
@@ -4,8 +4,18 @@
#detail .layui .layui-input-block {
margin-left: 150px;
}
+
+#textarea_1 > div {
+ margin-left: 45px;
+}
+#textarea_2 > div {
+ margin-left: 45px;
+}
+
.formDes .layui-form-label {
box-sizing: border-box;
+ text-align: left;
+ padding-left:45px;
}
diff --git a/src/main/webapp/views/cstmr/cstmr.html b/src/main/webapp/views/cstmr/cstmr.html
index 1764881..d6d49f8 100644
--- a/src/main/webapp/views/cstmr/cstmr.html
+++ b/src/main/webapp/views/cstmr/cstmr.html
@@ -200,6 +200,18 @@
</select>
</div>
</div>
+ <div class="layui-form-item" style="display: none;" id="directorNone">
+ <label class="layui-form-label layui-form-required">璐熻矗浜�: </label>
+ <div class="layui-input-block cool-auto-complete">
+ <input class="layui-input" name="director" placeholder="璇疯緭鍏ヨ礋璐ｄ汉" style="display: none" lay-verify="required">
+ <input id="director$" name="director$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ヨ礋璐ｄ汉" onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="userQueryBydirector" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="userQueryBydirectorSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
</div>
<div class="layui-col-md6">
<!-- <div class="layui-form-item">-->
@@ -232,19 +244,6 @@
<input class="layui-input" name="tel" placeholder="璇疯緭鍏ョ數璇�" autocomplete="off" lay-verify="required">
</div>
</div>
-
-<!-- <div class="layui-form-item">-->
-<!-- <label class="layui-form-label layui-form-required">璐熻矗浜�: </label>-->
-<!-- <div class="layui-input-block cool-auto-complete">-->
-<!-- <input class="layui-input" name="director" placeholder="璇疯緭鍏ヨ礋璐ｄ汉" style="display: none" lay-verify="required">-->
-<!-- <input id="director$" name="director$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ヨ礋璐ｄ汉" onfocus=this.blur()>-->
-<!-- <div class="cool-auto-complete-window">-->
-<!-- <input class="cool-auto-complete-window-input" data-key="userQueryBydirector" onkeyup="autoLoad(this.getAttribute('data-key'))">-->
-<!-- <select class="cool-auto-complete-window-select" data-key="userQueryBydirectorSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">-->
-<!-- </select>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
<div class="layui-form-item">
<label class="layui-form-label">澶囨敞: </label>
<div class="layui-input-block">
diff --git a/src/main/webapp/views/home/dashboard.html b/src/main/webapp/views/home/dashboard.html
index 6ab08f4..1ab25a8 100644
--- a/src/main/webapp/views/home/dashboard.html
+++ b/src/main/webapp/views/home/dashboard.html
@@ -78,7 +78,7 @@
</div>
</div>
</div>
- <div class="layui-card" style="background-color: #ffffff" id="popupMan">
+ <div class="layui-card" style="background-color: #ffffff">
<div class="layui-card-header testColorBlack" style="background-color: #FFFA1C1C">瀹炴椂閿�鍞儏鍐�</div>
<div class="layui-card-body" style="padding-bottom: 20px;background-color: #FFC6A02D">
<div class="layui-row">
@@ -257,7 +257,6 @@
}else {
// 闅愯棌鍥㈤槦鏁版嵁
document.getElementById('popup').style.display = 'none';
- document.getElementById('popupMan').style.width = '100%';
}
}
// 闅愯棌鍥㈤槦鏁版嵁
--
Gitblit v1.9.1