Commit e8552bae authored by yangyuxin's avatar yangyuxin

年报分离一部分

parent 6075da67
...@@ -162,7 +162,7 @@ ...@@ -162,7 +162,7 @@
GLOBAL_INITJSON = data.bean.data ? JSON.parse(data.bean.data) : {}; GLOBAL_INITJSON = data.bean.data ? JSON.parse(data.bean.data) : {};
GLOBAL_JSON = data.bean.dataSs ? JSON.parse(data.bean.dataSs) : {}; GLOBAL_JSON = data.bean.dataSs ? JSON.parse(data.bean.dataSs) : {};
GLOBAL_CACHE_DATA = data.bean.cacheData ? JSON.parse(data.bean.cacheData) : {}; GLOBAL_CACHE_DATA = data.bean.cacheData ? JSON.parse(data.bean.cacheData) : {};
console.log(GLOBAL_CACHE_DATA) // console.log(GLOBAL_CACHE_DATA)
GLOBAL_TABLE_SPECIAL = data.bean.specialCarryData ? JSON.parse(data.bean.specialCarryData) : {}; GLOBAL_TABLE_SPECIAL = data.bean.specialCarryData ? JSON.parse(data.bean.specialCarryData) : {};
GLOBAL_TABLE_FP = data.bean.zzsData ? JSON.parse(data.bean.zzsData) : {}; GLOBAL_TABLE_FP = data.bean.zzsData ? JSON.parse(data.bean.zzsData) : {};
gzQtxx = data.bean.gzQtxx ? JSON.parse(data.bean.gzQtxx) : {}; gzQtxx = data.bean.gzQtxx ? JSON.parse(data.bean.gzQtxx) : {};
......
<%@ page language="java" pageEncoding="UTF-8"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
<!doctype html> <!doctype html>
<html style="height:100%;font-size:14px;"> <html style="height:100%;font-size:14px;">
...@@ -10,33 +7,33 @@ ...@@ -10,33 +7,33 @@
<!-- 让IE浏览器用最高级内核渲染页面 还有用 Chrome 框架的页面用webkit 内核 --> <!-- 让IE浏览器用最高级内核渲染页面 还有用 Chrome 框架的页面用webkit 内核 -->
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<!-- IOS6全屏 Chrome高版本全屏 --> <!-- IOS6全屏 Chrome高版本全屏 -->
<!--[if lt IE 9]> <!--[if lt IE 9]-->
<meta http-equiv="X-UA-Compatible" content="edge" > <meta http-equiv="X-UA-Compatible" content="edge" >
<script src="/online_report/static/js/respond.js"></script> <script src="/static/js/respond.js"></script>
  <script src="/online_report/static/js/html5shiv.min.js"></script>  <script src="/static/js/html5shiv.min.js"></script>
<![endif]--> <!--[endif]-->
<!--[if lt IE 7]> <!--[if lt IE 7]-->
<script> <script>
window.CheckLowIe = true; window.CheckLowIe = true;
</script> </script>
<![endif]--> <!--[endif]-->
<meta name="spreadjs culture" content="zh-cn" /> <meta name="spreadjs culture" content="zh-cn" />
<meta charset="utf-8" /> <meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>${pzzlMc}</title> <title></title>
<!-- 样式 --> <!-- 样式 -->
<link href="/online_report/static/resources/gc.spread.sheets.excel2013white.12.0.0.css" rel="stylesheet"> <link href="/static/resources/gc.spread.sheets.excel2013white.12.0.0.css" rel="stylesheet">
<link href="/online_report/static/css/style.css?v=12" rel="stylesheet"> <link href="/static/css/style.css?v=12" rel="stylesheet">
<link href="/online_report/static/tools/js/My97DatePicker/skin/WdatePicker.css" rel="stylesheet" /> <link href="/static/tools/js/My97DatePicker/skin/WdatePicker.css" rel="stylesheet" />
<script src="/online_report/static/js/jquery.min.js"></script> <script src="/static/js/jquery.min.js"></script>
<!-- 工程文件 --> <!-- 工程文件 -->
<script src="/online_report/static/resources/gc.spread.sheets.all.min.js"></script> <script src="/static/resources/gc.spread.sheets.all.min.js"></script>
<script src="/online_report/static/resources/zh/gc.spread.sheets.resources.zh.12.0.0.min.js"></script> <script src="/static/resources/zh/gc.spread.sheets.resources.zh.12.0.0.min.js"></script>
<!-- 生成的资源文件 --> <!-- 生成的资源文件 -->
<!-- TODO 此处需要将路径调整为对应引用的地址--> <!-- TODO 此处需要将路径调整为对应引用的地址-->
<script src="/online_report/static/page_js/_year/data.js?v=20"></script> <!-- <script src="/static/page_js/_year/data.js?v=20"></script>
<script src="/online_report/static/page_extend_js/_year/data.js?v=20"></script> <script src="/static/page_extend_js/_year/data.js?v=20"></script> -->
<script> <script>
// 全局变量 用于存放报表的特殊取值操作 // 全局变量 用于存放报表的特殊取值操作
var NB_SPECIAL_HANDLER = {}; var NB_SPECIAL_HANDLER = {};
...@@ -63,7 +60,7 @@ ...@@ -63,7 +60,7 @@
<body class="body"> <body class="body">
<div class="header"> <div class="header">
<div class="title">${pzzlMc}</div> <div class="title"></div>
<div class="button-group"> <div class="button-group">
<button onClick="submitData()" class="htbutton"> 保存 </button> <button onClick="submitData()" class="htbutton"> 保存 </button>
</div> </div>
...@@ -484,27 +481,55 @@ ...@@ -484,27 +481,55 @@
</div> </div>
</div> </div>
<div id="resultFloat" title="查看校验结果" class="htbutton">查看校验</div> <div id="resultFloat" title="查看校验结果" class="htbutton">查看校验</div>
<!-- 业务逻辑代码 -->
<script type="text/javascript" src="/online_report/static/js/year/initLoader.js?v=20"></script>
<script type="text/javascript" src="/online_report/static/js/year/util.js?v=20"></script>
<script type="text/javascript" src="/online_report/static/js/year/api.js?v=20"></script>
<script type="text/javascript" src="/online_report/static/js/year/fomula.js?v=20"></script>
<script type="text/javascript" src="/online_report/static/js/year/tool.js?v=20"></script>
<script type="text/javascript" src="/online_report/static/js/year/specialHandler.js?v=20"></script>
<script type="text/javascript" src="/online_report/static/js/year/result.js?v=20"></script>
<script type="text/javascript" src="/online_report/static/tools/js/My97DatePicker/WdatePicker.js?v=1.1"></script>
<script> <script>
var GLOBAL_INITJSON = ${ data }; var URL = "http://localhost:7070"
var GLOBAL_JSON = ${ dataSs }; var GLOBAL_INITJSON,GLOBAL_JSON,GLOBAL_CACHE_DATA,GLOBAL_TABLE_SPECIAL,GLOBAL_TABLE_FP,ifGZflag;
var isGZflag = ${ ifGZflag?true:false }; $(function(){
var GLOBAL_CACHE_DATA = ${ cacheData }; $.ajax({
var GLOBAL_TABLE_SPECIAL = ${ specialCarryData }; type: "POST",
var GLOBAL_TABLE_FP = ${ zzsData }; url: URL + "/online_report/declare/toPzzl",
async:false,
dataType: "json", // 请求方式为jsonp
data: {
data: localStorage.getItem("data")
},
success: function (data) {
$(".header .title").html(data.pzzlMc);
$("title").html(data.pzzlMc)
if (data.bean) {
GLOBAL_INITJSON = data.bean.data ? JSON.parse(data.bean.data) : {};
GLOBAL_JSON = data.bean.dataSs ? JSON.parse(data.bean.dataSs) : {};
GLOBAL_CACHE_DATA = data.bean.cacheData ? JSON.parse(data.bean.cacheData) : {};
GLOBAL_TABLE_SPECIAL = data.bean.specialCarryData ? JSON.parse(data.bean.specialCarryData) : {};
GLOBAL_TABLE_FP = data.bean.zzsData ? JSON.parse(data.bean.zzsData) : {};
isGZflag = data.bean.ifGZflag ? true : false;
var oscript1 = document.createElement('script');
var oscript2 = document.createElement('script');
oscript1.src = '/static/page_js/'+data.pzzlDm+'/data.js?v=19';
oscript2.src = '/static/page_extend_js/'+data.pzzlDm+'/data.js?v=19';
document.body.appendChild(oscript1);
document.body.appendChild(oscript2);
}
},
error: function(xhr){
//jsonp 方式此方法不被触发
console.log("=======error======================")
}
})
// var GLOBAL_INITJSON = ${ data };
// var GLOBAL_JSON = ${ dataSs };
// var isGZflag = ${ ifGZflag?true:false };
// var GLOBAL_CACHE_DATA = ${ cacheData };
// var GLOBAL_TABLE_SPECIAL = ${ specialCarryData };
// var GLOBAL_TABLE_FP = ${ zzsData };
// 布局处理 // 布局处理
var $container = $(".container"); var $container = $(".container");
var $breakbar = $(".breakbar .middle-btn"); var $breakbar = $(".breakbar .middle-btn");
$(function () { // $(function () {
$container.removeClass("full"); $container.removeClass("full");
$breakbar.text("<"); $breakbar.text("<");
$breakbar.on("click", function () { $breakbar.on("click", function () {
...@@ -519,8 +544,8 @@ ...@@ -519,8 +544,8 @@
spread.refresh(); spread.refresh();
} }
}); });
}); // });
})
// $(document).ready(function () { // $(document).ready(function () {
// setTimeout(function () { // setTimeout(function () {
// // TODO 在选择完报表的条件下添加特殊样式标记 // // TODO 在选择完报表的条件下添加特殊样式标记
...@@ -529,6 +554,15 @@ ...@@ -529,6 +554,15 @@
// }, 1000); // }, 1000);
// }) // })
</script> </script>
<!-- 业务逻辑代码 -->
<script type="text/javascript" src="/static/js/year/initLoader.js?v=20"></script>
<script type="text/javascript" src="/static/js/year/util.js?v=20"></script>
<script type="text/javascript" src="/static/js/year/api.js?v=20"></script>
<script type="text/javascript" src="/static/js/year/fomula.js?v=20"></script>
<script type="text/javascript" src="/static/js/year/tool.js?v=20"></script>
<script type="text/javascript" src="/static/js/year/specialHandler.js?v=20"></script>
<script type="text/javascript" src="/static/js/year/result.js?v=20"></script>
<script type="text/javascript" src="/static/tools/js/My97DatePicker/WdatePicker.js?v=1.1"></script>
</body> </body>
</html> </html>
\ No newline at end of file
...@@ -216,9 +216,11 @@ function initPage(companyInfo) { ...@@ -216,9 +216,11 @@ function initPage(companyInfo) {
data: JSON.stringify(submitData) data: JSON.stringify(submitData)
}, },
success: function (data) { success: function (data) {
if (data.url == "edit.jsp") {
localStorage.setItem("data",JSON.stringify(submitData)); localStorage.setItem("data",JSON.stringify(submitData));
if (data.url == "edit.jsp") {
window.open("/declare/edit.html"); window.open("/declare/edit.html");
}else if ("yearReport.jsp") {
window.open("/declare/yearReport.html");
} }
}, },
error: function(xhr){ error: function(xhr){
......
...@@ -317,12 +317,17 @@ function regist_CF_GET_BBSJ_STR() { ...@@ -317,12 +317,17 @@ function regist_CF_GET_BBSJ_STR() {
CF_GET_BBSJ_STR.prototype.evaluateAsync = function (context) { CF_GET_BBSJ_STR.prototype.evaluateAsync = function (context) {
var result; var result;
var args = Array.prototype.slice.call(arguments).slice(1); var args = Array.prototype.slice.call(arguments).slice(1);
var argLength = args.length;
try { try {
var sheetName = context.ctx.source.getName(); var sheetName = context.ctx.source.getName();
var sheetIndex = spread.getSheetIndex(sheetName); var sheetIndex = spread.getSheetIndex(sheetName);
if (argLength == 2) {
var sheet = args[0].getSource(); var sheet = args[0].getSource();
var _value = (sheet && sheet.getValue(args[0].getRow(), args[0].getColumn())) || 0; var _value = (sheet && sheet.getValue(args[0].getRow(), args[0].getColumn())) || 0;
return _value; return _value;
} else {
return 0;
}
} catch (error) { } catch (error) {
// 此处是负责例外处理的语句 // 此处是负责例外处理的语句
console.log(error); console.log(error);
......
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