From dc1a8783473d2a93344082013ec8014af1e75731 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 03 十二月 2024 15:44:41 +0800
Subject: [PATCH] 修改阿拉伯语切换
---
north-glass-erp/northglass-erp/src/views/sd/basicData/SearchBasicData.vue | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/sd/basicData/SearchBasicData.vue b/north-glass-erp/northglass-erp/src/views/sd/basicData/SearchBasicData.vue
index 412978b..1ac2bed 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/basicData/SearchBasicData.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/basicData/SearchBasicData.vue
@@ -233,12 +233,20 @@
}
const handleChange = () => {
- console.log(basic.value.basicType[1])
- request.get(`/basicData/BasicDataByType/${basic.value.basicType[0]}/${basic.value.basicType[1]}`).then(res => {
- if(res.code==='200'){
- xGrid.value.reloadData(res.data)
- }
- })
+ if(basic.value.basicType==null){
+ request.get('/basicData/getBasicData').then(res => {
+ if(res.code==='200'){
+ xGrid.value.reloadData(res.data)
+ }
+ })
+ }else{
+ request.get(`/basicData/BasicDataByType/${basic.value.basicType[0]}/${basic.value.basicType[1]}`).then(res => {
+ if(res.code==='200'){
+ xGrid.value.reloadData(res.data)
+ }
+ })
+ }
+
}
@@ -253,7 +261,7 @@
@change="handleChange"
:options="options"
clearable
- placeholder=""
+ :placeholder="$t('processCard.pleaseSelect')"
/>
</el-col>
</el-row>
@@ -277,7 +285,11 @@
<template #num1_filter="{ column, $panel }">
<div>
<div v-for="(option, index) in column.filters" :key="index">
- <input v-model="option.data" type="text" @input="changeFilterEvent($event, option, $panel)"/>
+ <input
+ v-model="option.data"
+ type="text"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
</template>
--
Gitblit v1.8.0