|
@@ -198,7 +198,7 @@
|
|
|
margin-left: 20px
|
|
|
}
|
|
|
|
|
|
- .popup-tips {
|
|
|
+ .popup-tips ,.sub-popup-tips{
|
|
|
color: red;
|
|
|
display: none
|
|
|
}
|
|
@@ -549,7 +549,7 @@
|
|
|
<%--子订单分账弹窗--%>
|
|
|
<div class="mask revise-popup" id="sub-revise-popup">
|
|
|
<div class="revise-popup-content" style="width: 540px;">
|
|
|
- <h4>确认提示</h4>
|
|
|
+ <h4>分账提示</h4>
|
|
|
<div class="tab-content">
|
|
|
<%-- <div>--%>
|
|
|
<%-- <div style="display: inline-block">--%>
|
|
@@ -566,41 +566,41 @@
|
|
|
<div>
|
|
|
<div style="display: inline-block">
|
|
|
<p>
|
|
|
- <span>供应商分账号:<input id="div-shop-accounts"></span>
|
|
|
+ <span>采美分账号:<input type="number" id="div-caimei-accounts" onchange="inputnum(this)"></span>
|
|
|
</p>
|
|
|
</div>
|
|
|
<div style="display: inline-block;margin-left: 30px;">
|
|
|
<p>
|
|
|
- <span>供应商成本分账金额:<input id="div-shop-money"></span>
|
|
|
+ <span>采美分账金额:<input type="number" id="div-caimei-money" onchange="inputnum(this)"></span>
|
|
|
</p>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div>
|
|
|
<div style="display: inline-block">
|
|
|
<p>
|
|
|
- <span>采美分账号:<input id="div-caimei-accounts"></span>
|
|
|
+ <span>供应商分账号:<input type="number" id="div-shop-accounts" onchange="inputnum(this)"></span>
|
|
|
</p>
|
|
|
</div>
|
|
|
<div style="display: inline-block;margin-left: 30px;">
|
|
|
<p>
|
|
|
- <span>采美分账金额:<input id="div-caimei-money"></span>
|
|
|
+ <span>供应商分账金额:<input type="number" id="div-shop-money" onchange="inputnum(this)"></span>
|
|
|
</p>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div>
|
|
|
<div style="display: inline-block">
|
|
|
<p>
|
|
|
- <span>服务商分账号:<input id="div-service-accounts"></span>
|
|
|
+ <span>服务商分账号:<input type="number" id="div-service-accounts" onchange="inputnum(this)"></span>
|
|
|
</p>
|
|
|
</div>
|
|
|
<div style="display: inline-block;margin-left: 30px;">
|
|
|
<p>
|
|
|
- <span>服务商分账金额:<input id="div-service-money"></span>
|
|
|
+ <span>服务商分账金额:<input type="number" id="div-service-money" onchange="inputnum(this)"></span>
|
|
|
</p>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div class="popup-tips">不能为空</div>
|
|
|
+ <div class="sub-popup-tips">不能为空</div>
|
|
|
<div style="margin-top: 50px;">
|
|
|
<button class="sub-popup-cancel-btn">取消</button>
|
|
|
<button class="sub-popup-cfm-btn">确认分账</button>
|
|
@@ -797,16 +797,29 @@
|
|
|
block.text(content);
|
|
|
block.show();
|
|
|
}
|
|
|
+ function showTips2(content) {
|
|
|
+ var block = $('.sub-popup-tips');
|
|
|
+ block.text(content);
|
|
|
+ block.show();
|
|
|
+ }
|
|
|
|
|
|
function btnToGrey() {
|
|
|
$('.popup-cfm-btn').css({'background': '#ddd', 'color': '#555'});
|
|
|
$('.popup-cfm-btn').attr('disabled', true);
|
|
|
}
|
|
|
+ function btnToGrey1() {
|
|
|
+ $('.sub-popup-cfm-btn').css({'background': '#ddd', 'color': '#555'});
|
|
|
+ $('.sub-popup-cfm-btn').attr('disabled', true);
|
|
|
+ }
|
|
|
|
|
|
function btnToNormal() {
|
|
|
$('.popup-cfm-btn').css({'background': '#3daae9', 'color': '#fff'});
|
|
|
$('.popup-cfm-btn').attr('disabled', false);
|
|
|
}
|
|
|
+ function btnToNormal1() {
|
|
|
+ $('.sub-popup-cfm-btn').css({'background': '#3daae9', 'color': '#fff'});
|
|
|
+ $('.sub-popup-cfm-btn').attr('disabled', false);
|
|
|
+ }
|
|
|
|
|
|
function renderSupplierFee() {
|
|
|
var productFee = Number($('#popup-product-fee').val()),
|
|
@@ -890,31 +903,24 @@
|
|
|
});
|
|
|
|
|
|
$('#apply').on('click', function () {
|
|
|
-
|
|
|
- top.$.jBox.confirm('确定对该子订单申请分账吗?', '系统提示', function (v, h, f) {
|
|
|
- if (v == "ok") {
|
|
|
- var checked = $('.pay-wrapper input[type=checkbox]:checked'), params = '?';
|
|
|
- for (var i = 0; i < checked.length; i++) {
|
|
|
- var shoporderId = $(checked[i]).attr('data-shoporderid');
|
|
|
- params += ('&shopOrderIDs=' + shoporderId);
|
|
|
- var receiptStatus = $(checked[i]).attr('data-receiptStatus');
|
|
|
- var modifyPayable = $(checked[i]).attr('data-modifyPayable');
|
|
|
- if (modifyPayable && "3" != receiptStatus) {
|
|
|
- alertx('存在母订单线上支付尚未完成的情况,子订单(' + shoporderId + ')不能申请付款');
|
|
|
- return false;
|
|
|
- }
|
|
|
- }
|
|
|
- if (checked.length < 1 || params == '?') {
|
|
|
- alertx('请至少选择一个订单');
|
|
|
- return false;
|
|
|
- }
|
|
|
- $('#sub-revise-popup').show();
|
|
|
-
|
|
|
- <%--window.location.href = '${ctx}/order/cmPayShop/new/splitEdit' + params;--%>
|
|
|
+ var checked = $('.pay-wrapper input[type=checkbox]:checked'), params = '?';
|
|
|
+ for (var i = 0; i < checked.length; i++) {
|
|
|
+ var shoporderId = $(checked[i]).attr('data-shoporderid');
|
|
|
+ params += ('&shopOrderIDs=' + shoporderId);
|
|
|
+ var receiptStatus = $(checked[i]).attr('data-receiptStatus');
|
|
|
+ var modifyPayable = $(checked[i]).attr('data-modifyPayable');
|
|
|
+ if (modifyPayable && "3" != receiptStatus) {
|
|
|
+ alertx('存在母订单线上支付尚未完成的情况,子订单(' + shoporderId + ')不能申请付款');
|
|
|
+ return false;
|
|
|
}
|
|
|
- });
|
|
|
-
|
|
|
-
|
|
|
+ }
|
|
|
+ if (checked.length < 1 || params == '?') {
|
|
|
+ alertx('请至少选择一个订单');
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ $('#sub-revise-popup').show();
|
|
|
+ btnToGrey1();
|
|
|
+ <%--window.location.href = '${ctx}/order/cmPayShop/new/splitEdit' + params;--%>
|
|
|
});
|
|
|
|
|
|
$('.sub-popup-cfm-btn').on('click', function () {
|
|
@@ -929,10 +935,14 @@
|
|
|
var splits = shopCode + ',' + shopMoney + ';' + cmCode + ',' + cmMoney + ';' + serviceCode + ',' + serviceMoney;
|
|
|
console.log("splits--------------->" + splits);
|
|
|
console.log("shoporderId--------------->" + shoporderId);
|
|
|
- $.ajax({
|
|
|
- url: "${ctx}/order/cmPayShop/new/splitEdit",
|
|
|
- data: {'shopOrderId': shoporderId, 'splits': splits},
|
|
|
- type: "POST"
|
|
|
+ top.$.jBox.confirm('确定对该子订单申请分账吗?', '系统提示', function (v, h, f) {
|
|
|
+ if (v == "ok") {
|
|
|
+ $.ajax({
|
|
|
+ url: "${ctx}/order/cmPayShop/new/splitEdit",
|
|
|
+ data: {'shopOrderId': shoporderId, 'splits': splits},
|
|
|
+ type: "POST"
|
|
|
+ });
|
|
|
+ }
|
|
|
});
|
|
|
<%--window.location.href = '${ctx}/order/cmPayShop/new/splitEdit?shopOrderId=' + shoporderId + "&splits =" + splits;--%>
|
|
|
});
|
|
@@ -1071,7 +1081,66 @@
|
|
|
$('body').on('input propertychange', '#proportional', function () {
|
|
|
validAndAdd();
|
|
|
});
|
|
|
-
|
|
|
+ //校验分账
|
|
|
+ $('body').on('input propertychange', '#div-shop-accounts', function () {
|
|
|
+ validCheck();
|
|
|
+ });
|
|
|
+ $('body').on('input propertychange', '#div-shop-money', function () {
|
|
|
+ validCheck();
|
|
|
+ });
|
|
|
+ $('body').on('input propertychange', '#div-caimei-accounts', function () {
|
|
|
+ validCheck();
|
|
|
+ });
|
|
|
+ $('body').on('input propertychange', '#div-caimei-money', function () {
|
|
|
+ validCheck();
|
|
|
+ });
|
|
|
+ $('body').on('input propertychange', '#div-service-accounts', function () {
|
|
|
+ validCheck();
|
|
|
+ });
|
|
|
+ $('body').on('input propertychange', '#div-service-money', function () {
|
|
|
+ validCheck();
|
|
|
+ });
|
|
|
+ function validCheck(){
|
|
|
+ showTips2('');
|
|
|
+ btnToNormal1();
|
|
|
+ $('.sub-popup-tips').hide();
|
|
|
+ const shopCode = $('#div-shop-accounts').val();
|
|
|
+ const shopMoney = $('#div-shop-money').val();
|
|
|
+ const cmCode = $('#div-caimei-accounts').val();
|
|
|
+ const cmMoney = $('#div-caimei-money').val();
|
|
|
+ const serviceCode = $('#div-service-accounts').val();
|
|
|
+ const serviceMoney = $('#div-service-money').val();
|
|
|
+ if (!shopCode) {
|
|
|
+ showTips2('供应商分账号不能为空');
|
|
|
+ btnToGrey1();
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ if (!shopMoney) {
|
|
|
+ showTips2('请输入供应商分账金额');
|
|
|
+ btnToGrey1();
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ if (!cmCode) {
|
|
|
+ showTips2('采美分账号不能为空');
|
|
|
+ btnToGrey1();
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ if (!cmMoney) {
|
|
|
+ showTips2('请输入采美分账金额');
|
|
|
+ btnToGrey1();
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ if (!serviceCode) {
|
|
|
+ showTips2('服务商分账号不能为空');
|
|
|
+ btnToGrey1();
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ if (!serviceMoney) {
|
|
|
+ showTips2('请输入服务商分账金额');
|
|
|
+ btnToGrey1();
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ }
|
|
|
function validAndAdd() {
|
|
|
//先还原按钮
|
|
|
showTips1('');
|