Merge branch 'master' of http://132.232.92.186:3000/XinXiBu/oa-system

src/components/Finance/Cost.vue

@@ -5261,6 +5261,9 @@ export default {
         },
         costTypeSelect(val) {
             ////////console.log('costTypeSelect--------------------------------------------------------', val);
+            setTimeout(() => {
+                this.hideAirInfo();
+            }, 300);
         },
         async formVerify() {
             return new Promise((resolve, reject) => {
@@ -7063,7 +7066,7 @@ export default {
         hideAirInfo() {
 
             var settomgAir = [
-                { key: "经济舱", text: "经济舱单人成本(CNY)" },
+                //{ key: "经济舱", text: "经济舱单人成本(CNY)" },
                 { key: "公务舱", text: "公务舱单人成本(CNY)" },
                 { key: "头等舱", text: "头等舱单人成本(CNY)" }
             ];
@@ -7079,6 +7082,18 @@ export default {
             const container = document.getElementsByClassName('sheet-box')[0];
 
             if (container) {
+
+                container.querySelectorAll('.biaoge').forEach((item) => {
+                    item.style.display = 'block';
+                })
+
+                if (this.costTypevalue == 'B') {
+                    container.querySelectorAll('.biaogeB').forEach((item) => {
+                        item.style.display = 'block';
+                    })
+                    hideAirInfoArr = [...hideAirInfoArr, ...hideAirInfoArr];
+                }
+
                 hideAirInfoArr.forEach((item) => {
                     var elem = null;
                     const elementsInContainer = container.querySelectorAll('*');
@@ -7101,7 +7116,13 @@ export default {
                         let hasParentWithClass = false;
 
                         while (parent) {
-                            if (parent.classList && parent.classList.contains(targetClassName)) {
+                            var isBool = parent.classList && parent.classList.contains(targetClassName);
+
+                            if (this.costTypevalue == 'B' && !isBool) {
+                                isBool = parent.classList && parent.classList.contains('biaogeB');
+                            }
+
+                            if (isBool) {
                                 hasParentWithClass = true;
                                 parent.style.display = 'none';
                                 break;