Commit 9f270ef7 authored by wangjiangze's avatar wangjiangze

媒资注入功能更新

parent b18cb286
...@@ -126,7 +126,6 @@ class InjectAction extends CommonAction{ ...@@ -126,7 +126,6 @@ class InjectAction extends CommonAction{
$task_id = $model->add($taskData); $task_id = $model->add($taskData);
if($task_id){ if($task_id){
foreach($hotel_lists as $key => $value){ foreach($hotel_lists as $key => $value){
list($hotel_id,$sp_id) = explode("-",$value); list($hotel_id,$sp_id) = explode("-",$value);
$logDataLists = array(); $logDataLists = array();
...@@ -160,13 +159,14 @@ class InjectAction extends CommonAction{ ...@@ -160,13 +159,14 @@ class InjectAction extends CommonAction{
$log_r = $injectLogModel->addAll($logDataLists); $log_r = $injectLogModel->addAll($logDataLists);
} }
} }
if($log_r){
} echo "true";
// $this->ajaxReturn(array("status"=>1000,"msg"=>"操作成功!"));
if($task_id){ }else{
echo 'true'; echo "false";
}else{ }
echo 'false'; }else{
echo "false";
} }
} }
} }
......
...@@ -24,7 +24,7 @@ class InjectModel extends RelationModel{ ...@@ -24,7 +24,7 @@ class InjectModel extends RelationModel{
$model = new Model(); $model = new Model();
//====================== //======================
$fields = "count(id) count"; $fields = "count(1) count";
//返回列表(limit分页) //返回列表(limit分页)
if($queryType=="list"){ if($queryType=="list"){
$where .= $sort." ".$limit; $where .= $sort." ".$limit;
......
...@@ -199,16 +199,11 @@ function submitForm(){ ...@@ -199,16 +199,11 @@ function submitForm(){
return isValid; return isValid;
}, },
success:function(data){ success:function(data){
if(data=='true'){ if(data=="true"){
// $.messager.confirm('友情提示', '操作成功! 是否关闭窗口?', function(r){
// if (r){
// parentDialog.CancelEvent();
// }
// });
parentDialog.CancelEvent(); parentDialog.CancelEvent();
// $.messager.alert('友情提示','操作成功!','info'); }else{
}else $.messager.alert('友情提示','操作失败!','info');
$.messager.alert('友情提示','操作失败!','info'); }
} }
}); });
} }
......
...@@ -49,7 +49,7 @@ pagination: true, ...@@ -49,7 +49,7 @@ pagination: true,
pageList:[15,30,45,60], pageList:[15,30,45,60],
rownumbers: true, rownumbers: true,
sortName:'id', sortName:'id',
sortOrder:'asc', sortOrder:'desc',
queryParams: form2Json('searchform'), queryParams: form2Json('searchform'),
fitColumns: true, fitColumns: true,
height:'auto', height:'auto',
......
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