合并分支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/amend_grid.js

@@ -101,13 +101,16 @@ function initPage(companyInfo) {
     declareDate = declarationDateStart + " " + declarationDateEnd; // 临时存储date 可能用于时间比对，赋值给时间全局变量
     var id = "#taxAmendGrid";
     var buttonHtml = "更正申报";
-    var order = ["bblxMc", "sbrq", "skssqq", "skssqz", "ybtse", "do"];
+    var order = ["bblxMc", "djxh", "sbrq", "skssqq", "skssqz", "ybtse", "do"];
     var headerList = [{
       name: "序号",
       width: "5%"
     }, {
       name: "申报表名称",
-      width: "45%"
+      width: "30%"
+    },  {
+      name: "登记序号",
+      width: "15%"
     }, {
       name: "原申报日期",
       width: "10%"

static/biz/cancellation_grid.js

@@ -100,17 +100,24 @@ function initPage(companyInfo) {
       if (item.sbrq) {
         item.sbrq = tool.formatDate(item.sbrq);
       }
+      if (item.bblxDm=='30101') {
+          item.sssqQ = "-";
+          item.sssqZ = "-";
+      }
     })
     var id = "#taxGrid";
     var buttonHtml = "填写申报表";
-    var order = ["pzzlMc", "sssqQ", "sssqZ", "sbrq", "do"];
+    var order = ["pzzlMc", "djxh", "sssqQ", "sssqZ", "sbrq", "do"];
     var promptStatement = "";
     var headerList = [{
       name: "序号",
       width: "5%"
     }, {
       name: "申报表",
-      width: "55%"
+      width: "40%"
+    },  {
+      name: "登记序号",
+      width: "15%"
     }, {
       name: "税款所属期起",
       width: "10%"
@@ -145,7 +152,7 @@ function initPage(companyInfo) {
     })
     var id = "#financialGrid";
     var buttonHtml = "填写申报表";
-    var order = ["kjzd", "pzzlMc", "sssqQ", "sssqZ", "sbrq", "do"];
+    var order = ["kjzd", "pzzlMc", "djxh", "sssqQ", "sssqZ", "sbrq", "do"];
     var promptStatement = "";
     if (financialInfo.length < 1 && type == 1) {
       promptStatement = "您尚未进行财务报表类型备案，请先备案后再进行申报";
@@ -158,7 +165,10 @@ function initPage(companyInfo) {
       width: "10%"
     }, {
       name: "财务报表报送小类",
-      width: "45%"
+      width: "30%"
+    },  {
+      name: "登记序号",
+      width: "15%"
     }, {
       name: "报送所属期起",
       width: "10%"

static/biz/declare_grid.js

@@ -107,18 +107,25 @@ function initPage(companyInfo) {
         if (taxInfo[i].sbrq) {
           taxInfo[i].sbrq = tool.formatDate(taxInfo[i].sbrq.split(" ")[0]);
         }
+        if (taxInfo[i].bblxDm=='30101') {
+          taxInfo[i].sssqQ = "-";
+          taxInfo[i].sssqZ = "-";
+        }
       }
     }
     var id = "#taxGrid";
     var buttonHtml = "填写申报表";
-    var order = ["pzzlMc", "sssqQ", "sssqZ", "sbrq", "do"];
+    var order = ["pzzlMc", "djxh", "sssqQ", "sssqZ", "sbrq", "do"];
     var promptStatement = "";
     var headerList = [{
       name: "序号",
       width: "5%"
     }, {
       name: "申报表",
-      width: "55%"
+      width: "40%"
+    },  {
+      name: "登记序号",
+      width: "15%"
     }, {
       name: "税款所属期起",
       width: "10%"

static/biz/overdue_grid.js

@@ -105,18 +105,25 @@ function initPage(companyInfo) {
         if (taxInfo[i].sbqx) {
           taxInfo[i].sbqx = tool.formatDate(taxInfo[i].sbqx);
         }
+        if (taxInfo[i].bblxDm=='30101') {
+          taxInfo[i].sssqQ = "-";
+          taxInfo[i].sssqZ = "-";
+        }
       }
     }
     var id = "#taxGrid";
     var buttonHtml = "填写申报表";
-    var order = ["pzzlMc", "sssqQ", "sssqZ", "sbqx", "sbrq", "do"];
+    var order = ["pzzlMc", "djxh", "sssqQ", "sssqZ", "sbqx", "sbrq", "do"];
     var promptStatement = "";
     var headerList = [{
       name: "序号",
       width: "5%"
     }, {
       name: "申报表",
-      width: "45%"
+      width: "30%"
+    },  {
+      name: "登记序号",
+      width: "15%"
     }, {
       name: "税款所属期起",
       width: "10%"

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

static/biz/xgmyd_grid.js

@@ -110,14 +110,17 @@ function initPage(companyInfo) {
     }
     var id = "#taxGrid";
     var buttonHtml = "引导式申报";
-    var order = ["pzzlMc", "sssqQ", "sssqZ", "sbrq", "do"];
+    var order = ["pzzlMc", "djxh", "sssqQ", "sssqZ", "sbrq", "do"];
     var promptStatement = "";
     var headerList = [{
       name: "序号",
       width: "5%"
     }, {
       name: "申报表",
-      width: "55%"
+      width: "40%"
+    },  {
+      name: "登记序号",
+      width: "15%"
     }, {
       name: "税款所属期起",
       width: "10%"