Commit 2c8fd395 authored by 彭令令's avatar 彭令令

Merge branch 'optimize' of http://114.115.168.181/lushihao/zxtb_to_ssfwpt into optimize

parents 2d475543 8257ad14
<!doctype html>
<html>
<head>
<meta charset='UTF-8'>
<!-- 让360双核浏览器用webkit内核渲染页面-->
<meta name="renderer" content="webkit">
<meta name=renderer content=webkit>
<!-- 让IE浏览器用最高级内核渲染页面 还有用 Chrome 框架的页面用webkit 内核 -->
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<!-- IOS6全屏 Chrome高版本全屏 -->
<meta http-equiv="X-UA-Compatible" content="edge">
<link href="../../static/tools/css/bootstrap.css?v=1.1" rel="stylesheet">
<!--滚动条-->
<link rel="stylesheet" href="../../static/tools/css/scroll.css" />
<!--table样式-->
<link rel="stylesheet" href="../../static/tools/css/table.css" />
<!--样式-->
<link rel="stylesheet" href="../../static/tools/css/encapsulation.css" />
<!--时间插件-->
<link rel="stylesheet" href="../../static/tools/js/My97DatePicker/skin/WdatePicker.css" />
<!--declare-->
<link rel="stylesheet" href="../../static/css/declare/declare.css" />
<!-- 页面自定义样式 -->
<title>在线填报</title>
</head>
<script>
document.write("<script type='text/javascript' src='../../static/config.js?time=" + Math.random() + "'></" + "script" + ">")
</script>
<body>
<div>
<div style="background-color:#FFFFFF;">
<div id="zhsbtcBox" style="padding: 25px;">
<div class="div-border" style="padding-bottom: 20px;height: 60px;">
<img style="float:left;display:block" src="../../static/tools/images/zxtb.png">&nbsp;&nbsp;
<span style="float:left;display:block;margin-left: 10px;margin-top: 9px;top: 10px;"
class="span-title">财产行为税企业所得税综合申报套餐</span>
</div>
<div>
<div class="div-float" style="padding-bottom: 8px; width: 100%;position :relative">
<span>申报月份:</span>
<input readonly id="getInputValue" name="birth_date" style="width: 10%; display: inline;min-width: 150px"
type="text" class="Wdate checkId-input check-items-birthday form-control">
<input id="reset" class="btn btn-primary tdDong-btn"
style="margin-right: 10%;margin-right: 10px;height: 32px;margin-top: 5px;position:absolute;right: 120px;"
type="button" value="重置申报清册" />
</div>
</div>
</br>
<div class="div-clear-folat">
<strong>税费申报</strong>
</div>
<hr class="hr-margin" />
<!-- <div class="div-clear-folat" style="width: 99%; height: 40px;line-height: 40px;">
<strong>10111298000025892661国家税务总局天津滨海高新技术产业开发区税务局第二税务所</strong>
<input id="reset" class="btn btn-primary"
style="height: 30px;right: 120px;margin: 0; padding: 0 5px;float: right;"
type="button" value="税费申报" />
<input id="reset" class="btn btn-primary"
style="height: 30px;right: 120px;margin: 0 10px 0 0; padding: 0 5px;float: right;"
type="button" value="缴款" />
</div> -->
<!-- <div id="taxGrid" class="zhsbtcTab"></div> -->
<!-- <hr class="hr-margin" />
<div class="div-clear-folat" style="width: 99%; height: 30px;line-height: 30px;">
<strong>10111298000025892661国家税务总局天津滨海高新技术产业开发区税务局第二税务所</strong>
</div> -->
<!-- <div id="taxGrid1" class="zhsbtcTab"></div> -->
<!-- <div style="height:16px"></div> -->
<!-- <div class="font-clo" style="padding-top: 20px;">
<div style="font-size:12px">温馨提示:</div>
<div class="reminder"><span class="span-font-size">如近期有税费种认定、纳税人资格、备案等发生变动,页面展现清册与实际所需不符的,</span></div>
<div class="reminder"><span class="span-font-size">请点此处&nbsp;&nbsp;“<label for="reset" id="reset1"
class="label_declare">重置申报清册</label>”&nbsp;&nbsp;对该户清册进行重新生成。</span>
</div>
</div> -->
</div>
</div>
</div>
<input type='hidden' name='data' value="${token}" id="token">
<input type='hidden' name='data' value="${djxh}" id="djxh">
<form action="/declare/toPzzl" method="POST" target="_blank" id="changeForm">
<input type='hidden' name='data' id="changeForm_data">
</form>
<div id="myMask" class="myMask" hidden></div>
<div id="myModal" class="myModal" hidden>
<div class="myModal-title">
选择申报方式
</div>
<div class="myModal-body">
<div class="myModal-body-div">
<div style="line-height: 40px;margin: 10px;font-size: 14px;">
<div id="dName"></div>
<button class="btn btn-primary" id="normalDeclaration" onclick="initpage.declarationMethod('N')">一般申报</button>
</div>
</div>
<div class="myModal-body-div" style="clear:both;padding-top: 10px;">
<div style="line-height: 40px;margin: 10px;font-size: 14px;">
<div id="ybName"></div>
<button class="btn btn-primary ybDeclaration1" id="ybDeclaration"
onmouseover="this.className='btn ybDeclaration'"
onmouseout="this.className='btn btn-primary ybDeclaration1'"
onclick="initpage.declarationMethod('Y')">一表集成</button>
</div>
</div>
<img class="img-ybjc-modal" onclick="initpage.closeModal()" src="../../static/tools/images/close.png">
</div>
</div>
</body>
<script src="../../static/tools/js/jquery-1.11.3.js?v=1.1"></script>
<script src="../../static/js/tax/tool.js"></script>
<script src="../../static/tools/js/jquery.nicescroll.js?v=1.1"></script>
<script src="../../static/tools/js/bootstrap.js?v=1.1"></script>
<script src="../../static/tools/js/encapsulation.js?v=1.3"></script>
<script src="../../static/tools/js/minScroll.js?v=1.1"></script>
<script src="../../static/tools/js/My97DatePicker/WdatePicker.js?v=1.1"></script>
<script src="../../static/biz/zhsbtc_grid.js?v=1.0"></script>
<script>
// <!-- // 使用 el 表达式,将返回的信息写到此处,然后调用页面绘制方法绘制页面
// var companyInfo = ${json};
// if (companyInfo.success) {
// var initpage = initPage(companyInfo.bean);
// $("#getInputValue").on("focus", function() {
// WdatePicker({
// isShowClear:false,
// dateFmt: 'yyyy-MM',
// onpicking: function(dp){
// initpage.changeDate(this, dp);
// }
// });
// });
// } else {
// alertWarning("请求失败!");
// // 弹出错误对话框
// }
</script>
</html>
var zjhm = '';
var initpage;
var sbqDate = '';
var yearBblxDm = ['10414', '10420'];
$(function () {
showLoading();
getInitTable();
})
function getInitTable() {
$.ajax({
type: "post",
url: config.url + "/online/declare/index",
dataType: "json", // 请求方式为jsonp
// async: false,
data: {
djxh: getUrlParam("djxh"),
token: getUrlParam("token"),
sbsq: "",
// pzzlDm: getUrlParam("pzzlDm"),
pzzlDm: "12101|10401|10402",
},
// beforeSend:function(){
// myAlert("提示", "正在获取初始化信息", "确定")
// },
success: function (data) { //客户端jquery预先定义好的callback函数,成功获取跨域服务器上的json数据后,会动态执行这个callback函数
hideLoading();
//el表达式变jqa
// $("#token").attr("value","");
// if (data.success) {
// if (data.bean.url == "error.jsp") {
// myAlert("提示", data.bean.errorInfo, "确定")
// // window.location.href = "/jsp/error/index.html?falg="+param;
// return
// }
// }
var companyInfo = data;
if (companyInfo.success) {
zjhm = companyInfo.bean.zjhm
if (companyInfo.bean.sfyhzctsBz == 'Y') {
myAlert("提示", "尊敬的纳税人、缴费人,为进一步巩固拓展减税降费成效,助力市场主体纾困解难,对部分2020年底到期税费优惠政策(不包括社会保险费),您可暂按原政策文件规定申报享受优惠(原减免性质代码可继续使用)。详细情况可咨询主管税务分局、税务所或12366纳税服务热线。感谢您的理解与支持!!", "确定");
}
config.value = companyInfo.bean.value
companyInfo.bean.config = config
companyInfo.bean.return = true; /* @Author ygy @Date 10:12 2020/7/8 @Description 前端判断接口成功返回数据标记用于区分是否执行初始化table方法*/
config.return = true;
initpage = initPage(companyInfo.bean);
} else {
hideLoading();
if (data.errmsg != undefined) {
alertWarning(data.errmsg);
} else {
alertWarning(data.returnMessage);
}
if (!companyInfo.bean) {
companyInfo.bean = {};
companyInfo.bean.djxh = getUrlParam("djxh");
companyInfo.bean.return = false;
}
companyInfo.bean.config = config
initpage = initPage(companyInfo.bean);
// 弹出错误对话框
}
$("#getInputValue").on("focus", function () {
WdatePicker({
isShowClear: false,
dateFmt: 'yyyy-MM',
onpicking: function (dp) {
initpage.changeDate(this, dp);
}
});
});
},
error: function (xhr) {
hideLoading();
//jsonp 方式此方法不被触发
console.log("=======error======================")
}
})
}
/**
* 按期申报填报列表页控制脚本
*
* @author 于广洋
* @modify 王雷
*/
// -------------------------------
/**
* 绘制税种填报页面
*
* @param {*} companyInfo
*/
function initPage(companyInfo) {
getIEVersion();
localStorage.setItem("cancellation", null);
var companyInfo = companyInfo;
var djxh = companyInfo.djxh;
var nowdate = ""; // 存储当前选择的时间框;
var submitData
/**
* 展示税种申报信息
*/
var showTax = function (taxInfo, id) {
if (taxInfo.length > 0) {
for (var i = 0; i < taxInfo.length; i++) {
if (taxInfo[i].sbrq) {
taxInfo[i].sbrq = tool.formatDate(taxInfo[i].sbrq.split(" ")[0]);
}
if (taxInfo[i].bblxDm=='30101') {
taxInfo[i].sssqQ = "-";
taxInfo[i].sssqZ = "-";
}
}
}
// var id = "#taxGrid";
var buttonHtml = "";
var order = ["pzzlMc", "sssqQ", "sssqZ", "sbrq", "do"];
var promptStatement = "";
var headerList = [{
name: "序号",
width: "5%"
}, {
name: "申报表",
width: "40%"
}, {
name: "税款所属期起",
width: "15%"
}, {
name: "税款所属期止",
width: "15%"
}, {
name: "申报日期",
width: "10%"
}, {
name: "操作",
width: "15%"
}];
//渲染表
getTableDeclaration('#'+id, order, headerList, taxInfo, buttonHtml, promptStatement)
};
/**
* 税务申报table渲染
* @param {*} id
* @param {*} order
* @param {*} headerList
* @param {*} ddt
* @param {*} buttonHtml
*/
var getTableDeclaration = function (id, order, headerList, ddt, buttonHtml, promptStatement) {
var tableObj = {
id: id, //tabel父元素的id
autoHeight: ddt.length > 0 ? 10 : "",
containerWidth: "99%", //table占父元素的百分比
autoHeight: ddt.length > 0 ? 10 : "", // 默认10行
order: order, //数据按照什么顺序排序 1.do为是否保函操作 2.序号列会自动添加不需要写
onlyId: "uuId", //数据的唯一标识
height: "280", //表格的高度
buttonHeight: "", //表格的高度
buttonHtml: buttonHtml, //按钮里的字
headerList: headerList, //表头名字及占比,顺序与order对应
promptStatement: promptStatement, // 没有数据时默认提示
data: {
page: "1",
pageSize: ddt.length
},
jsonReady: ddt,
callback: function (data, node) {
console.log(data, node[0].innerText)
if (node[0].innerText == "申报") {
} else if (node[0].innerText == "填写并申报") {
data.operateType = '3';
data.sbbz = '3';
data.value = config.value;
if (data.sbzt == "Y") {
myAlert("提示", "当前申报表已经申报", "确定")
return false;
}
console.log(data.sourceFlag)
if (data.sourceFlag == "ssfwpt_sbzj") {
window.mlistener = {
selectRowData: {},
};
data.fillingFlag = "normal" // 填报标记
data.saveUserId = "zxtb"; // 用户id
data.zjhm = zjhm
window.mlistener.selectRowData = data;
if (yearBblxDm.indexOf(data.bblxDm) == -1) {
window.open(config.ssfwptPage, '_blank');
} else {
data.saveUserId = "zxtb_singleReport"; // 用户id
data.userId = "zxtb"; // userId
window.open(config.yearTaxTable, '_blank');
}
Object.defineProperty(mlistener, 'returnSelectRowData', {
set: function (val) {
setTimeout(function () {
getTaxDeclaration(sbqDate, "N", '2');
}, 1000);
}
})
} else {
data.djxh = companyInfo.djxh;
data.iszzsybjc = companyInfo.iszzsybjc; // 一表申报代码
data.nsrsbh = companyInfo.nsrsbh; // 那随人识别号
data.nssbq = nowdate;
data.checkTime = false;
if (data.pzzlDm === '11602') {
var List = companyInfo.taxInfos.filter(function (item) {
return item.pzzlDm == '10101' || item.pzzlDm == '10102'
})
if (List.length === 0) {
data.checkTime = true;
}
for (var i = 0; i < List.length; i++) {
if (List[i].sssqQ !== data.sssqQ || List[i].sssqZ !== data.sssqZ) {
data.checkTime = true;
break;
}
}
}
submitData = data;
if (node.context.innerText == "填写并申报" && companyInfo.iszzsybjc == "01" && data.pzzlDm == "10101") {
// if(node.context.innerText=="填写并申报"){
initpage.declarationMethod('N')
// $('#myMask').show();
// $('#myModal').show();
// $('#dName').html(data.pzzlMc);
// $('#dName').attr("title",data.pzzlMc);//修改title值
// $('#ybName').html(data.pzzlMc);
// $('#ybName').attr("title",data.pzzlMc);//修改title值
} else {
declarationMethod("N")
}
}
}
} //点击按钮后的回调函数
};
var object = tool.tableCreate(tableObj);
// object.jsonReadyTo(ddt, { page: "1", pageSize: ddt.length });
};
/**
* 税务申报 初始化数据获取
* @param {*} mydate
*/
//地址
//http://sbjs.tjsat.gov.cn:18090
//http://localhost:7070
var url;
if (companyInfo) {
url = companyInfo.config.url;
}
var getTaxDeclaration = function (date, type, refreshSbzt) {
// TODO 开始加载等待动画
showLoading();
var param = {
djxh: djxh,
operateType: companyInfo.operateType,
sbsq: date,
isFresh: type.toUpperCase() == "Y",
pzzlDm: companyInfo.pzzlDm,
refreshSbzt: refreshSbzt
}
$.ajax({
url: url + "/online/declare/getPzzlList",
data: param,
type: "POST",
dataType: "JSON",
// beforeSend:function(){
// myAlert("提示", "正在获取初始化信息", "确定")
// },
}).done(function (data) {
if (data.success) {
if (data.bean.url == "error.jsp") {
myAlert("提示", data.bean.errorInfo, "确定")
return
}
drawGrid(data.bean);
companyInfo = data.bean;
zjhm = companyInfo.zjhm
config.value = companyInfo.value;
if (type == 'Y') {
myAlert("提示", "重置清册成功", "确定")
}
} else {
if (data.errmsg != undefined) {
alertWarning(data.errmsg);
} else {
alertWarning(data.returnMessage);
}
}
}).always(function (data) {
hideLoading();
});
};
/**
* 隐藏modal
*/
var closeModal = function () {
$('#ybName').html("");
$('#dName').html("");
$('#myMask').hide();
$('#myModal').hide();
}
var drawGrid = function (bean) {
var arr = [];
console.log(bean)
for (let i in bean.taxInfos) {
arr.push(bean.taxInfos[i]); //属性
//arr.push(obj[i]); //值
}
if (arr.length == 0) {
alertInfo("税费申报暂无数据");
} else {
$.each(arr, function (i, item) {
//两个表合成一个表
$.each(bean.financialInfos, function (i, item1) {
item.push(item1);
});
var divObj1='<div id="btnBox" class="div-clear-folat" style="width: 99%; height: 40px;line-height: 40px;">'+
'<strong>'+item[0].djxh+item[0].zgswskfjMc+'</strong>'+
'</div>';
$('#zhsbtcBox').append(divObj1); //将子div添加到父div中
if ((i-1+1) == 0) {
var btnObj = '<input id="reset" class="btn btn-primary"'+
'style="height: 30px;right: 120px;margin: 0; padding: 0 5px;float: right;"'+
'type="button" value="税费申报" />'+
'<input id="reset" class="btn btn-primary"'+
'style="height: 30px;right: 120px;margin: 0 10px 0 0; padding: 0 5px;float: right;"'+
'type="button" value="缴款" />';
$('#btnBox').append(btnObj);
}
var divObj2 = "<div id='taxGrid"+i+"' class='zhsbtcTab'></div>";
$('#zhsbtcBox').append(divObj2);
if ((i-1+1) < arr.length) {
$('#zhsbtcBox').append('<hr class="hr-margin" />');
}
if ((i-1+1) == arr.length-1) {
var divObj3 = '<div class="font-clo" style="padding-top: 20px;">'+
'<div style="font-size:12px">温馨提示:</div>'+
'<div class="reminder"><span class="span-font-size">如近期有税费种认定、纳税人资格、备案等发生变动,页面展现清册与实际所需不符的,</span></div>'+
'<div class="reminder"><span class="span-font-size">请点此处&nbsp;&nbsp;“<label for="reset" id="reset1"'+
'class="label_declare">重置申报清册</label>”&nbsp;&nbsp;对该户册进行重新生成。</span>'+
'</div>'+
'</div>';
$('#zhsbtcBox').append(divObj3);
}
if (item.length > 0) {
for (var j = 0; j < item.length; j++) {
item[j].buttonHtml = "填写并申报";
// 印花税 - 10111 税源信息采集 申报
// 耕地占用税 - 10118
// 契税 - 10119 -
// 土地增值税 - 10113
// 环境保护税 - 10121
// 资源税 - 10107
if (['10111','10118','10119','10113','10121','10107'].indexOf(item[j].bblxDm) > -1) {
item[j].buttonHtml = "税源信息采集, 申报"
} else if (['10110','10114','10112'].indexOf(item[j].bblxDm) > -1) {
// 房产税 - 10110 申报
// 车船税 - 10114 -
// 城镇土地使用税 - 10112
item[j].buttonHtml = "申报"
} else {
item[j].buttonHtml = "填写并申报";
}
}
}
showTax(item, "taxGrid"+i);
// bean.taxInfos.push(item);
});
console.log(bean.taxInfos)
}
//两个表合成一个表
// $.each(bean.financialInfos, function (i, item) {
// bean.taxInfos.push(item);
// });
// if (bean.taxInfos.length == 0) {
// showTax(bean.taxInfos);
// alertInfo("税费申报暂无数据");
// } else {
// showTax(bean.taxInfos);
// }
};
/**
* 日期改变时触发
* N 非强制刷新
* @param {*} obj
* @param {*} dp
*/
var changeDate = function (obj, dp) {
date = dp.cal.getNewDateStr();
nowdate = date; // 给缓存时间赋值
// 加了一个延时,时间改变后时间框没有收起隐藏就加载数据,没有找到好的解决办法,暂时用延时处理
sbqDate = date
setTimeout(function () {
getTaxDeclaration(date, "N", '1');
}, 50);
};
var refresh = function () {
myConfirm("消息", "您确定需要重置申报清册吗?点击确定继续", "确定", "取消", function () {
getTaxDeclaration(nowdate, "Y", '1');
});
};
//申报方式 当iszzsybjc=01同时pzzlDm=010101时,调用改方法
var declarationMethod = function (statu) {
submitData.ybjcState = statu;
submitData.value = config.value;
//需要判断在线还是税表的开关
if (submitData.sourceFlag == "ssfwpt_sbzj") {
window.mlistener = {
selectRowData: {},
};
submitData.fillingFlag = "normal" // 填报标记
submitData.saveUserId = "zxtb"; // 用户id
submitData.zjhm = zjhm
window.mlistener.selectRowData = submitData;
if (yearBblxDm.indexOf(data.bblxDm) == -1) {
window.open(config.ssfwptPage, '_blank');
} else {
data.saveUserId = "zxtb_singleReport"; // 用户id
data.userId = "zxtb"; // userId
window.open(config.yearTaxTable, '_blank');
}
Object.defineProperty(mlistener, 'returnSelectRowData', {
set: function (val) {
setTimeout(function () {
getTaxDeclaration(sbqDate, "N", '2');
}, 1000);
}
})
} else {
//"ssfwpt_zxtb"
// var form = $("#changeForm");
// form.find("#changeForm_data").val(JSON.stringify(submitData));
// form.submit();
// showLoading()
var falg = "declare";
window.taxInfo = JSON.stringify(submitData);
localStorage.setItem("data", JSON.stringify(submitData));
// if (data.url == "edit.jsp") {
submitData.flag = true;
submitData.encryptKey = config.value;
var url = config.spreadUrl + "/online_report/declare/toPzzl?falg=" + falg
var form = $("#changeForm");
form.attr('action', url); //通过jquery为action属性赋值
form.find("#changeForm_data").val(JSON.stringify(submitData));
form.submit();
return false;
// $.ajax({
// type: "POST",
// url: url + "/online/declare/toPzzl",
// dataType: "json", // 请求方式为jsonp
// data: {
// data: JSON.stringify(submitData)
// },
// success: function (data) {
// hideLoading()
// if (data.code == 99 || data.code == "99") {
// if (data.errmsg != undefined) {
// alertWarning(data.errmsg);
// } else {
// alertWarning(data.returnMessage);
// }
// return false
// }
// window.taxInfo = JSON.stringify(submitData);
// localStorage.setItem("data", JSON.stringify(submitData));
// // if (data.url == "edit.jsp") {
// submitData.flag = true;
// submitData.encryptKey = config.value;
// var url = config.spreadUrl + "/online_report/declare/toPzzl?falg=" + falg
// var form = $("#changeForm");
// form.attr('action', url); //通过jquery为action属性赋值
// form.find("#changeForm_data").val(JSON.stringify(submitData));
// form.submit();
// // window.open(config.spreadUrl+"/online_report/declare/toPzzl?falg=" + falg + '&data=' + JSON.stringify(submitData));
// // window.open(config.webUrl + "declare/edit.html?falg=" + falg + '&params=' + encodeURI(JSON.stringify(submitData)));
// // }
// /* else if (data.url == "yearReport.jsp") {
// window.open(config.webUrl + "declare/yearReport.html?falg=" + falg + '&params=' + encodeURI(JSON.stringify(submitData)));
// } else if (data.url == "yearReportGLB.jsp") {
// window.open(config.webUrl + "declare/yearReportGLB.html?falg=" + falg + '&params=' + encodeURI(JSON.stringify(submitData)));
// } else {
// //因为后台不知道返回路径是什么样的就直接改成了else data.url == "error.jsp"
// window.open(config.webUrl + "error/index.html?falg=" + falg + '&params=' + encodeURI(JSON.stringify(submitData)));
// }*/
// },
// error: function (xhr) {
// //jsonp 方式此方法不被触发
// if (data.returnMessage == undefined) {
// if (data.returnMessage == undefined) {
// alertWarning(data.errmsg);
// } else {
// alertWarning("程序错误,请联系管理员!");
// }
// } else {
// alertWarning(data.returnMessage);
// }
// hideLoading()
// console.log("=======error======================")
// }
// })
// closeModal();
}
}
/**
* 重置调用方法
* @param {} params
*/
$("#reset,#reset1").on("click", refresh);
$("#goRecord").click(function () {
//TODO 调用备案接口
});
// 格式化后台返回的时间
if (companyInfo.config.return) {
$("#getInputValue").val(tool.formatDate(companyInfo.sbsq));
nowdate = companyInfo.sbsq;
drawGrid(companyInfo);
}
//页面出现滚动条,监听滚动条变化将高赋值给模态框
window.onscroll = function () {
$("#myModal").css("top", $(document).scrollTop() + 235);
}
return {
changeDate: changeDate,
reset: reset,
declarationMethod: declarationMethod,
closeModal: closeModal
}
}
\ No newline at end of file
......@@ -400,6 +400,16 @@ fieldset[disabled] .searchPage {
padding: 5px 6px;
line-height: 12px!important;
}
.zhsbtcTab .tdDong-btn {
margin-right: 20px;
}
.zhsbtcTab .tdDoing-contain {
text-align: left !important;
}
.zhsbtcTab .table-tr .row-1 {
padding-left: 5px !important;
text-align: left !important;
}
.tdDoing-contain {
text-align: center !important;
......
......@@ -955,6 +955,66 @@ var JSTOOL = function() {
/* @Author GyYu @Date 16:15 2020/11/20 @Description 应对小偷,加几个隐藏的按钮*/
for(var ll =0;ll<3;ll++){
if(ll==1){
if (tableObj.buttonHtml == "") {
if (json[i].do.indexOf(",") > -1) {
var buttonHtmlArr = json[i].do.split(",");
for (var cxi=0; cxi<buttonHtmlArr.length; cxi++) {
var div = document.createElement("div");
$div = $(div);
$div.attr("alt", commonJson[i][tableObj.onlyId]);
if (buttonHtmlArr[cxi] == "填写并申报") {
$div.addClass("btn tdDong-btn");
} else {
$div.addClass("btn btn-primary tdDong-btn");
}
$div.html(buttonHtmlArr[cxi]);
$td.addClass("tdDoing-contain");
$td.append(div);
}
}else {
var div = document.createElement("div");
$div = $(div);
$div.attr("alt", commonJson[i][tableObj.onlyId]);
$div.addClass("btn tdDong-btn");
$div.html(json[i].do);
$td.addClass("tdDoing-contain");
$td.append(div);
}
// tableObj.jsonReady.forEach(function (item, index) {
// console.log('item.buttonHtml===', item.buttonHtml);
// if(json[i].pzzlMc === item.bblxMc) {
// if (item.buttonHtml.indexOf(",") > -1) {
// console.log('item.buttonHtml22222===', item.buttonHtml)
// var buttonHtmlArr = item.buttonHtml.split(",");
// for (var cxi=0; cxi<buttonHtmlArr.length; cxi++) {
// var div = document.createElement("div");
// $div = $(div);
// $div.attr("alt", commonJson[i][tableObj.onlyId]);
// if (buttonHtmlArr[cxi] == "填写并申报") {
// $div.addClass("btn tdDong-btn");
// } else {
// $div.addClass("btn btn-primary tdDong-btn");
// }
// $div.html(buttonHtmlArr[cxi]);
// $td.addClass("tdDoing-contain");
// $td.append(div);
// }
// }
// else {
// console.log('11111111')
// var div = document.createElement("div");
// $div = $(div);
// $div.attr("alt", commonJson[i][tableObj.onlyId]);
// $div.addClass("btn tdDong-btn");
// $div.html(item.buttonHtml);
// $td.addClass("tdDoing-contain");
// $td.append(div);
// console.log('$td=====', $td)
// }
// }
// })
} else {
var div = document.createElement("div");
$div = $(div);
$div.attr("alt", commonJson[i][tableObj.onlyId]);
......@@ -962,6 +1022,8 @@ var JSTOOL = function() {
$div.html(tableObj.buttonHtml);
$td.addClass("tdDoing-contain");
$td.append(div);
}
}else{
var div = document.createElement("div");
$div = $(div);
......@@ -1085,8 +1147,12 @@ var JSTOOL = function() {
var obj = {};
tableMap[data[i][tableObj.onlyId]] = data[i];
for (var r = 0, len = sum.length; r < len; r++) {
if ([sum[r]] == 'do') {
obj[sum[r]] = data[i].buttonHtml; //yyx 操作里面的按钮赋值
} else {
obj[sum[r]] = data[i][sum[r]];
}
}
json[i] = obj;
}
commonJson = data;
......
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