时间选择处理

src/views/system/code/index.vue

@@ -11,7 +11,7 @@ import {
 } from "plus-pro-components";
 import { computed, reactive, ref, toRefs } from "vue";
 import { ElMessage } from "element-plus";
-import { cloneDeep } from "lodash-es";
+import { cloneDeep } from "lodash";
 import {
   addBusinessSystem,
   deleteBusinessSystem,

src/views/system/dept/index.vue

@@ -63,7 +63,7 @@ import {
   PlusPageInstance,
   useTable
 } from "plus-pro-components";
-import { cloneDeep } from "lodash-es";
+import { cloneDeep } from "lodash";
 import {
   addDept,
   deleteDept,

src/views/system/dict/dictData.vue

@@ -17,7 +17,7 @@ import {
 import { computed, onMounted, reactive, ref, toRefs } from "vue";
 import { useRoute, useRouter } from "vue-router";
 import { ElMessage, ElMessageBox } from "element-plus";
-import { cloneDeep } from "lodash-es";
+import { cloneDeep } from "lodash";
 import { isString } from "@pureadmin/utils";
 import { useMultiTagsStoreHook } from "@/store/modules/multiTags";
 

src/views/system/dict/index.vue

@@ -19,7 +19,7 @@ import {
 } from "@/api/system/dict";
 import { computed, reactive, ref, toRefs } from "vue";
 import { ElMessage } from "element-plus";
-import { cloneDeep } from "lodash-es";
+import { cloneDeep } from "lodash";
 
 defineOptions({
   name: "Dict"
@@ -42,6 +42,17 @@ const refresh = () => {
   plusPageInstance.value?.getList();
 };
 
+// 搜索条件处理
+const handleBeforeSearch = (values: any) => {
+  let params = cloneDeep(values);
+  if (params.daterange && params.daterange.length === 2) {
+    Reflect.set(params, "params", {});
+    Reflect.set(params.params, "beginTime", values.daterange[0]);
+    Reflect.set(params.params, "endTime", values.daterange[1]);
+  }
+  return params;
+};
+
 const handleRefresh = async () => {
   try {
     let res = await refreshDictCache();
@@ -112,6 +123,11 @@ const tableConfig: PlusColumn[] = [
   {
     label: "创建时间",
     prop: "createTime",
+    hideInSearch: true
+  },
+  {
+    label: "创建时间",
+    prop: "daterange",
     valueType: "date-picker",
     fieldProps: {
       type: "daterange",
@@ -120,7 +136,8 @@ const tableConfig: PlusColumn[] = [
       "end-placeholder": "结束日期",
       valueFormat: "YYYY-MM-DD",
       style: { width: "100%" }
-    }
+    },
+    hideInTable: true
   }
 ];
 
@@ -300,6 +317,7 @@ const { form, confirmLoading, rules, dialogVisible } = toRefs(state);
       :columns="tableConfig"
       :request="getList"
       :pageInfoMap="{ page: 'pageNum', pageSize: 'pageSize' }"
+      :beforeSearchSubmit="handleBeforeSearch"
       :table="{
         actionBar: { buttons, type: 'link', width: 140 },
         adaptive: { offsetBottom: 50 }

src/views/system/logininfor/index.vue

@@ -15,6 +15,7 @@ import {
   deleteSystemLogininfor,
   getSystemLogininforList
 } from "@/api/system/logininfor";
+import { cloneDeep } from "lodash";
 
 defineOptions({
   name: "Logininfor"
@@ -37,6 +38,17 @@ const refresh = () => {
   plusPageInstance.value?.getList();
 };
 
+// 搜索条件处理
+const handleBeforeSearch = (values: any) => {
+  let params = cloneDeep(values);
+  if (params.daterange && params.daterange.length === 2) {
+    Reflect.set(params, "params", {});
+    Reflect.set(params.params, "beginTime", values.daterange[0]);
+    Reflect.set(params.params, "endTime", values.daterange[1]);
+  }
+  return params;
+};
+
 const tableConfig: PlusColumn[] = [
   {
     label: "访问编号",
@@ -86,11 +98,17 @@ const tableConfig: PlusColumn[] = [
   {
     label: "登录时间",
     prop: "accessTime",
+    hideInSearch: true
+  },
+  {
+    label: "登录时间",
+    prop: "daterange",
     valueType: "date-picker",
     fieldProps: {
       type: "daterange",
       valueFormat: "YYYY-MM-DD HH:mm:ss"
-    }
+    },
+    hideInTable: true
   }
 ];
 
@@ -295,6 +313,7 @@ const { form, dialogVisible } = toRefs(state);
       :columns="tableConfig"
       :request="getList"
       :pageInfoMap="{ page: 'pageNum', pageSize: 'pageSize' }"
+      :beforeSearchSubmit="handleBeforeSearch"
       :table="{
         adaptive: { offsetBottom: 50 },
         isSelection: true,

src/views/system/menu/index.vue

@@ -63,7 +63,7 @@ import {
   PlusPageInstance,
   useTable
 } from "plus-pro-components";
-import { cloneDeep } from "lodash-es";
+import { cloneDeep } from "lodash";
 import {
   addMenu,
   deleteMenu,

src/views/system/operlog/index.vue

@@ -15,6 +15,7 @@ import {
 } from "@/api/system/operlog";
 import { useDict, useDictValue, useDictClass } from "@/utils/dict";
 import { ElMessage, ElMessageBox } from "element-plus";
+import { cloneDeep } from "lodash";
 
 defineOptions({
   name: "Operlog"
@@ -40,6 +41,17 @@ const refresh = () => {
   plusPageInstance.value?.getList();
 };
 
+// 搜索之前函数
+const handleBeforeSearch = (values: any) => {
+  let params = cloneDeep(values);
+  if (params.daterange && params.daterange.length === 2) {
+    Reflect.set(params, "params", {});
+    Reflect.set(params.params, "beginTime", values.daterange[0]);
+    Reflect.set(params.params, "endTime", values.daterange[1]);
+  }
+  return params;
+};
+
 const tableConfig: PlusColumn[] = [
   {
     label: "日志编号",
@@ -113,11 +125,17 @@ const tableConfig: PlusColumn[] = [
   {
     label: "操作时间",
     prop: "operTime",
+    hideInSearch: true
+  },
+  {
+    label: "操作时间",
+    prop: "daterange",
     valueType: "date-picker",
     fieldProps: {
       type: "daterange",
       valueFormat: "YYYY-MM-DD HH:mm:ss"
-    }
+    },
+    hideInTable: true
   },
   {
     label: "消耗时间",
@@ -329,6 +347,7 @@ const { form, dialogVisible } = toRefs(state);
       :columns="tableConfig"
       :request="getList"
       :pageInfoMap="{ page: 'pageNum', pageSize: 'pageSize' }"
+      :beforeSearchSubmit="handleBeforeSearch"
       :table="{
         actionBar: { buttons, type: 'link', width: 140 },
         adaptive: { offsetBottom: 50 },

src/views/system/role/index.vue

@@ -84,7 +84,7 @@ import {
   PlusPageInstance,
   useTable
 } from "plus-pro-components";
-import { cloneDeep } from "lodash-es";
+import { cloneDeep } from "lodash";
 import {
   addSystemRole,
   changeRoleStatus,
@@ -99,7 +99,6 @@ import MenuTree from "@/views/system/role/components/menuTree.vue";
 import { getMenuListTreeSelect } from "@/api/system/menu";
 import DeptTree from "@/views/system/role/components/deptTree.vue";
 import { useRouter } from "vue-router";
-import { useMultiTagsStoreHook } from "@/store/modules/multiTags";
 
 defineOptions({
   name: "Role"
@@ -140,8 +139,13 @@ const refresh = () => {
 
 // 搜索之前函数
 const handleBeforeSearch = (values: any) => {
-  // 返回新的参数
-  return cloneDeep(values);
+  let params = cloneDeep(values);
+  if (params.daterange && params.daterange.length === 2) {
+    Reflect.set(params, "params", {});
+    Reflect.set(params.params, "beginTime", values.daterange[0]);
+    Reflect.set(params.params, "endTime", values.daterange[1]);
+  }
+  return params;
 };
 
 const dialogTitle = computed(() => (state.isCreate ? "新增" : "编辑"));
@@ -215,6 +219,11 @@ const tableConfig: PlusColumn[] = [
   {
     label: "创建时间",
     prop: "createTime",
+    hideInSearch: true
+  },
+  {
+    label: "创建时间",
+    prop: "daterange",
     valueType: "date-picker",
     fieldProps: {
       type: "daterange",
@@ -222,9 +231,9 @@ const tableConfig: PlusColumn[] = [
       endPlaceholder: "结束日期",
       style: { width: "100%" },
       unlinkPanels: true,
-      format: "YYYY-MM-DD HH:mm:ss"
+      valueFormat: "YYYY-MM-DD"
     },
-    colProps: { span: 16 }
+    hideInTable: true
   }
 ];
 

src/views/testTable/pageTable/index.vue

@@ -19,8 +19,8 @@
         <el-row class="button-row">
           <el-button type="primary" @click="handleCreate"> 添加</el-button>
           <el-button type="danger" @click="handleBatchDelete">
-            批量删除</el-button
-          >
+            批量删除
+          </el-button>
         </el-row>
       </template>
       <template #table-toolbar>
@@ -62,7 +62,7 @@ import {
   PlusPage,
   useTable
 } from "plus-pro-components";
-import { cloneDeep } from "lodash-es";
+import { cloneDeep } from "lodash";
 import { ElMessage } from "element-plus";
 import ExportView from "@/components/ExportView/index.vue";