Skip to content

Z
zxtb_to_ssfwpt
Commit b7c580d3 authored by 于广洋's avatar 于广洋
Browse files
Options

填报页面正常开表

parent 3639a939
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 16 deletions
jsp/declare/edit.html
View file @ b7c580d3
......@@ -23,7 +23,7 @@
<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>
<!-- 工程文件 -->
......@@ -53,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>
......@@ -147,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"/>
......@@ -304,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>
......
static/biz/config.js
View file @ b7c580d3
......@@ -13,8 +13,8 @@ function getUrlParam (name) {
}
// 公共配置
var config = {
webUrl:"http://sbjs.tjsat.gov.cn:8088/web/onlineReport/jsp/",
// webUrl:"http://localhost/web/onlineReport/jsp/"
url:"",// 全局的url，现在貌似没什么用了。不过先留着
// 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",// 开发环境配置跨域设置
}
static/css/style.css
View file @ b7c580d3
......@@ -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;
......
static/js/tax/result.js
View file @ b7c580d3
......@@ -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