逾期、清算添加申报日期列；代码格式化

jsp/overdue/index.html

@@ -173,11 +173,18 @@
 
         } else {
           hideLoading();
-          if(companyInfo.errmsg!=undefined){
+          if (companyInfo.errmsg != undefined) {
             alertWarning(companyInfo.errmsg);
-          }else{
+          } else {
             alertWarning(companyInfo.returnMessage);
           }
+          if (!companyInfo.bean) {
+            companyInfo.bean = {};
+            companyInfo.bean.djxh = getUrlParam("djxh");
+            companyInfo.bean.return = false;
+          }
+          companyInfo.bean.config = config
+          initpage = initPage(companyInfo.bean);
           // alertWarning(companyInfo.errmsg);
           // companyInfo.bean.config = config
           // initpage = initPage(companyInfo.bean);

static/biz/declare_grid.js

@@ -171,7 +171,7 @@ function initPage(companyInfo) {
           Object.defineProperty(mlistener, 'returnSelectRowData', {
             set: function (val) {
               setTimeout(function () {
-                getTaxDeclaration(sbqDate, "N",'2');
+                getTaxDeclaration(sbqDate, "N", '2');
               }, 1000);
             }
           })
@@ -298,19 +298,19 @@ function initPage(companyInfo) {
     // 加了一个延时，时间改变后时间框没有收起隐藏就加载数据，没有找到好的解决办法，暂时用延时处理
     sbqDate = date
     setTimeout(function () {
-      getTaxDeclaration(date, "N",'1');
+      getTaxDeclaration(date, "N", '1');
     }, 50);
   };
 
   var refresh = function () {
     myConfirm("消息", "您确定需要重置申报清册吗？点击确定继续", "确定", "取消", function () {
-      getTaxDeclaration(nowdate, "Y",'1');
+      getTaxDeclaration(nowdate, "Y", '1');
     });
   };
   //申报方式 当iszzsybjc=01同时pzzlDm=010101时，调用改方法
   var declarationMethod = function (statu) {
     submitData.ybjcState = statu;
-	submitData.value = config.value;
+    submitData.value = config.value;
     console.log(submitData.sourceFlag, submitData.sourceFlag.indexOf("sbzj") != -1)
     //需要判断在线还是税表的开关
     if (submitData.sourceFlag == "ssfwpt_sbzj") {
@@ -321,13 +321,13 @@ function initPage(companyInfo) {
       submitData.saveUserId = "zxtb"; // 用户id
       window.mlistener.selectRowData = submitData;
       window.open(config.ssfwptPage, '_blank');
-	  Object.defineProperty(mlistener, 'returnSelectRowData', {
-		set: function (val) {
-		  setTimeout(function () {
-			getTaxDeclaration(sbqDate, "N",'2');
-		  }, 1000);
-		}
-	  })
+      Object.defineProperty(mlistener, 'returnSelectRowData', {
+        set: function (val) {
+          setTimeout(function () {
+            getTaxDeclaration(sbqDate, "N", '2');
+          }, 1000);
+        }
+      })
     } else {
       //"ssfwpt_zxtb"
       // var form = $("#changeForm");
@@ -344,32 +344,33 @@ function initPage(companyInfo) {
           data: JSON.stringify(submitData)
         },
         success: function (data) {
-            hideLoading()
-          if(data.code == 99 || data.code == "99"){
-              alertWarning(data.errmsg);
-              return false
+          hideLoading()
+          if (data.code == 99 || data.code == "99") {
+            alertWarning(data.errmsg);
+            return false
           }
           window.taxInfo = JSON.stringify(submitData);
           localStorage.setItem("data", JSON.stringify(submitData));
           if (data.url == "edit.jsp") {
-              submitData.flag = true;
-              submitData.encryptKey = config.value;
-              var url = config.spreadUrl+"/online_report/declare/toPzzl?falg=" + falg
-              var form = $("#changeForm");
-              form.attr('action',url);    //通过jquery为action属性赋值
-              form.find("#changeForm_data").val(JSON.stringify(submitData));
-              form.submit();
+            submitData.flag = true;
+            submitData.encryptKey = config.value;
+            var url = config.spreadUrl + "/online_report/declare/toPzzl?falg=" + falg
+            var form = $("#changeForm");
+            form.attr('action', url); //通过jquery为action属性赋值
+            form.find("#changeForm_data").val(JSON.stringify(submitData));
+            form.submit();
 
-             // window.open(config.spreadUrl+"/online_report/declare/toPzzl?falg=" + falg + '&data=' + JSON.stringify(submitData));
-           // window.open(config.webUrl + "declare/edit.html?falg=" + falg + '&params=' + encodeURI(JSON.stringify(submitData)));
-                      }/*  else if (data.url == "yearReport.jsp") {
-                         window.open(config.webUrl + "declare/yearReport.html?falg=" + falg + '&params=' + encodeURI(JSON.stringify(submitData)));
-                       } else if (data.url == "yearReportGLB.jsp") {
-                         window.open(config.webUrl + "declare/yearReportGLB.html?falg=" + falg + '&params=' + encodeURI(JSON.stringify(submitData)));
-                       } else {
-                         //因为后台不知道返回路径是什么样的就直接改成了else data.url == "error.jsp"
-                         window.open(config.webUrl + "error/index.html?falg=" + falg + '&params=' + encodeURI(JSON.stringify(submitData)));
-          }*/
+            // window.open(config.spreadUrl+"/online_report/declare/toPzzl?falg=" + falg + '&data=' + JSON.stringify(submitData));
+            // window.open(config.webUrl + "declare/edit.html?falg=" + falg + '&params=' + encodeURI(JSON.stringify(submitData)));
+          }
+          /*  else if (data.url == "yearReport.jsp") {
+                                   window.open(config.webUrl + "declare/yearReport.html?falg=" + falg + '&params=' + encodeURI(JSON.stringify(submitData)));
+                                 } else if (data.url == "yearReportGLB.jsp") {
+                                   window.open(config.webUrl + "declare/yearReportGLB.html?falg=" + falg + '&params=' + encodeURI(JSON.stringify(submitData)));
+                                 } else {
+                                   //因为后台不知道返回路径是什么样的就直接改成了else data.url == "error.jsp"
+                                   window.open(config.webUrl + "error/index.html?falg=" + falg + '&params=' + encodeURI(JSON.stringify(submitData)));
+                    }*/
         },
         error: function (xhr) {
           //jsonp 方式此方法不被触发
@@ -414,4 +415,4 @@ function initPage(companyInfo) {
     declarationMethod: declarationMethod,
     closeModal: closeModal
   }
-}
+}
\ No newline at end of file