Skip to content

Z
zxtb_to_ssfwpt
Commit 8257ad14 authored by yangyuxin's avatar yangyuxin
Browse files
Options

操作多行按钮问题

parent c960d3fa
Show whitespace changes
Inline Side-by-side
Showing with 123 additions and 47 deletions
static/biz/zhsbtc_grid.js
View file @ 8257ad14
......@@ -115,7 +115,7 @@ function initPage(companyInfo) {
}
}
// var id = "#taxGrid";
var buttonHtml = "填写并申报, 申报"; // "djxh"
var buttonHtml = "";
var order = ["pzzlMc", "sssqQ", "sssqZ", "sbrq", "do"];
var promptStatement = "";
var headerList = [{
......@@ -138,10 +138,7 @@ function initPage(companyInfo) {
width: "15%"
}];
//渲染表
console.log('#'+id)
getTableDeclaration('#'+id, order, headerList, taxInfo, buttonHtml, promptStatement)
//渲染表
// getTableDeclaration('#taxGrid1', order, headerList, taxInfo, buttonHtml, promptStatement)
};
/**
* 税务申报table渲染
......@@ -311,11 +308,19 @@ function initPage(companyInfo) {
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>'+
......@@ -350,10 +355,33 @@ function initPage(companyInfo) {
$('#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);
......
static/tools/js/encapsulation.js
View file @ 8257ad14
......@@ -955,21 +955,65 @@ 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.indexOf(",") > -1) {
var buttonHtmlArr = tableObj.buttonHtml.split(",");
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");
$div.addClass("btn tdDong-btn");
} else {
$div .addClass("btn btn-primary tdDong-btn");
$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);
......@@ -1103,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