合并optimize分支

static/biz/amend_grid.js

@@ -10,7 +10,7 @@ var nbbd10414 = "";
 var nbbd10420 = "";
 var prefix = "";
 $(function() {
-    if (config.environmental == 'test' || config.environmental =='preProduce') {
+    if (config.environmental == 'test' || config.environmental == 'preProduce') {
         prefix = "/web";
     } else if (config.environmental == 'production') {
         prefix = "/web/online";
@@ -39,11 +39,12 @@ function getInitTable() {
             $("#djxh").attr("value", companyInfo.djxh);
             if (companyInfo.success) {
                 zjhm = companyInfo.bean.zjhm
-                // var skssqz = companyInfo.bean.sbqz.replace('-','')
-                // if (companyInfo.bean.sfyhzctsBz == 'Y'&&skssqz<='20210331') {
-                //     myAlert("提示", "尊敬的纳税人、缴费人，为进一步巩固拓展减税降费成效，助力市场主体纾困解难，对部分2020年底到期税费优惠政策（不包括社会保险费），您可暂按原政策文件规定申报享受优惠（原减免性质代码可继续使用）。详细情况可咨询主管税务分局、税务所或12366纳税服务热线。感谢您的理解与支持！！", "确定");
-                // }
-                // tool.hjDialog(companyInfo.bean.djxh)出口退税暂不上线
+                sfyhzctsBz = companyInfo.bean.sfyhzctsBz
+                    // var skssqz = companyInfo.bean.sbqz.replace('-','')
+                    // if (companyInfo.bean.sfyhzctsBz == 'Y'&&skssqz<='20210331') {
+                    //     myAlert("提示", "尊敬的纳税人、缴费人，为进一步巩固拓展减税降费成效，助力市场主体纾困解难，对部分2020年底到期税费优惠政策（不包括社会保险费），您可暂按原政策文件规定申报享受优惠（原减免性质代码可继续使用）。详细情况可咨询主管税务分局、税务所或12366纳税服务热线。感谢您的理解与支持！！", "确定");
+                    // }
+                    // tool.hjDialog(companyInfo.bean.djxh)出口退税暂不上线
                 config.value = companyInfo.bean.value
                 companyInfo.bean.config = config
                 nbbd10414 = companyInfo.bean.nbbd10414;
@@ -207,6 +208,34 @@ function initPage(companyInfo) {
                                 }, 1000);
                             }
                         })
+                    } else if (data.sourceFlag == "ssfwpt_sbzj_version_2") { //税表组件2.0
+                        window.mlistener = {
+                            selectRowData: {},
+                            urlList: {
+                                getMenu: '/tax_service/getBbLb', //菜单接口
+                                openTable: "/tax_service/open_table", //开表接口
+                                getData: "/tax_service/get_data", //提取数据接口  
+                                saveTable: "/tax_service/save_single_sbb_info", //保存
+                                deleteTable: "/tax_service/delete_single_sbb_info", //删除
+                                checkTaxTable: "/tax_service/report_data_validate", //表间校验
+                                declareTable: "/tax_service/declare", //申报
+                                downloadFile: "/tax_service/load_declare_file", //下载申报文件接口
+                                correctTax: "/tax_service/get_gz_tax_and_declare" //更正接口
+                            }
+                        };
+                        data.sfyhzctsBz = sfyhzctsBz //首次进表标志
+                        data.fillingFlag = "corrections" // 填报标记
+                        data.flag = '' //清算标志 1是清算,空是正常开表
+                        window.mlistener.selectRowData = data;
+                        var openUrl = prefix + config.tableBridge; //测试环境
+                        window.open(openUrl, '_blank');
+                        Object.defineProperty(mlistener, 'returnSelectRowData', {
+                            set: function(val) {
+                                setTimeout(function() {
+                                    getTaxDeclaration(sbqDate, "N", '2');
+                                }, 1000);
+                            }
+                        })
                     } else {
                         //TODO 跳转页面
                         data.djxh = companyInfo.djxh;
@@ -310,7 +339,9 @@ function initPage(companyInfo) {
             data: param,
             type: "POST",
             dataType: "JSON",
-            headers: { 'Encryption': sessionStorage.getItem("authorization_sbzj2") },
+            headers: {
+                'Encryption': sessionStorage.getItem("authorization_sbzj2")
+            },
         }).done(function(data) {
             if (data.success) {
                 zjhm = data.bean.zjhm

static/biz/cancellation_grid.js

@@ -287,6 +287,7 @@ function initPage(companyInfo) {
                                 downloadFile: "/tax_service/load_declare_file" //下载申报文件接口
                             }
                         };
+                        data.fillingFlag = "cancellation" // 填报标记
                         data.flag = '1' //清算标志 1是清算,空是正常开表
                         window.mlistener.selectRowData = data;
                         var openUrl = prefix + config.tableBridge; //测试环境