Commit 455c0219 authored by wangjiangze's avatar wangjiangze

更新

parent 202aef7b
...@@ -63,6 +63,7 @@ class HotelAction extends CommonAction{ ...@@ -63,6 +63,7 @@ class HotelAction extends CommonAction{
$data['region_id'] = I("region_id"); $data['region_id'] = I("region_id");
$data['name'] = I("name"); $data['name'] = I("name");
$data['code'] = I("code"); $data['code'] = I("code");
$data['rooms'] = I("rooms");
$data['remark'] = I("remark"); $data['remark'] = I("remark");
$data['status'] = I("status"); $data['status'] = I("status");
......
...@@ -47,7 +47,7 @@ class PlaylistAction extends CommonAction{ ...@@ -47,7 +47,7 @@ class PlaylistAction extends CommonAction{
$sp_lists = $spModel->field("id,`name`")->where("`status`=0")->select(); $sp_lists = $spModel->field("id,`name`")->where("`status`=0")->select();
$play_lists = $model->join(" A join sh_sp_playlist_media_map B on A.id = B.playlist_id ")->field("A.id,A.`name`,A.sp_id,group_concat(B.media_id) media_ids")->group("A.id")->select(); $play_lists = $model->join(" A join sh_sp_playlist_media_map B on A.id = B.playlist_id ")->field("A.id,A.`name`,A.sp_id,group_concat(B.media_id) media_ids")->group("A.id")->select();
} }
$media_lists = $mediaModel->field("id,title,sp_id")->select(); $media_lists = $mediaModel->join(" A join sh_sp B on A.site_id = B.site_id ")->field("concat(A.id,'_',A.code) id,A.title,group_concat(B.id) sp_ids")->group(" A.id ")->select();
$this->sp_lists = $sp_lists; $this->sp_lists = $sp_lists;
$this->media_lists = json_encode($media_lists); $this->media_lists = json_encode($media_lists);
......
...@@ -60,6 +60,12 @@ body{padding:20px} ...@@ -60,6 +60,12 @@ body{padding:20px}
<input type="text" class="form-control" id="inputEmail3" placeholder="请输入合作方酒店标识" name="code" value="{$info.code}"> <input type="text" class="form-control" id="inputEmail3" placeholder="请输入合作方酒店标识" name="code" value="{$info.code}">
</div> </div>
</div> </div>
<div class="form-group">
<label for="inputEmail3" class="col-sm-3 control-label"> 房间数量</label>
<div class="col-sm-6">
<input type="text" class="form-control" id="inputEmail3" placeholder="请输入房间数量" name="rooms" value="{$info.rooms}">
</div>
</div>
<div class="form-group"> <div class="form-group">
<label for="inputPassword3" class="col-sm-3 control-label">备注</label> <label for="inputPassword3" class="col-sm-3 control-label">备注</label>
<div class="col-sm-8"> <div class="col-sm-8">
......
...@@ -39,7 +39,11 @@ body{padding:20px} ...@@ -39,7 +39,11 @@ body{padding:20px}
<div class="form-group"> <div class="form-group">
<label for="name" class="col-sm-2 control-label"></label> <label for="name" class="col-sm-2 control-label"></label>
<div class="col-sm-4"> <div class="col-sm-4">
<label class="control-label col-sm-5" style="text-align:left" for="multiselect">未选择</label> <label class="control-label col-sm-5" style="text-align:left;padding: 0" for="multiselect">未选择</label><br/>
<div class="input-group">
<input type="text" class="form-control" placeholder="搜索">
<span class="input-group-addon" id="searchSelect" for="multiselect" ><span class="glyphicon glyphicon-search"></span></span>
</div>
<select id="multiselect" class="form-control" size="8" multiple="multiple" style="height:160px"> <select id="multiselect" class="form-control" size="8" multiple="multiple" style="height:160px">
<!-- <volist name="hotel_lists" id="item"> <!-- <volist name="hotel_lists" id="item">
<option value="{$item.id}-{$item.sp_id}" sp_id="{$item.sp_id}" title="{$item.name}">{$item.name}</option> <option value="{$item.id}-{$item.sp_id}" sp_id="{$item.sp_id}" title="{$item.name}">{$item.name}</option>
...@@ -57,7 +61,11 @@ body{padding:20px} ...@@ -57,7 +61,11 @@ body{padding:20px}
</div> </div>
<div class="col-sm-4"> <div class="col-sm-4">
<label class="control-label col-sm-6" style="text-align:left" for="multiselect"><font color="red">*</font> 已选择酒店</label> <label class="control-label col-sm-6" style="text-align:left;padding: 0" for="multiselect"><font color="red">*</font> 已选择酒店</label><br/>
<div class="input-group">
<input type="text" class="form-control" placeholder="搜索">
<span class="input-group-addon" id="searchSelect" for="multiselect_to" ><span class="glyphicon glyphicon-search"></span></span>
</div>
<select id="multiselect_to" class="form-control" size="8" multiple="multiple" name="hotel_lists[]" style="height:160px"></select> <select id="multiselect_to" class="form-control" size="8" multiple="multiple" name="hotel_lists[]" style="height:160px"></select>
</div> </div>
</div> </div>
...@@ -82,7 +90,11 @@ body{padding:20px} ...@@ -82,7 +90,11 @@ body{padding:20px}
<div class="form-group"> <div class="form-group">
<label for="name" class="col-sm-2 control-label"></label> <label for="name" class="col-sm-2 control-label"></label>
<div class="col-sm-4"> <div class="col-sm-4">
<label class="control-label col-sm-5" style="text-align:left" for="multiselectMedia">未选择</label> <label class="control-label col-sm-5" style="text-align:left;padding: 0" for="multiselectMedia">未选择</label><br/>
<div class="input-group">
<input type="text" class="form-control" placeholder="搜索">
<span class="input-group-addon" id="searchSelect" for="multiselectMedia" ><span class="glyphicon glyphicon-search"></span></span>
</div>
<select id="multiselectMedia" class="form-control" size="8" multiple="multiple" style="height:160px"> <select id="multiselectMedia" class="form-control" size="8" multiple="multiple" style="height:160px">
</select> </select>
</div> </div>
...@@ -97,7 +109,11 @@ body{padding:20px} ...@@ -97,7 +109,11 @@ body{padding:20px}
</div> </div>
<div class="col-sm-4"> <div class="col-sm-4">
<label class="control-label col-sm-6" style="text-align:left" for="multiselectMedia"><font color="red">*</font> 已选择媒资</label> <label class="control-label col-sm-6" style="text-align:left;padding: 0" for="multiselectMedia"><font color="red">*</font> 已选择媒资</label><br/>
<div class="input-group">
<input type="text" class="form-control" placeholder="搜索">
<span class="input-group-addon" id="searchSelect" for="multiselectMedia_to" ><span class="glyphicon glyphicon-search"></span></span>
</div>
<select id="multiselectMedia_to" class="form-control" size="8" multiple="multiple" name="media_lists[]" style="height:160px"></select> <select id="multiselectMedia_to" class="form-control" size="8" multiple="multiple" name="media_lists[]" style="height:160px"></select>
</div> </div>
</div> </div>
...@@ -165,6 +181,28 @@ function submitForm(){ ...@@ -165,6 +181,28 @@ function submitForm(){
}); });
} }
$().ready(function(){ $().ready(function(){
$("body").on("click","#searchSelect",function(){
var for_select = $(this).attr("for");
var for_select_length = $("#"+for_select+" option").length;
var input_v = $(this).parent().find("input").val();
if(for_select_length<=0){
alert("无内容!");
return false;
}
$("#"+for_select+" option").each(function(i,item){
$(this).show();
});
if(input_v==""){
alert("请输入关键字!");
return false;
}
$("#"+for_select+" option").each(function(i,item){
if($(this).text().indexOf(input_v)<=-1){
$(this).hide();
}
});
});
var media_json = '{$media_lists_json}'; var media_json = '{$media_lists_json}';
var hotel_json = '{$hotel_lists_json}'; var hotel_json = '{$hotel_lists_json}';
$("select[name='sp']").bind("change",function(){ $("select[name='sp']").bind("change",function(){
......
...@@ -96,7 +96,7 @@ onRowContextMenu : onRowContextMenu ...@@ -96,7 +96,7 @@ onRowContextMenu : onRowContextMenu
<th data-options="field:'type',width:10">媒资分类</th> <th data-options="field:'type',width:10">媒资分类</th>
<th data-options="field:'programType',width:20">媒资类型</th> <th data-options="field:'programType',width:20">媒资类型</th>
<th data-options="field:'region',width:15">国家/地区</th> <th data-options="field:'region',width:15">国家/地区</th>
<th data-options="field:'year',width:10">年份</th> <th data-options="field:'year',width:10" sortable="true">年份</th>
<th data-options="field:'score',width:10">评分</th> <th data-options="field:'score',width:10">评分</th>
<!--<th data-options="field:'addtime',width:25" sortable="true">创建时间</th>--> <!--<th data-options="field:'addtime',width:25" sortable="true">创建时间</th>-->
<th data-options="field:'updatetime',width:25" sortable="true">更新时间</th> <th data-options="field:'updatetime',width:25" sortable="true">更新时间</th>
......
...@@ -57,7 +57,11 @@ body{padding:20px} ...@@ -57,7 +57,11 @@ body{padding:20px}
<div class="form-group"> <div class="form-group">
<label for="name" class="col-sm-2 control-label"></label> <label for="name" class="col-sm-2 control-label"></label>
<div class="col-sm-4"> <div class="col-sm-4">
<label class="control-label col-sm-5" style="text-align:left" for="multiselectMedia">未选择</label> <label class="control-label col-sm-5" style="text-align:left;padding: 0" for="multiselectMedia">未选择</label><br/>
<div class="input-group">
<input type="text" class="form-control" placeholder="搜索">
<span class="input-group-addon" id="searchSelect" for="multiselectMedia" ><span class="glyphicon glyphicon-search"></span></span>
</div>
<select id="multiselectMedia" class="form-control" size="8" multiple="multiple" style="height:160px"> <select id="multiselectMedia" class="form-control" size="8" multiple="multiple" style="height:160px">
</select> </select>
</div> </div>
...@@ -72,7 +76,11 @@ body{padding:20px} ...@@ -72,7 +76,11 @@ body{padding:20px}
</div> </div>
<div class="col-sm-4"> <div class="col-sm-4">
<label class="control-label col-sm-6" style="text-align:left" for="multiselectMedia"><font color="red">*</font> 已选择媒资</label> <label class="control-label col-sm-6" style="text-align:left;padding: 0" for="multiselectMedia"><font color="red">*</font> 已选择媒资</label><br/>
<div class="input-group">
<input type="text" class="form-control" placeholder="搜索">
<span class="input-group-addon" id="searchSelect" for="multiselectMedia_to" ><span class="glyphicon glyphicon-search"></span></span>
</div>
<select id="multiselectMedia_to" class="form-control" size="8" multiple="multiple" name="media_lists[]" style="height:160px"></select> <select id="multiselectMedia_to" class="form-control" size="8" multiple="multiple" name="media_lists[]" style="height:160px"></select>
</div> </div>
</div> </div>
...@@ -128,6 +136,28 @@ function submitForm(){ ...@@ -128,6 +136,28 @@ function submitForm(){
}); });
} }
$().ready(function(){ $().ready(function(){
$("body").on("click","#searchSelect",function(){
var for_select = $(this).attr("for");
var for_select_length = $("#"+for_select+" option").length;
var input_v = $(this).parent().find("input").val();
if(for_select_length<=0){
alert("无内容!");
return false;
}
$("#"+for_select+" option").each(function(i,item){
$(this).show();
});
if(input_v==""){
alert("请输入关键字!");
return false;
}
$("#"+for_select+" option").each(function(i,item){
if($(this).text().indexOf(input_v)<=-1){
$(this).hide();
}
});
});
var media_json = '{$media_lists}'; var media_json = '{$media_lists}';
$("select[name='sp_id']").bind("change",function(){ $("select[name='sp_id']").bind("change",function(){
var spid = $(this).val(); var spid = $(this).val();
...@@ -161,7 +191,7 @@ $().ready(function(){ ...@@ -161,7 +191,7 @@ $().ready(function(){
$("#playlist").addClass("hidden"); $("#playlist").addClass("hidden");
$("#multiselectMedia").empty(); $("#multiselectMedia").empty();
$.each(eval(media_json),function(i,item){ $.each(eval(media_json),function(i,item){
if(sp_id==item.sp_id){ if(item.sp_ids.indexOf(sp_id)>-1){
if($("select[name='media_lists[]'] option[value='"+item.id+"']").length==0){ if($("select[name='media_lists[]'] option[value='"+item.id+"']").length==0){
$("#multiselectMedia").append("<option value='"+item.id+"'>"+item.title+"</option>"); $("#multiselectMedia").append("<option value='"+item.id+"'>"+item.title+"</option>");
} }
......
...@@ -49,7 +49,11 @@ body{padding:20px} ...@@ -49,7 +49,11 @@ body{padding:20px}
<div class="form-group"> <div class="form-group">
<label for="name" class="col-sm-2 control-label"></label> <label for="name" class="col-sm-2 control-label"></label>
<div class="col-sm-4"> <div class="col-sm-4">
<label class="control-label col-sm-6" for="multiselect" style="text-align:left">未选择</label> <label class="control-label col-sm-6" for="multiselect" style="text-align:left;padding: 0">未选择</label><br/>
<div class="input-group">
<input type="text" class="form-control" placeholder="搜索">
<span class="input-group-addon" id="searchSelect" for="multiselect" ><span class="glyphicon glyphicon-search"></span></span>
</div>
<select id="multiselect" class="form-control" size="8" multiple="multiple" style="height:160px"> <select id="multiselect" class="form-control" size="8" multiple="multiple" style="height:160px">
<!-- <volist name="hotel_lists" id="item"> <!-- <volist name="hotel_lists" id="item">
<option value="{$item.id}-{$item.sp_id}" sp_id="{$item.sp_id}" title="{$item.name}">{$item.name}</option> <option value="{$item.id}-{$item.sp_id}" sp_id="{$item.sp_id}" title="{$item.name}">{$item.name}</option>
...@@ -67,7 +71,11 @@ body{padding:20px} ...@@ -67,7 +71,11 @@ body{padding:20px}
</div> </div>
<div class="col-sm-4"> <div class="col-sm-4">
<label class="control-label col-sm-6" for="multiselect"" style="text-align:left"><font color="red">*</font> 已选择酒店</label> <label class="control-label col-sm-6" for="multiselect"" style="text-align:left;padding: 0"><font color="red">*</font> 已选择酒店</label><br/>
<div class="input-group">
<input type="text" class="form-control" placeholder="搜索">
<span class="input-group-addon" id="searchSelect" for="multiselect_to" ><span class="glyphicon glyphicon-search"></span></span>
</div>
<select id="multiselect_to" class="form-control" size="8" multiple="multiple" name="hotel_lists[]" style="height:160px"></select> <select id="multiselect_to" class="form-control" size="8" multiple="multiple" name="hotel_lists[]" style="height:160px"></select>
</div> </div>
</div> </div>
...@@ -92,7 +100,11 @@ body{padding:20px} ...@@ -92,7 +100,11 @@ body{padding:20px}
<div class="form-group"> <div class="form-group">
<label for="name" class="col-sm-2 control-label"></label> <label for="name" class="col-sm-2 control-label"></label>
<div class="col-sm-4"> <div class="col-sm-4">
<label class="control-label col-sm-6" for="multiselectMedia"" style="text-align:left">未选择</label> <label class="control-label col-sm-6" for="multiselectMedia"" style="text-align:left;padding: 0">未选择</label><br/>
<div class="input-group">
<input type="text" class="form-control" placeholder="搜索">
<span class="input-group-addon" id="searchSelect" for="multiselectMedia" ><span class="glyphicon glyphicon-search"></span></span>
</div>
<select id="multiselectMedia" class="form-control" size="8" multiple="multiple" style="height:160px"> <select id="multiselectMedia" class="form-control" size="8" multiple="multiple" style="height:160px">
</select> </select>
</div> </div>
...@@ -107,7 +119,11 @@ body{padding:20px} ...@@ -107,7 +119,11 @@ body{padding:20px}
</div> </div>
<div class="col-sm-4"> <div class="col-sm-4">
<label class="control-label col-sm-6" for="multiselectMedia"" style="text-align:left"><font color="red">*</font> 已选择媒资</label> <label class="control-label col-sm-6" for="multiselectMedia"" style="text-align:left;padding: 0"><font color="red">*</font> 已选择媒资</label><br/>
<div class="input-group">
<input type="text" class="form-control" placeholder="搜索">
<span class="input-group-addon" id="searchSelect" for="multiselectMedia_to" ><span class="glyphicon glyphicon-search"></span></span>
</div>
<select id="multiselectMedia_to" class="form-control" size="8" multiple="multiple" name="media_lists[]" style="height:160px"></select> <select id="multiselectMedia_to" class="form-control" size="8" multiple="multiple" name="media_lists[]" style="height:160px"></select>
</div> </div>
</div> </div>
...@@ -189,6 +205,29 @@ function submitForm(){ ...@@ -189,6 +205,29 @@ function submitForm(){
}); });
} }
$().ready(function(){ $().ready(function(){
$("body").on("click","#searchSelect",function(){
var for_select = $(this).attr("for");
var for_select_length = $("#"+for_select+" option").length;
var input_v = $(this).parent().find("input").val();
if(for_select_length<=0){
alert("无内容!");
return false;
}
$("#"+for_select+" option").each(function(i,item){
$(this).show();
});
if(input_v==""){
alert("请输入关键字!");
return false;
}
$("#"+for_select+" option").each(function(i,item){
if($(this).text().indexOf(input_v)<=-1){
$(this).hide();
}
});
});
var media_json = '{$media_lists_json}'; var media_json = '{$media_lists_json}';
var hotel_json = '{$hotel_lists_json}'; var hotel_json = '{$hotel_lists_json}';
var region_lists = {$region_lists|json_encode}; var region_lists = {$region_lists|json_encode};
......
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