From 6b98a60032c905fb811f1d07b7c4cb640c53a3e9 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Wed, 23 Oct 2024 17:06:44 +0800
Subject: [PATCH] =?UTF-8?q?between=E5=AD=97=E7=AC=A6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/SearchHigh/src/SearchHigh.vue         | 12 ++++++------
 .../strategy/upShelfStrategy/index.vue               |  3 +--
 .../customerreturnRequestMain.data.ts                |  2 +-
 .../customerreturnRequestMain/index.vue              |  2 +-
 4 files changed, 9 insertions(+), 10 deletions(-)

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 @@
       </el-table-column>
     </el-table>
     <!-- 分页 -->
-    <Pagination v-model:limit="queryParams.pageSize" v-model:page="queryParams.pageNo" :total="total"
-      @pagination="getList" />
+    <Pagination v-model:limit="queryParams.pageSize" v-model:page="queryParams.pageNo" :total="total" @pagination="getList" />
   </ContentWrap>
   <!-- 导入 -->
   <ImportForm
diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
index 4d8d23151..9b3e6e43c 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
@@ -171,7 +171,7 @@ export const CustomerreturnRequestMain = useCrudSchemas(
             {
               key: 'createTime', // 查询列表中字段
               value: dateTime - 30 * 24 * 60 * 60 * 1000 + ',' + dateTime, // 指查询具体值
-              action: 'betweeen', // 查询拼接条件
+              action: 'between', // 查询拼接条件
               isSearch: true, // 使用自定义拼接条件
               isMainValue: false // 拼接条件必须要 false 同时不能与 isMainValue: true 同用
             },
diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
index 16539e72d..665592790 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
@@ -176,7 +176,7 @@ const onEnter = async (field,value)=>{
         {
           key: 'createTime', // 查询列表中字段
           value: dateTime - 30  * 24 * 60 * 60 * 1000 + "," + dateTime, // 指查询具体值
-          action: 'betweeen', // 查询拼接条件
+          action: 'between', // 查询拼接条件
           isSearch: true, // 使用自定义拼接条件
           isMainValue: false // 拼接条件必须要 false 同时不能与 isMainValue: true 同用
         },