BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 53a0d9bb0e320f6f911819ef3fccbe03b6820fce

Authored by xingyu
1 parent edf11dc0

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

Inline Side-by-side
Showing 33 changed files with 217 additions and 390 deletions
yudao-ui-admin/src/views/bpm/group/index.vue
  View file @53a0d9b
... ... @@ -13,9 +13,9 @@
13 13 :key="dict.value" :label="dict.label" :value="dict.value"/>
14 14 </el-select>
15 15 </el-form-item>
16   - <el-form-item label="创建时间">
17   - <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
18   - type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
  16 + <el-form-item label="创建时间" prop="createTime">
  17 + <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
  18 + range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
19 19 </el-form-item>
20 20 <el-form-item>
21 21 <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
... ... @@ -121,7 +121,6 @@ export default {
121 121 title: "",
122 122 // 是否显示弹出层
123 123 open: false,
124   - dateRangeCreateTime: [],
125 124 // 查询参数
126 125 queryParams: {
127 126 pageNo: 1,
... ... @@ -129,6 +128,7 @@ export default {
129 128 name: null,
130 129 status: null,
131 130 tenantId: null,
  131 + createTime: []
132 132 },
133 133 // 表单参数
134 134 form: {},
... ... @@ -152,11 +152,8 @@ export default {
152 152 /** 查询列表 */
153 153 getList() {
154 154 this.loading = true;
155   - // 处理查询参数
156   - let params = {...this.queryParams};
157   - this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
158 155 // 执行查询
159   - getUserGroupPage(params).then(response => {
  156 + getUserGroupPage(this.queryParams).then(response => {
160 157 this.list = response.data.list;
161 158 this.total = response.data.total;
162 159 this.loading = false;
... ... @@ -185,7 +182,6 @@ export default {
185 182 },
186 183 /** 重置按钮操作 */
187 184 resetQuery() {
188   - this.dateRangeCreateTime = [];
189 185 this.resetForm("queryForm");
190 186 this.handleQuery();
191 187 },
... ...
yudao-ui-admin/src/views/bpm/oa/leave/index.vue
  View file @53a0d9b
... ... @@ -9,9 +9,9 @@
9 9 <el-option v-for="dict in leaveTypeDictData" :key="dict.value" :label="dict.label" :value="dict.value" />
10 10 </el-select>
11 11 </el-form-item>
12   - <el-form-item label="申请时间">
13   - <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
14   - type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
  12 + <el-form-item label="申请时间" prop="createTime">
  13 + <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
  14 + range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
15 15 </el-form-item>
16 16 <el-form-item label="结果" prop="result">
17 17 <el-select v-model="queryParams.result" placeholder="请选择流结果" clearable>
... ... @@ -102,8 +102,6 @@ export default {
102 102 total: 0,
103 103 // 请假申请列表
104 104 list: [],
105   - //审批进度弹出层
106   - dateRangeCreateTime: [],
107 105 // 查询参数
108 106 queryParams: {
109 107 pageNo: 1,
... ... @@ -111,6 +109,7 @@ export default {
111 109 result: null,
112 110 type: null,
113 111 reason: null,
  112 + createTime: []
114 113 },
115 114  
116 115 leaveTypeDictData: getDictDatas(DICT_TYPE.BPM_OA_LEAVE_TYPE),
... ... @@ -124,11 +123,8 @@ export default {
124 123 /** 查询列表 */
125 124 getList() {
126 125 this.loading = true;
127   - // 处理查询参数
128   - let params = {...this.queryParams};
129   - this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
130 126 // 执行查询
131   - getLeavePage(params).then(response => {
  127 + getLeavePage(this.queryParams).then(response => {
132 128 this.list = response.data.list;
133 129 this.total = response.data.total;
134 130 this.loading = false;
... ... @@ -141,7 +137,6 @@ export default {
141 137 },
142 138 /** 重置按钮操作 */
143 139 resetQuery() {
144   - this.dateRangeCreateTime = [];
145 140 this.resetForm("queryForm");
146 141 this.handleQuery();
147 142 },
... ...
yudao-ui-admin/src/views/bpm/processInstance/index.vue
  View file @53a0d9b
... ... @@ -16,9 +16,9 @@
16 16 :key="dict.value" :label="dict.label" :value="dict.value"/>
17 17 </el-select>
18 18 </el-form-item>
19   - <el-form-item label="提交时间">
20   - <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
21   - type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
  19 + <el-form-item label="提交时间" prop="createTime">
  20 + <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
  21 + range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
22 22 </el-form-item>
23 23 <el-form-item label="状态" prop="status">
24 24 <el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
... ... @@ -116,8 +116,6 @@ export default {
116 116 total: 0,
117 117 // 工作流的流程实例的拓展列表
118 118 list: [],
119   - // 是否显示弹出层
120   - dateRangeCreateTime: [],
121 119 // 查询参数
122 120 queryParams: {
123 121 pageNo: 1,
... ... @@ -127,6 +125,7 @@ export default {
127 125 category: null,
128 126 status: null,
129 127 result: null,
  128 + createTime: []
130 129 }
131 130 };
132 131 },
... ... @@ -137,11 +136,8 @@ export default {
137 136 /** 查询列表 */
138 137 getList() {
139 138 this.loading = true;
140   - // 处理查询参数
141   - let params = {...this.queryParams};
142   - this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
143 139 // 执行查询
144   - getMyProcessInstancePage(params).then(response => {
  140 + getMyProcessInstancePage(this.queryParams).then(response => {
145 141 this.list = response.data.list;
146 142 this.total = response.data.total;
147 143 this.loading = false;
... ... @@ -154,7 +150,6 @@ export default {
154 150 },
155 151 /** 重置按钮操作 */
156 152 resetQuery() {
157   - this.dateRangeCreateTime = [];
158 153 this.resetForm("queryForm");
159 154 this.handleQuery();
160 155 },
... ...
yudao-ui-admin/src/views/bpm/task/done.vue
  View file @53a0d9b
... ... @@ -7,9 +7,9 @@
7 7 <el-form-item label="流程名" prop="name">
8 8 <el-input v-model="queryParams.name" placeholder="请输入流程名" clearable @keyup.enter.native="handleQuery"/>
9 9 </el-form-item>
10   - <el-form-item label="创建时间">
11   - <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
12   - type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
  10 + <el-form-item label="创建时间" prop="createTime">
  11 + <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
  12 + range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
13 13 </el-form-item>
14 14 <el-form-item>
15 15 <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
... ... @@ -77,11 +77,11 @@ export default {
77 77 // 已办任务列表
78 78 list: [],
79 79 // 查询参数
80   - dateRangeCreateTime: [],
81 80 queryParams: {
82 81 pageNo: 1,
83 82 pageSize: 10,
84 83 name: null,
  84 + createTime: []
85 85 },
86 86 };
87 87 },
... ... @@ -92,10 +92,7 @@ export default {
92 92 /** 查询列表 */
93 93 getList() {
94 94 this.loading = true;
95   - // 处理查询参数
96   - let params = {...this.queryParams};
97   - this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
98   - getDoneTaskPage(params).then(response => {
  95 + getDoneTaskPage(this.queryParams).then(response => {
99 96 this.list = response.data.list;
100 97 this.total = response.data.total;
101 98 this.loading = false;
... ... @@ -108,7 +105,6 @@ export default {
108 105 },
109 106 /** 重置按钮操作 */
110 107 resetQuery() {
111   - this.dateRangeCreateTime = [];
112 108 this.resetForm("queryForm");
113 109 this.handleQuery();
114 110 },
... ...
yudao-ui-admin/src/views/bpm/task/todo.vue
  View file @53a0d9b
... ... @@ -7,9 +7,9 @@
7 7 <el-form-item label="流程名" prop="name">
8 8 <el-input v-model="queryParams.name" placeholder="请输入流程名" clearable @keyup.enter.native="handleQuery"/>
9 9 </el-form-item>
10   - <el-form-item label="创建时间">
11   - <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
12   - type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
  10 + <el-form-item label="创建时间" prop="createTime">
  11 + <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
  12 + range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
13 13 </el-form-item>
14 14 <el-form-item>
15 15 <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
... ... @@ -67,11 +67,11 @@ export default {
67 67 // 待办任务列表
68 68 list: [],
69 69 // 查询参数
70   - dateRangeCreateTime: [],
71 70 queryParams: {
72 71 pageNo: 1,
73 72 pageSize: 10,
74 73 name: null,
  74 + createTime: []
75 75 },
76 76 };
77 77 },
... ... @@ -83,9 +83,7 @@ export default {
83 83 getList() {
84 84 this.loading = true;
85 85 // 处理查询参数
86   - let params = {...this.queryParams};
87   - this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
88   - getTodoTaskPage(params).then(response => {
  86 + getTodoTaskPage(this.queryParams).then(response => {
89 87 this.list = response.data.list;
90 88 this.total = response.data.total;
91 89 this.loading = false;
... ... @@ -98,7 +96,6 @@ export default {
98 96 },
99 97 /** 重置按钮操作 */
100 98 resetQuery() {
101   - this.dateRangeCreateTime = [];
102 99 this.resetForm("queryForm");
103 100 this.handleQuery();
104 101 },
... ...
yudao-ui-admin/src/views/infra/apiAccessLog/index.vue
  View file @53a0d9b
... ... @@ -18,9 +18,9 @@
18 18 <el-form-item label="请求地址" prop="requestUrl">
19 19 <el-input v-model="queryParams.requestUrl" placeholder="请输入请求地址" clearable @keyup.enter.native="handleQuery"/>
20 20 </el-form-item>
21   - <el-form-item label="请求时间">
22   - <el-date-picker v-model="dateRangeBeginTime" style="width: 240px" value-format="yyyy-MM-dd"
23   - type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
  21 + <el-form-item label="请求时间" prop="beginTime">
  22 + <el-date-picker v-model="queryParams.beginTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
  23 + range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
24 24 </el-form-item>
25 25 <el-form-item label="执行时长" prop="duration">
26 26 <el-input v-model="queryParams.duration" placeholder="请输入执行时长" clearable @keyup.enter.native="handleQuery"/>
... ... @@ -135,7 +135,6 @@ export default {
135 135 title: "",
136 136 // 是否显示弹出层
137 137 open: false,
138   - dateRangeBeginTime: [],
139 138 // 查询参数
140 139 queryParams: {
141 140 pageNo: 1,
... ... @@ -146,6 +145,7 @@ export default {
146 145 requestUrl: null,
147 146 duration: null,
148 147 resultCode: null,
  148 + beginTime: []
149 149 },
150 150 // 表单参数
151 151 form: {},
... ... @@ -158,11 +158,8 @@ export default {
158 158 /** 查询列表 */
159 159 getList() {
160 160 this.loading = true;
161   - // 处理查询参数
162   - let params = {...this.queryParams};
163   - this.addBeginAndEndTime(params, this.dateRangeBeginTime, 'beginTime');
164 161 // 执行查询
165   - getApiAccessLogPage(params).then(response => {
  162 + getApiAccessLogPage(this.queryParams).then(response => {
166 163 this.list = response.data.list;
167 164 this.total = response.data.total;
168 165 this.loading = false;
... ... @@ -185,7 +182,6 @@ export default {
185 182 },
186 183 /** 重置按钮操作 */
187 184 resetQuery() {
188   - this.dateRangeBeginTime = [];
189 185 this.resetForm("queryForm");
190 186 this.handleQuery();
191 187 },
... ... @@ -200,7 +196,6 @@ export default {
200 196 let params = {...this.queryParams};
201 197 params.pageNo = undefined;
202 198 params.pageSize = undefined;
203   - this.addBeginAndEndTime(params, this.dateRangeBeginTime, 'beginTime');
204 199 // 执行导出
205 200 this.$modal.confirm('是否确认导出所有API 访问日志数据项?').then(() => {
206 201 this.exportLoading = true;
... ...
yudao-ui-admin/src/views/infra/apiErrorLog/index.vue
  View file @53a0d9b
... ... @@ -18,9 +18,9 @@
18 18 <el-form-item label="请求地址" prop="requestUrl">
19 19 <el-input v-model="queryParams.requestUrl" placeholder="请输入请求地址" clearable @keyup.enter.native="handleQuery"/>
20 20 </el-form-item>
21   - <el-form-item label="异常时间">
22   - <el-date-picker v-model="dateRangeExceptionTime" style="width: 240px" value-format="yyyy-MM-dd"
23   - type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
  21 + <el-form-item label="异常时间" prop="exceptionTime">
  22 + <el-date-picker v-model="queryParams.exceptionTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
  23 + range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
24 24 </el-form-item>
25 25 <el-form-item label="处理状态" prop="processStatus">
26 26 <el-select v-model="queryParams.processStatus" placeholder="请选择处理状态" clearable>
... ... @@ -142,7 +142,6 @@ export default {
142 142 title: "",
143 143 // 是否显示弹出层
144 144 open: false,
145   - dateRangeExceptionTime: [],
146 145 // 查询参数
147 146 queryParams: {
148 147 pageNo: 1,
... ... @@ -152,6 +151,7 @@ export default {
152 151 applicationName: null,
153 152 requestUrl: null,
154 153 processStatus: null,
  154 + exceptionTime: []
155 155 },
156 156 // 表单参数
157 157 form: {},
... ... @@ -166,11 +166,8 @@ export default {
166 166 /** 查询列表 */
167 167 getList() {
168 168 this.loading = true;
169   - // 处理查询参数
170   - let params = {...this.queryParams};
171   - this.addBeginAndEndTime(params, this.dateRangeExceptionTime, 'exceptionTime');
172 169 // 执行查询
173   - getApiErrorLogPage(params).then(response => {
  170 + getApiErrorLogPage(this.queryParams).then(response => {
174 171 this.list = response.data.list;
175 172 this.total = response.data.total;
176 173 this.loading = false;
... ... @@ -193,7 +190,6 @@ export default {
193 190 },
194 191 /** 重置按钮操作 */
195 192 resetQuery() {
196   - this.dateRangeExceptionTime = [];
197 193 this.resetForm("queryForm");
198 194 this.handleQuery();
199 195 },
... ... @@ -218,7 +214,6 @@ export default {
218 214 let params = {...this.queryParams};
219 215 params.pageNo = undefined;
220 216 params.pageSize = undefined;
221   - this.addBeginAndEndTime(params, this.dateRangeExceptionTime, 'exceptionTime');
222 217 // 执行导出
223 218 this.$modal.confirm('是否确认导出所有API 错误日志数据项?').then(() => {
224 219 this.exportLoading = true;
... ...
yudao-ui-admin/src/views/infra/codegen/index.vue
  View file @53a0d9b
... ... @@ -12,9 +12,9 @@
12 12 <el-input v-model="queryParams.tableComment" placeholder="请输入表描述" clearable
13 13 @keyup.enter.native="handleQuery"/>
14 14 </el-form-item>
15   - <el-form-item label="创建时间">
16   - <el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
17   - range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"/>
  15 + <el-form-item label="创建时间" prop="createTime">
  16 + <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
  17 + range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
18 18 </el-form-item>
19 19 <el-form-item>
20 20 <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
... ... @@ -123,7 +123,8 @@ export default {
123 123 pageNo: 1,
124 124 pageSize: 10,
125 125 tableName: undefined,
126   - tableComment: undefined
  126 + tableComment: undefined,
  127 + createTime: []
127 128 },
128 129 // 预览参数
129 130 preview: {
... ... @@ -155,10 +156,7 @@ export default {
155 156 /** 查询表集合 */
156 157 getList() {
157 158 this.loading = true;
158   - getCodegenTablePage(this.addDateRange(this.queryParams, [
159   - this.dateRange[0] ? this.dateRange[0] + ' 00:00:00' : undefined,
160   - this.dateRange[1] ? this.dateRange[1] + ' 23:59:59' : undefined,
161   - ], 'CreateTime')).then(response => {
  159 + getCodegenTablePage(this.queryParams).then(response => {
162 160 this.tableList = response.data.list;
163 161 this.total = response.data.total;
164 162 this.loading = false;
... ... @@ -192,7 +190,6 @@ export default {
192 190 },
193 191 /** 重置按钮操作 */
194 192 resetQuery() {
195   - this.dateRange = [];
196 193 this.resetForm("queryForm");
197 194 this.handleQuery();
198 195 },
... ...
yudao-ui-admin/src/views/infra/config/index.vue
  View file @53a0d9b
... ... @@ -17,9 +17,9 @@
17 17 :label="dict.label" :value="parseInt(dict.value)"/>
18 18 </el-select>
19 19 </el-form-item>
20   - <el-form-item label="创建时间">
21   - <el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
22   - range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
  20 + <el-form-item label="创建时间" prop="createTime">
  21 + <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
  22 + range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
23 23 </el-form-item>
24 24 <el-form-item>
25 25 <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
... ... @@ -129,15 +129,14 @@ export default {
129 129 open: false,
130 130 // 类型数据字典
131 131 typeOptions: [],
132   - // 日期范围
133   - dateRange: [],
134 132 // 查询参数
135 133 queryParams: {
136 134 pageNo: 1,
137 135 pageSize: 10,
138 136 name: undefined,
139 137 key: undefined,
140   - type: undefined
  138 + type: undefined,
  139 + createTime: []
141 140 },
142 141 // 表单参数
143 142 form: {},
... ... @@ -165,10 +164,7 @@ export default {
165 164 /** 查询参数列表 */
166 165 getList() {
167 166 this.loading = true;
168   - listConfig(this.addDateRange(this.queryParams, [
169   - this.dateRange[0] ? this.dateRange[0] + ' 00:00:00' : undefined,
170   - this.dateRange[1] ? this.dateRange[1] + ' 23:59:59' : undefined,
171   - ])).then(response => {
  167 + listConfig(this.queryParams).then(response => {
172 168 this.configList = response.data.list;
173 169 this.total = response.data.total;
174 170 this.loading = false;
... ... @@ -198,7 +194,6 @@ export default {
198 194 },
199 195 /** 重置按钮操作 */
200 196 resetQuery() {
201   - this.dateRange = [];
202 197 this.resetForm("queryForm");
203 198 this.handleQuery();
204 199 },
... ... @@ -250,13 +245,13 @@ export default {
250 245 },
251 246 /** 导出按钮操作 */
252 247 handleExport() {
253   - const queryParams = this.addDateRange(this.queryParams, [
254   - this.dateRange[0] ? this.dateRange[0] + ' 00:00:00' : undefined,
255   - this.dateRange[1] ? this.dateRange[1] + ' 23:59:59' : undefined,
256   - ]);
257 248 this.$modal.confirm('是否确认导出所有参数数据项?').then(() => {
  249 + // 处理查询参数
  250 + let params = {...this.queryParams};
  251 + params.pageNo = undefined;
  252 + params.pageSize = undefined;
258 253 this.exportLoading = true;
259   - return exportConfig(queryParams);
  254 + return exportConfig(params);
260 255 }).then(response => {
261 256 this.$download.excel(response, '参数配置.xls');
262 257 this.exportLoading = false;
... ...
yudao-ui-admin/src/views/infra/file/index.vue
  View file @53a0d9b
... ... @@ -6,9 +6,9 @@
6 6 <el-form-item label="文件路径" prop="path">
7 7 <el-input v-model="queryParams.path" placeholder="请输入文件路径" clearable @keyup.enter.native="handleQuery"/>
8 8 </el-form-item>
9   - <el-form-item label="创建时间">
10   - <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
11   - type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
  9 + <el-form-item label="创建时间" prop="createTime">
  10 + <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
  11 + range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
12 12 </el-form-item>
13 13 <el-form-item>
14 14 <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
... ... @@ -104,13 +104,13 @@ export default {
104 104 list: [],
105 105 // 弹出层标题
106 106 title: "",
107   - dateRangeCreateTime: [],
108 107 // 查询参数
109 108 queryParams: {
110 109 pageNo: 1,
111 110 pageSize: 10,
112 111 path: null,
113 112 type: null,
  113 + createTime: []
114 114 },
115 115 // 用户导入参数
116 116 upload: {
... ... @@ -130,9 +130,6 @@ export default {
130 130 /** 查询列表 */
131 131 getList() {
132 132 this.loading = true;
133   - // 处理查询参数
134   - let params = {...this.queryParams};
135   - this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
136 133 // 执行查询
137 134 getFilePage(params).then(response => {
138 135 this.list = response.data.list;
... ... @@ -159,7 +156,6 @@ export default {
159 156 },
160 157 /** 重置按钮操作 */
161 158 resetQuery() {
162   - this.dateRangeCreateTime = [];
163 159 this.resetForm("queryForm");
164 160 this.handleQuery();
165 161 },
... ...
yudao-ui-admin/src/views/infra/fileConfig/index.vue
  View file @53a0d9b
... ... @@ -12,9 +12,9 @@
12 12 :key="dict.value" :label="dict.label" :value="dict.value"/>
13 13 </el-select>
14 14 </el-form-item>
15   - <el-form-item label="创建时间">
16   - <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
17   - type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
  15 + <el-form-item label="创建时间" prop="createTime">
  16 + <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
  17 + range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
18 18 </el-form-item>
19 19 <el-form-item>
20 20 <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
... ... @@ -162,13 +162,13 @@ export default {
162 162 title: "",
163 163 // 是否显示弹出层
164 164 open: false,
165   - dateRangeCreateTime: [],
166 165 // 查询参数
167 166 queryParams: {
168 167 pageNo: 1,
169 168 pageSize: 10,
170 169 name: null,
171 170 storage: null,
  171 + createTime: []
172 172 },
173 173 // 表单参数
174 174 form: {
... ... @@ -202,11 +202,8 @@ export default {
202 202 /** 查询列表 */
203 203 getList() {
204 204 this.loading = true;
205   - // 处理查询参数
206   - let params = {...this.queryParams};
207   - this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
208 205 // 执行查询
209   - getFileConfigPage(params).then(response => {
  206 + getFileConfigPage(this.queryParams).then(response => {
210 207 this.list = response.data.list;
211 208 this.total = response.data.total;
212 209 this.loading = false;
... ... @@ -235,7 +232,6 @@ export default {
235 232 },
236 233 /** 重置按钮操作 */
237 234 resetQuery() {
238   - this.dateRangeCreateTime = [];
239 235 this.resetForm("queryForm");
240 236 this.handleQuery();
241 237 },
... ...
yudao-ui-admin/src/views/infra/testDemo/index.vue
  View file @53a0d9b
... ... @@ -22,9 +22,9 @@
22 22 <el-form-item label="备注" prop="remark">
23 23 <el-input v-model="queryParams.remark" placeholder="请输入备注" clearable @keyup.enter.native="handleQuery"/>
24 24 </el-form-item>
25   - <el-form-item label="创建时间">
26   - <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
27   - type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
  25 + <el-form-item label="创建时间" prop="createTime">
  26 + <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
  27 + range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
28 28 </el-form-item>
29 29 <el-form-item>
30 30 <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
... ... @@ -125,7 +125,6 @@ export default {
125 125 title: "",
126 126 // 是否显示弹出层
127 127 open: false,
128   - dateRangeCreateTime: [],
129 128 // 查询参数
130 129 queryParams: {
131 130 pageNo: 1,
... ... @@ -135,6 +134,7 @@ export default {
135 134 type: null,
136 135 category: null,
137 136 remark: null,
  137 + createTime: []
138 138 },
139 139 // 表单参数
140 140 form: {},
... ... @@ -154,11 +154,8 @@ export default {
154 154 /** 查询列表 */
155 155 getList() {
156 156 this.loading = true;
157   - // 处理查询参数
158   - let params = {...this.queryParams};
159   - this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
160 157 // 执行查询
161   - getTestDemoPage(params).then(response => {
  158 + getTestDemoPage(this.queryParams).then(response => {
162 159 this.list = response.data.list;
163 160 this.total = response.data.total;
164 161 this.loading = false;
... ... @@ -188,7 +185,6 @@ export default {
188 185 },
189 186 /** 重置按钮操作 */
190 187 resetQuery() {
191   - this.dateRangeCreateTime = [];
192 188 this.resetForm("queryForm");
193 189 this.handleQuery();
194 190 },
... ... @@ -247,7 +243,6 @@ export default {
247 243 let params = {...this.queryParams};
248 244 params.pageNo = undefined;
249 245 params.pageSize = undefined;
250   - this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
251 246 // 执行导出
252 247 this.$modal.confirm('是否确认导出所有字典类型数据项?').then(() => {
253 248 this.exportLoading = true;
... ...
yudao-ui-admin/src/views/login.vue
  View file @53a0d9b
... ... @@ -151,7 +151,7 @@ export default {
151 151 {required: true, trigger: "blur", message: "手机号不能为空"},
152 152 {
153 153 validator: function (rule, value, callback) {
154   - 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) {
  154 + 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) {
155 155 callback(new Error("手机号格式错误"));
156 156 } else {
157 157 callback();
... ...
yudao-ui-admin/src/views/mall/market/banner/index.vue
  View file @53a0d9b
... ... @@ -12,9 +12,9 @@
12 12 :key="dict.value" :label="dict.label" :value="dict.value"/>
13 13 </el-select>
14 14 </el-form-item>
15   - <el-form-item label="创建时间">
16   - <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
17   - type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"/>
  15 + <el-form-item label="创建时间" prop="createTime">
  16 + <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
  17 + range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
18 18 </el-form-item>
19 19 <el-form-item>
20 20 <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
... ... @@ -135,13 +135,13 @@ export default {
135 135 title: "",
136 136 // 是否显示弹出层
137 137 open: false,
138   - dateRangeCreateTime: [],
139 138 // 查询参数
140 139 queryParams: {
141 140 pageNo: 1,
142 141 pageSize: 10,
143 142 title: null,
144 143 status: null,
  144 + createTime: []
145 145 },
146 146 // 商品分类树选项
147 147 categoryOptions: [],
... ... @@ -164,9 +164,6 @@ export default {
164 164 /** 查询列表 */
165 165 getList() {
166 166 this.loading = true;
167   - // 处理查询参数
168   - let params = {...this.queryParams};
169   - this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
170 167 // 执行查询
171 168 getBannerPage(params).then(response => {
172 169 this.list = response.data.list;
... ... @@ -199,7 +196,6 @@ export default {
199 196 },
200 197 /** 重置按钮操作 */
201 198 resetQuery() {
202   - this.dateRangeCreateTime = [];
203 199 this.resetForm("queryForm");
204 200 this.handleQuery();
205 201 },
... ...
yudao-ui-admin/src/views/mall/product/brand/index.vue
  View file @53a0d9b
... ... @@ -12,9 +12,9 @@
12 12 :key="dict.value" :label="dict.label" :value="dict.value"/>
13 13 </el-select>
14 14 </el-form-item>
15   - <el-form-item label="创建时间">
16   - <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
17   - type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"/>
  15 + <el-form-item label="创建时间" prop="createTime">
  16 + <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
  17 + range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
18 18 </el-form-item>
19 19 <el-form-item>
20 20 <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
... ... @@ -144,7 +144,6 @@ export default {
144 144 title: "",
145 145 // 是否显示弹出层
146 146 open: false,
147   - dateRangeCreateTime: [],
148 147 // 查询参数
149 148 queryParams: {
150 149 pageNo: 1,
... ... @@ -152,6 +151,7 @@ export default {
152 151 categoryId: null,
153 152 name: null,
154 153 status: null,
  154 + createTime: []
155 155 },
156 156 // 商品分类树选项
157 157 categoryOptions: [],
... ... @@ -174,11 +174,8 @@ export default {
174 174 /** 查询列表 */
175 175 getList() {
176 176 this.loading = true;
177   - // 处理查询参数
178   - let params = {...this.queryParams};
179   - this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
180 177 // 执行查询
181   - getBrandPage(params).then(response => {
  178 + getBrandPage(this.queryParams).then(response => {
182 179 this.list = response.data.list;
183 180 this.total = response.data.total;
184 181 this.loading = false;
... ... @@ -229,7 +226,6 @@ export default {
229 226 },
230 227 /** 重置按钮操作 */
231 228 resetQuery() {
232   - this.dateRangeCreateTime = [];
233 229 this.resetForm("queryForm");
234 230 this.handleQuery();
235 231 },
... ... @@ -291,7 +287,6 @@ export default {
291 287 let params = {...this.queryParams};
292 288 params.pageNo = undefined;
293 289 params.pageSize = undefined;
294   - this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
295 290 // 执行导出
296 291 this.$modal.confirm('是否确认导出所有品牌数据项?').then(() => {
297 292 this.exportLoading = true;
... ...
yudao-ui-admin/src/views/mall/product/property/index.vue
  View file @53a0d9b
... ... @@ -12,6 +12,10 @@
12 12 :key="dict.value" :label="dict.label" :value="dict.value"/>
13 13 </el-select>
14 14 </el-form-item>
  15 + <el-form-item label="创建时间" prop="createTime">
  16 + <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
  17 + range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
  18 + </el-form-item>
15 19 <el-form-item>
16 20 <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
17 21 <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
... ... @@ -123,13 +127,13 @@ export default {
123 127 title: "",
124 128 // 是否显示弹出层
125 129 open: false,
126   - dateRangeCreateTime: [],
127 130 // 查询参数
128 131 queryParams: {
129 132 pageNo: 1,
130 133 pageSize: 10,
131 134 name: null,
132 135 status: null,
  136 + createTime: []
133 137 },
134 138 // 表单参数
135 139 form: {
... ... @@ -151,11 +155,8 @@ export default {
151 155 /** 查询列表 */
152 156 getList() {
153 157 this.loading = true;
154   - // 处理查询参数
155   - let params = {...this.queryParams};
156   - this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
157 158 // 执行查询
158   - getPropertyPage(params).then(response => {
  159 + getPropertyPage(this.queryParams).then(response => {
159 160 this.list = response.data.list;
160 161 this.total = response.data.total;
161 162 this.loading = false;
... ... @@ -185,7 +186,6 @@ export default {
185 186 },
186 187 /** 重置按钮操作 */
187 188 resetQuery() {
188   - this.dateRangeCreateTime = [];
189 189 this.resetForm("queryForm");
190 190 this.handleQuery();
191 191 },
... ... @@ -244,7 +244,6 @@ export default {
244 244 let params = {...this.queryParams};
245 245 params.pageNo = undefined;
246 246 params.pageSize = undefined;
247   - this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
248 247 // 执行导出
249 248 this.$modal.confirm('是否确认导出所有规格名称数据项?').then(() => {
250 249 this.exportLoading = true;
... ...
yudao-ui-admin/src/views/mall/product/spu/index.vue
  View file @53a0d9b
... ... @@ -25,9 +25,9 @@
25 25 <el-option label="下架" value="1"/>
26 26 </el-select>
27 27 </el-form-item>
28   - <el-form-item label="创建时间">
29   - <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
30   - type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"/>
  28 + <el-form-item label="创建时间" prop="createTime">
  29 + <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
  30 + range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
31 31 </el-form-item>
32 32 <el-form-item>
33 33 <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
... ... @@ -193,7 +193,7 @@
193 193 label="条形码"
194 194 width="250" v-if="skuTags.length">
195 195 <template slot-scope="scope">
196   - <el-input v-model="scope.row.barCode" type="textarea" :disabled="scope.row.status==1"></el-input>
  196 + <el-input v-model="scope.row.barCode" type="textarea" :disabled="scope.row.status===1"></el-input>
197 197 </template>
198 198 </el-table-column>
199 199 <el-table-column
... ... @@ -207,7 +207,7 @@
207 207 :precision="2"
208 208 :max="1000000000"
209 209 :min="0.01"
210   - :disabled="scope.row.status==1">
  210 + :disabled="scope.row.status===1">
211 211 </el-input-number>
212 212 </template>
213 213 </el-table-column>
... ... @@ -222,7 +222,7 @@
222 222 :precision="2"
223 223 :max="1000000000"
224 224 :min="0.01"
225   - :disabled="scope.row.status==1">
  225 + :disabled="scope.row.status===1">
226 226 </el-input-number>
227 227 </template>
228 228 </el-table-column>
... ... @@ -237,7 +237,7 @@
237 237 :precision="2"
238 238 :max="1000000000"
239 239 :min="0.01"
240   - :disabled="scope.row.status==1">
  240 + :disabled="scope.row.status===1">
241 241 </el-input-number>
242 242 </template>
243 243 </el-table-column>
... ... @@ -341,7 +341,6 @@
341 341 title: "",
342 342 // 是否显示弹出层
343 343 open: false,
344   - dateRangeCreateTime: [],
345 344 // 查询参数
346 345 queryParams: {
347 346 pageNo: 1,
... ... @@ -356,6 +355,7 @@
356 355 price: null,
357 356 quantity: null,
358 357 status: null,
  358 + createTime: []
359 359 },
360 360 // 表单参数
361 361 form: {
... ... @@ -398,7 +398,7 @@
398 398  
399 399 },
400 400 changeSkuStatus(tagIndex) {
401   - if(this.form.skus[tagIndex].status == 0){
  401 + if(this.form.skus[tagIndex].status === 0){
402 402 this.form.skus[tagIndex].status = 1 ;
403 403 }else {
404 404 this.form.skus[tagIndex].status = 0 ;
... ... @@ -426,11 +426,9 @@
426 426 this.$emit('input', skuList)
427 427 },
428 428 handleTagClose(tagIndex, tagItemIndex) {
429   -
430 429 },
431 430 //确定添加sku规格
432 431 addTag() {
433   -
434 432 let skus = this.unUseTags.map(function (item, index) {
435 433 return item.name
436 434 });
... ... @@ -572,9 +570,6 @@
572 570 /** 查询列表 */
573 571 getList() {
574 572 this.loading = true;
575   - // 处理查询参数
576   - let params = {...this.queryParams};
577   - this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
578 573 // 执行查询
579 574 getSpuPage(params).then(response => {
580 575 this.list = response.data.list;
... ... @@ -631,8 +626,7 @@
631 626 /** 修改按钮操作 */
632 627 handleUpdate(row) {
633 628 this.reset();
634   - const id = row.id;
635   - getSpu(id).then(response => {
  629 + getSpu(row.id).then(response => {
636 630 console.log(">>>>>> response.data:" + JSON.stringify(response.data))
637 631 let dataSpu = response.data;
638 632 this.form = {
... ... @@ -660,7 +654,6 @@
660 654 /** 提交按钮 */
661 655 submitForm() {
662 656 console.log(this.form.picUrls.split(','));
663   -
664 657 this.$refs["form"].validate(valid => {
665 658 if (!valid) {
666 659 return;
... ... @@ -702,7 +695,6 @@
702 695 let params = {...this.queryParams};
703 696 params.pageNo = undefined;
704 697 params.pageSize = undefined;
705   - this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
706 698 // 执行导出
707 699 this.$modal.confirm('是否确认导出所有商品spu数据项?').then(() => {
708 700 this.exportLoading = true;
... ...
yudao-ui-admin/src/views/pay/app/index.vue
  View file @53a0d9b
... ... @@ -17,6 +17,10 @@
17 17 :value="parseInt(dict.value)"/>
18 18 </el-select>
19 19 </el-form-item>
  20 + <el-form-item label="创建时间" prop="createTime">
  21 + <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
  22 + range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
  23 + </el-form-item>
20 24 <el-form-item>
21 25 <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
22 26 <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
... ... @@ -237,7 +241,6 @@ export default {
237 241 title: "",
238 242 // 是否显示弹出层
239 243 open: false,
240   - dateRangeCreateTime: [],
241 244 // 查询参数
242 245 queryParams: {
243 246 pageNo: 1,
... ... @@ -248,6 +251,7 @@ export default {
248 251 payNotifyUrl: null,
249 252 refundNotifyUrl: null,
250 253 merchantName: null,
  254 + createTime: []
251 255 },
252 256 // 表单参数
253 257 form: {},
... ... @@ -300,13 +304,9 @@ export default {
300 304 /** 查询列表 */
301 305 getList() {
302 306 this.loading = true;
303   - // 处理查询参数
304   - let params = {...this.queryParams};
305   - this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
306 307 // 执行查询
307   - getAppPage(params).then(response => {
  308 + getAppPage(this.queryParams).then(response => {
308 309 this.list = response.data.list;
309   - console.log(this.list);
310 310 this.total = response.data.total;
311 311 this.loading = false;
312 312 });
... ... @@ -336,7 +336,6 @@ export default {
336 336 },
337 337 /** 重置按钮操作 */
338 338 resetQuery() {
339   - this.dateRangeCreateTime = [];
340 339 this.resetForm("queryForm");
341 340 this.handleQuery();
342 341 },
... ... @@ -393,9 +392,8 @@ export default {
393 392 },
394 393 /** 删除按钮操作 */
395 394 handleDelete(row) {
396   - const id = row.id;
397   - this.$modal.confirm('是否确认删除支付应用信息编号为"' + id + '"的数据项?').then(function () {
398   - return deleteApp(id);
  395 + this.$modal.confirm('是否确认删除支付应用信息编号为"' + row.id + '"的数据项?').then(function () {
  396 + return deleteApp(row.id);
399 397 }).then(() => {
400 398 this.getList();
401 399 this.$modal.msgSuccess("删除成功");
... ... @@ -412,7 +410,6 @@ export default {
412 410 let params = {...this.queryParams};
413 411 params.pageNo = undefined;
414 412 params.pageSize = undefined;
415   - this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
416 413 // 执行导出
417 414 this.$modal.confirm('是否确认导出所有支付应用信息数据项?').then(function () {
418 415 return exportAppExcel(params);
... ...
yudao-ui-admin/src/views/pay/merchant/index.vue
  View file @53a0d9b
... ... @@ -20,9 +20,9 @@
20 20 <el-form-item label="备注" prop="remark">
21 21 <el-input v-model="queryParams.remark" placeholder="请输入备注" clearable @keyup.enter.native="handleQuery"/>
22 22 </el-form-item>
23   - <el-form-item label="创建时间">
24   - <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
25   - type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
  23 + <el-form-item label="创建时间" prop="createTime">
  24 + <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
  25 + range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
26 26 </el-form-item>
27 27 <el-form-item>
28 28 <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
... ... @@ -136,7 +136,6 @@ export default {
136 136 title: "",
137 137 // 是否显示弹出层
138 138 open: false,
139   - dateRangeCreateTime: [],
140 139 // 查询参数
141 140 queryParams: {
142 141 pageNo: 1,
... ... @@ -146,6 +145,7 @@ export default {
146 145 shortName: null,
147 146 status: null,
148 147 remark: null,
  148 + createTime: []
149 149 },
150 150 // 表单参数
151 151 form: {},
... ... @@ -167,11 +167,8 @@ export default {
167 167 /** 查询列表 */
168 168 getList() {
169 169 this.loading = true;
170   - // 处理查询参数
171   - let params = {...this.queryParams};
172   - this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
173 170 // 执行查询
174   - getMerchantPage(params).then(response => {
  171 + getMerchantPage(this.queryParams).then(response => {
175 172 console.log(response.data);
176 173 this.list = response.data.list;
177 174 this.total = response.data.total;
... ... @@ -202,7 +199,6 @@ export default {
202 199 },
203 200 /** 重置按钮操作 */
204 201 resetQuery() {
205   - this.dateRangeCreateTime = [];
206 202 this.resetForm("queryForm");
207 203 this.handleQuery();
208 204 },
... ... @@ -215,8 +211,7 @@ export default {
215 211 /** 修改按钮操作 */
216 212 handleUpdate(row) {
217 213 this.reset();
218   - const id = row.id;
219   - getMerchant(id).then(response => {
  214 + getMerchant(row.id).then(response => {
220 215 this.form = response.data;
221 216 this.open = true;
222 217 this.title = "修改支付商户信息";
... ... @@ -273,7 +268,6 @@ export default {
273 268 let params = {...this.queryParams};
274 269 params.pageNo = undefined;
275 270 params.pageSize = undefined;
276   - this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
277 271 // 执行导出
278 272 this.$modal.confirm('是否确认导出所有支付商户信息数据项?').then(() => {
279 273 this.exportLoading = true;
... ...
yudao-ui-admin/src/views/pay/order/index.vue
  View file @53a0d9b
... ... @@ -47,12 +47,9 @@
47 47 :label="dict.label" :value="parseInt(dict.value)"/>
48 48 </el-select>
49 49 </el-form-item>
50   - <el-form-item label="创建时间">
51   - <el-date-picker
52   - v-model="dateRangeCreateTime" style="width: 350px"
53   - value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" range-separator="-"
54   - :default-time="['00:00:00','23:59:59']" start-placeholder="开始日期" end-placeholder="结束日期">
55   - </el-date-picker>
  50 + <el-form-item label="创建时间" prop="createTime">
  51 + <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
  52 + range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
56 53 </el-form-item>
57 54 <el-form-item>
58 55 <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
... ... @@ -270,10 +267,6 @@ export default {
270 267 title: "",
271 268 // 是否显示弹出层
272 269 open: false,
273   - dateRangeExpireTime: [],
274   - dateRangeSuccessTime: [],
275   - dateRangeNotifyTime: [],
276   - dateRangeCreateTime: [],
277 270 // 查询参数
278 271 queryParams: {
279 272 pageNo: 1,
... ... @@ -298,6 +291,10 @@ export default {
298 291 refundAmount: null,
299 292 channelUserId: null,
300 293 channelOrderNo: null,
  294 + expireTime: [],
  295 + successTime: [],
  296 + notifyTime: [],
  297 + createTime: []
301 298 },
302 299 // 商户加载遮罩层
303 300 merchantLoading: false,
... ... @@ -324,32 +321,25 @@ export default {
324 321 },
325 322 methods: {
326 323 initTime(){
327   - this.dateRangeCreateTime = [getNowDateTime("00:00:00"), getNowDateTime("23:59:59")];
  324 + this.queryParams.createTime = [getNowDateTime("00:00:00"), getNowDateTime("23:59:59")];
328 325 },
329 326 /** 查询列表 */
330 327 getList() {
331 328 // 判断选择的日期是否超过了一个月
332 329 let oneMonthTime = 31 * 24 * 3600 * 1000;
333   - if (this.dateRangeCreateTime == null){
  330 + if (this.queryParams.createTime == null){
334 331 this.initTime();
335 332 } else {
336   - let minDateTime = new Date(this.dateRangeCreateTime[0]).getTime();
337   - let maxDateTime = new Date(this.dateRangeCreateTime[1]).getTime()
  333 + let minDateTime = new Date(this.queryParams.createTime[0]).getTime();
  334 + let maxDateTime = new Date(this.queryParams.createTime[1]).getTime()
338 335 if (maxDateTime - minDateTime > oneMonthTime) {
339 336 this.$message.error('时间范围最大为 31 天！');
340 337 return false;
341 338 }
342 339 }
343   -
344 340 this.loading = true;
345   - // 处理查询参数
346   - let params = {...this.queryParams};
347   - this.addBeginAndEndTime(params, this.dateRangeExpireTime, 'expireTime');
348   - this.addBeginAndEndTime(params, this.dateRangeSuccessTime, 'successTime');
349   - this.addBeginAndEndTime(params, this.dateRangeNotifyTime, 'notifyTime');
350   - this.addDateRange(params, this.dateRangeCreateTime, 'CreateTime');
351 341 // 执行查询
352   - getOrderPage(params).then(response => {
  342 + getOrderPage(this.queryParams).then(response => {
353 343 this.list = response.data.list;
354 344 this.total = response.data.total;
355 345 this.loading = false;
... ... @@ -366,9 +356,6 @@ export default {
366 356 },
367 357 /** 重置按钮操作 */
368 358 resetQuery() {
369   - this.dateRangeSuccessTime = [];
370   - this.dateRangeNotifyTime = [];
371   - this.dateRangeExpireTime = [];
372 359 this.resetForm("queryForm");
373 360 this.initTime();
374 361 this.handleQuery();
... ... @@ -393,10 +380,6 @@ export default {
393 380 let params = {...this.queryParams};
394 381 params.pageNo = undefined;
395 382 params.pageSize = undefined;
396   - this.addBeginAndEndTime(params, this.dateRangeExpireTime, 'expireTime');
397   - this.addBeginAndEndTime(params, this.dateRangeSuccessTime, 'successTime');
398   - this.addBeginAndEndTime(params, this.dateRangeNotifyTime, 'notifyTime');
399   - this.addDateRange(params, this.dateRangeCreateTime, 'CreateTime');
400 383 // 执行导出
401 384 this.$modal.confirm('是否确认导出所有支付订单数据项?').then(function () {
402 385 return exportOrderExcel(params);
... ...
yudao-ui-admin/src/views/pay/refund/index.vue
  View file @53a0d9b
1 1 <template>
2 2 <div class="app-container">
3   -
4 3 <!-- 搜索工作栏 -->
5 4 <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="120px">
6 5 <el-form-item label="所属商户" prop="merchantId">
... ... @@ -31,26 +30,21 @@
31 30 <el-input v-model="queryParams.merchantRefundNo" placeholder="请输入商户退款订单号" clearable
32 31 @keyup.enter.native="handleQuery"/>
33 32 </el-form-item>
34   -
35 33 <el-form-item label="退款状态" prop="status">
36 34 <el-select v-model="queryParams.status" placeholder="请选择退款状态" clearable>
37 35 <el-option v-for="dict in payRefundOrderDictDatum" :key="parseInt(dict.value)"
38 36 :label="dict.label" :value="parseInt(dict.value)"/>
39 37 </el-select>
40 38 </el-form-item>
41   -
42 39 <el-form-item label="退款回调状态" prop="notifyStatus">
43 40 <el-select v-model="queryParams.notifyStatus" placeholder="请选择通知商户退款结果的回调状态" clearable>
44 41 <el-option v-for="dict in payOrderNotifyDictDatum" :key="parseInt(dict.value)"
45 42 :label="dict.label" :value="parseInt(dict.value)"/>
46 43 </el-select>
47 44 </el-form-item>
48   - <el-form-item label="创建时间">
49   - <el-date-picker
50   - v-model="dateRangeCreateTime" style="width: 350px"
51   - value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" range-separator="-"
52   - :default-time="['00:00:00','23:59:59']" start-placeholder="开始日期" end-placeholder="结束日期">
53   - </el-date-picker>
  45 + <el-form-item label="创建时间" prop="createTime">
  46 + <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
  47 + range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
54 48 </el-form-item>
55 49 <el-form-item>
56 50 <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
... ... @@ -286,10 +280,6 @@ export default {
286 280 title: "",
287 281 // 是否显示弹出层
288 282 open: false,
289   - dateRangeExpireTime: [],
290   - dateRangeSuccessTime: [],
291   - dateRangeNotifyTime: [],
292   - dateRangeCreateTime: [],
293 283 // 查询参数
294 284 queryParams: {
295 285 pageNo: 1,
... ... @@ -315,6 +305,10 @@ export default {
315 305 channelErrorCode: null,
316 306 channelErrorMsg: null,
317 307 channelExtras: null,
  308 + expireTime: [],
  309 + successTime: [],
  310 + notifyTime: [],
  311 + createTime: []
318 312 },
319 313 // 商户加载遮罩层
320 314 merchantLoading: false,
... ... @@ -343,31 +337,25 @@ export default {
343 337 },
344 338 methods: {
345 339 initTime(){
346   - this.dateRangeCreateTime = [getNowDateTime("00:00:00"), getNowDateTime("23:59:59")];
  340 + this.queryParams.createTime = [getNowDateTime("00:00:00"), getNowDateTime("23:59:59")];
347 341 },
348 342 /** 查询列表 */
349 343 getList() {
350 344 // 判断选择的日期是否超过了一个月
351 345 let oneMonthTime = 31 * 24 * 3600 * 1000;
352   - if (this.dateRangeCreateTime == null){
  346 + if (this.queryParams.createTime == null){
353 347 this.initTime();
354 348 } else {
355   - let minDateTime = new Date(this.dateRangeCreateTime[0]).getTime();
356   - let maxDateTime = new Date(this.dateRangeCreateTime[1]).getTime()
  349 + let minDateTime = new Date(this.queryParams.createTime[0]).getTime();
  350 + let maxDateTime = new Date(this.queryParams.createTime[1]).getTime()
357 351 if (maxDateTime - minDateTime > oneMonthTime) {
358 352 this.$message.error('时间范围最大为 31 天！');
359 353 return false;
360 354 }
361 355 }
362 356 this.loading = true;
363   - // 处理查询参数
364   - let params = {...this.queryParams};
365   - this.addBeginAndEndTime(params, this.dateRangeExpireTime, 'expireTime');
366   - this.addBeginAndEndTime(params, this.dateRangeSuccessTime, 'successTime');
367   - this.addBeginAndEndTime(params, this.dateRangeNotifyTime, 'notifyTime');
368   - this.addDateRange(params, this.dateRangeCreateTime, 'CreateTime');
369 357 // 执行查询
370   - getRefundPage(params).then(response => {
  358 + getRefundPage(this.queryParams).then(response => {
371 359 this.list = response.data.list;
372 360 this.total = response.data.total;
373 361 this.loading = false;
... ... @@ -384,10 +372,6 @@ export default {
384 372 },
385 373 /** 重置按钮操作 */
386 374 resetQuery() {
387   - this.dateRangeExpireTime = [];
388   - this.dateRangeSuccessTime = [];
389   - this.dateRangeNotifyTime = [];
390   - this.dateRangeCreateTime = [];
391 375 this.resetForm("queryForm");
392 376 this.handleQuery();
393 377 },
... ... @@ -397,10 +381,6 @@ export default {
397 381 let params = {...this.queryParams};
398 382 params.pageNo = undefined;
399 383 params.pageSize = undefined;
400   - this.addBeginAndEndTime(params, this.dateRangeExpireTime, 'expireTime');
401   - this.addBeginAndEndTime(params, this.dateRangeSuccessTime, 'successTime');
402   - this.addBeginAndEndTime(params, this.dateRangeNotifyTime, 'notifyTime');
403   - this.addDateRange(params, this.dateRangeCreateTime, 'CreateTime');
404 384 // 执行导出
405 385 this.$modal.confirm('是否确认导出所有退款订单数据项?').then(function () {
406 386 return exportRefundExcel(params);
... ...
yudao-ui-admin/src/views/system/dict/index.vue
  View file @53a0d9b
... ... @@ -12,9 +12,9 @@
12 12 <el-option v-for="dict in statusDictDatas" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
13 13 </el-select>
14 14 </el-form-item>
15   - <el-form-item label="创建时间">
16   - <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
17   - range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
  15 + <el-form-item label="创建时间" prop="createTime">
  16 + <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
  17 + range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
18 18 </el-form-item>
19 19 <el-form-item>
20 20 <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
... ... @@ -120,15 +120,14 @@ export default {
120 120 open: false,
121 121 // 状态数据字典
122 122 statusOptions: [],
123   - // 日期范围
124   - dateRangeCreateTime: [],
125 123 // 查询参数
126 124 queryParams: {
127 125 pageNo: 1,
128 126 pageSize: 10,
129 127 name: undefined,
130 128 type: undefined,
131   - status: undefined
  129 + status: undefined,
  130 + createTime: []
132 131 },
133 132 // 表单参数
134 133 form: {},
... ... @@ -155,11 +154,8 @@ export default {
155 154 /** 查询字典类型列表 */
156 155 getList() {
157 156 this.loading = true;
158   - // 处理查询参数
159   - let params = {...this.queryParams};
160   - this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
161 157 // 执行查询
162   - listType(params).then(response => {
  158 + listType(this.queryParams).then(response => {
163 159 this.typeList = response.data.list;
164 160 this.total = response.data.total;
165 161 this.loading = false;
... ... @@ -188,7 +184,6 @@ export default {
188 184 },
189 185 /** 重置按钮操作 */
190 186 resetQuery() {
191   - this.dateRangeCreateTime = [];
192 187 this.resetForm("queryForm");
193 188 this.handleQuery();
194 189 },
... ... @@ -244,7 +239,6 @@ export default {
244 239 let params = {...this.queryParams};
245 240 params.pageNo = undefined;
246 241 params.pageSize = undefined;
247   - this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
248 242 // 执行导出
249 243 this.$modal.confirm('是否确认导出所有字典类型数据项?').then(() => {
250 244 this.exportLoading = true;
... ...
yudao-ui-admin/src/views/system/errorCode/index.vue
  View file @53a0d9b
... ... @@ -18,9 +18,9 @@
18 18 <el-form-item label="错误码提示" prop="message">
19 19 <el-input v-model="queryParams.message" placeholder="请输入错误码提示" clearable @keyup.enter.native="handleQuery"/>
20 20 </el-form-item>
21   - <el-form-item label="创建时间">
22   - <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
23   - type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
  21 + <el-form-item label="创建时间" prop="createTime">
  22 + <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
  23 + range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
24 24 </el-form-item>
25 25 <el-form-item>
26 26 <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
... ... @@ -118,7 +118,6 @@ export default {
118 118 title: "",
119 119 // 是否显示弹出层
120 120 open: false,
121   - dateRangeCreateTime: [],
122 121 // 查询参数
123 122 queryParams: {
124 123 pageNo: 1,
... ... @@ -127,6 +126,7 @@ export default {
127 126 applicationName: null,
128 127 code: null,
129 128 message: null,
  129 + createTime: []
130 130 },
131 131 // 表单参数
132 132 form: {},
... ... @@ -145,11 +145,8 @@ export default {
145 145 /** 查询列表 */
146 146 getList() {
147 147 this.loading = true;
148   - // 处理查询参数
149   - let params = {...this.queryParams};
150   - this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
151 148 // 执行查询
152   - getErrorCodePage(params).then(response => {
  149 + getErrorCodePage(this.queryParams).then(response => {
153 150 this.list = response.data.list;
154 151 this.total = response.data.total;
155 152 this.loading = false;
... ... @@ -178,7 +175,6 @@ export default {
178 175 },
179 176 /** 重置按钮操作 */
180 177 resetQuery() {
181   - this.dateRangeCreateTime = [];
182 178 this.resetForm("queryForm");
183 179 this.handleQuery();
184 180 },
... ... @@ -237,7 +233,6 @@ export default {
237 233 let params = {...this.queryParams};
238 234 params.pageNo = undefined;
239 235 params.pageSize = undefined;
240   - this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
241 236 // 执行导出
242 237 this.$modal.confirm('是否确认导出所有错误码数据项?').then(() => {
243 238 this.exportLoading = true;
... ...
yudao-ui-admin/src/views/system/loginlog/index.vue
  View file @53a0d9b
... ... @@ -17,9 +17,9 @@
17 17 <el-option :key="false" label="失败" :value="false"/>
18 18 </el-select>
19 19 </el-form-item>
20   - <el-form-item label="登录时间">
21   - <el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd"
22   - type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
  20 + <el-form-item label="登录时间" prop="createTime">
  21 + <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
  22 + range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
23 23 </el-form-item>
24 24 <el-form-item>
25 25 <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
... ... @@ -81,15 +81,14 @@ export default {
81 81 list: [],
82 82 // 状态数据字典
83 83 statusOptions: [],
84   - // 日期范围
85   - dateRange: [],
86 84 // 查询参数
87 85 queryParams: {
88 86 pageNo: 1,
89 87 pageSize: 10,
90 88 userIp: undefined,
91 89 username: undefined,
92   - status: undefined
  90 + status: undefined,
  91 + createTime: []
93 92 }
94 93 };
95 94 },
... ... @@ -100,10 +99,7 @@ export default {
100 99 /** 查询登录日志列表 */
101 100 getList() {
102 101 this.loading = true;
103   - list(this.addDateRange(this.queryParams, [
104   - this.dateRange[0] ? this.dateRange[0] + ' 00:00:00' : undefined,
105   - this.dateRange[1] ? this.dateRange[1] + ' 23:59:59' : undefined,
106   - ])).then(response => {
  102 + list(this.queryParams).then(response => {
107 103 this.list = response.data.list;
108 104 this.total = response.data.total;
109 105 this.loading = false;
... ... @@ -117,16 +113,18 @@ export default {
117 113 },
118 114 /** 重置按钮操作 */
119 115 resetQuery() {
120   - this.dateRange = [];
121 116 this.resetForm("queryForm");
122 117 this.handleQuery();
123 118 },
124 119 /** 导出按钮操作 */
125 120 handleExport() {
126   - const queryParams = this.queryParams;
127 121 this.$modal.confirm('是否确认导出所有操作日志数据项?').then(() => {
  122 + // 处理查询参数
  123 + let params = {...this.queryParams};
  124 + params.pageNo = undefined;
  125 + params.pageSize = undefined;
128 126 this.exportLoading = true;
129   - return exportLoginLog(queryParams);
  127 + return exportLoginLog(params);
130 128 }).then(response => {
131 129 this.$download.excel(response, '登录日志.xls');
132 130 this.exportLoading = false;
... ...
yudao-ui-admin/src/views/system/operatelog/index.vue
  View file @53a0d9b
... ... @@ -23,9 +23,9 @@
23 23 <el-option :key="false" label="失败" :value="false"/>
24 24 </el-select>
25 25 </el-form-item>
26   - <el-form-item label="操作时间">
27   - <el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd"
28   - type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
  26 + <el-form-item label="操作时间" prop="startTime">
  27 + <el-date-picker v-model="queryParams.startTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
  28 + range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
29 29 </el-form-item>
30 30 <el-form-item>
31 31 <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
... ... @@ -150,8 +150,6 @@ export default {
150 150 typeOptions: [],
151 151 // 类型数据字典
152 152 statusOptions: [],
153   - // 日期范围
154   - dateRange: [],
155 153 // 表单参数
156 154 form: {},
157 155 // 查询参数
... ... @@ -161,7 +159,8 @@ export default {
161 159 title: undefined,
162 160 operName: undefined,
163 161 businessType: undefined,
164   - status: undefined
  162 + status: undefined,
  163 + startTime: []
165 164 },
166 165 };
167 166 },
... ... @@ -172,10 +171,7 @@ export default {
172 171 /** 查询登录日志 */
173 172 getList() {
174 173 this.loading = true;
175   - listOperateLog(this.addDateRange(this.queryParams, [
176   - this.dateRange[0] ? this.dateRange[0] + ' 00:00:00' : undefined,
177   - this.dateRange[1] ? this.dateRange[1] + ' 23:59:59' : undefined,
178   - ])).then( response => {
  174 + listOperateLog(this.queryParams).then( response => {
179 175 this.list = response.data.list;
180 176 this.total = response.data.total;
181 177 this.loading = false;
... ... @@ -189,7 +185,6 @@ export default {
189 185 },
190 186 /** 重置按钮操作 */
191 187 resetQuery() {
192   - this.dateRange = [];
193 188 this.resetForm("queryForm");
194 189 this.handleQuery();
195 190 },
... ... @@ -200,13 +195,13 @@ export default {
200 195 },
201 196 /** 导出按钮操作 */
202 197 handleExport() {
203   - const queryParams = this.addDateRange(this.queryParams, [
204   - this.dateRange[0] ? this.dateRange[0] + ' 00:00:00' : undefined,
205   - this.dateRange[1] ? this.dateRange[1] + ' 23:59:59' : undefined,
206   - ])
207 198 this.$modal.confirm('是否确认导出所有操作日志数据项?').then(() => {
  199 + // 处理查询参数
  200 + let params = {...this.queryParams};
  201 + params.pageNo = undefined;
  202 + params.pageSize = undefined;
208 203 this.exportLoading = true;
209   - return exportOperateLog(queryParams);
  204 + return exportOperateLog(params);
210 205 }).then(response => {
211 206 this.$download.excel(response, '操作日志.xls');
212 207 this.exportLoading = false;
... ...
yudao-ui-admin/src/views/system/role/index.vue
  View file @53a0d9b
... ... @@ -16,9 +16,9 @@
16 16 <el-option v-for="dict in statusDictDatas" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
17 17 </el-select>
18 18 </el-form-item>
19   - <el-form-item label="创建时间">
20   - <el-date-picker v-model="dateRange" size="small" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
21   - range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
  19 + <el-form-item label="创建时间" prop="createTime">
  20 + <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
  21 + range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
22 22 </el-form-item>
23 23 <el-form-item>
24 24 <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
... ... @@ -206,8 +206,6 @@ export default {
206 206 menuNodeAll: false,
207 207 deptExpand: true,
208 208 deptNodeAll: false,
209   - // 日期范围
210   - dateRange: [],
211 209 // 菜单列表
212 210 menuOptions: [],
213 211 // 部门列表
... ... @@ -219,7 +217,8 @@ export default {
219 217 pageSize: 10,
220 218 name: undefined,
221 219 code: undefined,
222   - status: undefined
  220 + status: undefined,
  221 + createTime: []
223 222 },
224 223 // 表单参数
225 224 form: {},
... ... @@ -256,10 +255,7 @@ export default {
256 255 /** 查询角色列表 */
257 256 getList() {
258 257 this.loading = true;
259   - listRole(this.addDateRange(this.queryParams, [
260   - this.dateRange[0] ? this.dateRange[0] + ' 00:00:00' : undefined,
261   - this.dateRange[1] ? this.dateRange[1] + ' 23:59:59' : undefined,
262   - ])).then(
  258 + listRole(this.queryParams).then(
263 259 response => {
264 260 this.roleList = response.data.list;
265 261 this.total = response.data.total;
... ... @@ -326,7 +322,6 @@ export default {
326 322 },
327 323 /** 重置按钮操作 */
328 324 resetQuery() {
329   - this.dateRange = [];
330 325 this.resetForm("queryForm");
331 326 this.handleQuery();
332 327 },
... ...
yudao-ui-admin/src/views/system/sensitiveWord/index.vue
  View file @53a0d9b
... ... @@ -16,9 +16,9 @@
16 16 :key="dict.value" :label="dict.label" :value="dict.value"/>
17 17 </el-select>
18 18 </el-form-item>
19   - <el-form-item label="创建时间">
20   - <el-date-picker v-model="dateRangeCreateTime" size="small" style="width: 240px" value-format="yyyy-MM-dd"
21   - type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"/>
  19 + <el-form-item label="创建时间" prop="createTime">
  20 + <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
  21 + range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
22 22 </el-form-item>
23 23 <el-form-item>
24 24 <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
... ... @@ -150,7 +150,6 @@ export default {
150 150 // 是否显示弹出层
151 151 open: false,
152 152 testOpen: false,
153   - dateRangeCreateTime: [],
154 153 tags: [],
155 154 // 查询参数
156 155 queryParams: {
... ... @@ -158,6 +157,7 @@ export default {
158 157 pageSize: 10,
159 158 name: null,
160 159 tag: null,
  160 + createTime: []
161 161 },
162 162 // 表单参数
163 163 form: {},
... ... @@ -187,11 +187,8 @@ export default {
187 187 /** 查询列表 */
188 188 getList() {
189 189 this.loading = true;
190   - // 处理查询参数
191   - let params = {...this.queryParams};
192   - this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
193 190 // 执行查询
194   - getSensitiveWordPage(params).then(response => {
  191 + getSensitiveWordPage(this.queryParams).then(response => {
195 192 this.list = response.data.list;
196 193 this.total = response.data.total;
197 194 this.loading = false;
... ... @@ -232,7 +229,6 @@ export default {
232 229 },
233 230 /** 重置按钮操作 */
234 231 resetQuery() {
235   - this.dateRangeCreateTime = [];
236 232 this.resetForm("queryForm");
237 233 this.handleQuery();
238 234 },
... ... @@ -313,7 +309,6 @@ export default {
313 309 let params = {...this.queryParams};
314 310 params.pageNo = undefined;
315 311 params.pageSize = undefined;
316   - this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
317 312 // 执行导出
318 313 this.$modal.confirm('是否确认导出所有敏感词数据项?').then(() => {
319 314 this.exportLoading = true;
... ...
yudao-ui-admin/src/views/system/sms/smsChannel.vue
  View file @53a0d9b
... ... @@ -12,9 +12,9 @@
12 12 :key="dict.value" :label="dict.label" :value="dict.value"/>
13 13 </el-select>
14 14 </el-form-item>
15   - <el-form-item label="创建时间">
16   - <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
17   - type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
  15 + <el-form-item label="创建时间" prop="createTime">
  16 + <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
  17 + range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
18 18 </el-form-item>
19 19 <el-form-item>
20 20 <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
... ... @@ -128,13 +128,13 @@ export default {
128 128 title: "",
129 129 // 是否显示弹出层
130 130 open: false,
131   - dateRangeCreateTime: [],
132 131 // 查询参数
133 132 queryParams: {
134 133 pageNo: 1,
135 134 pageSize: 10,
136 135 signature: null,
137 136 status: null,
  137 + createTime: []
138 138 },
139 139 // 表单参数
140 140 form: {},
... ... @@ -154,11 +154,8 @@ export default {
154 154 /** 查询列表 */
155 155 getList() {
156 156 this.loading = true;
157   - // 处理查询参数
158   - let params = {...this.queryParams};
159   - this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
160 157 // 执行查询
161   - getSmsChannelPage(params).then(response => {
  158 + getSmsChannelPage(this.queryParams).then(response => {
162 159 this.list = response.data.list;
163 160 this.total = response.data.total;
164 161 this.loading = false;
... ... @@ -190,7 +187,6 @@ export default {
190 187 },
191 188 /** 重置按钮操作 */
192 189 resetQuery() {
193   - this.dateRangeCreateTime = [];
194 190 this.resetForm("queryForm");
195 191 this.handleQuery();
196 192 },
... ... @@ -235,8 +231,7 @@ export default {
235 231 },
236 232 /** 删除按钮操作 */
237 233 handleDelete(row) {
238   - const id = row.id;
239   - this.$modal.confirm('是否确认删除短信渠道编号为"' + id + '"的数据项?').then(function() {
  234 + this.$modal.confirm('是否确认删除短信渠道编号为"' + row.id + '"的数据项?').then(function() {
240 235 return deleteSmsChannel(id);
241 236 }).then(() => {
242 237 this.getList();
... ...
yudao-ui-admin/src/views/system/sms/smsLog.vue
  View file @53a0d9b
... ... @@ -22,9 +22,9 @@
22 22 :key="dict.value" :label="dict.label" :value="dict.value"/>
23 23 </el-select>
24 24 </el-form-item>
25   - <el-form-item label="发送时间">
26   - <el-date-picker v-model="dateRangeSendTime" style="width: 240px" value-format="yyyy-MM-dd"
27   - type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
  25 + <el-form-item label="发送时间" prop="sendTime">
  26 + <el-date-picker v-model="queryParams.sendTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
  27 + range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
28 28 </el-form-item>
29 29 <el-form-item label="接收状态" prop="receiveStatus">
30 30 <el-select v-model="queryParams.receiveStatus" placeholder="请选择接收状态" clearable>
... ... @@ -32,9 +32,9 @@
32 32 :key="dict.value" :label="dict.label" :value="dict.value"/>
33 33 </el-select>
34 34 </el-form-item>
35   - <el-form-item label="接收时间">
36   - <el-date-picker v-model="dateRangeReceiveTime" style="width: 240px" value-format="yyyy-MM-dd"
37   - type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
  35 + <el-form-item label="接收时间" prop="receiveTime">
  36 + <el-date-picker v-model="queryParams.receiveTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
  37 + range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
38 38 </el-form-item>
39 39 <el-form-item>
40 40 <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
... ... @@ -208,8 +208,6 @@ export default {
208 208 title: "",
209 209 // 是否显示弹出层
210 210 open: false,
211   - dateRangeSendTime: [],
212   - dateRangeReceiveTime: [],
213 211 // 表单参数
214 212 form: {},
215 213 // 查询参数
... ... @@ -221,6 +219,8 @@ export default {
221 219 mobile: null,
222 220 sendStatus: null,
223 221 receiveStatus: null,
  222 + sendTime: [],
  223 + receiveTime: []
224 224 },
225 225 // 短信渠道
226 226 channelOptions: [],
... ... @@ -237,12 +237,8 @@ export default {
237 237 /** 查询列表 */
238 238 getList() {
239 239 this.loading = true;
240   - // 处理查询参数
241   - let params = {...this.queryParams};
242   - this.addBeginAndEndTime(params, this.dateRangeSendTime, 'sendTime');
243   - this.addBeginAndEndTime(params, this.dateRangeReceiveTime, 'receiveTime');
244 240 // 执行查询
245   - getSmsLogPage(params).then(response => {
  241 + getSmsLogPage(this.queryParams).then(response => {
246 242 this.list = response.data.list;
247 243 this.total = response.data.total;
248 244 this.loading = false;
... ... @@ -260,8 +256,6 @@ export default {
260 256 },
261 257 /** 重置按钮操作 */
262 258 resetQuery() {
263   - this.dateRangeSendTime = [];
264   - this.dateRangeReceiveTime = [];
265 259 this.resetForm("queryForm");
266 260 this.handleQuery();
267 261 },
... ... @@ -271,8 +265,6 @@ export default {
271 265 let params = {...this.queryParams};
272 266 params.pageNo = undefined;
273 267 params.pageSize = undefined;
274   - this.addBeginAndEndTime(params, this.dateRangeSendTime, 'sendTime');
275   - this.addBeginAndEndTime(params, this.dateRangeReceiveTime, 'receiveTime');
276 268 // 执行导出
277 269 this.$modal.confirm('是否确认导出所有短信日志数据项?').then(() => {
278 270 this.exportLoading = true;
... ...
yudao-ui-admin/src/views/system/sms/smsTemplate.vue
  View file @53a0d9b
... ... @@ -28,9 +28,9 @@
28 28 :label="channel.signature + '【' + getDictDataLabel(DICT_TYPE.SYSTEM_SMS_CHANNEL_CODE, channel.code) + '】'" />
29 29 </el-select>
30 30 </el-form-item>
31   - <el-form-item label="创建时间">
32   - <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
33   - type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
  31 + <el-form-item label="创建时间" prop="createTime">
  32 + <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
  33 + range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
34 34 </el-form-item>
35 35 <el-form-item>
36 36 <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
... ... @@ -183,7 +183,6 @@ export default {
183 183 title: "",
184 184 // 是否显示弹出层
185 185 open: false,
186   - dateRangeCreateTime: [],
187 186 // 查询参数
188 187 queryParams: {
189 188 pageNo: 1,
... ... @@ -194,6 +193,7 @@ export default {
194 193 content: null,
195 194 apiTemplateId: null,
196 195 channelId: null,
  196 + createTime: []
197 197 },
198 198 // 表单参数
199 199 form: {},
... ... @@ -232,11 +232,8 @@ export default {
232 232 /** 查询列表 */
233 233 getList() {
234 234 this.loading = true;
235   - // 处理查询参数
236   - let params = {...this.queryParams};
237   - this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
238 235 // 执行查询
239   - getSmsTemplatePage(params).then(response => {
  236 + getSmsTemplatePage(this.queryParams).then(response => {
240 237 this.list = response.data.list;
241 238 this.total = response.data.total;
242 239 this.loading = false;
... ... @@ -269,7 +266,6 @@ export default {
269 266 },
270 267 /** 重置按钮操作 */
271 268 resetQuery() {
272   - this.dateRangeCreateTime = [];
273 269 this.resetForm("queryForm");
274 270 this.handleQuery();
275 271 },
... ... @@ -328,7 +324,6 @@ export default {
328 324 let params = {...this.queryParams};
329 325 params.pageNo = undefined;
330 326 params.pageSize = undefined;
331   - this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
332 327 // 执行导出
333 328 this.$modal.confirm('是否确认导出所有短信模板数据项?', "警告").then(() => {
334 329 this.exportLoading = true;
... ...
yudao-ui-admin/src/views/system/tenant/index.vue
  View file @53a0d9b
... ... @@ -18,6 +18,10 @@
18 18 :key="dict.value" :label="dict.label" :value="dict.value"/>
19 19 </el-select>
20 20 </el-form-item>
  21 + <el-form-item label="创建时间" prop="createTime">
  22 + <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
  23 + range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
  24 + </el-form-item>
21 25 <el-form-item>
22 26 <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
23 27 <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
... ... @@ -158,7 +162,6 @@ export default {
158 162 title: "",
159 163 // 是否显示弹出层
160 164 open: false,
161   - dateRangeCreateTime: [],
162 165 // 查询参数
163 166 queryParams: {
164 167 pageNo: 1,
... ... @@ -167,6 +170,7 @@ export default {
167 170 contactName: null,
168 171 contactMobile: null,
169 172 status: undefined,
  173 + createTime: []
170 174 },
171 175 // 表单参数
172 176 form: {},
... ... @@ -195,11 +199,8 @@ export default {
195 199 /** 查询列表 */
196 200 getList() {
197 201 this.loading = true;
198   - // 处理查询参数
199   - let params = {...this.queryParams};
200   - this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
201 202 // 执行查询
202   - getTenantPage(params).then(response => {
  203 + getTenantPage(this.queryParams).then(response => {
203 204 this.list = response.data.list;
204 205 this.total = response.data.total;
205 206 this.loading = false;
... ... @@ -232,7 +233,6 @@ export default {
232 233 },
233 234 /** 重置按钮操作 */
234 235 resetQuery() {
235   - this.dateRangeCreateTime = [];
236 236 this.resetForm("queryForm");
237 237 this.handleQuery();
238 238 },
... ... @@ -291,7 +291,6 @@ export default {
291 291 let params = {...this.queryParams};
292 292 params.pageNo = undefined;
293 293 params.pageSize = undefined;
294   - this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
295 294 // 执行导出
296 295 this.$modal.confirm('是否确认导出所有租户数据项?').then(() => {
297 296 this.exportLoading = true;
... ...
yudao-ui-admin/src/views/system/tenantPackage/index.vue
  View file @53a0d9b
... ... @@ -12,9 +12,9 @@
12 12 :key="dict.value" :label="dict.label" :value="dict.value"/>
13 13 </el-select>
14 14 </el-form-item>
15   - <el-form-item label="创建时间">
16   - <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
17   - type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
  15 + <el-form-item label="创建时间" prop="createTime">
  16 + <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
  17 + range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
18 18 </el-form-item>
19 19 <el-form-item>
20 20 <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
... ... @@ -114,7 +114,6 @@ export default {
114 114 title: "",
115 115 // 是否显示弹出层
116 116 open: false,
117   - dateRangeCreateTime: [],
118 117 // 查询参数
119 118 queryParams: {
120 119 pageNo: 1,
... ... @@ -122,6 +121,7 @@ export default {
122 121 name: null,
123 122 status: null,
124 123 remark: null,
  124 + createTime: []
125 125 },
126 126 // 表单参数
127 127 form: {},
... ... @@ -149,11 +149,8 @@ export default {
149 149 /** 查询列表 */
150 150 getList() {
151 151 this.loading = true;
152   - // 处理查询参数
153   - let params = {...this.queryParams};
154   - this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
155 152 // 执行查询
156   - getTenantPackagePage(params).then(response => {
  153 + getTenantPackagePage(this.queryParams).then(response => {
157 154 this.list = response.data.list;
158 155 this.total = response.data.total;
159 156 this.loading = false;
... ... @@ -190,7 +187,6 @@ export default {
190 187 },
191 188 /** 重置按钮操作 */
192 189 resetQuery() {
193   - this.dateRangeCreateTime = [];
194 190 // 表单重置
195 191 this.resetForm("queryForm");
196 192 this.handleQuery();
... ...
yudao-ui-admin/src/views/system/user/index.vue
  View file @53a0d9b
... ... @@ -31,9 +31,9 @@
31 31 <el-option v-for="dict in statusDictDatas" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
32 32 </el-select>
33 33 </el-form-item>
34   - <el-form-item label="创建时间">
35   - <el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
36   - range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
  34 + <el-form-item label="创建时间" prop="createTime">
  35 + <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
  36 + range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
37 37 </el-form-item>
38 38 <el-form-item>
39 39 <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
... ... @@ -237,7 +237,6 @@ import {
237 237 resetUserPwd,
238 238 updateUser
239 239 } from "@/api/system/user";
240   -import {getAccessToken} from "@/utils/auth";
241 240 import Treeselect from "@riophae/vue-treeselect";
242 241 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
243 242  
... ... @@ -275,8 +274,6 @@ export default {
275 274 deptName: undefined,
276 275 // 默认密码
277 276 initPassword: undefined,
278   - // 日期范围
279   - dateRange: [],
280 277 // 状态数据字典
281 278 statusOptions: [],
282 279 // 性别状态字典
... ... @@ -313,7 +310,8 @@ export default {
313 310 username: undefined,
314 311 mobile: undefined,
315 312 status: undefined,
316   - deptId: undefined
  313 + deptId: undefined,
  314 + createTime: []
317 315 },
318 316 // 列信息
319 317 columns: [
... ... @@ -345,7 +343,7 @@ export default {
345 343 ],
346 344 mobile: [
347 345 {
348   - pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
  346 + 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}$/,
349 347 message: "请输入正确的手机号码",
350 348 trigger: "blur"
351 349 }
... ... @@ -397,10 +395,7 @@ export default {
397 395 /** 查询用户列表 */
398 396 getList() {
399 397 this.loading = true;
400   - listUser(this.addDateRange(this.queryParams, [
401   - this.dateRange[0] ? this.dateRange[0] + ' 00:00:00' : undefined,
402   - this.dateRange[1] ? this.dateRange[1] + ' 23:59:59' : undefined,
403   - ])).then(response => {
  398 + listUser(this.queryParams).then(response => {
404 399 this.userList = response.data.list;
405 400 this.total = response.data.total;
406 401 this.loading = false;
... ... @@ -477,7 +472,6 @@ export default {
477 472 },
478 473 /** 重置按钮操作 */
479 474 resetQuery() {
480   - this.dateRange = [];
481 475 this.resetForm("queryForm");
482 476 this.handleQuery();
483 477 },
... ... @@ -581,13 +575,13 @@ export default {
581 575 },
582 576 /** 导出按钮操作 */
583 577 handleExport() {
584   - const queryParams = this.addDateRange(this.queryParams, [
585   - this.dateRange[0] ? this.dateRange[0] + ' 00:00:00' : undefined,
586   - this.dateRange[1] ? this.dateRange[1] + ' 23:59:59' : undefined,
587   - ]);
588 578 this.$modal.confirm('是否确认导出所有用户数据项?').then(() => {
  579 + // 处理查询参数
  580 + let params = {...this.queryParams};
  581 + params.pageNo = undefined;
  582 + params.pageSize = undefined;
589 583 this.exportLoading = true;
590   - return exportUser(queryParams);
  584 + return exportUser(params);
591 585 }).then(response => {
592 586 this.$download.excel(response, '用户数据.xls');
593 587 this.exportLoading = false;
... ...