Merge pull request '2.7号功能提交' (#161) from feature/add_item into release

Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/161
master
郑永星 4 years ago
commit 84d6d1c145

@ -2157,6 +2157,14 @@ class CompanyStatementPoolController extends ThinkController
$optist = array_diff($optist, ["cancelPool","reCount"]); $optist = array_diff($optist, ["cancelPool","reCount"]);
} }
if ($info['withdraw_type'] == "特殊补点") {
$optist = array_diff($optist, ["cancelPool"]);
if ($info['verify_status'] == '0') {
array_push($optist,"cancelPool");
}
}
if ($info['withdraw_type'] == "特殊补点") { if ($info['withdraw_type'] == "特殊补点") {
$optist = array_diff($optist, ["reCount"]); $optist = array_diff($optist, ["reCount"]);
if ($info['company_type'] == 2 && $info['verify_status'] == '0') { if ($info['company_type'] == 2 && $info['verify_status'] == '0') {
@ -2169,14 +2177,6 @@ class CompanyStatementPoolController extends ThinkController
array_push($optist,"editPool"); array_push($optist,"editPool");
} }
if ($info['withdraw_type'] == "特殊补点") {
$optist = array_diff($optist, ["cancelPool"]);
if ($info['verify_status'] == '0') {
array_push($optist,"cancelPool");
}
}
if(empty($info['ext_file'])){ if(empty($info['ext_file'])){
//未上传凭证 //未上传凭证
$optist = array_diff($optist, ["viewVoucher", "editVoucher"]); $optist = array_diff($optist, ["viewVoucher", "editVoucher"]);

@ -637,46 +637,7 @@
}) })
}); });
function checkInput() {
$(".ali_user").off("blur");
$(".ali_account").off("blur");
$(".ali_user").bind("blur", function(){
var name = $(this).val();
if(!(\/^[\\u4e00-\\u9fa5]+$\/i.test(name))&&name.length>0){
$(this).val("");
layer.msg('支付宝真实姓名错误');
}
if (name.length>10) {
$(this).val(name.substr(0,10));
layer.msg('字符输入超过10位');
return;
}
});
$(".ali_account").bind("blur", function(){
var strEmail = $(this).val();
var flagPhone=\/^(\\d{11})$\/;
var flagEmail = \/^\\w+((-\\w+)|(\\.\\w+))*\\@[A-Za-z0-9]+((\\.|-)[A-Za-z0-9]+)*\\.[A-Za-z0-9]+$\/;
if (strEmail.length>50) {
$(this).val("");
layer.msg('字符输入超过50位');
return;
}
if(flagPhone.test(strEmail)==false && flagEmail.test(strEmail) == false && strEmail.length>0) {
$(this).val("");
layer.msg('支付宝账号格式不正确');
}
});
}
function isPaymentChange() { function isPaymentChange() {
$(".is_payment").off("change"); $(".is_payment").off("change");
@ -778,15 +739,15 @@
"</select>" + "</select>" +
"</td>" +"<td rowspan='"+(first_row-1)+"' class='payee_name_s'>" + "</td>" +"<td rowspan='"+(first_row-1)+"' class='payee_name_s'>" +
"<input class='payee_name' placeholder='请输入户名' "+(is_payment==1?'style=\\\'display:none\\\'':'')+" value='"+payee_name+"'>" + "<input class='payee_name' placeholder='请输入户名' "+(is_payment==1?'style=\\\'display:none\\\'':'')+" value='"+payee_name+"'>" +
"<input class='ali_user' placeholder='请输入户名' oninput='value.replace(\'\\d{11}\','$1')' "+(is_payment!=1?'style=\\\'display:none\\\'':'')+" value='"+ali_user+"'>" + "<input class='ali_user' placeholder='支付宝真实姓名' oninput='value.replace(\'\\d{11}\','$1')' "+(is_payment!=1?'style=\\\'display:none\\\'':'')+" value='"+ali_user+"'>" +
"</td>" + "</td>" +
"<td rowspan='"+(first_row-1)+"' class='bank_account_s'>" + "<td rowspan='"+(first_row-1)+"' class='bank_account_s'>" +
"<input class='bank_account' placeholder='请输入账号' "+(is_payment==1?'style=\\\'display:none\\\'':'')+" value='"+bank_account+"'>" + "<input class='bank_account' placeholder='请输入账号' "+(is_payment==1?'style=\\\'display:none\\\'':'')+" value='"+bank_account+"'>" +
"<input class='ali_account' placeholder='请输入账号' oninput='value.replace(\'\\d{11}\','$1')' "+(is_payment!=1?'style=\\\'display:none\\\'':'')+" value='"+ali_account+"'>" + "<input class='ali_account' placeholder='请输入支付宝账号' oninput='value.replace(\'\\d{11}\','$1')' "+(is_payment!=1?'style=\\\'display:none\\\'':'')+" value='"+ali_account+"'>" +
"</td>" + "</td>" +
"<td rowspan='"+(first_row-1)+"' class='opening_bank_s'>" + "<td rowspan='"+(first_row-1)+"' class='opening_bank_s'>" +
"<input class='opening_bank' placeholder='请输入开户行' "+(is_payment==1?'style=\\\'display:none\\\'':'')+" value='"+opening_bank+"'>" + "<input class='opening_bank' placeholder='请输入开户行' "+(is_payment==1?'style=\\\'display:none\\\'':'')+" value='"+opening_bank+"'>" +
"<input class='ali_opening_bank' placeholder='请输入开户行' "+(is_payment!=1?'style=\\\'display:none\\\'':'')+" value=''>" + "<input class='ali_opening_bank' placeholder='请输入开户行' "+(is_payment!=1?'style=\\\'display:none\\\'':'')+" value='' disabled>" +
"</td>"; "</td>";
var next_company = $(this).parent().parent().next().find(".company_id").text(); var next_company = $(this).parent().parent().next().find(".company_id").text();
@ -816,6 +777,47 @@
caculateAmount(); caculateAmount();
}); });
}
function checkInput() {
$(".ali_user").off("blur");
$(".ali_account").off("blur");
$(".ali_user").bind("blur", function(){
var name = $(this).val();
if(!(\/^[\\u4e00-\\u9fa5]+$\/i.test(name))&&name.length>0){
$(this).val("");
layer.msg('支付宝真实姓名错误');
}
if (name.length>10) {
$(this).val(name.substr(0,10));
layer.msg('字符输入超过10位');
return;
}
});
$(".ali_account").bind("blur", function(){
var strEmail = $(this).val();
var flagPhone=\/^(\\d{11})$\/;
var flagEmail = \/^\\w+((-\\w+)|(\\.\\w+))*\\@[A-Za-z0-9]+((\\.|-)[A-Za-z0-9]+)*\\.[A-Za-z0-9]+$\/;
if (strEmail.length>50) {
$(this).val("");
layer.msg('字符输入超过50位');
return;
}
if(flagPhone.test(strEmail)==false && flagEmail.test(strEmail) == false && strEmail.length>0) {
$(this).val("");
layer.msg('支付宝账号格式不正确');
}
});
} }
var company_id = "{$_GET['company_id']??0}"; var company_id = "{$_GET['company_id']??0}";

Loading…
Cancel
Save