diff --git a/src/components/SearchHigh/src/SearchHigh.vue b/src/components/SearchHigh/src/SearchHigh.vue
index ca10540a5..44c20ff59 100644
--- a/src/components/SearchHigh/src/SearchHigh.vue
+++ b/src/components/SearchHigh/src/SearchHigh.vue
@@ -131,7 +131,7 @@ const butttondata = [
defaultButtons.defaultSearchBtn(null), // 查询
// defaultButtons.defaultSearchResetBtn(null), // 重置 重置功能现在有问题,让去掉
]
-// 高级筛选条件列表配置 ==,!=,>,<,>=,<=,like,in,notIn,betweeen,isNull,isNotNull
+// 高级筛选条件列表配置 ==,!=,>,<,>=,<=,like,in,notIn,between,isNull,isNotNull
const moreListOptions = ref({
action: [
{
@@ -163,7 +163,7 @@ const moreListOptions = ref({
value: 'notIn',
label: t('ts.不包含')
}, {
- value: 'betweeen',
+ value: 'between',
label: t('ts.区间')
}, {
value: 'isNull',
@@ -218,13 +218,13 @@ const getFilterable = (val) => {
}
return precision
}
-// 根据数据内容约束条件选项 ==,!=,>,<,>=,<=,like,in,notIn,betweeen,isNull,isNotNull
+// 根据数据内容约束条件选项 ==,!=,>,<,>=,<=,like,in,notIn,between,isNull,isNotNull
const formatMoreListActions = (val) => {
if (val) {
if(getInputType(val.column)=='datePicker'|| getInputType(val.column) == 'date'){
- return moreListOptions.value.action.filter(item => item.value == 'betweeen')
+ return moreListOptions.value.action.filter(item => item.value == 'between')
}else{
- return moreListOptions.value.action.filter(item => item.value != 'betweeen')
+ return moreListOptions.value.action.filter(item => item.value != 'between')
}
}
return moreListOptions.value.action
@@ -256,7 +256,7 @@ const lastestType = ref('')
// 筛选条件改变重置其他项
const resetSelect = (val) => {
if (getInputType(val.column) == 'datePicker' || getInputType(val.column) == 'date') {
- val.action = 'betweeen'
+ val.action = 'between'
val.disabled = false
}else{
val.action = 'like'
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/index.vue
index 023b5a04c..1287ad79e 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/index.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/index.vue
@@ -42,8 +42,7 @@
-
+
{
{
key: 'createTime', // 查询列表中字段
value: dateTime - 30 * 24 * 60 * 60 * 1000 + "," + dateTime, // 指查询具体值
- action: 'betweeen', // 查询拼接条件
+ action: 'between', // 查询拼接条件
isSearch: true, // 使用自定义拼接条件
isMainValue: false // 拼接条件必须要 false 同时不能与 isMainValue: true 同用
},