同步分支dev_20210617的修改

jsp/declare/index.html

@@ -75,9 +75,7 @@
         <div class="reminder"><span class="span-font-size">如遇此情况，等几秒钟再&nbsp;&nbsp;“刷新”&nbsp;&nbsp;或退出后稍后重进申报清册查看。</span>
         </div>
         <div class="reminder"><span class="span-font-size">5、没有财务报表清册，可能是以下原因之一：</span></div>
-        <div class="reminder"><span class="span-font-size">未做财务报表备案，<label id="goRecord"
-                                                                           class="label_declare">&nbsp;现在去备案；</label></span>
-        </div>
+        <div class="reminder"><span class="span-font-size">未做财务报表备案；</span></div>
         <div class="reminder"><span class="span-font-size">只做了备案报告书但未做具体的会计报表名称；</span></div>
       </div>
     </div>

jsp/overdue/index.html

@@ -81,9 +81,7 @@
         <div class="reminder"><span class="span-font-size">如遇此情况，等几秒钟再&nbsp;&nbsp;“刷新”&nbsp;&nbsp;或退出后稍后重进申报清册查看。</span>
         </div>
         <div class="reminder"><span class="span-font-size">5、没有财务报表清册，可能是以下原因之一：</span></div>
-        <div class="reminder"><span class="span-font-size">未做财务报表备案，<label id="goRecord"
-              class="label_declare">&nbsp;现在去备案；</label></span>
-        </div>
+        <div class="reminder"><span class="span-font-size">未做财务报表备案；</span></div>
         <div class="reminder"><span class="span-font-size">只做了备案报告书但未做具体的会计报表名称；</span></div>
       </div>
     </div>

static/biz/syntheticalReport_grid.js

@@ -30,7 +30,7 @@ function getInitTable() {
       hideLoading();
       //el表达式变jqa
       // $("#token").attr("value","");
-      if(data.code=='99'){
+      if (data.code == '99') {
         myAlert("提示", data.errmsg, "确定")
         return false
       }
@@ -47,7 +47,14 @@ function getInitTable() {
       zjhm = data.bean.zjhm
       djxh = data.bean.djxh;
       sbqDate = data.bean.sbsq;
-      taxInfos = data.bean.taxInfos;
+      taxInfos = [];
+      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]);
+        }
+      }
       data.bean.financialInfos = [];
       data.bean.taxInfos = [{
         "sssqZ": "--",
@@ -185,7 +192,7 @@ function initPage(companyInfo) {
             sbsq: sbqDate,
             taxInfos: taxInfos,
             value: config.value,
-            zjhm:zjhm
+            zjhm: zjhm
           },
         };
         window.open(config.zhsbPage, '_blank');
@@ -240,7 +247,14 @@ function initPage(companyInfo) {
           return
         }
         djxh = data.bean.djxh;
-        taxInfos = data.bean.taxInfos;
+        taxInfos = [];
+        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]);
+          }
+        }
         data.bean.financialInfos = [];
         data.bean.taxInfos = [{
           "sssqZ": "--",
@@ -336,7 +350,7 @@ function initPage(companyInfo) {
       window.mlistener = {
         selectRowData: {},
       };
-      
+
       submitData.fillingFlag = "normal" // 填报标记
       submitData.saveUserId = "zxtb"; // 用户id
       submitData.zjhm = zjhm
@@ -437,4 +451,4 @@ function initPage(companyInfo) {
     declarationMethod: declarationMethod,
     closeModal: closeModal
   }
-}
+}
\ No newline at end of file