From de2c3068cdea54ffa36d2359b32abd9b8a144cde Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期一, 09 十二月 2024 14:49:47 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/processCard/SelectAddProcess.vue | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectAddProcess.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectAddProcess.vue
index 515e4ec..2d7f85b 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectAddProcess.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectAddProcess.vue
@@ -86,7 +86,7 @@
.toISOString()
.replace('T', ' ')
.slice(0, 10) //榛樿寮�濮嬫椂闂�7澶╁墠
- const end = new Date(new Date().getTime()+ 3600 * 1000 * 24)
+ const end = new Date(new Date().getTime())
.toISOString()
.replace('T', ' ')
.slice(0, 10)//榛樿缁撴潫鏃堕棿褰撳墠鏃堕棿
@@ -258,9 +258,8 @@
</script>
<template>
- <div class="main-div-customer">
- <div id="selectForm">
- <el-row :gutter="0">
+ <div style="width: 100%;height: 100%">
+ <div class="head">
<el-date-picker
v-model="orderInfo.workOrderDate"
:default-time="defaultTime"
@@ -277,11 +276,12 @@
id="select"
type="primary" :icon="Search">{{$t('basicData.search')}}
</el-button>
- </el-row>
</div>
+
+ <div class="main-table">
<vxe-grid
- height="95%"
+ height="100%"
@filter-change="filterChanged"
class="mytable-scrollbar"
ref="xGrid"
@@ -316,13 +316,16 @@
<template #num1_filter="{ column, $panel }">
<div>
<div v-for="(option, index) in column.filters" :key="index">
- <input type="type" v-model="option.data" @input="changeFilterEvent($event, option, $panel)"/>
+ <input type="type" v-model="option.data"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
</template>
</vxe-grid>
+ </div>
</div>
</template>
@@ -335,4 +338,13 @@
width: 50%;
text-align: center;
}
+.head{
+ width: 100%;
+ height: 35px;
+}
+
+.main-table{
+ width: 100%;
+ height: calc(100% - 35px);
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0