Merge branch 'integrate' into integrateFirst

index.html

@@ -109,26 +109,24 @@
                     dataType: "json",  // 请求方式为jsonp
                     data: {
                         djxh: djxhNumber.val(),
-                        nsrsbh: sbh.val() ? sbh.val() : '',
+                        nsrsbh: sbh.val(),
                         token: '',
                         sbsq: '',
                         pzzlDm: ''
                     },
                     success: function (data) { //客户端jquery预先定义好的callback函数，成功获取跨域服务器上的json数据后，会动态执行这个callback函数
-                        localStorage.setItem("djxh",djxhNumber.val());
-                        localStorage.setItem("nsrsbh",sbh.val() ? sbh.val() : '');
                         if (data.success) {
                             if (data.bean.url == "error.jsp") {
                                 myAlert("提示", data.bean.errorInfo, "确定")
                                 // window.location.href = "/jsp/error/index.html?falg="+param;
                             }else if (param == "declare") {
-                                window.location.href = "/jsp/declare/index.html";
+                                window.location.href = "/jsp/declare/index.html?djxh="+djxhNumber.val()+"&nsrsbh="+sbh.val();
                             }else if (param == "amend") {
-                                window.location.href = "/jsp/amend/index.html";
+                                window.location.href = "/jsp/amend/index.html?djxh="+djxhNumber.val()+"&nsrsbh="+sbh.val();
                             }else if (param == "overdue") {
-                                window.location.href = "/jsp/overdue/index.html";
+                                window.location.href = "/jsp/overdue/index.html?djxh="+djxhNumber.val()+"&nsrsbh="+sbh.val();
                             }else if (param == "cancellation") {
-                                window.location.href = "/jsp/cancellation/index.html";
+                                window.location.href = "/jsp/cancellation/index.html?djxh="+djxhNumber.val()+"&nsrsbh="+sbh.val();
                             }
                         }
                     },

jsp/amend/index.html

@@ -95,14 +95,23 @@
         $(function(){
             //
             var url = localStorage.getItem("url");
+            function GetQueryValue(queryName) {
+                var query = decodeURI(window.location.search.substring(1));
+                var vars = query.split("&");
+                for (var i = 0; i < vars.length; i++) {
+                    var pair = vars[i].split("=");
+                    if (pair[0] == queryName) { return pair[1]; }
+                }
+                return null;
+            }
             $.ajax({
                 type: "GET",
                 url: url + "/ssfwpt/amend/index",
                 dataType: "json",  // 请求方式为jsonp
                 // async: false,
                 data: {
-                    djxh: localStorage.getItem("djxh"),
-                    nsrsbh: localStorage.getItem("nsrsbh"),
+                    djxh: GetQueryValue("djxh"),
+                    nsrsbh: GetQueryValue("nsrsbh"),
                     token: '',
                     sbsq: '',
                     pzzlDm: ''

jsp/cancellation/index.html

@@ -74,14 +74,23 @@
     $(function(){
         //
         var url = localStorage.getItem("url");
+        function GetQueryValue(queryName) {
+            var query = decodeURI(window.location.search.substring(1));
+            var vars = query.split("&");
+            for (var i = 0; i < vars.length; i++) {
+                var pair = vars[i].split("=");
+                if (pair[0] == queryName) { return pair[1]; }
+            }
+            return null;
+        }
         $.ajax({
             type: "GET",
             url: url + "/ssfwpt/cancellation/index",
             dataType: "json",  // 请求方式为jsonp
             // async: false,
             data: {
-                djxh: localStorage.getItem("djxh"),
-                nsrsbh: localStorage.getItem("nsrsbh"),
+                djxh: GetQueryValue("djxh"),
+                nsrsbh: GetQueryValue("nsrsbh"),
                 token: '',
                 sbsq: '',
                 pzzlDm: ''

jsp/declare/index.html

@@ -112,14 +112,23 @@
     $(function(){
         //
         var url = localStorage.getItem("url");
+        function GetQueryValue(queryName) {
+            var query = decodeURI(window.location.search.substring(1));
+            var vars = query.split("&");
+            for (var i = 0; i < vars.length; i++) {
+                var pair = vars[i].split("=");
+                if (pair[0] == queryName) { return pair[1]; }
+            }
+            return null;
+        }
         $.ajax({
             type: "GET",
             url: url + "/ssfwpt/declare/index",
             dataType: "json",  // 请求方式为jsonp
             // async: false,
             data: {
-                djxh: localStorage.getItem("djxh"),
-                nsrsbh: localStorage.getItem("nsrsbh"),
+                djxh: GetQueryValue("djxh"),
+                nsrsbh: GetQueryValue("nsrsbh"),
                 token: '',
                 sbsq: '',
                 pzzlDm: ''

jsp/overdue/index.html

@@ -117,14 +117,23 @@
     $(function(){
         //
         var url = localStorage.getItem("url");
+        function GetQueryValue(queryName) {
+            var query = decodeURI(window.location.search.substring(1));
+            var vars = query.split("&");
+            for (var i = 0; i < vars.length; i++) {
+                var pair = vars[i].split("=");
+                if (pair[0] == queryName) { return pair[1]; }
+            }
+            return null;
+        }
         $.ajax({
             type: "GET",
             url: url + "/ssfwpt/overdue/index",
             dataType: "json",  // 请求方式为jsonp
             // async: false,
             data: {
-                djxh: localStorage.getItem("djxh"),
-                nsrsbh: localStorage.getItem("nsrsbh"),
+                djxh: GetQueryValue("djxh"),
+                nsrsbh: GetQueryValue("nsrsbh"),
                 token: '',
                 sbsq: '',
                 pzzlDm: ''

static/biz/overdue_grid.js

@@ -65,7 +65,7 @@ function initPage(companyInfo) {
     var showFinancial = function(financialInfo,type) {
         if(financialInfo.length>0){
             for(var i=0;i<financialInfo.length;i++){
-                financialInfo[i].sbrq = financialInfo[i].sbrq.split(" ")[0];
+                financialInfo[i].sbrq = financialInfo[i].sbrq ? financialInfo[i].sbrq.split(" ")[0] : "";
             }
         }
         var id = "#financialGrid";