12.28功能提交

master
zhengyongxing 4 years ago
parent 29e8421266
commit ffa78964ec

@ -90,9 +90,14 @@ class CompanyStatementOfflineController extends ThinkController
}
if ($v['pay_check'] == 0) {
$v['pay_check_str'] = "未确认";
$v['pay_check_str'] = "---";
} else {
$v['pay_check_str'] = "已确认";
$member = M("ucenter_member")
->field("username")
->where(['id'=>$v['pay_check_member_id']])
->find();
$v['pay_check_str'] = $member['username'].(($v['pay_check'] == 1)?'已确认':'未确认')."<br>".date('Y-m-d H:i:s', $v['pay_check_time']);;
// $v['pay_check_str'] = "已确认";
}
$v['oplist'] = $this->OpAuth($v);
@ -149,6 +154,7 @@ class CompanyStatementOfflineController extends ThinkController
//修改打款设置
public function editPayment(){
// dump($_SESSION);die();
if(!isset($_REQUEST['info'])) $this->error("参数错误");
$info = $_REQUEST['info'];
@ -171,7 +177,9 @@ class CompanyStatementOfflineController extends ThinkController
"company_info"=>json_encode($company_info,JSON_UNESCAPED_UNICODE),
"remark"=>$v['remark'],
"pay_check"=>1,
"id"=>$k
"pay_check_member_id"=> $_SESSION['onethink_admin']['user_auth']['uid'],
"id"=>$k,
"pay_check_time"=>time()
];
$CompanyInfo->save($savedata);
@ -185,6 +193,30 @@ class CompanyStatementOfflineController extends ThinkController
}
public function returnSetPayment() {
if(!isset($_REQUEST['ids'])) $this->error("参数错误");
$ids = $_REQUEST['ids'];
$ids = explode(',',$ids);
$CompanyInfo = M("company_statement_info","tab_");
$CompanyInfo
->where(['id'=>['in',$ids]])
->save([
'pay_check'=>0,
'pay_check_member_id'=>0,
'pay_check_time'=>0
]);
$this->ajaxReturn(array(
'status' => 1,
"info"=>"打款信息编辑成功"
));
}
public function doPayment()
{
if(!isset($_REQUEST['ids']) || !isset($_REQUEST['payment_time'])) $this->error("参数错误");
@ -315,6 +347,7 @@ class CompanyStatementOfflineController extends ThinkController
{
$mentBtn = [
"setPayment"=>"<a class='butn' id='setPayment'>打款信息确认</a>",
"returnSetPayment"=>"<a class='butn' id='returnSetPayment'>打款信息确认撤回</a>",
"doPayment"=>"<a class='butn' id='doPayment'>打款确认</a>",
"export"=>"<a class='butn' id='export'>批量导出</a>",
];

@ -161,7 +161,7 @@
<th>结算时间</th>
<th>结算金额</th>
<th>结算流水</th>
<th>打款信息确认状态</th>
<th>打款状态</th>
<th class="tooltip">汇总单号<span class="tooltiptext">汇总单号</span></th>
@ -179,12 +179,13 @@
<notemtpy name = "data">
<volist name="data" id="data">
<tr>
<td ><input class="ids" type="checkbox" value="{$data['id']}" name="ids[]" data-companytype="{$data['company_type']}" data-paystatus="{$data['pay_status']}"></td>
<td ><input class="ids" type="checkbox" data-pay_check="{$data['pay_check']}" value="{$data['id']}" name="ids[]" data-companytype="{$data['company_type']}" data-paystatus="{$data['pay_status']}"></td>
<td>{$data.company_name}</td>
<td>{$data.company_type_str}</td>
<td>{$data.valid}</td>
<td>{$data.statement_money}</td>
<td>{$data.platform_amount}</td>
<td>{$data.pay_check_str}</td>
<td>{$data.payment}</td>
<td>{$data.statement_num}</td>
<td>
@ -264,6 +265,44 @@
})
$("#company_type").change();
$("#setPayment").on('click',function(){
var tip = 0;
var text = $("input:checkbox[name='ids[]']:checked").map(function(index,elem) {
if($(elem).data("pay_check") == 0){
return $(elem).val();
} else {
tip = 1;
}
}).get();
if(tip == 1) {
layer.msg("<font style='color: white'>请选择打款信息未确认的单子</font>");
return;
}
text = text.join(",");
if (!text) {
layer.msg("<font style='color: white'>没有符合打款确认的打款单,请重新选择</font>");
return;
}
var url = "{:U('setPayment')}"+"&id="+text
layer.open({
type: 2,
title: "海南万盟天下科技有限公司",
shadeClose: true,
shade: 0.8,
area: ['100%', '100%'],
content: url
});
});
$(".viewStatement").click(function () {
var id = $(this).data("id");
var url = "{:U('viewStatement')}"+"&id="+id
@ -277,14 +316,84 @@
});
});
$("#returnSetPayment").on("click",function () {
var paystatustip = 0;
var tip = 0;
var text = $("input:checkbox[name='ids[]']:checked").map(function(index,elem) {
if($(elem).data("pay_check") == 1 && $(elem).data("paystatus") != 1){
return $(elem).val();
}
if ($(elem).data("pay_check") != 1) {
tip = 1;
}
if ($(elem).data("paystatus") == 1) {
paystatustip = 1;
}
}).get();
if(tip == 1) {
layer.msg("<font style='color: white'>请选择打款信息已确认的单子</font>");
return;
}
if(paystatustip == 1) {
layer.msg("<font style='color: white'>请选择未打款的单子</font>");
return;
}
text = text.join(",");
layer.confirm('【提示】是否确认打款信息撤回', {
btn: ['确认','取消'],
title:false
}, function(){
$.ajax({
type:'post',
dataType:'json',
data: {'ids':text},
url:"{:U('returnSetPayment')}",
success:function(data) {
if (data.status == 1) {
layer.msg("<font style='color: white'>打款信息确认撤回成功</font>");
window.location.reload();
return;
}
},
error:function() {
alert('服务器开小差了,请稍后再试。');
}
})
});
});
$("#doPayment").on("click",function(){
var id = $(this).attr("id");
var pay_check_tip = 0;
var text = $("input:checkbox[name='ids[]']:checked").map(function(index,elem) {
if($(elem).data("paystatus") == 0){
if($(elem).data("paystatus") == 0&&$(elem).data("pay_check") == 1){
return $(elem).val();
}
if ($(elem).data("pay_check") != 1) {
pay_check_tip = 1;
}
}).get();
if (pay_check_tip == 1) {
layer.msg("<font style='color:white'>请选择打款信息已经确认的单子</font>");
return;
}
if(text.length < 1){
layer.msg("<font style='color:white'>无需要进行确认打款确认操作的数据</font>");
return;

@ -0,0 +1,245 @@
<!DOCTYPE html>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta charset="UTF-8">
<title></title>
<link rel="stylesheet" type="text/css" href="__CSS__/base.css" media="all">
<link rel="stylesheet" type="text/css" href="__CSS__/common.css" media="all">
<link rel="stylesheet" type="text/css" href="__CSS__/style.css" media="all">
<link rel="stylesheet" type="text/css" href="__CSS__/default_color.css" media="all">
<link href="__STATIC__/datetimepicker/css/datetimepicker.css" rel="stylesheet" type="text/css">
<link href="__STATIC__/datetimepicker/css/dropdown.css" rel="stylesheet" type="text/css">
<link rel="stylesheet" href="__CSS__/select2.min.css" type="text/css" />
<script type="text/javascript" src="__STATIC__/jquery-2.0.3.min.js"></script>
<script type="text/javascript" src="__JS__/select2.min.js"></script>
<script type="text/javascript" src="__STATIC__/layer3/layer.js"></script>
<script type="text/javascript" src="__STATIC__/datetimepicker/js/bootstrap-datetimepicker.min.js"></script>
<script type="text/javascript" src="__STATIC__/datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js"
charset="UTF-8"></script>
<script src="__STATIC__/juicer-min.js" type="text/javascript"></script>
</head>
<style>
html {
min-width: 100%;
}
body {
padding: 0px 10px 150px;
/* width: 960px; */
margin: auto;
}
.tabcon1711 table {
width: 480px;
}
table {
margin: auto;
}
.hidebox {
display: none;
}
.r {
width: 300px;
}
.l {
width: 180px;
}
.select2-container--default .select2-selection--single {
color: #000;
resize: none;
border-width: 1px;
border-style: solid;
border-color: #a7b5bc #ced9df #ced9df #a7b5bc;
box-shadow: 0px 3px 3px #F7F8F9 inset;
height: 35px;
height: 28px;
border-radius: 3px;
font-size: 12px;
}
.select2-container--default .select2-selection--single .select2-selection__rendered {
line-height: 35px;
line-height: 28px;
}
.select2-container--default .select2-selection--single .select2-selection__arrow {
height: 26px;
}
.select2-container--default .select2-search--dropdown .select2-search__field {
height: 26px;
line-height: 26px;
font-size: 12px;
}
.select2-results__option[aria-selected] {
font-size: 12px;
}
.input-list,
.i_list {
float: left;
margin: 0;
}
</style>
<body>
<!-- <div style="width: 100%;line-height: 100px;font-size: 25px;font-weight: 600;text-align: center;">
海南万盟天下科技有限公司
</div> -->
<div class="data_list box_mt" style="margin-top: 20px;">
<div class="">
<table>
<thead>
<tr>
<th style="border-right: solid 1px #b6cad2;">序号</th>
<th style="border-right: solid 1px #b6cad2;">合作公司</th>
<th style="border-right: solid 1px #b6cad2;">是否支付宝打款</th>
<th style="border-right: solid 1px #b6cad2;">户名</th>
<th style="border-right: solid 1px #b6cad2;">帐号</th>
<th style="border-right: solid 1px #b6cad2;">开户行</th>
<th style="border-right: solid 1px #b6cad2;">关联结算汇总单订单号</th>
<th style="border-right: solid 1px #b6cad2;">结算金额(元)</th>
<th style="border-right: solid 1px #b6cad2;">备注</th>
</tr>
</thead>
<tbody id="statementShow">
<foreach name="CompanyInfo" item="vo" >
<if condition="$vo['pay_status'] neq 1">
<tr>
<td>{$key-0+1}</td>
<td>{$vo.company_name}</td>
<if condition="$vo['is_payment'] eq 1">
<td></td>
<td><input type="text" class="txt paymentset" data-id="{$vo.id}" name="ali_user" value="{$vo.company_info.ali_user}" placeholder="支付宝真实名称"></td>
<td><input type="text" class="txt paymentset" data-id="{$vo.id}" name="ali_account" value="{$vo.company_info.ali_account}" placeholder="支付宝账号"></td>
<td></td>
<else />
<td></td>
<td><input type="text" class="txt paymentset" data-id="{$vo.id}" name="payee_name" value="{$vo.company_info.payee_name}" placeholder="银行帐户名"></td>
<td><input type="text" class="txt paymentset" data-id="{$vo.id}" name="bank_account" value="{$vo.company_info.bank_account}" placeholder="银行帐号"></td>
<td><input type="text" class="txt paymentset" data-id="{$vo.id}" name="opening_bank" value="{$vo.company_info.opening_bank}" placeholder="开户行"></td>
</if>
<td>{$vo.statement_num}</td>
<td>{$vo.statement_money}</td>
<td><input type="text" class="txt paymentset" data-id="{$vo.id}" name="remark" value="{$vo.remark}" placeholder="备注"></td>
</tr>
<else />
<tr>
<td>{$key-0+1}</td>
<td>{$vo.company_name}</td>
<if condition="$vo['is_payment'] eq 1">
<td></td>
<td>{$vo.company_info.ali_user}</td>
<td>{$vo.company_info.ali_account}</td>
<td></td>
<else />
<td></td>
<td>{$vo.company_info.payee_name}</td>
<td>{$vo.company_info.bank_account}</td>
<td>{$vo.company_info.opening_bank}</td>
</if>
<td>{$vo.statement_num}</td>
<td>{$vo.statement_money}</td>
<td>{$vo.remark}</td>
</tr>
</if>
</foreach>
<tr>
<td colspan="2">合计:</td>
<td colspan="7">结算总金额:{$all_money}</td>
</tr>
</tbody>
</table>
</div>
</div>
<div class="search_list" style="display:flex;justify-content:flex-end;width:100%;margin-top: 30px;">
<div class="input-list" style="margin-left: 30px;float: right;">
<a class="sch-btn" href="javascript:;" id="setPayment" style="width: 150px;">确认提交</a>
</div>
</div>
<script>
$("#setPayment").on("click",function(){
var sendObj = {};
var url = "{:U('editPayment')}";
$("input[name='ali_user'],input[name='ali_account'],input[name='remark'],input[name='payee_name'],input[name='bank_account'],input[name='opening_bank']").map(function(index,elem) {
var id = $(elem).data("id");
var e = $(elem).attr("name");
var v = $(elem).val();
if(id in sendObj){
sendObj[id][e] = v;
}else{
sendObj[id] = {};
sendObj[id][e] = v;
}
});
layer.confirm("若支付宝账号及真实姓名不全的公司,将无法进行打款。请认真核对,点击取消返回",{title:false}, function(index){
$.ajax({
type: "POST",
url: url,
dataType: 'json',
async: false,
data: {info:sendObj},
success:function(data){
layer.close(index);
if(data.status==1){
layer.msg("<font style='color:white'>" + data.info + "</font>");
setTimeout(function(){
window.parent.reload();
},1000);
}else{
layer.msg("<font style='color:white'>" + data.info + "</font>");
return false;
}
}
});
});
})
function cancelPoolAjax(opurl,senddata){
//执行
$.ajax({
type: "POST",
url: opurl,
dataType: 'json',
async: false,
data: senddata,
success:function(data){
if(data.status==1){
layer.msg("<font style='color:white'>" + data.info + "</font>");
setTimeout(function(){
window.location.reload();
},1500);
}else{
layer.msg("<font style='color:white'>" + data.info + "</font>");
return false;
}
}
});
}
</script>
</body>
</html>

@ -794,7 +794,7 @@ class PaymentController extends BaseController
"company_info"=>json_encode($company_info,JSON_UNESCAPED_UNICODE),
"remark"=>$v['remark'],
"pay_check"=>1,
"pay_check_member_id"=>$member_id = $_SESSION['onethink_admin']['payment_user']['id'],
"pay_check_member_id"=> $_SESSION['onethink_admin']['payment_user']['id'],
"id"=>$k,
"pay_check_time"=>time()
];

@ -0,0 +1,244 @@
<!DOCTYPE html>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta charset="UTF-8">
<title></title>
<link rel="stylesheet" type="text/css" href="__CSS__/base.css" media="all">
<link rel="stylesheet" type="text/css" href="__CSS__/common.css" media="all">
<link rel="stylesheet" type="text/css" href="__CSS__/style.css" media="all">
<link rel="stylesheet" type="text/css" href="__CSS__/default_color.css" media="all">
<link href="__STATIC__/datetimepicker/css/datetimepicker.css" rel="stylesheet" type="text/css">
<link href="__STATIC__/datetimepicker/css/dropdown.css" rel="stylesheet" type="text/css">
<link rel="stylesheet" href="__CSS__/select2.min.css" type="text/css" />
<script type="text/javascript" src="__STATIC__/jquery-2.0.3.min.js"></script>
<script type="text/javascript" src="__JS__/select2.min.js"></script>
<script type="text/javascript" src="__STATIC__/layer3/layer.js"></script>
<script type="text/javascript" src="__STATIC__/datetimepicker/js/bootstrap-datetimepicker.min.js"></script>
<script type="text/javascript" src="__STATIC__/datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js"
charset="UTF-8"></script>
<script src="__STATIC__/juicer-min.js" type="text/javascript"></script>
</head>
<style>
html {
min-width: 100%;
}
body {
padding: 0px 10px 150px;
/* width: 960px; */
margin: auto;
}
.tabcon1711 table {
width: 480px;
}
table {
margin: auto;
}
.hidebox {
display: none;
}
.r {
width: 300px;
}
.l {
width: 180px;
}
.select2-container--default .select2-selection--single {
color: #000;
resize: none;
border-width: 1px;
border-style: solid;
border-color: #a7b5bc #ced9df #ced9df #a7b5bc;
box-shadow: 0px 3px 3px #F7F8F9 inset;
height: 35px;
height: 28px;
border-radius: 3px;
font-size: 12px;
}
.select2-container--default .select2-selection--single .select2-selection__rendered {
line-height: 35px;
line-height: 28px;
}
.select2-container--default .select2-selection--single .select2-selection__arrow {
height: 26px;
}
.select2-container--default .select2-search--dropdown .select2-search__field {
height: 26px;
line-height: 26px;
font-size: 12px;
}
.select2-results__option[aria-selected] {
font-size: 12px;
}
.input-list,
.i_list {
float: left;
margin: 0;
}
</style>
<body>
<!-- <div style="width: 100%;line-height: 100px;font-size: 25px;font-weight: 600;text-align: center;">
海南万盟天下科技有限公司
</div> -->
<div class="data_list box_mt" style="margin-top: 20px;">
<div class="">
<table>
<thead>
<tr>
<th style="border-right: solid 1px #b6cad2;">序号</th>
<th style="border-right: solid 1px #b6cad2;">合作公司</th>
<th style="border-right: solid 1px #b6cad2;">是否支付宝打款</th>
<th style="border-right: solid 1px #b6cad2;">户名</th>
<th style="border-right: solid 1px #b6cad2;">帐号</th>
<!-- <th style="border-right: solid 1px #b6cad2;">开户行</th>-->
<th style="border-right: solid 1px #b6cad2;">关联结算汇总单订单号</th>
<th style="border-right: solid 1px #b6cad2;">结算金额(元)</th>
<th style="border-right: solid 1px #b6cad2;">备注</th>
</tr>
</thead>
<tbody id="statementShow">
<foreach name="CompanyInfo" item="vo" >
<if condition="$vo['pay_status'] neq 1">
<tr>
<td>{$key-0+1}</td>
<td>{$vo.company_name}</td>
<if condition="$vo['is_payment'] eq 1">
<td></td>
<td><input type="text" class="txt paymentset" data-id="{$vo.id}" name="ali_user" value="{$vo.company_info.ali_user}" placeholder="支付宝真实名称"></td>
<td><input type="text" class="txt paymentset" data-id="{$vo.id}" name="ali_account" value="{$vo.company_info.ali_account}" placeholder="支付宝账号"></td>
<!-- <td></td>-->
<else />
<td></td>
<td><input type="text" class="txt paymentset" data-id="{$vo.id}" name="payee_name" value="{$vo.company_info.payee_name}" placeholder="银行帐户名"></td>
<td><input type="text" class="txt paymentset" data-id="{$vo.id}" name="bank_account" value="{$vo.company_info.bank_account}" placeholder="银行帐号"></td>
<td><input type="text" class="txt paymentset" data-id="{$vo.id}" name="opening_bank" value="{$vo.company_info.opening_bank}" placeholder="开户行"></td>
</if>
<td>{$vo.statement_num}</td>
<td>{$vo.statement_money}</td>
<td><input type="text" class="txt paymentset" data-id="{$vo.id}" name="remark" value="{$vo.remark}" placeholder="备注"></td>
</tr>
<else />
<tr>
<td>{$key-0+1}</td>
<td>{$vo.company_name}</td>
<if condition="$vo['is_payment'] eq 1">
<td></td>
<td>{$vo.company_info.ali_user}</td>
<td>{$vo.company_info.ali_account}</td>
<else />
<td></td>
<td>{$vo.company_info.payee_name}</td>
<td>{$vo.company_info.bank_account}</td>
<td>{$vo.company_info.opening_bank}</td>
</if>
<td>{$vo.statement_num}</td>
<td>{$vo.statement_money}</td>
<td>{$vo.remark}</td>
</tr>
</if>
</foreach>
<tr>
<td colspan="2">合计:</td>
<td colspan="7">结算总金额:{$all_money}</td>
</tr>
</tbody>
</table>
</div>
</div>
<div class="search_list" style="display:flex;justify-content:flex-end;width:100%;margin-top: 30px;">
<div class="input-list" style="margin-left: 30px;float: right;">
<a class="sch-btn" href="javascript:;" id="setPayment" style="width: 150px;">确认提交</a>
</div>
</div>
<script>
$("#setPayment").on("click",function(){
var sendObj = {};
var url = "{:U('editPayment')}";
$("input[name='ali_user'],input[name='ali_account'],input[name='remark'],input[name='payee_name'],input[name='bank_account'],input[name='opening_bank']").map(function(index,elem) {
var id = $(elem).data("id");
var e = $(elem).attr("name");
var v = $(elem).val();
if(id in sendObj){
sendObj[id][e] = v;
}else{
sendObj[id] = {};
sendObj[id][e] = v;
}
});
layer.confirm("若支付宝账号及真实姓名不全的公司,将无法进行打款。请认真核对,点击取消返回",{title:false}, function(index){
$.ajax({
type: "POST",
url: url,
dataType: 'json',
async: false,
data: {info:sendObj},
success:function(data){
layer.close(index);
if(data.status==1){
layer.msg("<font style='color:white'>" + data.info + "</font>");
setTimeout(function(){
window.parent.reload();
},1000);
}else{
layer.msg("<font style='color:white'>" + data.info + "</font>");
return false;
}
}
});
});
})
function cancelPoolAjax(opurl,senddata){
//执行
$.ajax({
type: "POST",
url: opurl,
dataType: 'json',
async: false,
data: senddata,
success:function(data){
if(data.status==1){
layer.msg("<font style='color:white'>" + data.info + "</font>");
setTimeout(function(){
window.location.reload();
},1500);
}else{
layer.msg("<font style='color:white'>" + data.info + "</font>");
return false;
}
}
});
}
</script>
</body>
</html>
Loading…
Cancel
Save