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

src/components/Finance/Cost.vue

@@ -427,7 +427,7 @@
                     </div>
                     <div class="cost-info-li">
                         <!-- 客户名单 -->
-                        <el-popover class="clientinfo" placement="bottom" width="952" trigger="hover">
+                        <el-popover class="clientinfo" placement="bottom" width="1052" trigger="hover">
                             <el-table :cell-style="{ 'text-align': 'center' }"
                                 :header-cell-style="{ 'text-align': 'center' }" max-height="600" border
                                 :data="rollcallarr">
@@ -461,6 +461,11 @@
                                         {{ scope.row.idCardNo }}
                                     </template>
                                 </el-table-column>
+                                <el-table-column width="100" property="shippingSpaceType" label="舱位类型" align="center">
+                                    <template slot-scope="scope">
+                                        {{ scope.row.shippingSpaceType }}
+                                    </template>
+                                </el-table-column>
                                 <!-- <el-table-column width="110" property="birthDay" label="生日">
                                     <template slot-scope="scope">
                                         {{ fgarr(scope.row.birthDay) }}
@@ -2706,7 +2711,7 @@ export default {
                 {
                     "diid": 0,
                     "cbType": "Left",
-                    "cbValues": ['签证', '机票', '保险', '火车票', '地接', '公务', '零用金'] //"string"
+                    "cbValues": ['签证', '机票', '保险', '地接', '公务', '零用金'] //"string"
                 },
                 {
                     "diid": 0,
@@ -3820,7 +3825,7 @@ export default {
                             {
                                 "diid": that.diid,
                                 "cbType": "Left",
-                                "cbValues": ['签证', '机票', '保险', '火车票', '地接', '公务', '零用金'] //"string"
+                                "cbValues": ['签证', '机票', '保险', '地接', '公务', '零用金'] //"string"
                             },
                             {
                                 "diid": that.diid,
@@ -6979,6 +6984,63 @@ export default {
             })
 
 
+        },
+        hideAirInfo() {
+            const container = document.getElementsByClassName('sheet-box')[0];
+            var elem = null;
+            if (container) {
+                const elementsInContainer = container.querySelectorAll('*');
+                elementsInContainer.forEach((element) => {
+                    if (element.textContent == '公务舱单人成本(CNY)') {
+                        if (!this.isElementHidden(element)) {
+                            //console.log('找到包含内容且未隐藏的元素:', element);
+                            if (elem == null) {
+                                elem = element;
+                            }
+                        }
+                    }
+                });
+
+                if (elem && elem.tagName == 'TH') {
+
+                    const targetClassName = 'biaoge';
+                    let parent = elem;
+                    let hasParentWithClass = false;
+
+                    while (parent) {
+                        if (parent.classList && parent.classList.contains(targetClassName)) {
+                            hasParentWithClass = true;
+                            parent.style.display = 'none';
+                            break;
+                        }
+                        parent = parent.parentElement; // 移动到上一级父容器
+                    }
+
+
+                }
+
+            } else {
+                console.log('未找到指定的容器');
+            }
+        },
+        isElementHidden(element) {
+            if (element.style.display === 'none') {
+                return true;
+            }
+
+            if (element.hidden) {
+                return true;
+            }
+
+            if (element.style.visibility === 'hidden') {
+                return true;
+            }
+
+            if (element.offsetParent === null) {
+                return true;
+            }
+
+            return false;
         }
     },
     updated() {