From b7546c0dcc65d193b7a549aa267a70a1a2dcac61 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 14 十月 2024 08:42:53 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue b/north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue
index 5f5ce14..e9d678d 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue
@@ -335,6 +335,7 @@
}
function filterChanged(column){
+ //console.log(column)
gridOptions.loading=true
//绛涢�夋潯浠跺彂鐢熷彉鍖栨潯浠跺彂鐢熷彉鍖�
let value = column.datas[0]!=undefined?column.datas[0]:''
@@ -561,14 +562,20 @@
<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
+ v-model="option.data"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
</template>
<template #num2_filter="{ column, $panel }">
<div>
<div v-for="(option, index) in column.filters" :key="index">
- <vxe-select v-model="option.data" @change="changeFilterEvent($event, option, $panel)" :placeholder="$t('processCard.pleaseSelect')">
+ <vxe-select
+ v-model="option.data"
+ @change="changeFilterEvent($event, option, $panel)"
+ :placeholder="$t('processCard.pleaseSelect')">
<vxe-option value="0" :label="$t('basicData.unchecked')"></vxe-option>
<vxe-option value="1" :label="$t('basicData.partiallySelected')"></vxe-option>
<vxe-option value="2" :label="$t('basicData.selected')"></vxe-option>
--
Gitblit v1.8.0