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

static/biz/amend_grid.js

@@ -98,7 +98,7 @@ function initPage(companyInfo) {
                         selectRowData: {},
                     };
                     data.fillingFlag = "corrections" // 填报标记
-                    data.saveUserId = jgxxRyxx.bdReportResponse.zjlx + jgxxRyxx.bdReportResponse.zjhm;// 用户id
+                    data.saveUserId = "zxtb";// 用户id
                     window.mlistener.selectRowData = data;
                     window.open("/web/taxservicedesk/index.html#/taxTableList",'_blank');
                 }else {

static/biz/cancellation_grid.js

@@ -270,7 +270,7 @@ function initPage(companyInfo) {
                 selectRowData: {},
             };
             submitData.fillingFlag = "inventory" // 填报标记
-            submitData.saveUserId = jgxxRyxx.bdReportResponse.zjlx + jgxxRyxx.bdReportResponse.zjhm;// 用户id
+            data.saveUserId = "zxtb";// 用户id
             window.mlistener.selectRowData = submitData;
             window.open("/web/taxservicedesk/index.html#/taxTableList",'_blank');
         }else {

static/biz/declare_grid.js

@@ -89,7 +89,7 @@ function initPage(companyInfo) {
                         selectRowData: {},
                     };
                     data.fillingFlag = "normal" // 填报标记
-                    data.saveUserId = jgxxRyxx.bdReportResponse.zjlx + jgxxRyxx.bdReportResponse.zjhm;// 用户id
+                    data.saveUserId = "zxtb";// 用户id
                     window.mlistener.selectRowData = data;
                     window.open("/web/taxservicedesk/index.html#/taxTableList",'_blank');
                 }else {

static/biz/overdue_grid.js

@@ -240,7 +240,7 @@ function initPage(companyInfo) {
                 selectRowData: {},
             };
             submitData.fillingFlag = "inventory" // 填报标记
-            submitData.saveUserId = jgxxRyxx.bdReportResponse.zjlx + jgxxRyxx.bdReportResponse.zjhm;// 用户id
+            data.saveUserId = "zxtb";// 用户id
             window.mlistener.selectRowData = submitData;
             window.open("/web/taxservicedesk/index.html#/taxTableList",'_blank');
         }else {

static/js/tax/result.js

@@ -2359,7 +2359,7 @@ function leftMenuAddError() {
     if (JSON.stringify(GLOBAL_SHEET_ERROR[tableName]) != "{}") {
       if (!$errorDom.hasClass('has-error')) {
         $errorDom.addClass('has-error');
-        $errorDom.text($errorDom.text() + "【校验错误】");
+        $errorDom.text($errorDom.text() + "（校验错误）");
       }
     } else {
       if ($errorDom.hasClass('has-error')) {

static/js/year/result.js

@@ -987,7 +987,7 @@ function leftMenuAddError() {
     if (JSON.stringify(GLOBAL_SHEET_ERROR[tableName]) != "{}") {
       if (!$errorDom.hasClass('has-error')) {
         $errorDom.addClass('has-error');
-        $errorDom.text($errorDom.text() + "【校验错误】");
+        $errorDom.text($errorDom.text() + "（校验错误）");
       }
     } else {
       if ($errorDom.hasClass('has-error')) {

static/js/yearGLB/result.js

@@ -848,7 +848,7 @@ function leftMenuAddError() {
     if (JSON.stringify(GLOBAL_SHEET_ERROR[tableName]) != "{}") {
       if (!$errorDom.hasClass('has-error')) {
         $errorDom.addClass('has-error');
-        $errorDom.text($errorDom.text() + "【校验错误】");
+        $errorDom.text($errorDom.text() + "（校验错误）");
       }
     } else {
       if ($errorDom.hasClass('has-error')) {