Merge branch 'master' into temp

static/biz/declare_grid.js

@@ -127,6 +127,10 @@ function initPage(companyInfo) {
      * 税务申报 初始化数据获取
      * @param {*} mydate
      */
+    //地址
+    //http://sbjs.tjsat.gov.cn:18090
+    //http://localhost:7070
+    var url = "http://localhost:7070";
     var getTaxDeclaration = function(date, type) {
         // TODO 开始加载等待动画
         showLoading();
@@ -137,7 +141,7 @@ function initPage(companyInfo) {
             pzzlDm:companyInfo.pzzlDm
         }
         $.ajax({
-            url: "/online_report/declare/getPzzlList",
+            url: url + "/online_report/declare/getPzzlList",
             data: param,
             type: "POST",
             dataType: "JSON"
@@ -205,9 +209,6 @@ function initPage(companyInfo) {
         // form.find("#changeForm_data").val(JSON.stringify(submitData));
         // form.submit();
 
-        //http://sbjs.tjsat.gov.cn:18090
-        //http://localhost:7070
-        var url = "http://localhost:7070";
         $.ajax({
             type: "POST",
             url: url + "/online_report/declare/toPzzl",