按钮添加 逻辑

static/js/tax/result.js

@@ -58,6 +58,8 @@ $(document).ready(function () {
       topBtnHtml += '<button class="htbutton import" id="correctionsBtn"> 更正 </button>'
     } else if (GLOBAL_JSON.operateType == "5") {
       topBtnHtml += '<button class="htbutton import" id="overdueBtn"> 逾期申报 </button>';
+    } else if (GLOBAL_JSON.operateType == "6") {
+        topBtnHtml += '<button class="htbutton import" id="cancellationBtn"> 清册注销 </button>';
     } else {
        topBtnHtml += '<button class="htbutton" id="storageBtn"> 暂存 </button> <button class="htbutton" id="saveBtn"> 保存 </button> <button class="htbutton import" id="uploadDataBtn"> 申报 </button>  <button class="htbutton" id="importInBtn"> 导入 </button>  <button class="htbutton" id="exportOutBtn"> 导出 </button> <button class="htbutton" id="resetCurrentBtn" title="重置当前报表数据"> 重置当前报表 </button>  <button class="htbutton resetAll" id="resetBtn" title="重置所有报表数据"> 全部重置 </button>';
        //topBtnHtml = '<button class="htbutton import" id="storageBtn"> 开始申报 </button>';
@@ -74,6 +76,12 @@ $(document).ready(function () {
   });
   $(".button-group").html(topBtnHtml);
 
+  //清册注销
+  $("#cancellationBtn").on('click', function (e) {
+    e.preventDefault();
+    saveData(6);
+  });
+
   //逾期按钮
   $("#overdueBtn").on('click', function (e) {
     e.preventDefault();
@@ -737,11 +745,11 @@ function saveData(operateType,isshenbao,isZcfxtx,isconfirm) {
                       }
                       showLoading();
                       var url =  URL +"/ssfwpt/declare/save";
-                      if(localStorage["cancellation"] && "cancellation" == localStorage["cancellation"]){
-                        pagedata.operateType = 6;
-                      }else{
+                      // if(localStorage["cancellation"] && "cancellation" == localStorage["cancellation"]){
+                      //   pagedata.operateType = 6;
+                      // }else{
                         pagedata.operateType = operateType;
-                      }
+                      // }
 
                        if (operateType == 4) {
                           url = URL +"/ssfwpt/amend/save";
@@ -910,11 +918,11 @@ function saveData(operateType,isshenbao,isZcfxtx,isconfirm) {
                   }
                   showLoading();
                   var url =  URL +"/ssfwpt/declare/save";
-                  if(localStorage["cancellation"] && "cancellation" == localStorage["cancellation"]){
-                    pagedata.operateType = 6;
-                  }else{
+                  // if(localStorage["cancellation"] && "cancellation" == localStorage["cancellation"]){
+                  //   pagedata.operateType = 6;
+                  // }else{
                     pagedata.operateType = operateType;
-                  }
+                  // }
 
                    if (operateType == 4) {
                       url = URL +"/ssfwpt/amend/save";
@@ -1083,11 +1091,11 @@ function saveData(operateType,isshenbao,isZcfxtx,isconfirm) {
              }
              showLoading();
              var url =  URL +"/ssfwpt/declare/save";
-             if(localStorage["cancellation"] && "cancellation" == localStorage["cancellation"]){
-               pagedata.operateType = 6;
-             }else{
+             // if(localStorage["cancellation"] && "cancellation" == localStorage["cancellation"]){
+             //   pagedata.operateType = 6;
+             // }else{
                pagedata.operateType = operateType;
-             }
+             // }
 
               if (operateType == 4) {
                  url = URL +"/ssfwpt/amend/save";
@@ -1256,11 +1264,11 @@ function saveData(operateType,isshenbao,isZcfxtx,isconfirm) {
          }
          showLoading();
          var url =  URL +"/ssfwpt/declare/save";
-         if(localStorage["cancellation"] && "cancellation" == localStorage["cancellation"]){
-           pagedata.operateType = 6;
-         }else{
+         // if(localStorage["cancellation"] && "cancellation" == localStorage["cancellation"]){
+         //   pagedata.operateType = 6;
+         // }else{
            pagedata.operateType = operateType;
-         }
+         // }
 
           if (operateType == 4) {
              url = URL +"/ssfwpt/amend/save";

static/js/tax/specialHandler.js

@@ -3099,7 +3099,7 @@ function getFJS(flag) {
                          if(item.zspmMc.indexOf("消费税") != -1 && GLOBAL_JSON.qtxx){
                              var xfsYbtse = GLOBAL_JSON.qtxx.xfsYbtse ? GLOBAL_JSON.qtxx.xfsYbtse : 0;
                              xfsYbtse > 0 ? xfsYbtse = xfsYbtse : xfsYbtse = 0;
-                             setCellValue(oldSheetIndex1,startRowIndex1, 2, xfsYbtse);
+                             setCellValue(oldSheetIndex1,startRowIndex1, 4, xfsYbtse);
                          }
                    }
 
@@ -3431,28 +3431,33 @@ function get10102_009Info(){
           v2_ = GLOBAL_JSON.wsxx["HDYNSE_FW_BNLJ"]["value"];
       }
       setCellValue(0, 24, 8, parseInt(v2_)+parseInt(v2__));
-     var startRowIndex = 9;
-     var startRowIndex_ = 17;
-     var tableName = "table_10102_009",
-     sheetIndex = spread.getSheetIndex(tableName);
-     var oldSheetIndex = data.sheets[tableName].index;
-     var List = GLOBAL_JSON.jmxz[10101];
-     var JSXXList = [],
-     MSXXList = [];
-     List.forEach(function(item,index){
-        if("JSXX" == item.type){
-            var value = item.dm.split("|")[0] + " " + item.jc
-            JSXXList.push(value)
-        }
-        if("MSXX" == item.type){
-            var value = item.dm.split("|")[0] + " " + item.jc
-            MSXXList.push(value)
-        }
-     })
-         newCellType(sheetIndex, startRowIndex,1, 'select', JSXXList)
-         setCellLoked(sheetIndex, startRowIndex,1,false);
-         newCellType(sheetIndex, startRowIndex_,1, 'select', MSXXList)
-         setCellLoked(sheetIndex, startRowIndex_,1,false);
+    //  var startRowIndex = 9;
+    //  var startRowIndex_ = 17;
+    //  var tableName = "table_10102_009",
+    //  sheetIndex = spread.getSheetIndex(tableName);
+    //  var oldSheetIndex = data.sheets[tableName].index;
+    //  var List = GLOBAL_JSON.jmxz[10101];
+    //  var JSXXList = [],
+    //  MSXXList = [];
+    //  List.forEach(function(item,index){
+    //     if("JSXX" == item.type){
+    //         var value = item.dm.split("|")[0] + " " + item.jc
+    //         JSXXList.push(value)
+    //     }
+    //     if("MSXX" == item.type){
+    //         var value = item.dm.split("|")[0] + " " + item.jc
+    //         MSXXList.push(value)
+    //     }
+    //  })
+    // MSXXList.push("   ")
+    //      var v = getCellValue(sheetIndex, startRowIndex, 1);
+    //      var v_2 = getCellValue(sheetIndex, startRowIndex_, 1);
+    //      newCellType(sheetIndex, startRowIndex,1, 'select', JSXXList)
+    //      setCellLoked(sheetIndex, startRowIndex,1,false);
+    //      newCellType(sheetIndex, startRowIndex_,1, 'select', MSXXList)
+    //      setCellLoked(sheetIndex, startRowIndex_,1,false);
+    //      setCellValue(sheetIndex, startRowIndex, 1, v);
+    //      setCellValue(sheetIndex, startRowIndex_, 1, v_2);
 
 }
 

static/js/year/result.js

@@ -1699,6 +1699,12 @@ function saveResultHandler(data, operateType,isZcfxtx) {
 
 
 function _bindTopButtonEvent() {
+  //清册注销
+  $("#cancellationBtn").on('click', function (e) {
+    e.preventDefault();
+    saveData(6);
+  });
+
   //逾期按钮
   $("#overdueBtn").on('click', function (e) {
     e.preventDefault();

static/js/year/specialHandler.js

@@ -363,11 +363,6 @@ function bindValueChanged() {
                      setCellValue(activeSheetIndex, 14, 4, 0);
                  });
             }
-              if(FYLZZ && "N" == FYLZZ){
-                   myAlert("提示", "目前你尚未进行非营利组织免税资格认定，不能填报本行。", "确定", function () {
-                       setCellValue(activeSheetIndex, 14, 4, 0);
-                   });
-              }
           }
       break;
       case '10414_034':
@@ -890,7 +885,7 @@ function bindNbCellClickEvent() {
                     var FYLZZ = GLOBAL_JSON.wsxx ? GLOBAL_JSON.wsxx : {};
                     FYLZZ = FYLZZ.FYLZZ ? FYLZZ.FYLZZ : {};
                     FYLZZ = FYLZZ["value"] ? FYLZZ["value"] : null;
-                    if(FYLZZ && "Y" == FYLZZ){
+                    if(FYLZZ && "N" == FYLZZ){
                          myAlert("提示", "目前你尚未进行非营利组织免税资格认定，不能填报本行。", "确定", function () {
                              setCellValue(activeSheetIndex, 14, 4, 0);
                          });

static/js/year/util.js

@@ -263,7 +263,13 @@ function addLeftItem(flag, NBindex) {
                 }
             });
         } else if (tableName == 'table_10414_051' || tableName == 'table_10414_052' || tableName == 'table_10414_053') {
+            if (GLOBAL_JSON.operateType == "6") {
+                var topBtnHtml = '<button class="htbutton import" id="cancellationBtn"> 清册注销 </button> <button class="htbutton import" id="zcfxts"> 政策风险扫描 </button> <button class="htbutton import" id="addZrf"> 增加转让方 </button> <button class="htbutton import" id="deleteZrf"> 删除转让方 </button>';
+            }else if (GLOBAL_JSON.operateType == "5") {
+                var topBtnHtml = '<button class="htbutton import" id="overdueBtn"> 逾期申报 </button> <button class="htbutton import" id="zcfxts"> 政策风险扫描 </button> <button class="htbutton import" id="addZrf"> 增加转让方 </button> <button class="htbutton import" id="deleteZrf"> 删除转让方 </button>';
+            }else {
                 var topBtnHtml = '<button class="htbutton" id="storageBtn"> 暂存 </button> <button class="htbutton" id="saveBtn"> 保存 </button> <button class="htbutton import" id="zcfxts"> 政策风险扫描 </button><button class="htbutton import" id="uploadDataBtn"> 申报 </button> <button class="htbutton" id="exportOutBtn"> 导出 </button> <button class="htbutton" id="resetCurrentBtn" title="重置当前报表数据"> 重置当前报表 </button>  <button class="htbutton resetAll" id="resetBtn" title="重置所有报表数据"> 全部重置 </button> <button class="htbutton import" id="addZrf"> 增加转让方 </button> <button class="htbutton import" id="deleteZrf"> 删除转让方 </button>';
+            }
             if(isGZflag){
                 topBtnHtml = '  <button class="htbutton import" id="uploadDataBtn"> 更正 </button> <button class="htbutton resetAll" id="resetBtn" title="重置所有报表数据"> 全部重置 </button> ';
             }
@@ -278,7 +284,13 @@ function addLeftItem(flag, NBindex) {
                 deleteZrf_051(tableName);
             });
         } else if (tableName == 'table_10414_059' || tableName == 'table_10414_060' || tableName == 'table_10414_061') {
+            if (GLOBAL_JSON.operateType == "6") {
+                var topBtnHtml = '<button class="htbutton import" id="cancellationBtn"> 清册注销 </button> <button class="htbutton import" id="zcfxts"> 政策风险扫描 </button> <button class="htbutton import" id="addFlqy"> 增加分立企业 </button> <button class="htbutton import" id="deleteFlqy"> 删除分立企业 </button>';
+            }else if (GLOBAL_JSON.operateType == "5") {
+                var topBtnHtml = '<button class="htbutton import" id="overdueBtn"> 逾期申报 </button> <button class="htbutton import" id="zcfxts"> 政策风险扫描 </button> <button class="htbutton import" id="addFlqy"> 增加分立企业 </button> <button class="htbutton import" id="deleteFlqy"> 删除分立企业 </button>';
+            }else {
                 var topBtnHtml = '<button class="htbutton" id="storageBtn"> 暂存 </button> <button class="htbutton" id="saveBtn"> 保存 </button> <button class="htbutton import" id="zcfxts"> 政策风险扫描 </button> <button class="htbutton import" id="uploadDataBtn"> 申报 </button> <button class="htbutton" id="exportOutBtn"> 导出 </button> <button class="htbutton" id="resetCurrentBtn" title="重置当前报表数据"> 重置当前报表 </button>  <button class="htbutton resetAll" id="resetBtn" title="重置所有报表数据"> 全部重置 </button> <button class="htbutton import" id="addFlqy"> 增加分立企业 </button> <button class="htbutton import" id="deleteFlqy"> 删除分立企业 </button>';
+            }
             if(isGZflag){
                  topBtnHtml = ' <button class="htbutton import" id="uploadDataBtn"> 更正 </button> <button class="htbutton resetAll" id="resetBtn" title="重置所有报表数据"> 全部重置 </button> ';
              }
@@ -293,7 +305,13 @@ function addLeftItem(flag, NBindex) {
                 deleteFlqy(tableName);
             });
         } else if (tableName == 'table_10414_038') {
+            if (GLOBAL_JSON.operateType == "6") {
+                var topBtnHtml = '<button class="htbutton import" id="cancellationBtn"> 清册注销 </button> <button class="htbutton import" id="pullFj"> 提取附表 </button> <button class="htbutton import" id="zcfxts"> 政策风险扫描 </button>';
+            }else if (GLOBAL_JSON.operateType == "5") {
+                var topBtnHtml = '<button class="htbutton import" id="overdueBtn"> 逾期申报 </button> <button class="htbutton import" id="pullFj"> 提取附表 </button> <button class="htbutton import" id="zcfxts"> 政策风险扫描 </button>';
+            }else {
                 var topBtnHtml = '<button class="htbutton import" id="pullFj"> 提取附表 </button> <button class="htbutton" id="storageBtn"> 暂存 </button> <button class="htbutton" id="saveBtn"> 保存 </button> <button class="htbutton import" id="zcfxts"> 政策风险扫描 </button> <button class="htbutton import" id="uploadDataBtn"> 申报</button> <button class="htbutton" id="exportOutBtn"> 导出 </button> <button class="htbutton" id="resetCurrentBtn" title="重置当前报表数据"> 重置当前报表 </button> <button class="htbutton resetAll" id="resetBtn" title="重置所有报表数据"> 全部重置 </button>';
+            }
             if(isGZflag){
                 topBtnHtml = '<button class="htbutton import" id="pullFj"> 提取附表 </button> <button class="htbutton import" id="uploadDataBtn"> 更正 </button> <button class="htbutton resetAll" id="resetBtn" title="重置所有报表数据"> 全部重置 </button> ';
             }
@@ -305,7 +323,13 @@ function addLeftItem(flag, NBindex) {
                 pullFj();
             });
         } else {
+            if (GLOBAL_JSON.operateType == "6") {
+                var topBtnHtml = '<button class="htbutton import" id="cancellationBtn"> 清册注销 </button> <button class="htbutton import" id="zcfxts"> 政策风险扫描 </button>';
+            }else if (GLOBAL_JSON.operateType == "5") {
+                var topBtnHtml = '<button class="htbutton import" id="overdueBtn"> 逾期申报 </button> <button class="htbutton import" id="zcfxts"> 政策风险扫描 </button>';
+            }else {
                 var topBtnHtml = '<button class="htbutton" id="storageBtn"> 暂存 </button> <button class="htbutton" id="saveBtn"> 保存 </button> <button class="htbutton import" id="zcfxts"> 政策风险扫描 </button> <button class="htbutton import" id="uploadDataBtn"> 申报 </button> <button class="htbutton" id="exportOutBtn"> 导出 </button> <button class="htbutton" id="resetCurrentBtn" title="重置当前报表数据"> 重置当前报表 </button>  <button class="htbutton resetAll" id="resetBtn" title="重置所有报表数据"> 全部重置 </button>';
+            }
             if(isGZflag){
                topBtnHtml = ' <button class="htbutton import" id="uploadDataBtn"> 更正 </button> <button class="htbutton resetAll" id="resetBtn" title="重置所有报表数据"> 全部重置 </button> ';
            }

static/js/yearGLB/result.js

@@ -1305,6 +1305,12 @@ function saveResultHandler(data, operateType) {
 
 
 function _bindTopButtonEvent() {
+  //清册注销
+  $("#cancellationBtn").on('click', function (e) {
+    e.preventDefault();
+    saveData(6);
+  });
+
   //逾期按钮
   $("#overdueBtn").on('click', function (e) {
     e.preventDefault();

static/js/yearGLB/util.js

@@ -125,7 +125,13 @@ function addLeftItem(flag, NBindex) {
                 selectNb();
             });
         } else if (tableName == 'table_10420_005') {
+            if (GLOBAL_JSON.operateType == "6") {
+                var topBtnHtml = '<button class="htbutton import" id="cancellationBtn"> 清册注销 </button> <button class="htbutton" id="saveGlf"> 保存关联方 </button> ';
+            }else if (GLOBAL_JSON.operateType == "5") {
+                var topBtnHtml = '<button class="htbutton import" id="overdueBtn"> 逾期申报 </button> <button class="htbutton" id="saveGlf"> 保存关联方 </button> ';
+            }else {
                 var topBtnHtml = ' <button class="htbutton" id="importInBtn"> 导入 </button><button class="htbutton" id="saveGlf"> 保存关联方 </button> <button class="htbutton" id="storageBtn"> 暂存 </button> <button class="htbutton" id="saveBtn"> 保存 </button> <button class="htbutton import" id="uploadDataBtn"> 申报 </button> <button class="htbutton" id="exportOutBtn"> 导出 </button> <button class="htbutton" id="resetCurrentBtn" title="重置当前报表数据"> 重置当前报表 </button>  <button class="htbutton resetAll" id="resetBtn" title="重置所有报表数据"> 全部重置 </button>';
+            }
             if(isGZflag){
                 topBtnHtml = '<button class="htbutton import" id="uploadDataBtn"> 更正 </button> <button class="htbutton" id="resetCurrentBtn" title="重置当前报表数据"> 重置当前报表 </button> <button class="htbutton resetAll" id="resetBtn" title="重置所有报表数据"> 全部重置 </button> ';
             }
@@ -138,7 +144,13 @@ function addLeftItem(flag, NBindex) {
                 })
             });
         } else {
+            if (GLOBAL_JSON.operateType == "6") {
+                var topBtnHtml = '<button class="htbutton import" id="cancellationBtn"> 清册注销 </button>';
+            }else if (GLOBAL_JSON.operateType == "5") {
+                var topBtnHtml = '<button class="htbutton import" id="overdueBtn"> 逾期申报 </button>';
+            }else {
                 var topBtnHtml = ' <button class="htbutton" id="importInBtn"> 导入 </button><button class="htbutton" id="storageBtn"> 暂存 </button> <button class="htbutton" id="saveBtn"> 保存 </button> <button class="htbutton import" id="uploadDataBtn"> 申报 </button> <button class="htbutton" id="exportOutBtn"> 导出 </button> <button class="htbutton" id="resetCurrentBtn" title="重置当前报表数据"> 重置当前报表 </button>  <button class="htbutton resetAll" id="resetBtn" title="重置所有报表数据"> 全部重置 </button>';
+            }
             if(isGZflag){
                topBtnHtml = '<button class="htbutton import" id="uploadDataBtn"> 更正 </button> <button class="htbutton" id="resetCurrentBtn" title="重置当前报表数据"> 重置当前报表 </button> <button class="htbutton resetAll" id="resetBtn" title="重置所有报表数据"> 全部重置 </button> ';
             }