From 26aa014b40fa80905990997bc848db975861c916 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 05 十二月 2024 13:27:48 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/mm/basicData/WarehouseSearchBasicData.vue | 49 +++++++++++++++++++++++++++++--------------------
1 files changed, 29 insertions(+), 20 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/mm/basicData/WarehouseSearchBasicData.vue b/north-glass-erp/northglass-erp/src/views/mm/basicData/WarehouseSearchBasicData.vue
index b31a144..ca7c14c 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/basicData/WarehouseSearchBasicData.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/basicData/WarehouseSearchBasicData.vue
@@ -156,27 +156,28 @@
</script>
<template>
- <div>
- <vxe-grid
- style="width: 40vw;"
- class="mytable-scrollbar"
- max-height="500px"
- ref="xGrid"
- v-bind="gridOptions"
- v-on="gridEvents"
- >
- <template #button_slot="{ row }">
- <el-button @click="getTableRow(row,'edit')"
- v-if="userStore.user.permissions.indexOf('warehouseSearchBasicData.edit') > -1"
- link type="primary" size="small">{{ $t('basicData.edit') }}</el-button>
- <el-popconfirm @confirm="getTableRow(row,'delete')" :title="$t('searchOrder.deleteConfirm')">
- <template #reference>
- <el-button link type="primary" size="small">{{ $t('basicData.delete') }}</el-button>
- </template>
- </el-popconfirm>
- </template>
+ <div style="width: 100%;height: 100%">
+ <div class="main-table">
+ <vxe-grid
+ class="mytable-scrollbar"
+ height="100%"
+ ref="xGrid"
+ v-bind="gridOptions"
+ v-on="gridEvents"
+ >
+ <template #button_slot="{ row }">
+ <el-button @click="getTableRow(row,'edit')"
+ v-if="userStore.user.permissions.indexOf('warehouseSearchBasicData.edit') > -1"
+ link type="primary" size="small">{{ $t('basicData.edit') }}</el-button>
+ <el-popconfirm @confirm="getTableRow(row,'delete')" :title="$t('searchOrder.deleteConfirm')">
+ <template #reference>
+ <el-button link type="primary" size="small">{{ $t('basicData.delete') }}</el-button>
+ </template>
+ </el-popconfirm>
+ </template>
- </vxe-grid>
+ </vxe-grid>
+ </div>
<el-dialog
v-model="dialogTableVisible"
destroy-on-close
@@ -187,5 +188,13 @@
</template>
<style scoped>
+.head{
+ width: 100%;
+ height: 70px;
+}
+.main-table{
+ width: 100%;
+ height: calc(100% - 0px);
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0