Merge branch 'optimize' of http://114.115.168.181/lushihao/zxtb_to_ssfwpt into optimize

static/biz/sdscxsReport_grid.js

@@ -22,8 +22,7 @@ function getInitTable() {
     dataType: "json", // 请求方式为jsonp
     // async: false,
     data: {
-      // djxh: getUrlParam("djxh"),
-      djxh: '10111291000025610682',
+      djxh: getUrlParam("djxh"),
       token: getUrlParam("token"),
       sbsq: "",
     },
@@ -56,25 +55,26 @@ function getInitTable() {
       zjhm = data.bean.zjhm
       djxh = data.bean.djxh;
       sbqDate = data.bean.sbsq;
-      taxInfos = [];
       var skssq;
       for (var i = 0; i < data.bean.taxInfos.length; i++) {
-        var djxh = data.bean.taxInfos[i].djxh;
-        var zsDjxh = data.bean.taxInfos[i].zsDjxh;
-        if (djxh == zsDjxh) {
-          taxInfos.push(data.bean.taxInfos[i]);
+        if (data.bean.taxInfos[i].sbrq) {
+          data.bean.taxInfos[i].sbrq = tool.formatDate(data.bean.taxInfos[i].sbrq.split(" ")[0]);
         }
         if (data.bean.taxInfos[i].bblxDm == '10401') {
           skssq = data.bean.taxInfos[i].sksssjz
         }
       }
+      taxInfos = data.bean.taxInfos;
       data.bean.financialInfos = [];
-      data.bean['zhsbInfos'] = [{
+      data.bean['zhsbInfos'] = [];
+      if (data.bean.taxInfos.length > 0) {
+        data.bean.zhsbInfos.push({
           "sssqZ": "--",
           "sssqQ": "--",
           "sbrq": "--",
           "pzzlMc": "综合申报表",
-      }]
+        })
+      }
       var companyInfo = data;
       if (companyInfo.success) {
         config.value = companyInfo.bean.value
@@ -374,27 +374,26 @@ function initPage(companyInfo) {
           return
         }
         djxh = data.bean.djxh;
-        taxInfos = [];
         var skssq
         for (var i in data.bean.taxInfos) {
+          if (data.bean.taxInfos[i].sbrq) {
+            data.bean.taxInfos[i].sbrq = tool.formatDate(data.bean.taxInfos[i].sbrq.split(" ")[0]);
+          }
           if (data.bean.taxInfos[i].bblxDm == '10401') {
             skssq = data.bean.taxInfos[i].sksssjz
           }
         }
-        for (var i = 0; i < data.bean.taxInfos.length; i++) {
-          var djxh = data.bean.taxInfos[i].djxh;
-          var zsDjxh = data.bean.taxInfos[i].zsDjxh;
-          if (djxh == zsDjxh) {
-            taxInfos.push(data.bean.taxInfos[i]);
-          }
-        }
+        taxInfos = data.bean.taxInfos;
         data.bean.financialInfos = [];
-        data.bean['zhsbInfos'] = [{
+        data.bean['zhsbInfos'] = [];
+        if (data.bean.taxInfos.length > 0) {
+          data.bean.zhsbInfos.push({
             "sssqZ": "--",
             "sssqQ": "--",
             "sbrq": "--",
             "pzzlMc": "综合申报表",
-        }]
+          })
+        }
         drawGrid(data.bean);
         companyInfo = data.bean;
         if (data.bean.taxInfos.length > 0) {