Merge branch 'master' of http://47.101.159.18:3000/Muchinfo/MTP2.0_WEB

src/common/setup/table/clolumn.ts

@@ -73,6 +73,8 @@ export function getTableColumns() {
      * 更新动态表头
      */
     function updateColumn(value: object) {
+        console.log('过滤参数', value);
+
         filteredInfo.value = value
         registerColumn(cacheTableKey, cacheFilterKeyList, cacheColumnCB)
     }

src/layout/index.vue

@@ -1,23 +1,26 @@
 <template>
-    <div class="layout">
-        <LayoutTop @chooseMenu="chooseMenu" />
-        <!-- <template> -->
-        <!--v-if="isShowBottomPart" -->
-        <div class="sliderLayout">
-            <div class="shortLine"></div>
-        </div>
-        <LayoutBottom />
-        <!-- </template> -->
+  <div class="layout">
+    <LayoutTop @chooseMenu="chooseMenu" />
+    <!-- <template> -->
+    <!--v-if="isShowBottomPart" -->
+    <div class="sliderLayout">
+      <div class="shortLine"></div>
     </div>
+    <LayoutBottom />
+    <!-- </template> -->
+  </div>
 </template>
 <script lang="ts">
 import LayoutTop from './components/top.vue';
 import LayoutBottom from './components/bottom.vue';
 import { defineComponent, ref } from 'vue';
+import APP from '@/services';
+import { OperationTabMenu } from '@/services/go/commonService/interface';
+import { initData } from '@/common/methods';
 
 // 控制下半部分是否显示
 function submitBottomIsShow() {
-    const isShowBottomPart = ref<boolean>(false);
+    const isShowBottomPart = ref<boolean>(true);
     function chooseMenu(value: boolean) {
         isShowBottomPart.value = value;
     }
@@ -31,10 +34,16 @@ export default defineComponent({
         LayoutBottom,
     },
     setup() {
+        const menuList = APP.getRef('menus');
         const { isShowBottomPart, chooseMenu } = submitBottomIsShow();
-        const visible = ref<boolean>(true);
+        initData(() => {
+            // 判断是否有单据
+            if (menuList.value.find((e: OperationTabMenu) => e.code === 'bottom')) {
+                isShowBottomPart.value = true;
+            }
+        });
 
-        return { isShowBottomPart, chooseMenu, visible };
+        return { isShowBottomPart, chooseMenu };
     },
 });
 </script>
@@ -44,6 +53,9 @@ export default defineComponent({
     width: 100%;
     height: 100%;
     flex-direction: column;
+    .layout-bottom-container {
+        height: 329px;
+    }
     .sliderLayout {
         width: 100%;
         height: 4px;