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/pp/machine/AddMachine.vue | 80 +++++++++++++++++++++-------------------
1 files changed, 42 insertions(+), 38 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/machine/AddMachine.vue b/north-glass-erp/northglass-erp/src/views/pp/machine/AddMachine.vue
index 544a4bc..766c591 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/machine/AddMachine.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/machine/AddMachine.vue
@@ -166,51 +166,55 @@
</script>
<template>
- <div class="main-div-customer">
- <vxe-grid
- ref="xGrid"
- class="mytable-scrollbar"
- height="650px"
- max-height="100%"
- v-bind="gridOptions"
- v-on="teamGridEvents"
+ <div style="width: 100%;height: 100%">
+ <div class="main-table">
+ <vxe-grid
+ ref="xGrid"
+ class="mytable-scrollbar"
+ height="100%"
+ v-bind="gridOptions"
+ v-on="teamGridEvents"
- >
+ >
- <template #num1_filter="{ column, $panel }">
- <div>
- <div v-for="(option, index) in column.filters" :key="index">
- <input v-model="option.data" type="text"
- @keyup.enter.native="$panel.confirmFilter()"
- @input="changeFilterEvent($event, option, $panel)"/>
+ <template #num1_filter="{ column, $panel }">
+ <div>
+ <div v-for="(option, index) in column.filters" :key="index">
+ <input v-model="option.data" type="text"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
+ </div>
</div>
- </div>
- </template>
- <!--宸ュ簭-->
- <template #basicCategory="{ row }">
- <vxe-select v-model="row.basicCategory"
- clearable
- filterable
- placeholder="">
- <vxe-option v-for="item in titleSelectJson.processType"
- :key="item.basic_name"
- :label="item.basic_name"
- :value="item.basic_name"/>
- </vxe-select>
- </template>
- <template #basicCategory_default="{ row }">
- <span>{{ row.basicCategory }}</span>
- </template>
- </vxe-grid>
-
+ </template>
+ <!--宸ュ簭-->
+ <template #basicCategory="{ row }">
+ <vxe-select v-model="row.basicCategory"
+ clearable
+ filterable
+ placeholder="">
+ <vxe-option v-for="item in titleSelectJson.processType"
+ :key="item.basic_name"
+ :label="item.basic_name"
+ :value="item.basic_name"/>
+ </vxe-select>
+ </template>
+ <template #basicCategory_default="{ row }">
+ <span>{{ row.basicCategory }}</span>
+ </template>
+ </vxe-grid>
+ </div>
</div>
</template>
<style scoped>
-.main-div-customer {
- width: 80%;
- margin: 0 auto;
- height: 100%;
+.head{
+ width: 100%;
+ height: 35px;
+}
+
+.main-table{
+ width: 100%;
+ height: calc(100% - 0px);
}
.vxe-grid {
/* 绂佺敤娴忚鍣ㄩ粯璁ら�変腑 */
--
Gitblit v1.8.0