合并代码

src/views/tower/project/index.vue

@@ -10,6 +10,8 @@
           :datasource="datasource"
           v-model:selection="selection"
           :customRow="customRow"
+          :height="tableHeight"
+          :full-height="fixedHeight ? 'calc(100vh - 100px)' : void 0"
           tool-class="ele-toolbar-form"
           :scroll="{ x: 1200 }"
           class="sys-org-table"
@@ -21,7 +23,6 @@
               :selection="selection"
               @add="openEdit"
               @remove="removeBatch"
-              @advanced="openAdvanced"
             />
           </template>
           <template #bodyCell="{ column, record }">
@@ -33,9 +34,9 @@
             </template>
             <template v-if="column.key === 'action'">
               <a-space>
-                <a @click="openEdit(record)">库存查看</a>
+                <a @click="openEdit(record)">修改</a>
                 <a-divider type="vertical" />
-                <a @click="openEdit(record)">项目年报</a>
+                <a @click="openEdit(record)">库存查看</a>
               </a-space>
             </template>
           </template>
@@ -50,7 +51,7 @@
 </template>
 
 <script lang="ts" setup>
-  import { createVNode, ref } from 'vue';
+  import { createVNode, computed, ref } from 'vue';
   import { message, Modal } from 'ant-design-vue';
   import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
   import type { EleProTable } from 'ele-admin-pro';
@@ -129,7 +130,7 @@
     {
       title: '操作',
       key: 'action',
-      width: 200,
+      width: 150,
       align: 'center',
       hideInSetting: true
     }
@@ -143,8 +144,12 @@
   const showInfo = ref(false);
   // 是否显示编辑弹窗
   const showEdit = ref(false);
-  // 是否显示高级搜索
-  const showAdvancedSearch = ref(false);
+  // 表格固定高度
+  const fixedHeight = ref(true);
+  // 表格高度
+  const tableHeight = computed(() => {
+    return fixedHeight.value ? 'calc(100vh - 308px)' : void 0;
+  });
 
   // 表格数据源
   const datasource: DatasourceFunction = ({
@@ -195,11 +200,6 @@
     showInfo.value = true;
   };
 
-  /* 打开高级搜索 */
-  const openAdvanced = () => {
-    showAdvancedSearch.value = !showAdvancedSearch.value;
-  };
-
   /* 删除单个 */
   const remove = (row: Project) => {
     const hide = message.loading('请求中..', 0);