记得上下班打卡 | git大法好,push需谨慎

Commit ebf232d1 authored by sangchunxi's avatar sangchunxi

#1948 #1966 bug 修复,正式提交

parent b7384352
...@@ -158,7 +158,7 @@ ...@@ -158,7 +158,7 @@
formatter: function (value, row, index) { formatter: function (value, row, index) {
var actions = []; var actions = [];
actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="toPop(\'' + row.performancesId + '\')"><i class="fa fa-edit"></i>设置票提</a> '); actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="toPop(\'' + row.performancesId + '\')"><i class="fa fa-edit"></i>设置票提</a> ');
actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="editPop(\'' + row.performancesId + '\')"><i class="fa fa-edit"></i>编辑票提</a> '); // actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="editPop(\'' + row.performancesId + '\')"><i class="fa fa-edit"></i>编辑票提</a> ');
actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="toDetail(\'' + row.performancesId + '\')"><i class="fa fa-edit"></i>查看</a> '); actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="toDetail(\'' + row.performancesId + '\')"><i class="fa fa-edit"></i>查看</a> ');
actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.performancesId + '\')"><i class="fa fa-edit"></i>销售数据</a> '); actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.performancesId + '\')"><i class="fa fa-edit"></i>销售数据</a> ');
return actions.join(''); return actions.join('');
...@@ -198,10 +198,10 @@ ...@@ -198,10 +198,10 @@
postData.push({ postData.push({
delTag: subOArr[i].delTag, delTag: subOArr[i].delTag,
id: subOArr[i].id, id: subOArr[i].id,
ordCarry: Number($('.ticketsti' + i).find('.normal').val()) / 100, ordCarry: Number($('.ticketsti' + i).find('.normal').val()) / 100 || 0,
performanceId: subOArr[i].performanceId, performanceId: subOArr[i].performanceId,
ticketId: subOArr[i].ticketId, ticketId: subOArr[i].ticketId,
totalCarry: Number($('.ticketsti' + i).find('.total').val()) / 100, totalCarry: Number($('.ticketsti' + i).find('.total').val()) / 100 || 0,
}); });
} }
$.ajax({ $.ajax({
...@@ -210,8 +210,13 @@ ...@@ -210,8 +210,13 @@
headers: {"Content-Type": "application/json;charset=UTF-8"}, headers: {"Content-Type": "application/json;charset=UTF-8"},
data: JSON.stringify(postData), data: JSON.stringify(postData),
success: function (e) { success: function (e) {
if (e.code === 301) {
$.modal.msgWarning(e.msg);
$(".layui-layer-close1").click();
} else {
$(".layui-layer-close1").click(); $(".layui-layer-close1").click();
} }
}
}); });
} }
...@@ -267,14 +272,15 @@ ...@@ -267,14 +272,15 @@
url: ctx + 'smile/agent/list?performancesId=' + id, url: ctx + 'smile/agent/list?performancesId=' + id,
headers: {"Content-Type": "application/json;charset=UTF-8"}, headers: {"Content-Type": "application/json;charset=UTF-8"},
success: function (e) { success: function (e) {
subOArr = e.data; subOArr = e.data || [];
subOArr.forEach(item =>{ subOArr.forEach(item =>{
$('#addClassify .form-group').append( $('#addClassify .form-group').append(
'<div class="ticketsti' + item + '">' + '<div class="ticketsti' + item + '">' +
'<p>' + item.ticketName + '</p>' + '<p>' + item.ticketName + '</p>' +
'<p>票提设置</p>' + '<p>票提设置</p>' +
'<span>总代<input type="text" class="total">%</span>' + '<span>总代<input type="text" id="total" class="total" onblur="allProxy()">%</span>' +
'<span>普代<input type="text" class="normal">%</span>' + '<span>普代<input type="text" id="normal" class="normal" onblur="normalProxy()">%</span>' +
'<p id="allProxyErrorText"></p>' +
'</div>' '</div>'
) )
}) })
...@@ -286,6 +292,30 @@ ...@@ -286,6 +292,30 @@
} }
}); });
} }
function allProxy() {
var allProxyVal = document.getElementById("total").value;
var int = isIntNum(allProxyVal)
if(!int) { // 如果是整数
document.getElementById("allProxyErrorText").innerHTML = "请填写正整数!";
}
}
function normalProxy() {
}
function isIntNum() {
var reg = new RegExp(/^[1-9]\d*$/);
// 表单验证规则设置:请确认输入为整数
if (!reg.test(value)) {
return false
} else {
// 符合条件
return true
}
}
</script> </script>
</body> </body>
</html> </html>
\ No newline at end of file
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