refactor: 时间区间查询传入数组

yudao-ui-admin/src/views/bpm/group/index.vue

@@ -13,9 +13,9 @@
                      :key="dict.value" :label="dict.label" :value="dict.value"/>
         </el-select>
       </el-form-item>
-      <el-form-item label="创建时间">
+      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
+        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-                        type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
+                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
@@ -121,7 +121,6 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
-      dateRangeCreateTime: [],
       // 查询参数
       queryParams: {
         pageNo: 1,
@@ -129,6 +128,7 @@ export default {
         name: null,
         status: null,
         tenantId: null,
+        createTime: []
       },
       // 表单参数
       form: {},
@@ -152,11 +152,8 @@ export default {
     /** 查询列表 */
     getList() {
       this.loading = true;
-      // 处理查询参数
-      let params = {...this.queryParams};
-      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
       // 执行查询
-      getUserGroupPage(params).then(response => {
+      getUserGroupPage(this.queryParams).then(response => {
         this.list = response.data.list;
         this.total = response.data.total;
         this.loading = false;
@@ -185,7 +182,6 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.dateRangeCreateTime = [];
       this.resetForm("queryForm");
       this.handleQuery();
     },

yudao-ui-admin/src/views/bpm/oa/leave/index.vue

@@ -9,9 +9,9 @@
           <el-option v-for="dict in leaveTypeDictData" :key="dict.value" :label="dict.label" :value="dict.value" />
         </el-select>
       </el-form-item>
-      <el-form-item label="申请时间">
+      <el-form-item label="申请时间" prop="createTime">
-        <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
+        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-                        type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
+                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
       </el-form-item>
       <el-form-item label="结果" prop="result">
         <el-select v-model="queryParams.result" placeholder="请选择流结果" clearable>
@@ -102,8 +102,6 @@ export default {
       total: 0,
       // 请假申请列表
       list: [],
-      //审批进度弹出层
-      dateRangeCreateTime: [],
       // 查询参数
       queryParams: {
         pageNo: 1,
@@ -111,6 +109,7 @@ export default {
         result: null,
         type: null,
         reason: null,
+        createTime: []
       },
 
       leaveTypeDictData: getDictDatas(DICT_TYPE.BPM_OA_LEAVE_TYPE),
@@ -124,11 +123,8 @@ export default {
     /** 查询列表 */
     getList() {
       this.loading = true;
-      // 处理查询参数
-      let params = {...this.queryParams};
-      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
       // 执行查询
-      getLeavePage(params).then(response => {
+      getLeavePage(this.queryParams).then(response => {
         this.list = response.data.list;
         this.total = response.data.total;
         this.loading = false;
@@ -141,7 +137,6 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.dateRangeCreateTime = [];
       this.resetForm("queryForm");
       this.handleQuery();
     },

yudao-ui-admin/src/views/bpm/processInstance/index.vue

@@ -16,9 +16,9 @@
                      :key="dict.value" :label="dict.label" :value="dict.value"/>
         </el-select>
       </el-form-item>
-      <el-form-item label="提交时间">
+      <el-form-item label="提交时间" prop="createTime">
-        <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
+        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-                        type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
+                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
       </el-form-item>
       <el-form-item label="状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
@@ -116,8 +116,6 @@ export default {
       total: 0,
       // 工作流的流程实例的拓展列表
       list: [],
-      // 是否显示弹出层
-      dateRangeCreateTime: [],
       // 查询参数
       queryParams: {
         pageNo: 1,
@@ -127,6 +125,7 @@ export default {
         category: null,
         status: null,
         result: null,
+        createTime: []
       }
     };
   },
@@ -137,11 +136,8 @@ export default {
     /** 查询列表 */
     getList() {
       this.loading = true;
-      // 处理查询参数
-      let params = {...this.queryParams};
-      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
       // 执行查询
-      getMyProcessInstancePage(params).then(response => {
+      getMyProcessInstancePage(this.queryParams).then(response => {
         this.list = response.data.list;
         this.total = response.data.total;
         this.loading = false;
@@ -154,7 +150,6 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.dateRangeCreateTime = [];
       this.resetForm("queryForm");
       this.handleQuery();
     },

yudao-ui-admin/src/views/bpm/task/done.vue

@@ -7,9 +7,9 @@
       <el-form-item label="流程名" prop="name">
         <el-input v-model="queryParams.name" placeholder="请输入流程名" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
-      <el-form-item label="创建时间">
+      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
+        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-                        type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
+                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
@@ -77,11 +77,11 @@ export default {
       // 已办任务列表
       list: [],
       // 查询参数
-      dateRangeCreateTime: [],
       queryParams: {
         pageNo: 1,
         pageSize: 10,
         name: null,
+        createTime: []
       },
     };
   },
@@ -92,10 +92,7 @@ export default {
     /** 查询列表 */
     getList() {
       this.loading = true;
-      // 处理查询参数
+      getDoneTaskPage(this.queryParams).then(response => {
-      let params = {...this.queryParams};
-      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
-      getDoneTaskPage(params).then(response => {
         this.list = response.data.list;
         this.total = response.data.total;
         this.loading = false;
@@ -108,7 +105,6 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.dateRangeCreateTime = [];
       this.resetForm("queryForm");
       this.handleQuery();
     },

yudao-ui-admin/src/views/bpm/task/todo.vue

@@ -7,9 +7,9 @@
       <el-form-item label="流程名" prop="name">
         <el-input v-model="queryParams.name" placeholder="请输入流程名" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
-      <el-form-item label="创建时间">
+      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
+        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-                        type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
+                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
@@ -67,11 +67,11 @@ export default {
       // 待办任务列表
       list: [],
       // 查询参数
-      dateRangeCreateTime: [],
       queryParams: {
         pageNo: 1,
         pageSize: 10,
         name: null,
+        createTime: []
       },
     };
   },
@@ -83,9 +83,7 @@ export default {
     getList() {
       this.loading = true;
       // 处理查询参数
-      let params = {...this.queryParams};
+      getTodoTaskPage(this.queryParams).then(response => {
-      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
-      getTodoTaskPage(params).then(response => {
         this.list = response.data.list;
         this.total = response.data.total;
         this.loading = false;
@@ -98,7 +96,6 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.dateRangeCreateTime = [];
       this.resetForm("queryForm");
       this.handleQuery();
     },

yudao-ui-admin/src/views/infra/apiAccessLog/index.vue

@@ -18,9 +18,9 @@
       <el-form-item label="请求地址" prop="requestUrl">
         <el-input v-model="queryParams.requestUrl" placeholder="请输入请求地址" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
-      <el-form-item label="请求时间">
+      <el-form-item label="请求时间" prop="beginTime">
-        <el-date-picker v-model="dateRangeBeginTime" style="width: 240px" value-format="yyyy-MM-dd"
+        <el-date-picker v-model="queryParams.beginTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-                        type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
+                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
       </el-form-item>
       <el-form-item label="执行时长" prop="duration">
         <el-input v-model="queryParams.duration" placeholder="请输入执行时长" clearable @keyup.enter.native="handleQuery"/>
@@ -135,7 +135,6 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
-      dateRangeBeginTime: [],
       // 查询参数
       queryParams: {
         pageNo: 1,
@@ -146,6 +145,7 @@ export default {
         requestUrl: null,
         duration: null,
         resultCode: null,
+        beginTime: []
       },
       // 表单参数
       form: {},
@@ -158,11 +158,8 @@ export default {
     /** 查询列表 */
     getList() {
       this.loading = true;
-      // 处理查询参数
-      let params = {...this.queryParams};
-      this.addBeginAndEndTime(params, this.dateRangeBeginTime, 'beginTime');
       // 执行查询
-      getApiAccessLogPage(params).then(response => {
+      getApiAccessLogPage(this.queryParams).then(response => {
         this.list = response.data.list;
         this.total = response.data.total;
         this.loading = false;
@@ -185,7 +182,6 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.dateRangeBeginTime = [];
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -200,7 +196,6 @@ export default {
       let params = {...this.queryParams};
       params.pageNo = undefined;
       params.pageSize = undefined;
-      this.addBeginAndEndTime(params, this.dateRangeBeginTime, 'beginTime');
       // 执行导出
       this.$modal.confirm('是否确认导出所有API 访问日志数据项?').then(() => {
         this.exportLoading = true;

yudao-ui-admin/src/views/infra/apiErrorLog/index.vue

@@ -18,9 +18,9 @@
       <el-form-item label="请求地址" prop="requestUrl">
         <el-input v-model="queryParams.requestUrl" placeholder="请输入请求地址" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
-      <el-form-item label="异常时间">
+      <el-form-item label="异常时间" prop="exceptionTime">
-        <el-date-picker v-model="dateRangeExceptionTime" style="width: 240px" value-format="yyyy-MM-dd"
+        <el-date-picker v-model="queryParams.exceptionTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-                        type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
+                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
       </el-form-item>
       <el-form-item label="处理状态" prop="processStatus">
         <el-select v-model="queryParams.processStatus" placeholder="请选择处理状态" clearable>
@@ -142,7 +142,6 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
-      dateRangeExceptionTime: [],
       // 查询参数
       queryParams: {
         pageNo: 1,
@@ -152,6 +151,7 @@ export default {
         applicationName: null,
         requestUrl: null,
         processStatus: null,
+        exceptionTime: []
       },
       // 表单参数
       form: {},
@@ -166,11 +166,8 @@ export default {
     /** 查询列表 */
     getList() {
       this.loading = true;
-      // 处理查询参数
-      let params = {...this.queryParams};
-      this.addBeginAndEndTime(params, this.dateRangeExceptionTime, 'exceptionTime');
       // 执行查询
-      getApiErrorLogPage(params).then(response => {
+      getApiErrorLogPage(this.queryParams).then(response => {
         this.list = response.data.list;
         this.total = response.data.total;
         this.loading = false;
@@ -193,7 +190,6 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.dateRangeExceptionTime = [];
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -218,7 +214,6 @@ export default {
       let params = {...this.queryParams};
       params.pageNo = undefined;
       params.pageSize = undefined;
-      this.addBeginAndEndTime(params, this.dateRangeExceptionTime, 'exceptionTime');
       // 执行导出
       this.$modal.confirm('是否确认导出所有API 错误日志数据项?').then(() => {
         this.exportLoading = true;

yudao-ui-admin/src/views/infra/codegen/index.vue

@@ -12,9 +12,9 @@
         <el-input v-model="queryParams.tableComment" placeholder="请输入表描述" clearable
                   @keyup.enter.native="handleQuery"/>
       </el-form-item>
-      <el-form-item label="创建时间">
+      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
+        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"/>
+                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
@@ -123,7 +123,8 @@ export default {
         pageNo: 1,
         pageSize: 10,
         tableName: undefined,
-        tableComment: undefined
+        tableComment: undefined,
+        createTime: []
       },
       // 预览参数
       preview: {
@@ -155,10 +156,7 @@ export default {
     /** 查询表集合 */
     getList() {
       this.loading = true;
-      getCodegenTablePage(this.addDateRange(this.queryParams, [
+      getCodegenTablePage(this.queryParams).then(response => {
-        this.dateRange[0] ? this.dateRange[0] + ' 00:00:00' : undefined,
-        this.dateRange[1] ? this.dateRange[1] + ' 23:59:59' : undefined,
-      ], 'CreateTime')).then(response => {
             this.tableList = response.data.list;
             this.total = response.data.total;
             this.loading = false;
@@ -192,7 +190,6 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.dateRange = [];
       this.resetForm("queryForm");
       this.handleQuery();
     },

yudao-ui-admin/src/views/infra/config/index.vue

@@ -17,9 +17,9 @@
                      :label="dict.label" :value="parseInt(dict.value)"/>
         </el-select>
       </el-form-item>
-      <el-form-item label="创建时间">
+      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
+        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-          range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
+                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
@@ -129,15 +129,14 @@ export default {
       open: false,
       // 类型数据字典
       typeOptions: [],
-      // 日期范围
-      dateRange: [],
       // 查询参数
       queryParams: {
         pageNo: 1,
         pageSize: 10,
         name: undefined,
         key: undefined,
-        type: undefined
+        type: undefined,
+        createTime: []
       },
       // 表单参数
       form: {},
@@ -165,10 +164,7 @@ export default {
     /** 查询参数列表 */
     getList() {
       this.loading = true;
-      listConfig(this.addDateRange(this.queryParams, [
+      listConfig(this.queryParams).then(response => {
-        this.dateRange[0] ? this.dateRange[0] + ' 00:00:00' : undefined,
-        this.dateRange[1] ? this.dateRange[1] + ' 23:59:59' : undefined,
-      ])).then(response => {
           this.configList = response.data.list;
           this.total = response.data.total;
           this.loading = false;
@@ -198,7 +194,6 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.dateRange = [];
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -250,13 +245,13 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      const queryParams = this.addDateRange(this.queryParams, [
-        this.dateRange[0] ? this.dateRange[0] + ' 00:00:00' : undefined,
-        this.dateRange[1] ? this.dateRange[1] + ' 23:59:59' : undefined,
-      ]);
       this.$modal.confirm('是否确认导出所有参数数据项?').then(() => {
+          // 处理查询参数
+          let params = {...this.queryParams};
+          params.pageNo = undefined;
+          params.pageSize = undefined;
           this.exportLoading = true;
-          return exportConfig(queryParams);
+          return exportConfig(params);
         }).then(response => {
           this.$download.excel(response, '参数配置.xls');
           this.exportLoading = false;

yudao-ui-admin/src/views/infra/file/index.vue

@@ -6,9 +6,9 @@
       <el-form-item label="文件路径" prop="path">
         <el-input v-model="queryParams.path" placeholder="请输入文件路径" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
-      <el-form-item label="创建时间">
+      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
+        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-                        type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
+                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
@@ -104,13 +104,13 @@ export default {
       list: [],
       // 弹出层标题
       title: "",
-      dateRangeCreateTime: [],
       // 查询参数
       queryParams: {
         pageNo: 1,
         pageSize: 10,
         path: null,
         type: null,
+        createTime: []
       },
       // 用户导入参数
       upload: {
@@ -130,9 +130,6 @@ export default {
     /** 查询列表 */
     getList() {
       this.loading = true;
-      // 处理查询参数
-      let params = {...this.queryParams};
-      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
       // 执行查询
       getFilePage(params).then(response => {
         this.list = response.data.list;
@@ -159,7 +156,6 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.dateRangeCreateTime = [];
       this.resetForm("queryForm");
       this.handleQuery();
     },

yudao-ui-admin/src/views/infra/fileConfig/index.vue

@@ -12,9 +12,9 @@
                      :key="dict.value" :label="dict.label" :value="dict.value"/>
         </el-select>
       </el-form-item>
-      <el-form-item label="创建时间">
+      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
+        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-                        type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
+                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
@@ -162,13 +162,13 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
-      dateRangeCreateTime: [],
       // 查询参数
       queryParams: {
         pageNo: 1,
         pageSize: 10,
         name: null,
         storage: null,
+        createTime: []
       },
       // 表单参数
       form: {
@@ -202,11 +202,8 @@ export default {
     /** 查询列表 */
     getList() {
       this.loading = true;
-      // 处理查询参数
-      let params = {...this.queryParams};
-      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
       // 执行查询
-      getFileConfigPage(params).then(response => {
+      getFileConfigPage(this.queryParams).then(response => {
         this.list = response.data.list;
         this.total = response.data.total;
         this.loading = false;
@@ -235,7 +232,6 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.dateRangeCreateTime = [];
       this.resetForm("queryForm");
       this.handleQuery();
     },

yudao-ui-admin/src/views/infra/testDemo/index.vue

@@ -22,9 +22,9 @@
       <el-form-item label="备注" prop="remark">
         <el-input v-model="queryParams.remark" placeholder="请输入备注" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
-      <el-form-item label="创建时间">
+      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
+        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-                        type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
+                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
@@ -125,7 +125,6 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
-      dateRangeCreateTime: [],
       // 查询参数
       queryParams: {
         pageNo: 1,
@@ -135,6 +134,7 @@ export default {
         type: null,
         category: null,
         remark: null,
+        createTime: []
       },
       // 表单参数
       form: {},
@@ -154,11 +154,8 @@ export default {
     /** 查询列表 */
     getList() {
       this.loading = true;
-      // 处理查询参数
-      let params = {...this.queryParams};
-      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
       // 执行查询
-      getTestDemoPage(params).then(response => {
+      getTestDemoPage(this.queryParams).then(response => {
         this.list = response.data.list;
         this.total = response.data.total;
         this.loading = false;
@@ -188,7 +185,6 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.dateRangeCreateTime = [];
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -247,7 +243,6 @@ export default {
       let params = {...this.queryParams};
       params.pageNo = undefined;
       params.pageSize = undefined;
-      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
       // 执行导出
       this.$modal.confirm('是否确认导出所有字典类型数据项?').then(() => {
           this.exportLoading = true;

yudao-ui-admin/src/views/login.vue

@@ -151,7 +151,7 @@ export default {
           {required: true, trigger: "blur", message: "手机号不能为空"},
           {
             validator: function (rule, value, callback) {
-              if (/^(?:(?:\+|00)86)?1(?:(?:3[\d])|(?:4[5-79])|(?:5[0-35-9])|(?:6[5-7])|(?:7[0-8])|(?:8[\d])|(?:9[189]))\d{8}$/.test(value) == false) {
+              if (/^(?:(?:\+|00)86)?1(?:(?:3[\d])|(?:4[5-79])|(?:5[0-35-9])|(?:6[5-7])|(?:7[0-8])|(?:8[\d])|(?:9[189]))\d{8}$/.test(value) === false) {
                 callback(new Error("手机号格式错误"));
               } else {
                 callback();

yudao-ui-admin/src/views/mall/market/banner/index.vue

@@ -12,9 +12,9 @@
                      :key="dict.value" :label="dict.label" :value="dict.value"/>
         </el-select>
       </el-form-item>
-      <el-form-item label="创建时间">
+      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
+        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-                        type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"/>
+                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
@@ -135,13 +135,13 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
-      dateRangeCreateTime: [],
       // 查询参数
       queryParams: {
         pageNo: 1,
         pageSize: 10,
         title: null,
         status: null,
+        createTime: []
       },
       // 商品分类树选项
       categoryOptions: [],
@@ -164,9 +164,6 @@ export default {
     /** 查询列表 */
     getList() {
       this.loading = true;
-      // 处理查询参数
-      let params = {...this.queryParams};
-      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
       // 执行查询
       getBannerPage(params).then(response => {
         this.list = response.data.list;
@@ -199,7 +196,6 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.dateRangeCreateTime = [];
       this.resetForm("queryForm");
       this.handleQuery();
     },

yudao-ui-admin/src/views/mall/product/brand/index.vue

@@ -12,9 +12,9 @@
                      :key="dict.value" :label="dict.label" :value="dict.value"/>
         </el-select>
       </el-form-item>
-      <el-form-item label="创建时间">
+      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
+        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-                        type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"/>
+                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
@@ -144,7 +144,6 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
-      dateRangeCreateTime: [],
       // 查询参数
       queryParams: {
         pageNo: 1,
@@ -152,6 +151,7 @@ export default {
         categoryId: null,
         name: null,
         status: null,
+        createTime: []
       },
       // 商品分类树选项
       categoryOptions: [],
@@ -174,11 +174,8 @@ export default {
     /** 查询列表 */
     getList() {
       this.loading = true;
-      // 处理查询参数
-      let params = {...this.queryParams};
-      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
       // 执行查询
-      getBrandPage(params).then(response => {
+      getBrandPage(this.queryParams).then(response => {
         this.list = response.data.list;
         this.total = response.data.total;
         this.loading = false;
@@ -229,7 +226,6 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.dateRangeCreateTime = [];
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -291,7 +287,6 @@ export default {
       let params = {...this.queryParams};
       params.pageNo = undefined;
       params.pageSize = undefined;
-      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
       // 执行导出
       this.$modal.confirm('是否确认导出所有品牌数据项?').then(() => {
         this.exportLoading = true;

yudao-ui-admin/src/views/mall/product/property/index.vue

@@ -12,6 +12,10 @@
                      :key="dict.value" :label="dict.label" :value="dict.value"/>
         </el-select>
       </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
+                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
@@ -123,13 +127,13 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
-      dateRangeCreateTime: [],
       // 查询参数
       queryParams: {
         pageNo: 1,
         pageSize: 10,
         name: null,
         status: null,
+        createTime: []
       },
       // 表单参数
       form: {
@@ -151,11 +155,8 @@ export default {
     /** 查询列表 */
     getList() {
       this.loading = true;
-      // 处理查询参数
-      let params = {...this.queryParams};
-      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
       // 执行查询
-      getPropertyPage(params).then(response => {
+      getPropertyPage(this.queryParams).then(response => {
         this.list = response.data.list;
         this.total = response.data.total;
         this.loading = false;
@@ -185,7 +186,6 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.dateRangeCreateTime = [];
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -244,7 +244,6 @@ export default {
       let params = {...this.queryParams};
       params.pageNo = undefined;
       params.pageSize = undefined;
-      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
       // 执行导出
       this.$modal.confirm('是否确认导出所有规格名称数据项?').then(() => {
           this.exportLoading = true;

yudao-ui-admin/src/views/mall/product/spu/index.vue

@@ -25,9 +25,9 @@
           <el-option label="下架" value="1"/>
         </el-select>
       </el-form-item>
-      <el-form-item label="创建时间">
+      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
+        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-                        type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"/>
+                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
@@ -193,7 +193,7 @@
               label="条形码"
               width="250" v-if="skuTags.length">
               <template slot-scope="scope">
-                <el-input v-model="scope.row.barCode" type="textarea" :disabled="scope.row.status==1"></el-input>
+                <el-input v-model="scope.row.barCode" type="textarea" :disabled="scope.row.status===1"></el-input>
               </template>
             </el-table-column>
             <el-table-column
@@ -207,7 +207,7 @@
                   :precision="2"
                   :max="1000000000"
                   :min="0.01"
-                  :disabled="scope.row.status==1">
+                  :disabled="scope.row.status===1">
                 </el-input-number>
               </template>
             </el-table-column>
@@ -222,7 +222,7 @@
                   :precision="2"
                   :max="1000000000"
                   :min="0.01"
-                  :disabled="scope.row.status==1">
+                  :disabled="scope.row.status===1">
                 </el-input-number>
               </template>
             </el-table-column>
@@ -237,7 +237,7 @@
                   :precision="2"
                   :max="1000000000"
                   :min="0.01"
-                  :disabled="scope.row.status==1">
+                  :disabled="scope.row.status===1">
                 </el-input-number>
               </template>
             </el-table-column>
@@ -341,7 +341,6 @@
                 title: "",
                 // 是否显示弹出层
                 open: false,
-                dateRangeCreateTime: [],
                 // 查询参数
                 queryParams: {
                     pageNo: 1,
@@ -356,6 +355,7 @@
                     price: null,
                     quantity: null,
                     status: null,
+                    createTime: []
                 },
                 // 表单参数
                 form: {
@@ -398,7 +398,7 @@
 
             },
             changeSkuStatus(tagIndex) {
-                if(this.form.skus[tagIndex].status == 0){
+                if(this.form.skus[tagIndex].status === 0){
                     this.form.skus[tagIndex].status = 1 ;
                 }else {
                     this.form.skus[tagIndex].status = 0 ;
@@ -426,11 +426,9 @@
                 this.$emit('input', skuList)
             },
             handleTagClose(tagIndex, tagItemIndex) {
-
             },
             //确定添加sku规格
             addTag() {
-
                 let skus = this.unUseTags.map(function (item, index) {
                     return item.name
                 });
@@ -572,9 +570,6 @@
             /** 查询列表 */
             getList() {
                 this.loading = true;
-                // 处理查询参数
-                let params = {...this.queryParams};
-                this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
                 // 执行查询
                 getSpuPage(params).then(response => {
                     this.list = response.data.list;
@@ -631,8 +626,7 @@
             /** 修改按钮操作 */
             handleUpdate(row) {
                 this.reset();
-                const id = row.id;
+                getSpu(row.id).then(response => {
-                getSpu(id).then(response => {
                   console.log(">>>>>> response.data:" + JSON.stringify(response.data))
                     let dataSpu = response.data;
                     this.form = {
@@ -660,7 +654,6 @@
             /** 提交按钮 */
             submitForm() {
                 console.log(this.form.picUrls.split(','));
-
                 this.$refs["form"].validate(valid => {
                     if (!valid) {
                         return;
@@ -702,7 +695,6 @@
                 let params = {...this.queryParams};
                 params.pageNo = undefined;
                 params.pageSize = undefined;
-                this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
                 // 执行导出
                 this.$modal.confirm('是否确认导出所有商品spu数据项?').then(() => {
                     this.exportLoading = true;

yudao-ui-admin/src/views/pay/app/index.vue

@@ -17,6 +17,10 @@
                      :value="parseInt(dict.value)"/>
         </el-select>
       </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
+                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
@@ -237,7 +241,6 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
-      dateRangeCreateTime: [],
       // 查询参数
       queryParams: {
         pageNo: 1,
@@ -248,6 +251,7 @@ export default {
         payNotifyUrl: null,
         refundNotifyUrl: null,
         merchantName: null,
+        createTime: []
       },
       // 表单参数
       form: {},
@@ -300,13 +304,9 @@ export default {
     /** 查询列表 */
     getList() {
       this.loading = true;
-      // 处理查询参数
-      let params = {...this.queryParams};
-      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
       // 执行查询
-      getAppPage(params).then(response => {
+      getAppPage(this.queryParams).then(response => {
         this.list = response.data.list;
-        console.log(this.list);
         this.total = response.data.total;
         this.loading = false;
       });
@@ -336,7 +336,6 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.dateRangeCreateTime = [];
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -393,9 +392,8 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const id = row.id;
+      this.$modal.confirm('是否确认删除支付应用信息编号为"' + row.id + '"的数据项?').then(function () {
-      this.$modal.confirm('是否确认删除支付应用信息编号为"' + id + '"的数据项?').then(function () {
+        return deleteApp(row.id);
-        return deleteApp(id);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
@@ -412,7 +410,6 @@ export default {
       let params = {...this.queryParams};
       params.pageNo = undefined;
       params.pageSize = undefined;
-      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
       // 执行导出
       this.$modal.confirm('是否确认导出所有支付应用信息数据项?').then(function () {
         return exportAppExcel(params);

yudao-ui-admin/src/views/pay/merchant/index.vue

@@ -20,9 +20,9 @@
       <el-form-item label="备注" prop="remark">
         <el-input v-model="queryParams.remark" placeholder="请输入备注" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
-      <el-form-item label="创建时间">
+      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
+        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-                        type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
+                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
@@ -136,7 +136,6 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
-      dateRangeCreateTime: [],
       // 查询参数
       queryParams: {
         pageNo: 1,
@@ -146,6 +145,7 @@ export default {
         shortName: null,
         status: null,
         remark: null,
+        createTime: []
       },
       // 表单参数
       form: {},
@@ -167,11 +167,8 @@ export default {
     /** 查询列表 */
     getList() {
       this.loading = true;
-      // 处理查询参数
-      let params = {...this.queryParams};
-      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
       // 执行查询
-      getMerchantPage(params).then(response => {
+      getMerchantPage(this.queryParams).then(response => {
         console.log(response.data);
         this.list = response.data.list;
         this.total = response.data.total;
@@ -202,7 +199,6 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.dateRangeCreateTime = [];
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -215,8 +211,7 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const id = row.id;
+      getMerchant(row.id).then(response => {
-      getMerchant(id).then(response => {
         this.form = response.data;
         this.open = true;
         this.title = "修改支付商户信息";
@@ -273,7 +268,6 @@ export default {
       let params = {...this.queryParams};
       params.pageNo = undefined;
       params.pageSize = undefined;
-      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
       // 执行导出
       this.$modal.confirm('是否确认导出所有支付商户信息数据项?').then(() => {
           this.exportLoading = true;

yudao-ui-admin/src/views/pay/order/index.vue

@@ -47,12 +47,9 @@
                      :label="dict.label" :value="parseInt(dict.value)"/>
         </el-select>
       </el-form-item>
-      <el-form-item label="创建时间">
+      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker
+        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-          v-model="dateRangeCreateTime" style="width: 350px"
+                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
-          value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange"  range-separator="-"
-          :default-time="['00:00:00','23:59:59']" start-placeholder="开始日期" end-placeholder="结束日期">
-        </el-date-picker>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
@@ -270,10 +267,6 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
-      dateRangeExpireTime: [],
-      dateRangeSuccessTime: [],
-      dateRangeNotifyTime: [],
-      dateRangeCreateTime: [],
       // 查询参数
       queryParams: {
         pageNo: 1,
@@ -298,6 +291,10 @@ export default {
         refundAmount: null,
         channelUserId: null,
         channelOrderNo: null,
+        expireTime: [],
+        successTime: [],
+        notifyTime: [],
+        createTime: []
       },
       // 商户加载遮罩层
       merchantLoading: false,
@@ -324,32 +321,25 @@ export default {
   },
   methods: {
     initTime(){
-      this.dateRangeCreateTime = [getNowDateTime("00:00:00"), getNowDateTime("23:59:59")];
+      this.queryParams.createTime = [getNowDateTime("00:00:00"), getNowDateTime("23:59:59")];
     },
     /** 查询列表 */
     getList() {
       // 判断选择的日期是否超过了一个月
       let oneMonthTime = 31 * 24 * 3600 * 1000;
-      if (this.dateRangeCreateTime == null){
+      if (this.queryParams.createTime == null){
         this.initTime();
       } else {
-        let minDateTime = new Date(this.dateRangeCreateTime[0]).getTime();
+        let minDateTime = new Date(this.queryParams.createTime[0]).getTime();
-        let maxDateTime = new Date(this.dateRangeCreateTime[1]).getTime()
+        let maxDateTime = new Date(this.queryParams.createTime[1]).getTime()
         if (maxDateTime - minDateTime > oneMonthTime) {
           this.$message.error('时间范围最大为 31 天！');
           return false;
         }
       }
-
       this.loading = true;
-      // 处理查询参数
-      let params = {...this.queryParams};
-      this.addBeginAndEndTime(params, this.dateRangeExpireTime, 'expireTime');
-      this.addBeginAndEndTime(params, this.dateRangeSuccessTime, 'successTime');
-      this.addBeginAndEndTime(params, this.dateRangeNotifyTime, 'notifyTime');
-      this.addDateRange(params, this.dateRangeCreateTime, 'CreateTime');
       // 执行查询
-      getOrderPage(params).then(response => {
+      getOrderPage(this.queryParams).then(response => {
         this.list = response.data.list;
         this.total = response.data.total;
         this.loading = false;
@@ -366,9 +356,6 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.dateRangeSuccessTime = [];
-      this.dateRangeNotifyTime = [];
-      this.dateRangeExpireTime = [];
       this.resetForm("queryForm");
       this.initTime();
       this.handleQuery();
@@ -393,10 +380,6 @@ export default {
       let params = {...this.queryParams};
       params.pageNo = undefined;
       params.pageSize = undefined;
-      this.addBeginAndEndTime(params, this.dateRangeExpireTime, 'expireTime');
-      this.addBeginAndEndTime(params, this.dateRangeSuccessTime, 'successTime');
-      this.addBeginAndEndTime(params, this.dateRangeNotifyTime, 'notifyTime');
-      this.addDateRange(params, this.dateRangeCreateTime, 'CreateTime');
       // 执行导出
       this.$modal.confirm('是否确认导出所有支付订单数据项?').then(function () {
         return exportOrderExcel(params);

yudao-ui-admin/src/views/pay/refund/index.vue

@@ -1,6 +1,5 @@
 <template>
   <div class="app-container">
-
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="120px">
       <el-form-item label="所属商户" prop="merchantId">
@@ -31,26 +30,21 @@
         <el-input v-model="queryParams.merchantRefundNo" placeholder="请输入商户退款订单号" clearable
                   @keyup.enter.native="handleQuery"/>
       </el-form-item>
-
       <el-form-item label="退款状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="请选择退款状态" clearable>
           <el-option v-for="dict in payRefundOrderDictDatum" :key="parseInt(dict.value)"
                      :label="dict.label" :value="parseInt(dict.value)"/>
         </el-select>
       </el-form-item>
-
       <el-form-item label="退款回调状态" prop="notifyStatus">
         <el-select v-model="queryParams.notifyStatus" placeholder="请选择通知商户退款结果的回调状态" clearable>
           <el-option v-for="dict in payOrderNotifyDictDatum" :key="parseInt(dict.value)"
                      :label="dict.label" :value="parseInt(dict.value)"/>
         </el-select>
       </el-form-item>
-      <el-form-item label="创建时间">
+      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker
+        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-          v-model="dateRangeCreateTime" style="width: 350px"
+                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
-          value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange"  range-separator="-"
-          :default-time="['00:00:00','23:59:59']" start-placeholder="开始日期" end-placeholder="结束日期">
-        </el-date-picker>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
@@ -286,10 +280,6 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
-      dateRangeExpireTime: [],
-      dateRangeSuccessTime: [],
-      dateRangeNotifyTime: [],
-      dateRangeCreateTime: [],
       // 查询参数
       queryParams: {
         pageNo: 1,
@@ -315,6 +305,10 @@ export default {
         channelErrorCode: null,
         channelErrorMsg: null,
         channelExtras: null,
+        expireTime: [],
+        successTime: [],
+        notifyTime: [],
+        createTime: []
       },
       // 商户加载遮罩层
       merchantLoading: false,
@@ -343,31 +337,25 @@ export default {
   },
   methods: {
     initTime(){
-      this.dateRangeCreateTime = [getNowDateTime("00:00:00"), getNowDateTime("23:59:59")];
+      this.queryParams.createTime = [getNowDateTime("00:00:00"), getNowDateTime("23:59:59")];
     },
     /** 查询列表 */
     getList() {
       // 判断选择的日期是否超过了一个月
       let oneMonthTime = 31 * 24 * 3600 * 1000;
-      if (this.dateRangeCreateTime == null){
+      if (this.queryParams.createTime == null){
         this.initTime();
       } else {
-        let minDateTime = new Date(this.dateRangeCreateTime[0]).getTime();
+        let minDateTime = new Date(this.queryParams.createTime[0]).getTime();
-        let maxDateTime = new Date(this.dateRangeCreateTime[1]).getTime()
+        let maxDateTime = new Date(this.queryParams.createTime[1]).getTime()
         if (maxDateTime - minDateTime > oneMonthTime) {
           this.$message.error('时间范围最大为 31 天！');
           return false;
         }
       }
       this.loading = true;
-      // 处理查询参数
-      let params = {...this.queryParams};
-      this.addBeginAndEndTime(params, this.dateRangeExpireTime, 'expireTime');
-      this.addBeginAndEndTime(params, this.dateRangeSuccessTime, 'successTime');
-      this.addBeginAndEndTime(params, this.dateRangeNotifyTime, 'notifyTime');
-      this.addDateRange(params, this.dateRangeCreateTime, 'CreateTime');
       // 执行查询
-      getRefundPage(params).then(response => {
+      getRefundPage(this.queryParams).then(response => {
         this.list = response.data.list;
         this.total = response.data.total;
         this.loading = false;
@@ -384,10 +372,6 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.dateRangeExpireTime = [];
-      this.dateRangeSuccessTime = [];
-      this.dateRangeNotifyTime = [];
-      this.dateRangeCreateTime = [];
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -397,10 +381,6 @@ export default {
       let params = {...this.queryParams};
       params.pageNo = undefined;
       params.pageSize = undefined;
-      this.addBeginAndEndTime(params, this.dateRangeExpireTime, 'expireTime');
-      this.addBeginAndEndTime(params, this.dateRangeSuccessTime, 'successTime');
-      this.addBeginAndEndTime(params, this.dateRangeNotifyTime, 'notifyTime');
-      this.addDateRange(params, this.dateRangeCreateTime, 'CreateTime');
       // 执行导出
       this.$modal.confirm('是否确认导出所有退款订单数据项?').then(function () {
         return exportRefundExcel(params);

yudao-ui-admin/src/views/system/dict/index.vue

@@ -12,9 +12,9 @@
           <el-option v-for="dict in statusDictDatas" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
         </el-select>
       </el-form-item>
-      <el-form-item label="创建时间">
+      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
+        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-          range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
@@ -120,15 +120,14 @@ export default {
       open: false,
       // 状态数据字典
       statusOptions: [],
-      // 日期范围
-      dateRangeCreateTime: [],
       // 查询参数
       queryParams: {
         pageNo: 1,
         pageSize: 10,
         name: undefined,
         type: undefined,
-        status: undefined
+        status: undefined,
+        createTime: []
       },
       // 表单参数
       form: {},
@@ -155,11 +154,8 @@ export default {
     /** 查询字典类型列表 */
     getList() {
       this.loading = true;
-      // 处理查询参数
-      let params = {...this.queryParams};
-      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
       // 执行查询
-      listType(params).then(response => {
+      listType(this.queryParams).then(response => {
         this.typeList = response.data.list;
         this.total = response.data.total;
         this.loading = false;
@@ -188,7 +184,6 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.dateRangeCreateTime = [];
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -244,7 +239,6 @@ export default {
       let params = {...this.queryParams};
       params.pageNo = undefined;
       params.pageSize = undefined;
-      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
       // 执行导出
       this.$modal.confirm('是否确认导出所有字典类型数据项?').then(() => {
         this.exportLoading = true;

yudao-ui-admin/src/views/system/errorCode/index.vue

@@ -18,9 +18,9 @@
       <el-form-item label="错误码提示" prop="message">
         <el-input v-model="queryParams.message" placeholder="请输入错误码提示" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
-      <el-form-item label="创建时间">
+      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
+        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-                        type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
+                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
@@ -118,7 +118,6 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
-      dateRangeCreateTime: [],
       // 查询参数
       queryParams: {
         pageNo: 1,
@@ -127,6 +126,7 @@ export default {
         applicationName: null,
         code: null,
         message: null,
+        createTime: []
       },
       // 表单参数
       form: {},
@@ -145,11 +145,8 @@ export default {
     /** 查询列表 */
     getList() {
       this.loading = true;
-      // 处理查询参数
-      let params = {...this.queryParams};
-      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
       // 执行查询
-      getErrorCodePage(params).then(response => {
+      getErrorCodePage(this.queryParams).then(response => {
         this.list = response.data.list;
         this.total = response.data.total;
         this.loading = false;
@@ -178,7 +175,6 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.dateRangeCreateTime = [];
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -237,7 +233,6 @@ export default {
       let params = {...this.queryParams};
       params.pageNo = undefined;
       params.pageSize = undefined;
-      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
       // 执行导出
       this.$modal.confirm('是否确认导出所有错误码数据项?').then(() => {
         this.exportLoading = true;

yudao-ui-admin/src/views/system/loginlog/index.vue

@@ -17,9 +17,9 @@
           <el-option :key="false" label="失败" :value="false"/>
         </el-select>
       </el-form-item>
-      <el-form-item label="登录时间">
+      <el-form-item label="登录时间" prop="createTime">
-        <el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd"
+        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-          type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
@@ -81,15 +81,14 @@ export default {
       list: [],
       // 状态数据字典
       statusOptions: [],
-      // 日期范围
-      dateRange: [],
       // 查询参数
       queryParams: {
         pageNo: 1,
         pageSize: 10,
         userIp: undefined,
         username: undefined,
-        status: undefined
+        status: undefined,
+        createTime: []
       }
     };
   },
@@ -100,10 +99,7 @@ export default {
     /** 查询登录日志列表 */
     getList() {
       this.loading = true;
-      list(this.addDateRange(this.queryParams, [
+      list(this.queryParams).then(response => {
-        this.dateRange[0] ? this.dateRange[0] + ' 00:00:00' : undefined,
-        this.dateRange[1] ? this.dateRange[1] + ' 23:59:59' : undefined,
-      ])).then(response => {
           this.list = response.data.list;
           this.total = response.data.total;
           this.loading = false;
@@ -117,16 +113,18 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.dateRange = [];
       this.resetForm("queryForm");
       this.handleQuery();
     },
     /** 导出按钮操作 */
     handleExport() {
-      const queryParams = this.queryParams;
       this.$modal.confirm('是否确认导出所有操作日志数据项?').then(() => {
+          // 处理查询参数
+          let params = {...this.queryParams};
+          params.pageNo = undefined;
+          params.pageSize = undefined;
           this.exportLoading = true;
-          return exportLoginLog(queryParams);
+          return exportLoginLog(params);
         }).then(response => {
           this.$download.excel(response, '登录日志.xls');
           this.exportLoading = false;

yudao-ui-admin/src/views/system/operatelog/index.vue

@@ -23,9 +23,9 @@
           <el-option :key="false" label="失败" :value="false"/>
         </el-select>
       </el-form-item>
-      <el-form-item label="操作时间">
+      <el-form-item label="操作时间" prop="startTime">
-        <el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd"
+        <el-date-picker v-model="queryParams.startTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-          type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
@@ -150,8 +150,6 @@ export default {
       typeOptions: [],
       // 类型数据字典
       statusOptions: [],
-      // 日期范围
-      dateRange: [],
       // 表单参数
       form: {},
       // 查询参数
@@ -161,7 +159,8 @@ export default {
         title: undefined,
         operName: undefined,
         businessType: undefined,
-        status: undefined
+        status: undefined,
+        startTime: []
       },
     };
   },
@@ -172,10 +171,7 @@ export default {
     /** 查询登录日志 */
     getList() {
       this.loading = true;
-      listOperateLog(this.addDateRange(this.queryParams, [
+      listOperateLog(this.queryParams).then( response => {
-        this.dateRange[0] ? this.dateRange[0] + ' 00:00:00' : undefined,
-        this.dateRange[1] ? this.dateRange[1] + ' 23:59:59' : undefined,
-      ])).then( response => {
           this.list = response.data.list;
           this.total = response.data.total;
           this.loading = false;
@@ -189,7 +185,6 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.dateRange = [];
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -200,13 +195,13 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      const queryParams = this.addDateRange(this.queryParams, [
-        this.dateRange[0] ? this.dateRange[0] + ' 00:00:00' : undefined,
-        this.dateRange[1] ? this.dateRange[1] + ' 23:59:59' : undefined,
-      ])
       this.$modal.confirm('是否确认导出所有操作日志数据项?').then(() => {
+          // 处理查询参数
+          let params = {...this.queryParams};
+          params.pageNo = undefined;
+          params.pageSize = undefined;
           this.exportLoading = true;
-          return exportOperateLog(queryParams);
+          return exportOperateLog(params);
         }).then(response => {
           this.$download.excel(response, '操作日志.xls');
           this.exportLoading = false;

yudao-ui-admin/src/views/system/role/index.vue

@@ -16,9 +16,9 @@
           <el-option v-for="dict in statusDictDatas" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
         </el-select>
       </el-form-item>
-      <el-form-item label="创建时间">
+      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker v-model="dateRange" size="small" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
+        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-          range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -206,8 +206,6 @@ export default {
       menuNodeAll: false,
       deptExpand: true,
       deptNodeAll: false,
-      // 日期范围
-      dateRange: [],
       // 菜单列表
       menuOptions: [],
       // 部门列表
@@ -219,7 +217,8 @@ export default {
         pageSize: 10,
         name: undefined,
         code: undefined,
-        status: undefined
+        status: undefined,
+        createTime: []
       },
       // 表单参数
       form: {},
@@ -256,10 +255,7 @@ export default {
     /** 查询角色列表 */
     getList() {
       this.loading = true;
-      listRole(this.addDateRange(this.queryParams, [
+      listRole(this.queryParams).then(
-        this.dateRange[0] ? this.dateRange[0] + ' 00:00:00' : undefined,
-        this.dateRange[1] ? this.dateRange[1] + ' 23:59:59' : undefined,
-      ])).then(
         response => {
           this.roleList = response.data.list;
           this.total = response.data.total;
@@ -326,7 +322,6 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.dateRange = [];
       this.resetForm("queryForm");
       this.handleQuery();
     },

yudao-ui-admin/src/views/system/sensitiveWord/index.vue

@@ -16,9 +16,9 @@
                      :key="dict.value" :label="dict.label" :value="dict.value"/>
         </el-select>
       </el-form-item>
-      <el-form-item label="创建时间">
+      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker v-model="dateRangeCreateTime" size="small" style="width: 240px" value-format="yyyy-MM-dd"
+        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-                        type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"/>
+                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
@@ -150,7 +150,6 @@ export default {
       // 是否显示弹出层
       open: false,
       testOpen: false,
-      dateRangeCreateTime: [],
       tags: [],
       // 查询参数
       queryParams: {
@@ -158,6 +157,7 @@ export default {
         pageSize: 10,
         name: null,
         tag: null,
+        createTime: []
       },
       // 表单参数
       form: {},
@@ -187,11 +187,8 @@ export default {
     /** 查询列表 */
     getList() {
       this.loading = true;
-      // 处理查询参数
-      let params = {...this.queryParams};
-      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
       // 执行查询
-      getSensitiveWordPage(params).then(response => {
+      getSensitiveWordPage(this.queryParams).then(response => {
         this.list = response.data.list;
         this.total = response.data.total;
         this.loading = false;
@@ -232,7 +229,6 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.dateRangeCreateTime = [];
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -313,7 +309,6 @@ export default {
       let params = {...this.queryParams};
       params.pageNo = undefined;
       params.pageSize = undefined;
-      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
       // 执行导出
       this.$modal.confirm('是否确认导出所有敏感词数据项?').then(() => {
         this.exportLoading = true;

yudao-ui-admin/src/views/system/sms/smsChannel.vue

@@ -12,9 +12,9 @@
                      :key="dict.value" :label="dict.label" :value="dict.value"/>
         </el-select>
       </el-form-item>
-      <el-form-item label="创建时间">
+      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
+        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-                        type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
+                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
@@ -128,13 +128,13 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
-      dateRangeCreateTime: [],
       // 查询参数
       queryParams: {
         pageNo: 1,
         pageSize: 10,
         signature: null,
         status: null,
+        createTime: []
       },
       // 表单参数
       form: {},
@@ -154,11 +154,8 @@ export default {
     /** 查询列表 */
     getList() {
       this.loading = true;
-      // 处理查询参数
-      let params = {...this.queryParams};
-      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
       // 执行查询
-      getSmsChannelPage(params).then(response => {
+      getSmsChannelPage(this.queryParams).then(response => {
         this.list = response.data.list;
         this.total = response.data.total;
         this.loading = false;
@@ -190,7 +187,6 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.dateRangeCreateTime = [];
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -235,8 +231,7 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const id = row.id;
+      this.$modal.confirm('是否确认删除短信渠道编号为"' + row.id + '"的数据项?').then(function() {
-      this.$modal.confirm('是否确认删除短信渠道编号为"' + id + '"的数据项?').then(function() {
         return deleteSmsChannel(id);
       }).then(() => {
         this.getList();

yudao-ui-admin/src/views/system/sms/smsLog.vue

@@ -22,9 +22,9 @@
                      :key="dict.value" :label="dict.label" :value="dict.value"/>
         </el-select>
       </el-form-item>
-      <el-form-item label="发送时间">
+      <el-form-item label="发送时间" prop="sendTime">
-        <el-date-picker v-model="dateRangeSendTime" style="width: 240px" value-format="yyyy-MM-dd"
+        <el-date-picker v-model="queryParams.sendTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-                        type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
+                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
       </el-form-item>
       <el-form-item label="接收状态" prop="receiveStatus">
         <el-select v-model="queryParams.receiveStatus" placeholder="请选择接收状态" clearable>
@@ -32,9 +32,9 @@
                      :key="dict.value" :label="dict.label" :value="dict.value"/>
         </el-select>
       </el-form-item>
-      <el-form-item label="接收时间">
+      <el-form-item label="接收时间" prop="receiveTime">
-        <el-date-picker v-model="dateRangeReceiveTime" style="width: 240px" value-format="yyyy-MM-dd"
+        <el-date-picker v-model="queryParams.receiveTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-                        type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
+                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
@@ -208,8 +208,6 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
-      dateRangeSendTime: [],
-      dateRangeReceiveTime: [],
       // 表单参数
       form: {},
       // 查询参数
@@ -221,6 +219,8 @@ export default {
         mobile: null,
         sendStatus: null,
         receiveStatus: null,
+        sendTime: [],
+        receiveTime: []
       },
       // 短信渠道
       channelOptions: [],
@@ -237,12 +237,8 @@ export default {
     /** 查询列表 */
     getList() {
       this.loading = true;
-      // 处理查询参数
-      let params = {...this.queryParams};
-      this.addBeginAndEndTime(params, this.dateRangeSendTime, 'sendTime');
-      this.addBeginAndEndTime(params, this.dateRangeReceiveTime, 'receiveTime');
       // 执行查询
-      getSmsLogPage(params).then(response => {
+      getSmsLogPage(this.queryParams).then(response => {
         this.list = response.data.list;
         this.total = response.data.total;
         this.loading = false;
@@ -260,8 +256,6 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.dateRangeSendTime = [];
-      this.dateRangeReceiveTime = [];
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -271,8 +265,6 @@ export default {
       let params = {...this.queryParams};
       params.pageNo = undefined;
       params.pageSize = undefined;
-      this.addBeginAndEndTime(params, this.dateRangeSendTime, 'sendTime');
-      this.addBeginAndEndTime(params, this.dateRangeReceiveTime, 'receiveTime');
       // 执行导出
       this.$modal.confirm('是否确认导出所有短信日志数据项?').then(() => {
         this.exportLoading = true;

yudao-ui-admin/src/views/system/sms/smsTemplate.vue

@@ -28,9 +28,9 @@
                      :label="channel.signature + '【' + getDictDataLabel(DICT_TYPE.SYSTEM_SMS_CHANNEL_CODE, channel.code) + '】'" />
         </el-select>
       </el-form-item>
-      <el-form-item label="创建时间">
+      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
+        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-                        type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
+                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
@@ -183,7 +183,6 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
-      dateRangeCreateTime: [],
       // 查询参数
       queryParams: {
         pageNo: 1,
@@ -194,6 +193,7 @@ export default {
         content: null,
         apiTemplateId: null,
         channelId: null,
+        createTime: []
       },
       // 表单参数
       form: {},
@@ -232,11 +232,8 @@ export default {
     /** 查询列表 */
     getList() {
       this.loading = true;
-      // 处理查询参数
-      let params = {...this.queryParams};
-      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
       // 执行查询
-      getSmsTemplatePage(params).then(response => {
+      getSmsTemplatePage(this.queryParams).then(response => {
         this.list = response.data.list;
         this.total = response.data.total;
         this.loading = false;
@@ -269,7 +266,6 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.dateRangeCreateTime = [];
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -328,7 +324,6 @@ export default {
       let params = {...this.queryParams};
       params.pageNo = undefined;
       params.pageSize = undefined;
-      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
       // 执行导出
       this.$modal.confirm('是否确认导出所有短信模板数据项?', "警告").then(() => {
         this.exportLoading = true;

yudao-ui-admin/src/views/system/tenant/index.vue

@@ -18,6 +18,10 @@
                        :key="dict.value" :label="dict.label" :value="dict.value"/>
         </el-select>
       </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
+                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
@@ -158,7 +162,6 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
-      dateRangeCreateTime: [],
       // 查询参数
       queryParams: {
         pageNo: 1,
@@ -167,6 +170,7 @@ export default {
         contactName: null,
         contactMobile: null,
         status: undefined,
+        createTime: []
       },
       // 表单参数
       form: {},
@@ -195,11 +199,8 @@ export default {
     /** 查询列表 */
     getList() {
       this.loading = true;
-      // 处理查询参数
-      let params = {...this.queryParams};
-      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
       // 执行查询
-      getTenantPage(params).then(response => {
+      getTenantPage(this.queryParams).then(response => {
         this.list = response.data.list;
         this.total = response.data.total;
         this.loading = false;
@@ -232,7 +233,6 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.dateRangeCreateTime = [];
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -291,7 +291,6 @@ export default {
       let params = {...this.queryParams};
       params.pageNo = undefined;
       params.pageSize = undefined;
-      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
       // 执行导出
       this.$modal.confirm('是否确认导出所有租户数据项?').then(() => {
           this.exportLoading = true;

yudao-ui-admin/src/views/system/tenantPackage/index.vue

@@ -12,9 +12,9 @@
                        :key="dict.value" :label="dict.label" :value="dict.value"/>
         </el-select>
       </el-form-item>
-      <el-form-item label="创建时间">
+      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
+        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-                        type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
+                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
@@ -114,7 +114,6 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
-      dateRangeCreateTime: [],
       // 查询参数
       queryParams: {
         pageNo: 1,
@@ -122,6 +121,7 @@ export default {
         name: null,
         status: null,
         remark: null,
+        createTime: []
       },
       // 表单参数
       form: {},
@@ -149,11 +149,8 @@ export default {
     /** 查询列表 */
     getList() {
       this.loading = true;
-      // 处理查询参数
-      let params = {...this.queryParams};
-      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
       // 执行查询
-      getTenantPackagePage(params).then(response => {
+      getTenantPackagePage(this.queryParams).then(response => {
         this.list = response.data.list;
         this.total = response.data.total;
         this.loading = false;
@@ -190,7 +187,6 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.dateRangeCreateTime = [];
       // 表单重置
       this.resetForm("queryForm");
       this.handleQuery();

yudao-ui-admin/src/views/system/user/index.vue

@@ -31,9 +31,9 @@
               <el-option v-for="dict in statusDictDatas" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
             </el-select>
           </el-form-item>
-          <el-form-item label="创建时间">
+          <el-form-item label="创建时间" prop="createTime">
-            <el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
+            <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-              range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+              range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
           </el-form-item>
           <el-form-item>
             <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
@@ -237,7 +237,6 @@ import {
   resetUserPwd,
   updateUser
 } from "@/api/system/user";
-import {getAccessToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
@@ -275,8 +274,6 @@ export default {
       deptName: undefined,
       // 默认密码
       initPassword: undefined,
-      // 日期范围
-      dateRange: [],
       // 状态数据字典
       statusOptions: [],
       // 性别状态字典
@@ -313,7 +310,8 @@ export default {
         username: undefined,
         mobile: undefined,
         status: undefined,
-        deptId: undefined
+        deptId: undefined,
+        createTime: []
       },
       // 列信息
       columns: [
@@ -345,7 +343,7 @@ export default {
         ],
         mobile: [
           {
-            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+            pattern: /^(?:(?:\+|00)86)?1(?:(?:3[\d])|(?:4[5-79])|(?:5[0-35-9])|(?:6[5-7])|(?:7[0-8])|(?:8[\d])|(?:9[189]))\d{8}$/,
             message: "请输入正确的手机号码",
             trigger: "blur"
           }
@@ -397,10 +395,7 @@ export default {
     /** 查询用户列表 */
     getList() {
       this.loading = true;
-      listUser(this.addDateRange(this.queryParams, [
+      listUser(this.queryParams).then(response => {
-        this.dateRange[0] ? this.dateRange[0] + ' 00:00:00' : undefined,
-        this.dateRange[1] ? this.dateRange[1] + ' 23:59:59' : undefined,
-      ])).then(response => {
           this.userList = response.data.list;
           this.total = response.data.total;
           this.loading = false;
@@ -477,7 +472,6 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.dateRange = [];
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -581,13 +575,13 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      const queryParams = this.addDateRange(this.queryParams, [
-        this.dateRange[0] ? this.dateRange[0] + ' 00:00:00' : undefined,
-        this.dateRange[1] ? this.dateRange[1] + ' 23:59:59' : undefined,
-      ]);
       this.$modal.confirm('是否确认导出所有用户数据项?').then(() => {
+          // 处理查询参数
+          let params = {...this.queryParams};
+          params.pageNo = undefined;
+          params.pageSize = undefined;
           this.exportLoading = true;
-          return exportUser(queryParams);
+          return exportUser(params);
         }).then(response => {
           this.$download.excel(response, '用户数据.xls');
           this.exportLoading = false;