1.解决bug29338，合并代码有误 2.解决bug29340，5分钟保存不应弹出控制面板 3.增加注释

src/components/saveButton.vue

@@ -2,7 +2,7 @@
 import { types } from 'util';
  * @Author: zqm
  * @Date: 2021-06-28 15:44:47
- * @LastEditTime: 2022-04-18 13:37:53
+ * @LastEditTime: 2022-04-18 16:02:27
  * @LastEditors: Please set LastEditors
  * @Description: 保存按钮
  * @FilePath: \taxFormToolFramework\src\components\saveButton.vue
@@ -42,31 +42,32 @@ export default {
     saveFun(type) {
       var tableData = this.$store.state.data.engines;
       var saveTableData = tableData.getTableData();
-      var checkList = saveTableData.checkList.checkList
+      var checkList = saveTableData.checkList.checkList;//获取表间校验
       this.$store.commit("checkList", checkList);
       //清除定位
       tableData.clearDefectBackgroundColor();
       if (this.$store.state.data.platform != "2") {
-        if (this.buttonName == "保存" && !['tab', 'export', "modal", 'declare', "initModal"].includes(type)) {
+        //切表、导出、弹窗、申报、弹窗初始化保存结构、5分钟保存不提示校验
+        if (this.buttonName == "保存" && !['tab', 'export', 'declare', "initModal", 'timing'].includes(type)) {
           //保存时的校验
           var alertList = this.$store.state.data.configData.alert
           var saveModalList = Enumerable.From(alertList).Where(function (val) { return val.type == "2" }).ToArray();
-          if (saveModalList.length > 0) {//展示弹窗，再调表内校验
+          if (saveModalList.length > 0) {//展示保存弹窗，再调表内校验
             var obj = this.recursionParent(this.$parent, "inTablemodal")
             obj.initModal("save")
           } else {
             //表内校验
-            if (this.$store.state.data.platform == "1") {
+            if (this.$store.state.data.platform == "1") {//弹窗
               var obj = this.recursionParent(this.$parent, "checkResult")
               obj.inTableCheck()
             }
-            //税收调查
-            if (this.$store.state.data.platform == "3") {
+            if (this.$store.state.data.platform == "3") {//控制面板
               var obj = this.recursionParent(this.$parent, "infoBar")
               obj.initCheck(checkList)
             }
           }
         }
+        //根据弹窗选择或者所填更新表内数据时，不应保存两次(bug29305)，更新完表内节点再保存
         if (["10101_002", "10102_001"].includes(this.$store.state.data.bblxHeader.bbDm) && type != "modal") {
           var alertList = this.$store.state.data.configData.alert
           var saveModalList = Enumerable.From(alertList).Where(function (val) { return val.type == "2" }).ToArray();
@@ -88,20 +89,20 @@ export default {
         //整理保存数据
         var saveData = {}
         saveData.bblxHeader = this.$store.state.data.bblxHeader;
-        saveData.bblxHeader.bczt = this.buttonName != "保存" ? "Z" : (checkFlag ? "N" : 'Y')
+        saveData.bblxHeader.bczt = this.buttonName != "保存" ? "Z" : (checkFlag ? "N" : 'Y')//Z:暂存 N：保存错误 Y：保存正确
         saveData.data = [];
         if (this.$store.state.data.platform != "3") {
-          this.$store.state.data.saveStructure.header.verificationState = checkFlag ? false : true;
+          this.$store.state.data.saveStructure.header.verificationState = checkFlag ? false : true;//false：保存错误 true：保存正确
         } else {//审核说明
-          if (checkFlag) {
+          if (checkFlag) {//存在拦截性校验
             var checkJson = this.$store.state.data.checkJson
-            if (_self.$store.state.data.openData.isBj == "Y") {
-              var shsmJson = Enumerable.From(checkJson).Where(function (val) { return val.flag == "bn" }).ToArray()
+            if (_self.$store.state.data.openData.isBj == "Y") {//存在表间校验
+              var shsmJson = Enumerable.From(checkJson).Where(function (val) { return val.flag == "bn" }).ToArray()//过滤只剩表内校验
             } else {
-              var shsmJson = Enumerable.From(checkJson).Where(function (val) { return !val.bbdm }).ToArray()
+              var shsmJson = Enumerable.From(checkJson).Where(function (val) { return !val.bbdm }).ToArray()//填写了审核说明的本表表内
             }
-            var shsmList = Enumerable.From(checkList).Where(function (val) { return val.shsmbz == 'Y' }).ToArray()
-            if (shsmJson.length == shsmList.length) {
+            var shsmList = Enumerable.From(checkList).Where(function (val) { return val.shsmbz == 'Y' }).ToArray();//需要填写审核说明的表内校验
+            if (shsmJson.length == shsmList.length) {//判断长度是否相等
               this.$store.state.data.saveStructure.header.verificationState = true;
             } else {
               this.$store.state.data.saveStructure.header.verificationState = false;
@@ -131,12 +132,9 @@ export default {
           if (data.returnCode == '00') {
             _self.$parent.$parent.$emit('changeSelected', "saveButton");
             _self.$store.commit("saveStatus", true);
-            if (!['export'].includes(type)) {
-              if (type != "declare") {
-                _self.$message({ message: '保存报表成功！', type: 'success' });
-              }
+            if (!['export'].includes(type)) {//导出数据不改变报表状态
               if (_self.$store.state.data.platform == "1") {
-                if (type != "declare") {
+                if (!['declare', 'initModal'].includes(type)) {
                   _self.$message({ message: '保存报表成功！', type: 'success' });
                 }
                 //更新报表状态
@@ -144,12 +142,12 @@ export default {
                   return val.bbDm + '_' + val.detailPcdm == saveData.bblxHeader.bbDm + '_' + saveData.bblxHeader.detailPcdm
                 }).ToArray()[0]
                 menu.verificationState = checkFlag ? false : true;
-                if (type == "declare") {
+                if (type == "declare") {//申报保存成功后调用表间校验
                   var nextObj = _self.recursionParent(_self.$parent, "checkResult");
                   nextObj.betweenTableCheck('init');
                 }
               }
-              if (_self.$store.state.data.platform == "3") {
+              if (_self.$store.state.data.platform == "3" && type != "timing") {//税收调查保存审核说明（5分钟保存不保存审核说明）
                 _self.saveAudit(saveData)
               }
             }
@@ -204,9 +202,9 @@ export default {
     },
     //保存审核说明
     saveAudit(saveData) {
-      console.log("checkJson", this.$store.state.data.checkJson);
       var _self = this
       var saveJsonUrl = interfacePrefix + config.saveTaxCheckJson;
+      //整理保存数据
       var checkJson = this.$store.state.data.checkJson
       var openData = this.$store.state.data.openData;
       saveData.bblxHeader.bczt = 'Y';
@@ -242,7 +240,6 @@ export default {
         flag: flag
       }
       this.ajax.post(saveJsonUrl, params, function (data) {
-        console.log("saveAudit", data);
         _self.$message({ message: '保存报表成功！', type: 'success' });
         //更新校验
         var tableData = _self.$store.state.data.engines;
@@ -250,11 +247,13 @@ export default {
         var checkList = saveTableData.checkList.checkList
         var obj = _self.recursionParent(_self.$parent, "infoBar")
         obj.initCheck(checkList)
+        //报表状态回调
         if (!["", "{}", undefined, null].includes(window.opener)) {
           window.opener.mlistener.returnSelectRowData = saveData.data[0].header;
         }
       }, "json", true);
     },
+    //formname节点赋值
     getFormname(bbDm) {
       var formname = ""
       switch (bbDm) {