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

jsp/amend/index.html

@@ -72,14 +72,7 @@
                 <!--跳转需要传递的参数-->
                 <form action="/amend/toGzPzzl" method="POST" target="_blank" id="changeForm_amend">
                     <input type='hidden' name='data' id="changeForm_data">
-                    <!-- <input type='hidden' name='token' id="changeForm_token">
-                <input type='hidden' name='pzzlDm' id="changeForm_pzzlDm">
-                <input type='hidden' name='sssqQ' id="changeForm_sssqQ">
-                <input type='hidden' name='sssqZ' id="changeForm_sssqZ">
-                <input type='hidden' name='sbbsx' id="changeForm_sbbsx"> -->
                 </form>
-                <input type='hidden' name='data' value="${djxh}" id="djxh">
-                <input type='hidden' name='data' value="${token}" id="token">
             </div>
         </div>
     </div>

jsp/cancellation/index.html

@@ -102,6 +102,7 @@
                 $("#djxh").attr("value", companyInfo.djxh);
                 initpage = initPage(companyInfo.content);
                 if (companyInfo.returnCode == "00") {
+                    config.value = companyInfo.content.value // 不一定对
                     companyInfo.content.config = config
                     initpage = initPage(companyInfo.content);
 

jsp/overdue/index.html

@@ -144,6 +144,7 @@
                 //el表达式变jq
                 // $("#token").attr("value","");
                 var companyInfo = data;
+                config.value = companyInfo.bean.value
                 $("#djxh").attr("value", companyInfo.djxh);
                 if (companyInfo.success) {
                     companyInfo.bean.config = config

static/biz/amend_grid.js

@@ -139,8 +139,7 @@ function initPage(companyInfo) {
                     // var form = $("#changeForm_amend");
                     // form.find("#changeForm_data").val(JSON.stringify(data));
                     // form.submit();
-
-                    var requestData = JSON.stringify(data);
+                    var requestData = data;
                     var falg = "amend";
                     showLoading()
                     $.ajax({
@@ -149,13 +148,18 @@ function initPage(companyInfo) {
                         url: url + "/ssfwpt/amend/toGzPzzl",
                         dataType: "json",  // 请求方式为jsonp
                         data: {
-                            data: requestData
+                            data: JSON.stringify(data)
                         },
                         success: function (data) {
                             hideLoading()
-                            localStorage.setItem("data", requestData);
+                            if(data.code == 99 || data.code == "99"){
+                                alertWarning(data.errmsg);
+                                return false
+                            }
                             requestData.flag = true;
-                            var url = config.spreadUrl+"/online_report/declare/toPzzl?falg=" + falg
+                            requestData.encryptKey = config.value + "1";
+                            localStorage.setItem("data", requestData);
+                            var url = config.spreadUrl+"/online_report/amend/toGzPzzl?falg=" + falg
                             var form = $("#changeForm_amend");
                             form.attr('action',url);    //通过jquery为action属性赋值
                             form.find("#changeForm_data").val(JSON.stringify(requestData));

static/biz/cancellation_grid.js

@@ -291,10 +291,15 @@ function initPage(companyInfo) {
                     data: JSON.stringify(submitData)
                 },
                 success: function (data) {
+                    if(data.code == 99 || data.code == "99"){
+                        alertWarning(data.errmsg);
+                        return false
+                    }
                     hideLoading()
                     localStorage.setItem("data",JSON.stringify(submitData));
                     console.log("请求成功", data)
                     submitData.flag = true;
+                    submitData.encryptKey = config.value;
                     var url = config.spreadUrl+"/online_report/declare/toPzzl?falg=" + falg
                     var form = $("#changeForm");
                     form.attr('action',url);    //通过jquery为action属性赋值

static/biz/declare_grid.js

@@ -337,11 +337,15 @@ function initPage(companyInfo) {
         },
         success: function (data) {
             hideLoading()
-          console.log("taxInfo:", JSON.stringify(submitData))
+          if(data.code == 99 || data.code == "99"){
+              alertWarning(data.errmsg);
+              return false
+          }
           window.taxInfo = JSON.stringify(submitData);
           localStorage.setItem("data", JSON.stringify(submitData));
           if (data.url == "edit.jsp") {
               submitData.flag = true;
+              submitData.encryptKey = config.value;
               var url = config.spreadUrl+"/online_report/declare/toPzzl?falg=" + falg
               var form = $("#changeForm");
               form.attr('action',url);    //通过jquery为action属性赋值

static/biz/overdue_grid.js

@@ -262,9 +262,14 @@ function initPage(companyInfo) {
                 },
                 success: function (data) {
                     hideLoading()
+                    if(data.code == 99 || data.code == "99"){
+                        alertWarning(data.errmsg);
+                        return false
+                    }
                     localStorage.setItem("data",JSON.stringify(submitData));
                     console.log("请求成功", data)
                     submitData.flag = true;
+                    submitData.encryptKey = config.value;
                     var url = config.spreadUrl+"/online_report/declare/toPzzl?falg=" + falg
                     var form = $("#changeForm");
                     form.attr('action',url);    //通过jquery为action属性赋值