diff --git a/yudao-ui-admin/src/views/bpm/group/index.vue b/yudao-ui-admin/src/views/bpm/group/index.vue index 3e586fdcb..775aecda1 100644 --- a/yudao-ui-admin/src/views/bpm/group/index.vue +++ b/yudao-ui-admin/src/views/bpm/group/index.vue @@ -13,9 +13,9 @@ :key="dict.value" :label="dict.label" :value="dict.value"/> - - + + 搜索 @@ -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(); }, diff --git a/yudao-ui-admin/src/views/bpm/oa/leave/index.vue b/yudao-ui-admin/src/views/bpm/oa/leave/index.vue index c66acb295..e3b05d47a 100644 --- a/yudao-ui-admin/src/views/bpm/oa/leave/index.vue +++ b/yudao-ui-admin/src/views/bpm/oa/leave/index.vue @@ -9,9 +9,9 @@ - - + + @@ -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(); }, diff --git a/yudao-ui-admin/src/views/bpm/processInstance/index.vue b/yudao-ui-admin/src/views/bpm/processInstance/index.vue index c004ab44c..91adf4a05 100644 --- a/yudao-ui-admin/src/views/bpm/processInstance/index.vue +++ b/yudao-ui-admin/src/views/bpm/processInstance/index.vue @@ -16,9 +16,9 @@ :key="dict.value" :label="dict.label" :value="dict.value"/> - - + + @@ -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(); }, diff --git a/yudao-ui-admin/src/views/bpm/task/done.vue b/yudao-ui-admin/src/views/bpm/task/done.vue index b35dc597d..8dac4b085 100644 --- a/yudao-ui-admin/src/views/bpm/task/done.vue +++ b/yudao-ui-admin/src/views/bpm/task/done.vue @@ -7,9 +7,9 @@ - - + + 搜索 @@ -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; - // 处理查询参数 - let params = {...this.queryParams}; - this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime'); - getDoneTaskPage(params).then(response => { + getDoneTaskPage(this.queryParams).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(); }, diff --git a/yudao-ui-admin/src/views/bpm/task/todo.vue b/yudao-ui-admin/src/views/bpm/task/todo.vue index 2766ab690..17b221200 100644 --- a/yudao-ui-admin/src/views/bpm/task/todo.vue +++ b/yudao-ui-admin/src/views/bpm/task/todo.vue @@ -7,9 +7,9 @@ - - + + 搜索 @@ -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}; - this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime'); - getTodoTaskPage(params).then(response => { + getTodoTaskPage(this.queryParams).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(); }, diff --git a/yudao-ui-admin/src/views/infra/apiAccessLog/index.vue b/yudao-ui-admin/src/views/infra/apiAccessLog/index.vue index 79881f34c..638f46521 100644 --- a/yudao-ui-admin/src/views/infra/apiAccessLog/index.vue +++ b/yudao-ui-admin/src/views/infra/apiAccessLog/index.vue @@ -18,9 +18,9 @@ - - + + @@ -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; diff --git a/yudao-ui-admin/src/views/infra/apiErrorLog/index.vue b/yudao-ui-admin/src/views/infra/apiErrorLog/index.vue index 2ba20c549..6c9631c93 100644 --- a/yudao-ui-admin/src/views/infra/apiErrorLog/index.vue +++ b/yudao-ui-admin/src/views/infra/apiErrorLog/index.vue @@ -18,9 +18,9 @@ - - + + @@ -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; diff --git a/yudao-ui-admin/src/views/infra/codegen/index.vue b/yudao-ui-admin/src/views/infra/codegen/index.vue index 754ed03d1..6652e97e8 100644 --- a/yudao-ui-admin/src/views/infra/codegen/index.vue +++ b/yudao-ui-admin/src/views/infra/codegen/index.vue @@ -12,9 +12,9 @@ - - + + 搜索 @@ -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, [ - this.dateRange[0] ? this.dateRange[0] + ' 00:00:00' : undefined, - this.dateRange[1] ? this.dateRange[1] + ' 23:59:59' : undefined, - ], 'CreateTime')).then(response => { + getCodegenTablePage(this.queryParams).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(); }, diff --git a/yudao-ui-admin/src/views/infra/config/index.vue b/yudao-ui-admin/src/views/infra/config/index.vue index 9ac4fd468..23c204864 100644 --- a/yudao-ui-admin/src/views/infra/config/index.vue +++ b/yudao-ui-admin/src/views/infra/config/index.vue @@ -17,9 +17,9 @@ :label="dict.label" :value="parseInt(dict.value)"/> - - + + 搜索 @@ -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, [ - this.dateRange[0] ? this.dateRange[0] + ' 00:00:00' : undefined, - this.dateRange[1] ? this.dateRange[1] + ' 23:59:59' : undefined, - ])).then(response => { + listConfig(this.queryParams).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; diff --git a/yudao-ui-admin/src/views/infra/file/index.vue b/yudao-ui-admin/src/views/infra/file/index.vue index 53716782e..9d38a7484 100644 --- a/yudao-ui-admin/src/views/infra/file/index.vue +++ b/yudao-ui-admin/src/views/infra/file/index.vue @@ -6,9 +6,9 @@ - - + + 搜索 @@ -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(); }, diff --git a/yudao-ui-admin/src/views/infra/fileConfig/index.vue b/yudao-ui-admin/src/views/infra/fileConfig/index.vue index 2662a0d9d..5b8b54324 100755 --- a/yudao-ui-admin/src/views/infra/fileConfig/index.vue +++ b/yudao-ui-admin/src/views/infra/fileConfig/index.vue @@ -12,9 +12,9 @@ :key="dict.value" :label="dict.label" :value="dict.value"/> - - + + 搜索 @@ -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(); }, diff --git a/yudao-ui-admin/src/views/infra/testDemo/index.vue b/yudao-ui-admin/src/views/infra/testDemo/index.vue index e7f205665..b03726764 100755 --- a/yudao-ui-admin/src/views/infra/testDemo/index.vue +++ b/yudao-ui-admin/src/views/infra/testDemo/index.vue @@ -22,9 +22,9 @@ - - + + 搜索 @@ -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; diff --git a/yudao-ui-admin/src/views/login.vue b/yudao-ui-admin/src/views/login.vue index b236cb20f..88a7b4abd 100644 --- a/yudao-ui-admin/src/views/login.vue +++ b/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(); diff --git a/yudao-ui-admin/src/views/mall/market/banner/index.vue b/yudao-ui-admin/src/views/mall/market/banner/index.vue index 448f9124b..daa3c488e 100644 --- a/yudao-ui-admin/src/views/mall/market/banner/index.vue +++ b/yudao-ui-admin/src/views/mall/market/banner/index.vue @@ -12,9 +12,9 @@ :key="dict.value" :label="dict.label" :value="dict.value"/> - - + + 搜索 @@ -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(); }, diff --git a/yudao-ui-admin/src/views/mall/product/brand/index.vue b/yudao-ui-admin/src/views/mall/product/brand/index.vue index 73f3b7608..b0c3c97b8 100644 --- a/yudao-ui-admin/src/views/mall/product/brand/index.vue +++ b/yudao-ui-admin/src/views/mall/product/brand/index.vue @@ -12,9 +12,9 @@ :key="dict.value" :label="dict.label" :value="dict.value"/> - - + + 搜索 @@ -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; diff --git a/yudao-ui-admin/src/views/mall/product/property/index.vue b/yudao-ui-admin/src/views/mall/product/property/index.vue index 6fd222341..0768ba207 100644 --- a/yudao-ui-admin/src/views/mall/product/property/index.vue +++ b/yudao-ui-admin/src/views/mall/product/property/index.vue @@ -12,6 +12,10 @@ :key="dict.value" :label="dict.label" :value="dict.value"/> + + + 搜索 重置 @@ -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; diff --git a/yudao-ui-admin/src/views/mall/product/spu/index.vue b/yudao-ui-admin/src/views/mall/product/spu/index.vue index da7d18115..a61431a5c 100644 --- a/yudao-ui-admin/src/views/mall/product/spu/index.vue +++ b/yudao-ui-admin/src/views/mall/product/spu/index.vue @@ -25,9 +25,9 @@ - - + + 搜索 @@ -193,7 +193,7 @@ label="条形码" width="250" v-if="skuTags.length"> + :disabled="scope.row.status===1"> @@ -222,7 +222,7 @@ :precision="2" :max="1000000000" :min="0.01" - :disabled="scope.row.status==1"> + :disabled="scope.row.status===1"> @@ -237,7 +237,7 @@ :precision="2" :max="1000000000" :min="0.01" - :disabled="scope.row.status==1"> + :disabled="scope.row.status===1"> @@ -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(id).then(response => { + getSpu(row.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; diff --git a/yudao-ui-admin/src/views/pay/app/index.vue b/yudao-ui-admin/src/views/pay/app/index.vue index d1bbc00aa..b1dbfc72c 100644 --- a/yudao-ui-admin/src/views/pay/app/index.vue +++ b/yudao-ui-admin/src/views/pay/app/index.vue @@ -17,6 +17,10 @@ :value="parseInt(dict.value)"/> + + + 搜索 重置 @@ -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('是否确认删除支付应用信息编号为"' + id + '"的数据项?').then(function () { - return deleteApp(id); + this.$modal.confirm('是否确认删除支付应用信息编号为"' + row.id + '"的数据项?').then(function () { + return deleteApp(row.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); diff --git a/yudao-ui-admin/src/views/pay/merchant/index.vue b/yudao-ui-admin/src/views/pay/merchant/index.vue index e841c2f95..153808c10 100644 --- a/yudao-ui-admin/src/views/pay/merchant/index.vue +++ b/yudao-ui-admin/src/views/pay/merchant/index.vue @@ -20,9 +20,9 @@ - - + + 搜索 @@ -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(id).then(response => { + getMerchant(row.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; diff --git a/yudao-ui-admin/src/views/pay/order/index.vue b/yudao-ui-admin/src/views/pay/order/index.vue index a5eb90827..cf7aa33f5 100755 --- a/yudao-ui-admin/src/views/pay/order/index.vue +++ b/yudao-ui-admin/src/views/pay/order/index.vue @@ -47,12 +47,9 @@ :label="dict.label" :value="parseInt(dict.value)"/> - - - + + 搜索 @@ -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 maxDateTime = new Date(this.dateRangeCreateTime[1]).getTime() + let minDateTime = new Date(this.queryParams.createTime[0]).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); diff --git a/yudao-ui-admin/src/views/pay/refund/index.vue b/yudao-ui-admin/src/views/pay/refund/index.vue index e50e28313..c018b1878 100755 --- a/yudao-ui-admin/src/views/pay/refund/index.vue +++ b/yudao-ui-admin/src/views/pay/refund/index.vue @@ -1,6 +1,5 @@