Merge pull request '12.28功能提交' (#51) from feature/add_item into release

12.28功能提交
master
郑永星 4 years ago
commit 1496fa349a

@ -516,13 +516,13 @@ class MarketPercentageController extends ThinkController
'pay_time'=>$save['pay_time'],
'admin_id'=>$save['admin_id']
])->save(['coefficient'=>$save['coefficient']]);
}
M("market_altogether","tab_")->where([
'pay_time'=>$save['pay_time'],
'admin_id'=>$save['admin_id']
])->save($marketSave);
M("market_altogether","tab_")->where([
'pay_time'=>$save['pay_time'],
'admin_id'=>$save['admin_id']
])->save($marketSave);
}
} else {
$save['create_time'] = time();

@ -141,23 +141,29 @@
url += '&is_get=1';
$.ajax({
url:url,
type:"post",
dataType:'json',
success:function(data){
if (data.status == 1) {
layer.msg(data.msg);
setTimeout(function(){
window.parent.reload()
},2000)
} else {
layer.msg(data.msg);
layer.confirm('【提示】是否确认财务部编辑保存', {
btn: ['确认','取消'],
title:false
}, function(index){
$.ajax({
url:url,
type:"post",
dataType:'json',
success:function(data){
if (data.status == 1) {
layer.msg(data.msg);
setTimeout(function(){
window.parent.reload()
},2000)
} else {
layer.msg(data.msg);
}
}
})
});
}
})
});
</script>

Loading…
Cancel
Save