From 4aec2799e2b36dc38e212869790cb465d1c273c6 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 01 八月 2024 09:34:44 +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 | 8 ++++----
north-glass-erp/northglass-erp/src/lang/en.js | 4 ++++
north-glass-erp/northglass-erp/src/views/sd/product/SelectProduct.vue | 4 ++--
north-glass-erp/northglass-erp/src/lang/zh.js | 4 ++++
4 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/lang/en.js b/north-glass-erp/northglass-erp/src/lang/en.js
index 3414a9a..03caad0 100644
--- a/north-glass-erp/northglass-erp/src/lang/en.js
+++ b/north-glass-erp/northglass-erp/src/lang/en.js
@@ -64,6 +64,10 @@
false:'No',
computedSize:'Scientific counting',
paste:'Paste',
+
+ selected:'selected',
+ partiallySelected:'partially selected',
+ unchecked :'unchecked',
msg:{
max255:"The value contains a maximum of 255 characters",
range99999Dec2:
diff --git a/north-glass-erp/northglass-erp/src/lang/zh.js b/north-glass-erp/northglass-erp/src/lang/zh.js
index 6e6a437..522cdfc 100644
--- a/north-glass-erp/northglass-erp/src/lang/zh.js
+++ b/north-glass-erp/northglass-erp/src/lang/zh.js
@@ -64,6 +64,10 @@
false:'鍚�',
computedSize:'绉戝璁℃暟',
paste:'绮樿创',
+
+ selected:'閫変腑',
+ partiallySelected:'閮ㄥ垎閫変腑',
+ unchecked :'鏈�変腑',
msg:{
max255:"鏈�澶氳緭鍏�255涓瓧绗�",
range99999Dec2:
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 25732f5..d25a51d 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
@@ -544,10 +544,10 @@
<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)">
- <vxe-option value="0" label="鏈�変腑"></vxe-option>
- <vxe-option value="1" label="閮ㄥ垎閫変腑"></vxe-option>
- <vxe-option value="2" label="閫変腑"></vxe-option>
+ <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>
</vxe-select>
</div>
</div>
diff --git a/north-glass-erp/northglass-erp/src/views/sd/product/SelectProduct.vue b/north-glass-erp/northglass-erp/src/views/sd/product/SelectProduct.vue
index e24168c..2a031aa 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/product/SelectProduct.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/product/SelectProduct.vue
@@ -367,8 +367,8 @@
<div>
<div v-for="(option, index) in column.filters" :key="index">
<vxe-select v-model="option.data" :placeholder="$t('processCard.pleaseSelect')" @change="changeFilterEvent($event, option, $panel)">
- <vxe-option value="0" label="鏈�変腑"></vxe-option>
- <vxe-option value="1" label="閫変腑"></vxe-option>
+ <vxe-option value="0" :label="$t('basicData.unchecked')"></vxe-option>
+ <vxe-option value="1" :label="$t('basicData.selected')"></vxe-option>
</vxe-select>
</div>
</div>
--
Gitblit v1.8.0