同步分支produce需求修改，确保integrateFirst测试开发分支正常

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

@@ -101,20 +101,23 @@ function initPage(companyInfo) {
         item.sbrq = tool.formatDate(item.sbrq);
       }
       if (item.bblxDm=='30101') {
-        item.sssqQ = "-";
-        item.sssqZ = "-";
+          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%"
@@ -149,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 = "您尚未进行财务报表类型备案，请先备案后再进行申报";
@@ -162,7 +165,10 @@ function initPage(companyInfo) {
       width: "10%"
     }, {
       name: "财务报表报送小类",
-      width: "45%"
+      width: "30%"
+    },  {
+      name: "登记序号",
+      width: "15%"
     }, {
       name: "报送所属期起",
       width: "10%"
@@ -215,7 +221,13 @@ function initPage(companyInfo) {
           return false;
         }
         data.value = config.value;
-        if (data.sourceFlag == "ssfwpt_sbzj") {
+        // 财产行为税
+        if (ccxwsBblxDm.indexOf(data.bblxDm) != -1) {
+          // 测试环境start
+          var openUrl = config.ccxwsTaxTable + '?djxh=' + data.djxh + '&zsDjxh=' + data.zsDjxh + '&nsrsbh=' + data.nsrsbh + '&nsrmc=' + data.nsrmc + '&operateType=cancellation' + '&lybz=online' + '&token=' + data.token //测试环境
+          // var openUrl = config.ccxwsTaxTable +'?lybz=online' +'&operateType=cancellation'+'&sblx=js' + '&token=' + data.token //正式环境
+          window.open(openUrl, '_blank');
+        } else if (data.sourceFlag == "ssfwpt_sbzj") {
           window.mlistener = {
             selectRowData: {},
           };
@@ -223,18 +235,11 @@ function initPage(companyInfo) {
           data.saveUserId = "zxtb"; // 用户id
           data.zjhm = zjhm
           window.mlistener.selectRowData = data;
-          console.log(data)
-          // 财产行为税
-          if (ccxwsBblxDm.indexOf(data.bblxDm) != -1) {
-            // 测试环境start
-            var openUrl = config.ccxwsTaxTable + '?djxh='+data.djxh +'&zsDjxh='+data.zsDjxh + '&nsrsbh='+data.nsrsbh + '&nsrmc=' + data.nsrmc + '&operateType=cancellation' + '&lybz=online' + '&token=' + data.token +'&nsrlx='+ data.nsrlx //测试环境
-            // var openUrl = config.ccxwsTaxTable +'?lybz=online' +'&operateType=cancellation'+'&sblx=js' + '&token=' + data.token //正式环境
-            window.open(openUrl, '_blank');
-          } else if (yearBblxDm.indexOf(data.bblxDm) != -1){
+          if (yearBblxDm.indexOf(data.bblxDm) != -1) {
             data.saveUserId = "zxtb_singleReport"; // 用户id
             data.userId = "zxtb"; // userId
             window.open(config.yearTaxTable, '_blank');
-          }else {
+          } else {
             window.open(config.ssfwptPage, '_blank');
           }
           Object.defineProperty(mlistener, 'returnSelectRowData', {

static/biz/declare_grid.js

@@ -115,14 +115,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%"

static/biz/overdue_grid.js

@@ -113,14 +113,17 @@ function initPage(companyInfo) {
     }
     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%"
@@ -219,24 +222,24 @@ function initPage(companyInfo) {
           return false;
         }
         data.value = config.value;
-        if (data.sourceFlag == "ssfwpt_sbzj") {
+        // 财产行为税
+        if (ccxwsBblxDm.indexOf(data.bblxDm) != -1) {
+          // 测试环境start
+          var openUrl = config.ccxwsTaxTable + '?djxh=' + data.djxh + '&zsDjxh=' + data.zsDjxh + '&nsrsbh=' + data.nsrsbh + '&nsrmc=' + data.nsrmc + '&operateType=overdue' + '&lybz=online' + '&token=' + data.token //测试环境
+          // var openUrl = config.ccxwsTaxTable +'?lybz=online' +'&operateType=overdue' + '&sblx=yq' + '&token=' + data.token //正式环境
+          window.open(openUrl, '_blank');
+        } else if (data.sourceFlag == "ssfwpt_sbzj") {
           window.mlistener = {
             selectRowData: {},
           };
           data.fillingFlag = "overdue" // 填报标记
           data.saveUserId = "zxtb"; // 用户id
           window.mlistener.selectRowData = data;
-          // 财产行为税
-          if (ccxwsBblxDm.indexOf(data.bblxDm) != -1) {
-            // 测试环境start
-            var openUrl = config.ccxwsTaxTable + '?djxh='+data.djxh +'&zsDjxh='+data.zsDjxh + '&nsrsbh='+data.nsrsbh + '&nsrmc=' + data.nsrmc + '&operateType=overdue' + '&lybz=online' +'&token=' + data.token +'&nsrlx='+ data.nsrlx //测试环境
-            // var openUrl = config.ccxwsTaxTable +'?lybz=online' +'&operateType=overdue' + '&sblx=yq' + '&token=' + data.token //正式环境
-            window.open(openUrl, '_blank');
-          } else if (yearBblxDm.indexOf(data.bblxDm) != -1){
+          if (yearBblxDm.indexOf(data.bblxDm) != -1) {
             data.saveUserId = "zxtb_singleReport"; // 用户id
             data.userId = "zxtb"; // userId
             window.open(config.yearTaxTable, '_blank');
-          }else {
+          } else {
             window.open(config.ssfwptPage, '_blank');
           }
           Object.defineProperty(mlistener, 'returnSelectRowData', {

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%"