Commit ef989cd7 authored by 刘明珠's avatar 刘明珠

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

parents cc276bc4 b7c580d3
......@@ -68,15 +68,18 @@
// }
</script>
</body>
<script>
document.write("<script type='text/javascript' src='/web/onlineReport/static/biz/config.js?time="+Math.random()+"'></"+"script"+">")
</script>
<script type="text/javascript" src="/web/onlineReport/static/tools/js/jquery-1.11.3.js?v=1.1"></script>
<script type="text/javascript" src="/web/onlineReport/static/tools/js/encapsulation.js?v=1.3"></script>
<script>
// localStorage.setItem("url", "http://localhost:7070");
// localStorage.setItem("url", "http://sbjs.tjsat.gov.cn:18090");
//��˰
localStorage.setItem("url", "http://192.168.106.17:8091");
// localStorage.setItem("url", "http://192.168.106.17:8091");
// localStorage.setItem("url", "http://192.168.106.46:8091");
var url = "http://192.168.105.153:8091";
var url = config.url;
$(function(){
//�����걨
var btnObj1 = $("#delcareBtn");
......
......@@ -81,7 +81,9 @@
<script src="/web/onlineReport/static/tools/js/encapsulation.js?v=1.3"></script>
<script src="/web/onlineReport/static/tools/js/minScroll.js?v=1.1"></script>
<script src="/web/onlineReport/static/tools/js/My97DatePicker/WdatePicker.js?v=1.1"></script>
<script src="/web/onlineReport/static/biz/getJgxxRyxx.js?v=1.0"></script>
<script>
document.write("<script type='text/javascript' src='/web/onlineReport/static/biz/config.js?time="+Math.random()+"'></"+"script"+">")
</script>
<script src="/web/onlineReport/static/biz/amend_grid.js?v=1.0"></script>
<script>
// <!-- // 使用 el 表达式,将返回的信息写到此处,然后调用页面绘制方法绘制页面
......@@ -95,13 +97,10 @@
// -->
var initpage;
$(function(){
// getJgxxRyxx();
//
var url = "http://192.168.105.153:8091";
showLoading();
$.ajax({
type: "post",
url: url + "/ssfwpt/amend/index",
url: config.url + "/ssfwpt/amend/index",
dataType: "json", // 请求方式为jsonp
// async: false,
data: {
......@@ -117,7 +116,7 @@
var companyInfo = data;
$("#djxh").attr("value", companyInfo.djxh);
if (companyInfo.success) {
companyInfo.bean.gzTaxInfos.push(
/*companyInfo.content.gzTaxInfos.push(
{
"sbxxId":"20200612181124bda9492c2fe34faeb3f4f686260363eb",
"ssdabh":"91120225MA05KP981U",
......@@ -182,12 +181,12 @@
"nssbqq2":null,
"nssbqz2":null
}
);
);*/
companyInfo.bean.config = config
initpage = initPage(companyInfo.bean);
} else {
hideLoading();
alertWarning("请求失败!");
alertWarning(companyInfo.returnMessage);
// 弹出错误对话框
}
},
......
......@@ -48,7 +48,9 @@
<script src="/web/onlineReport/static/tools/js/encapsulation.js?v=1.2"></script>
<script src="/web/onlineReport/static/tools/js/minScroll.js?v=1.1"></script>
<script src="/web/onlineReport/static/tools/js/My97DatePicker/WdatePicker.js?v=1.1"></script>
<script src="/web/onlineReport/static/biz/getJgxxRyxx.js?v=2.0"></script>
<script>
document.write("<script type='text/javascript' src='/web/onlineReport/static/biz/config.js?time="+Math.random()+"'></"+"script"+">")
</script>
<script src="/web/onlineReport/static/biz/cancellation_grid.js?v=1.0"></script>
<script>
// // <!-- // 使用 el 表达式,将返回的信息写到此处,然后调用页面绘制方法绘制页面
......@@ -73,13 +75,10 @@
// }
var initpage;
$(function(){
//
// getJgxxRyxx();
var url = "http://192.168.105.153:8091";
showLoading();
$.ajax({
type: "GET",
url: url + "/ssfwpt/cancellation/index",
type: "POST",
url: config.url+"/ssfwpt/liquidation/tax_info",
dataType: "json", // 请求方式为jsonp
// async: false,
data: {
......@@ -94,9 +93,9 @@
// $("#token").attr("value","");
var companyInfo = data;
$("#djxh").attr("value", companyInfo.djxh);
if (companyInfo.success) {
companyInfo.bean.config = config
initpage = initPage(companyInfo.bean);
if (companyInfo.returnCode == "00") {
companyInfo.content.config = config
initpage = initPage(companyInfo.content);
$("#getInputValue").on("focus", function() {
WdatePicker({
isShowClear:false,
......@@ -108,7 +107,7 @@
});
} else {
hideLoading();
alertWarning("请求失败!");
alertWarning(companyInfo.returnMessage);
// 弹出错误对话框
}
},
......
......@@ -23,12 +23,15 @@
<title></title>
<!-- 样式 -->
<link href="/web/onlineReport/static/resources/gc.spread.sheets.excel2013white.12.0.0.css" rel="stylesheet">
<link href="/web/onlineReport/static/css/style.css?v=13" rel="stylesheet">
<link href="/web/onlineReport/static/css/style.css?v=1" rel="stylesheet">
<link href="/web/onlineReport/static/tools/js/My97DatePicker/skin/WdatePicker.css" rel="stylesheet" />
<script src="/web/onlineReport/static/js/jquery.min.js"></script>
<!-- 工程文件 -->
<script src="/web/onlineReport/static/resources/gc.spread.sheets.all.min.js"></script>
<script src="/web/onlineReport/static/resources/zh/gc.spread.sheets.resources.zh.12.0.0.min.js"></script>
<script>
document.write("<script type='text/javascript' src='/web/onlineReport/static/biz/config.js?time="+Math.random()+"'></"+"script"+">")
</script>
<!-- 生成的资源文件 -->
<!-- TODO 此处需要将路径调整为对应引用的地址-->
<!-- <script src="/web/onlineReport/static/page_js/${pzzlDm}/data.js?v=1"></script>
......@@ -50,8 +53,10 @@
<span class="sssj"></span>
</p>
</div>
<div class="button-group">
<button onClick="submitData()" class="htbutton"> 保存 </button>
<div>
<div class="button-group">
<button onClick="submitData()" class="htbutton"> 保存 </button>
</div>
</div>
</div>
</div>
......@@ -144,7 +149,6 @@
<button class="htbutton" id="closeModal">取消</button>
</div>
</div>
<div id="resultFloat" title="查看校验结果" class="htbutton">查看校验</div>
<form action="/declare/toPzzl" method="POST" id="toReportNB">
<input type="hidden" name="initTableData" value="" id="initTableData"/>
<input type="hidden" name="initTableArrs" value="" id="initTableArrs"/>
......@@ -152,7 +156,7 @@
</form>
<script>
// var URL = "http://192.168.105.153:8091"
var URL = "http://192.168.105.153:8091"
var URL = config.url
var GLOBAL_INITJSON,GLOBAL_JSON,GLOBAL_CACHE_DATA,GLOBAL_TABLE_SPECIAL,GLOBAL_TABLE_FP,gzQtxx;
var param = GetQueryValue("falg");
var address;
......@@ -301,6 +305,10 @@
<script type="text/javascript" src="/web/onlineReport/static/js/tax/specialHandler.js?v=1"></script>
<script type="text/javascript" src="/web/onlineReport/static/js/tax/initLoader.js?v=1"></script>
<script type="text/javascript" src="/web/onlineReport/static/js/tax/result.js?v=1"></script>
<!-- <script>
document.write("<script type='text/javascript' src='/web/onlineReport/static/js/tax/initLoader.js?time="+Math.random()+"'></"+"script"+">")
document.write("<script type='text/javascript' src='/web/onlineReport/static/js/tax/result.js?time="+Math.random()+"'></"+"script"+">")
</script>-->
<script type="text/javascript" src="/web/onlineReport/static/tools/js/My97DatePicker/WdatePicker.js?v=1"></script>
</body>
......
......@@ -89,7 +89,9 @@
<script src="/web/onlineReport/static/tools/js/encapsulation.js?v=1.3"></script>
<script src="/web/onlineReport/static/tools/js/minScroll.js?v=1.1"></script>
<script src="/web/onlineReport/static/tools/js/My97DatePicker/WdatePicker.js?v=1.1"></script>
<script src="/web/onlineReport/static/biz/getJgxxRyxx.js?v=2.0"></script>
<script>
document.write("<script type='text/javascript' src='/web/onlineReport/static/biz/config.js?time="+Math.random()+"'></"+"script"+">")
</script>
<script src="/web/onlineReport/static/biz/declare_grid.js?v=1.0"></script>
<script>
// <!-- // 使用 el 表达式,将返回的信息写到此处,然后调用页面绘制方法绘制页面
......@@ -113,12 +115,10 @@
var initpage;
$(function(){
//
// getJgxxRyxx();
var url = "http://192.168.105.153:8091";
showLoading();
$.ajax({
type: "post",
url: url + "/ssfwpt/declare/index",
url: config.url + "/ssfwpt/declare/index",
dataType: "json", // 请求方式为jsonp
// async: false,
data: {
......@@ -155,7 +155,7 @@
});
});
} else {
alertWarning("请求失败!");
alertWarning(companyInfo.returnMessage);
// 弹出错误对话框
}
},
......
......@@ -28,6 +28,9 @@
<link href="/web/onlineReport/static/tools/js/My97DatePicker/skin/WdatePicker.css" rel="stylesheet" />
<script src="/web/onlineReport/static/js/jquery.min.js"></script>
<!-- 工程文件 -->
<script>
document.write("<script type='text/javascript' src='/web/onlineReport/static/biz/config.js?time="+Math.random()+"'></"+"script"+">")
</script>
<script src="/web/onlineReport/static/resources/gc.spread.sheets.all.min.js"></script>
<script src="/web/onlineReport/static/resources/zh/gc.spread.sheets.resources.zh.12.0.0.min.js"></script>
<!-- 生成的资源文件 -->
......@@ -489,7 +492,7 @@
</div>
<div id="resultFloat" title="查看校验结果" class="htbutton">查看校验</div>
<script>
var URL = "http://192.168.105.153:8091";
var URL = config.url;
var GLOBAL_INITJSON,GLOBAL_JSON,GLOBAL_CACHE_DATA,GLOBAL_TABLE_SPECIAL,GLOBAL_TABLE_FP,ifGZflag;
var param = GetQueryValue("falg");
var address;
......
......@@ -27,6 +27,9 @@
<link href="/web/onlineReport/static/css/style.css?v=12" rel="stylesheet">
<link href="/web/onlineReport/static/tools/js/My97DatePicker/skin/WdatePicker.css" rel="stylesheet" />
<script src="/web/onlineReport/static/js/jquery.min.js"></script>
<script>
document.write("<script type='text/javascript' src='/web/onlineReport/static/biz/config.js?time="+Math.random()+"'></"+"script"+">")
</script>
<!-- 工程文件 -->
<script src="/web/onlineReport/static/resources/gc.spread.sheets.all.min.js"></script>
<script src="/web/onlineReport/static/resources/zh/gc.spread.sheets.resources.zh.12.0.0.min.js"></script>
......@@ -260,7 +263,7 @@
</div>
<div id="resultFloat" title="查看校验结果" class="htbutton">查看校验</div>
<script>
var URL = "http://192.168.105.153:8091";
var URL = config.url;
var GLOBAL_INITJSON,GLOBAL_JSON,GLOBAL_CACHE_DATA,GLOBAL_TABLE_SPECIAL,GLOBAL_TABLE_FP,isGZflag;
var param = GetQueryValue("falg");
var address;
......
......@@ -15,11 +15,14 @@
<input type='hidden' name='data' value="${data}" id="data">
</div>
</body>
<script>
document.write("<script type='text/javascript' src='/web/onlineReport/static/biz/config.js?time="+Math.random()+"'></"+"script"+">")
</script>
<script src="/web/onlineReport/static/tools/js/jquery-1.11.3.js?v=1.1"></script>
<script src="/web/onlineReport/static/tools/js/encapsulation.js?v=1.3"></script>
<script src="/web/onlineReport/static/biz/error.js?v=1.1"></script>
<script>
var URL = "http://192.168.105.153:8091";
var URL = config.url;
var param = GetQueryValue("falg");
var address;
if (param == "declare") {
......
......@@ -96,7 +96,9 @@
<script src="/web/onlineReport/static/tools/js/encapsulation.js?v=1.3"></script>
<script src="/web/onlineReport/static/tools/js/minScroll.js?v=1.1"></script>
<script src="/web/onlineReport/static/tools/js/My97DatePicker/WdatePicker.js?v=1.1"></script>
<script src="/web/onlineReport/static/biz/getJgxxRyxx.js?v=2.0"></script>
<script>
document.write("<script type='text/javascript' src='/web/onlineReport/static/biz/config.js?time="+Math.random()+"'></"+"script"+">")
</script>
<script src="/web/onlineReport/static/biz/overdue_grid.js?v=1.0"></script>
<script>
// <!-- // 使用 el 表达式,将返回的信息写到此处,然后调用页面绘制方法绘制页面
......@@ -117,13 +119,10 @@
// }
var initpage;
$(function(){
//
// getJgxxRyxx();
var url = "http://192.168.105.153:8091";
showLoading();
$.ajax({
type: "GET",
url: url + "/ssfwpt/overdue/index",
url: config.url + "/ssfwpt/overdue/index",
dataType: "json", // 请求方式为jsonp
// async: false,
data: {
......@@ -152,7 +151,7 @@
});
} else {
hideLoading();
alertWarning("请求失败!");
alertWarning(companyInfo.returnMessage);
// 弹出错误对话框
}
},
......
......@@ -229,7 +229,7 @@ function initPage(companyInfo) {
//地址
//http://sbjs.tjsat.gov.cn:18090
//http://localhost:7070
var url = "http://192.168.105.153:8091";
var url = companyInfo.config.url;
var getTaxAmendData = function(param) {
// TODO 开始加载等待动画
showLoading();
......
......@@ -131,7 +131,7 @@ function initPage(companyInfo) {
selectRowData: {},
};
data.fillingFlag = "inventory" // 填报标记
data.saveUserId = jgxxRyxx.bdReportResponse.zjlx + jgxxRyxx.bdReportResponse.zjhm;// 用户id
data.saveUserId = "zxtb";// 用户id
window.mlistener.selectRowData = data;
window.open("/web/taxservicedesk/index.html#/taxTableList",'_blank');
}else{
......@@ -189,7 +189,7 @@ function initPage(companyInfo) {
//地址
//http://sbjs.tjsat.gov.cn:18090
//http://localhost:7070
var url = "http://192.168.105.153:8091";
var url = companyInfo.config.url;
var getTaxDeclaration = function(date, type) {
// TODO 开始加载等待动画
showLoading();
......
/**
* @Author ygy
* @Description //TODO 获取地址栏参数
* @Date 19:43 2020/6/12
* @Param
* @return
**/
function getUrlParam (name) {
var reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)');
var r = window.location.search.substr(1).match(reg);
if (r != null) return decodeURIComponent(r[2]);
return null;
}
// 公共配置
var config = {
// webUrl:"http://sbjs.tjsat.gov.cn:8088/web/onlineReport/jsp/declare/",
webUrl:"http://localhost:8088/web/onlineReport/jsp/",
url:"http://192.168.106.23:8091",// 开发环境配置跨域设置
}
......@@ -140,7 +140,7 @@ function initPage(companyInfo) {
//地址
//http://sbjs.tjsat.gov.cn:18090
//http://localhost:7070
var url = "http://192.168.105.153:8091";
var url = companyInfo.config.url;
var getTaxDeclaration = function(date, type) {
// TODO 开始加载等待动画
showLoading();
......@@ -228,7 +228,7 @@ function initPage(companyInfo) {
selectRowData: {},
};
submitData.fillingFlag = "normal" // 填报标记
submitData.saveUserId = jgxxRyxx.bdReportResponse.zjlx + jgxxRyxx.bdReportResponse.zjhm;// 用户id
submitData.saveUserId = "zxtb";// 用户id
window.mlistener.selectRowData = submitData;
window.open("/web/taxservicedesk/index.html#/taxTableList",'_blank');
}else {
......
var jgxxRyxx ;
/**
* @Author ygy
* @Description //TODO 通过token查询企业和人员信息
* @Date 19:40 2020/6/12 qyxxCacheVoList bdReportResponse
*
_self.$store.commit("qyxxData",data.content.qyxxCacheVoList);
_self.$store.commit("loginData",data.content.bdReportResponse);
**/
function getJgxxRyxx() {
var url = "http://192.168.105.153:8091"
$.ajax({
type: "post",
url: url + "/ssfwpt/xxzl/getJgxxRyxx",
dataType: "json", // 请求方式为jsonp
async: false,
data: {
token: getUrlParam("token"),
},
success: function (data) {
jgxxRyxx = data.content;
},
error: function(xhr){
console.log("=====================error======================")
}
})
}
/**
* @Author ygy
* @Description //TODO 获取地址栏参数
* @Date 19:43 2020/6/12
* @Param
* @return
**/
function getUrlParam (name) {
var reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)');
var r = window.location.search.substr(1).match(reg);
if (r != null) return decodeURIComponent(r[2]);
return null;
}
var config = {
webUrl:"http://sbjs.tjsat.gov.cn:8088/web/onlineReport/jsp/"
// webUrl:"http://localhost/web/onlineReport/jsp/"
}
......@@ -135,7 +135,7 @@ function initPage(companyInfo) {
selectRowData: {},
};
data.fillingFlag = "overdue" // 填报标记
data.saveUserId = jgxxRyxx.bdReportResponse.zjlx + jgxxRyxx.bdReportResponse.zjhm;// 用户id
data.saveUserId = "zxtb";// 用户id
window.mlistener.selectRowData = data;
window.open("/web/taxservicedesk/index.html#/taxTableList",'_blank');
}else{
......@@ -187,7 +187,7 @@ function initPage(companyInfo) {
//地址
//http://sbjs.tjsat.gov.cn:18090
//http://localhost:7070
var url = "http://192.168.105.153:8091";
var url = companyInfo.config.url;
var getTaxOverdue = function(date, type) {
// TODO 开始加载等待动画
showLoading();
......
......@@ -54,7 +54,7 @@ input {
clear: none;
margin-left: -15px;
}
#importInBtn, #exportOutBtn, #resetCurrentBtn, #resetBtn{
#importInBtn, #exportOutBtn, #resetCurrentBtn, #resetBtn, #resultFloat{
float: right;
margin-right: 5px;
margin-top: 14px;
......@@ -434,10 +434,10 @@ input {
padding: 5px 10px;
background: #42b983;
color: #fff; */
position: absolute;
/* position: absolute;
right: 35px;
top: 90px;
cursor: pointer;
cursor: pointer;*/
display: none;
/* -webkit-border-radius: 10px;
-moz-border-radius: 10px;
......
......@@ -52,20 +52,21 @@ $(document).ready(function () {
console.log(GLOBAL_JSON)
// console.log(JSON.stringify(GLOBAL_JSON));
var topBtnHtml;
topBtnHtml ='<button class="htbutton" id="resultFloat"> 查看校验 </button> '
if(GLOBAL_JSON.pzzlDm != '10414') {
if (GLOBAL_JSON.operateType == "4") {
topBtnHtml = '<button class="htbutton import" id="correctionsBtn"> 更正 </button>'
topBtnHtml += '<button class="htbutton import" id="correctionsBtn"> 更正 </button>'
} else if (GLOBAL_JSON.operateType == "5") {
topBtnHtml = '<button class="htbutton import" id="overdueBtn"> 逾期申报 </button>';
topBtnHtml += '<button class="htbutton import" id="overdueBtn"> 逾期申报 </button>';
} else {
topBtnHtml = '<button class="htbutton" id="storageBtn"> 暂存 </button> <button class="htbutton" id="saveBtn"> 保存 </button> <button class="htbutton import" id="uploadDataBtn"> 申报 </button> <button class="htbutton" id="importInBtn"> 导入 </button> <button class="htbutton" id="exportOutBtn"> 导出 </button> <button class="htbutton" id="resetCurrentBtn" title="重置当前报表数据"> 重置当前报表 </button> <button class="htbutton resetAll" id="resetBtn" title="重置所有报表数据"> 全部重置 </button>';
topBtnHtml += '<button class="htbutton" id="storageBtn"> 暂存 </button> <button class="htbutton" id="saveBtn"> 保存 </button> <button class="htbutton import" id="uploadDataBtn"> 申报 </button> <button class="htbutton" id="importInBtn"> 导入 </button> <button class="htbutton" id="exportOutBtn"> 导出 </button> <button class="htbutton" id="resetCurrentBtn" title="重置当前报表数据"> 重置当前报表 </button> <button class="htbutton resetAll" id="resetBtn" title="重置所有报表数据"> 全部重置 </button>';
//topBtnHtml = '<button class="htbutton import" id="storageBtn"> 开始申报 </button>';
if(GLOBAL_JSON.pzzlDm == '10404') {
topBtnHtml = '<button class="htbutton" id="storageBtn"> 暂存 </button> <button class="htbutton" id="saveBtn"> 保存 </button> <button class="htbutton import" id="zcfxtx"> 政策风险扫描 </button> <button class="htbutton import" id="uploadDataBtn"> 申报 </button> <button class="htbutton" id="importInBtn"> 导入 </button> <button class="htbutton" id="exportOutBtn"> 导出 </button> <button class="htbutton" id="resetCurrentBtn" title="重置当前报表数据"> 重置当前报表 </button> <button class="htbutton resetAll" id="resetBtn" title="重置所有报表数据"> 全部重置 </button>';
topBtnHtml += '<button class="htbutton" id="storageBtn"> 暂存 </button> <button class="htbutton" id="saveBtn"> 保存 </button> <button class="htbutton import" id="zcfxtx"> 政策风险扫描 </button> <button class="htbutton import" id="uploadDataBtn"> 申报 </button> <button class="htbutton" id="importInBtn"> 导入 </button> <button class="htbutton" id="exportOutBtn"> 导出 </button> <button class="htbutton" id="resetCurrentBtn" title="重置当前报表数据"> 重置当前报表 </button> <button class="htbutton resetAll" id="resetBtn" title="重置所有报表数据"> 全部重置 </button>';
}
}
} else {
topBtnHtml = '<button class="htbutton resetAll" id="saveBtnShenBao"> 保存 </button> <button class="htbutton import" id="toReportBtn"> 去申报 </button>';
topBtnHtml += '<button class="htbutton resetAll" id="saveBtnShenBao"> 保存 </button> <button class="htbutton import" id="toReportBtn"> 去申报 </button>';
}
$("body").on("input", "#xw_value", function () {
......@@ -1494,7 +1495,10 @@ function getLeftMenu() {
if (GLOBAL_CACHE_DATA != "") {
var oldTables = GLOBAL_JSON.tables;
// console.log(GLOBAL_CACHE_DATA)
var cacheTables = JSON.parse(GLOBAL_CACHE_DATA).tables;
var cacheTables = [];
if(JSON.parse(GLOBAL_CACHE_DATA)&&"tables" in JSON.parse(GLOBAL_CACHE_DATA)){
cacheTables = JSON.parse(GLOBAL_CACHE_DATA).tables;
}
if(!cacheTables){
cacheTables = []
}
......
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