记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit 7d593848 authored by sangchunxi's avatar sangchunxi
Browse files
Options

#1999 bug 提交

parent dc5ef464
Hide whitespace changes
Inline Side-by-side
Showing with 75 additions and 24 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/smile/organization/list.html
View file @ 7d593848
...@@ -14,7 +14,8 @@ ...@@ -14,7 +14,8 @@
padding: 0 20px; padding: 0 20px;
} }
.picker{ .picker{
height: 300px; display: flex;
justify-content: flex-start;
} }
#addClassify .selectClassify label { #addClassify .selectClassify label {
display: flex; display: flex;
...@@ -46,6 +47,33 @@ ...@@ -46,6 +47,33 @@
.item div a{ .item div a{
margin-left: 12px; margin-left: 12px;
} }
/* 星星 */
.required-group-name {
color: red;
font-size: 20px;
position: relative;
top: 6px;
}
.groupName {
border: 1px solid #dfdfdf;
}
.required-province {
color: red;
display: inline-block;
margin-right: 3px;
position: relative;
top: 6px;
font-size: 20px;
}
/* 必填红色文字 */
.required-group-text {
height: 20px;
color: red;
}
.required-province-text {
color: red;
height: 20px;
}
</style> </style>
</head> </head>
<body class="gray-bg"> <body class="gray-bg">
...@@ -65,10 +93,14 @@ ...@@ -65,10 +93,14 @@
<div class="ibox-content"> <div class="ibox-content">
<div class="form-group"> <div class="form-group">
<div class="file-loading"> <div class="file-loading">
<span class="required-group-name">*</span>
<input class="groupName" type="text" placeholder="组名称" > <input class="groupName" type="text" placeholder="组名称" >
<p class="required-group-text"></p>
<div class="picker"> <div class="picker">
<span class="required-province">*</span>
<div class="demo" id="demo-1"></div> <div class="demo" id="demo-1"></div>
</div> </div>
<p class="required-province-text"></p>
<!-- <input class="groupMobile" type="text" placeholder="输入手机号选择总代" >--> <!-- <input class="groupMobile" type="text" placeholder="输入手机号选择总代" >-->
</div> </div>
</div> </div>
...@@ -135,6 +167,7 @@ ...@@ -135,6 +167,7 @@
addressStr: [], addressStr: [],
addressIds: [] addressIds: []
} }
function yes() { function yes() {
var groupName = $('.groupName').val(); var groupName = $('.groupName').val();
// var groupMobile = $('.groupMobile').val(); // var groupMobile = $('.groupMobile').val();
...@@ -150,37 +183,54 @@ ...@@ -150,37 +183,54 @@
province: adArr.addressStr[0], province: adArr.addressStr[0],
provinceId: adArr.addressIds[0] + '' provinceId: adArr.addressIds[0] + ''
}; };
if (editStatus != '') { if (!groupName) {
postData.id = editStatus; $('.required-group-text').text('组名称为必填项！');
$.ajax({ } else {
type: 'post', $('.required-group-text').text('');
url: orifix + '/updateOrg', }
headers:{"Content-Type":"application/json;charset=UTF-8"}, if (!adArr.addressStr[0]) {
data: JSON.stringify(postData), $('.required-province-text').text('省名称为必填项！');
success:function(e) {
$(".layui-layer-close1").click();
refreshItem();
}
})
} else { } else {
// postData.areaId = 0; $('.required-province-text').text('');
$.ajax({
type: 'post',
url: orifix + '/create',
headers:{"Content-Type":"application/json;charset=UTF-8"},
data: JSON.stringify(postData),
success:function(e) {
$(".layui-layer-close1").click();
refreshItem();
}
})
} }
if (groupName && adArr.addressStr[0]) {
if (editStatus != '') { // edit
postData.id = editStatus;
$.ajax({
type: 'post',
url: orifix + '/updateOrg',
headers:{"Content-Type":"application/json;charset=UTF-8"},
data: JSON.stringify(postData),
success:function(e) {
$(".layui-layer-close1").click();
refreshItem();
$('.required-group-text').val('');
$('.required-province-text').val('');
}
})
} else { // create
// postData.areaId = 0;
$.ajax({
type: 'post',
url: orifix + '/create',
headers:{"Content-Type":"application/json;charset=UTF-8"},
data: JSON.stringify(postData),
success:function(e) {
$(".layui-layer-close1").click();
refreshItem();
}
})
}
}
} }
function closeModal(){ function closeModal(){
$(".layui-layer-close1").click(); $(".layui-layer-close1").click();
} }
// 新建组
$("#button-open-10").click(function(){ $("#button-open-10").click(function(){
$('.editCon').val(''); $('.editCon').val('');
$('.groupName').val(''); $('.groupName').val('');
...@@ -226,6 +276,7 @@ ...@@ -226,6 +276,7 @@
$('.editCon').val(id); $('.editCon').val(id);
$('.groupName').val(e.data.name); $('.groupName').val(e.data.name);
// $('.groupMobile').val(e.data.address); // $('.groupMobile').val(e.data.address);
adArr.addressStr[0] = e.data.province
$.getJSON( ctx + 'smile/user/getAreaJson' ).done(function ( res ) { $.getJSON( ctx + 'smile/user/getAreaJson' ).done(function ( res ) {
$( "#demo-1" ).iPicker({ $( "#demo-1" ).iPicker({
level:1, level:1,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment