Skip to content

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

修改填表页面入口页面样式布局，修改年报 修改年报关联表

parent b7179be7
Show whitespace changes
Inline Side-by-side
Showing with 169 additions and 18 deletions
jsp/declare/edit.html
View file @ d1b463f3
......@@ -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=12" rel="stylesheet">
<link href="/web/onlineReport/static/css/style.css?v=13" 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>
<!-- 工程文件 -->
......@@ -45,7 +45,9 @@
<div class="title">
<p>
<span class="caption">当前报表：</span>
<span class="name"></span>
<span class="name"></span> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<span class="caption">所属期：</span>
<span class="sssj"></span>
</p>
</div>
<div class="button-group">
......@@ -168,6 +170,39 @@
}
return null;
}
function formatDate(date){
var re = /^\d+(?=\.{0,1}\d+$|$)/;
if (date != "") {
// 是纯数字
if (re.test(date)) {
// 长度为6 比如 201802
if (date.length == 6) {
var y = date.slice(0, 4);
var m = date.slice(4, 6);
date = y + '年' + m + '月';
} else {
// 长度为8 比如 20180219
var y = date.slice(0, 4);
var m = date.slice(4, 6);
var d = date.slice(6, 8);
date = y + '年' + m + '月' + d + '日';
}
}else{
var eDates = new Date(date);
var y = eDates.getFullYear();
var m = eDates.getMonth() + 1;
if(m<10){
m = "0"+m;
}
var d = eDates.getDate();
if( d<10){
d = "0"+ d;
}
date = y + '年' + m + '月' + d + '日';
}
}
return date;
}
$(function(){
var iframeUrl = window.location.search.split('?')[1];
var csList = iframeUrl.split('&');
......@@ -179,6 +214,8 @@
} else {
param = localStorage.getItem("data")
}
var sksssjqz = formatDate(JSON.parse(param).sksssjq) +"&nbsp;&nbsp;至&nbsp;&nbsp;"+ formatDate(JSON.parse(param).sksssjz)
$(".header span.sssj").html(sksssjqz);
// window.parent.postMessage({ cmd: 'zxtb' }, '*');
$.ajax({
type: "POST",
......@@ -234,9 +271,19 @@
$breakbar.on("click", function () {
if ($container.is(".full")) {
$container.removeClass("full");
$(".header").css({
marginTop:"17px",
position:"fixed"
})
$breakbar.text("<");
} else {
$container.addClass("full");
$(".header").css({
marginLeft:"17px",
position:"initial",
marginTop:"0px",
})
$breakbar.text(">");
}
if (spread) {
......
jsp/declare/yearReport.html
View file @ d1b463f3
......@@ -59,11 +59,13 @@
</head>
<body class="body">
<div class="header">
<div class="header">、、
<div class="title">
<p>
<span class="caption">当前报表：</span>
<span class="name"></span>
<span class="name"></span> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<span class="caption">所属期：</span>
<span class="sssj"></span>
</p>
</div>
<div class="button-group">
......@@ -505,14 +507,59 @@
}
return null;
}
function formatDate(date){
var re = /^\d+(?=\.{0,1}\d+$|$)/;
if (date != "") {
// 是纯数字
if (re.test(date)) {
// 长度为6 比如 201802
if (date.length == 6) {
var y = date.slice(0, 4);
var m = date.slice(4, 6);
date = y + '年' + m + '月';
} else {
// 长度为8 比如 20180219
var y = date.slice(0, 4);
var m = date.slice(4, 6);
var d = date.slice(6, 8);
date = y + '年' + m + '月' + d + '日';
}
}else{
var eDates = new Date(date);
var y = eDates.getFullYear();
var m = eDates.getMonth() + 1;
if(m<10){
m = "0"+m;
}
var d = eDates.getDate();
if( d<10){
d = "0"+ d;
}
date = y + '年' + m + '月' + d + '日';
}
}
return date;
}
$(function(){
var iframeUrl = window.location.search.split('?')[1];
var csList = iframeUrl.split('&');
var param = ""
if (csList.length > 1) {
var openData = csList[1].split('=')[1]
param = decodeURI(openData)
} else {
param = localStorage.getItem("data")
}
var sksssjqz = formatDate(JSON.parse(param).sksssjq) +"&nbsp;&nbsp;至&nbsp;&nbsp;"+ formatDate(JSON.parse(param).sksssjz)
$(".header span.sssj").html(sksssjqz);
$.ajax({
type: "POST",
url: URL + "/ssfwpt/" + address,
async:false,
dataType: "json", // 请求方式为jsonp
data: {
data: localStorage.getItem("data")
data: param
},
success: function (data) {
$(".header span.name").html(data.pzzlMc);
......
jsp/declare/yearReportGLB.html
View file @ d1b463f3
......@@ -63,7 +63,9 @@
<div class="title">
<p>
<span class="caption">当前报表：</span>
<span class="name"></span>
<span class="name"></span> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<span class="caption">所属期：</span>
<span class="sssj"></span>
</p>
</div>
<div class="button-group">
......@@ -276,14 +278,59 @@
}
return null;
}
function formatDate(date){
var re = /^\d+(?=\.{0,1}\d+$|$)/;
if (date != "") {
// 是纯数字
if (re.test(date)) {
// 长度为6 比如 201802
if (date.length == 6) {
var y = date.slice(0, 4);
var m = date.slice(4, 6);
date = y + '年' + m + '月';
} else {
// 长度为8 比如 20180219
var y = date.slice(0, 4);
var m = date.slice(4, 6);
var d = date.slice(6, 8);
date = y + '年' + m + '月' + d + '日';
}
}else{
var eDates = new Date(date);
var y = eDates.getFullYear();
var m = eDates.getMonth() + 1;
if(m<10){
m = "0"+m;
}
var d = eDates.getDate();
if( d<10){
d = "0"+ d;
}
date = y + '年' + m + '月' + d + '日';
}
}
return date;
}
$(function(){
var iframeUrl = window.location.search.split('?')[1];
var csList = iframeUrl.split('&');
var param = ""
if (csList.length > 1) {
var openData = csList[1].split('=')[1]
param = decodeURI(openData)
} else {
param = localStorage.getItem("data")
}
var sksssjqz = formatDate(JSON.parse(param).sksssjq) +"&nbsp;&nbsp;至&nbsp;&nbsp;"+ formatDate(JSON.parse(param).sksssjz)
$(".header span.sssj").html(sksssjqz);
$.ajax({
type: "POST",
url: URL + "/ssfwpt/" + address,
async:false,
dataType: "json", // 请求方式为jsonp
data: {
data: localStorage.getItem("data")
data:param
},
success: function (data) {
$(".header span.name").html(data.pzzlMc);
......
static/css/style.css
View file @ d1b463f3
......@@ -24,6 +24,8 @@ input {
padding: 0 16px;
border-radius: 3px;
z-index: 1;
margin-top: 17px;
margin-left: 17px;
}
.header .title {
......@@ -41,17 +43,22 @@ input {
color: #333;
} */
.header .title .name {
.header .title .name,.sssj {
font-weight: 900;
}
.header .button-group {
float: right;
/* float: right;*/
height: 60px;
line-height: 60px;
clear: none;
margin-left: -15px;
}
#importInBtn, #exportOutBtn, #resetCurrentBtn, #resetBtn{
float: right;
margin-right: 5px;
margin-top: 14px;
}
.htbutton {
outline: none;
border-radius: 4px;
......@@ -105,6 +112,8 @@ input {
width: 333px;
padding: 10px;
border: 1px solid #e4e4e4;
margin-top: 17px;
margin-left: 17px;
}
.container.full .left-bar {
......@@ -139,9 +148,10 @@ input {
}
.container .right {
margin-top: 17px;
position: absolute;
top: 0;
left: 350px;
left: 367px;
right: 0;
bottom: 0;
height: 100%;
......
static/js/tax/util.js
View file @ d1b463f3
......@@ -61,7 +61,7 @@ function getLeftItemBy29852(arr,index_){
var index = spread.getSheetIndex(name);
if (bbmc !== undefined) {
if (isSheetRequired) {
bbmc = bbmc + ' <span style="color:red">（必填）</span>'
bbmc = ' <span style="color:red">【必填表】</span>' +bbmc
}
html += "<div class='left-item' data-table='" + name + "' data-index='" + index + "'>" + bbmc + "</div>";
activeIndex.push(index);
......@@ -260,7 +260,7 @@ function addLeftItem(flag, NBindex) {
var index = spread.getSheetIndex(name);
if (bbmc !== undefined) {
if (isSheetRequired) {
bbmc = bbmc + ' <span style="color:red">（必填）</span>'
bbmc = ' <span style="color:red">【必填表】</span>' +bbmc
}
//TODO
......@@ -280,7 +280,7 @@ function addLeftItem(flag, NBindex) {
var index = spread.getSheetIndex(name);
if (bbmc !== undefined) {
if (isSheetRequired) {
bbmc = bbmc + ' <span style="color:red">（必填）</span>'
bbmc = ' <span style="color:red">【必填表】</span>' + bbmc
}
//TODO
......
static/js/year/util.js
View file @ d1b463f3
......@@ -54,8 +54,8 @@ function addLeftItem(flag, NBindex) {
if (bbmc !== undefined) {
if (isSheetRequired) {
//年报特殊处理
bbmc = bbmc + ((bbdm != "10414_001" && bbdm != "10414_002") ?
' <span style="color:red">（必填）</span>' : '')
bbmc = ((bbdm != "10414_001" && bbdm != "10414_002") ?
' <span style="color:red">【必填表】</span>' : '') + bbmc
}
//TODO
......
static/js/yearGLB/util.js
View file @ d1b463f3
......@@ -47,8 +47,8 @@ function addLeftItem(flag, NBindex) {
if (bbmc !== undefined) {
if (isSheetRequired) {
//年报特殊处理
bbmc = bbmc + ((bbdm != "10414_001" && bbdm != "10414_002") ?
' <span style="color:red">（必填）</span>' : '')
bbmc = ((bbdm != "10414_001" && bbdm != "10414_002") ?
' <span style="color:red">【必填表】</span>' : '') +bbmc
}
//TODO
......
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