wms / wms4_zhongputaicang · Commits

Commit adf201e4baa7944a2739a32c38c8036f6ce03383

Authored by 谭毅彬
2 parents d32d7698 24791d20

Merge branch 'develop' of http://git.huahengcloud.com/wms/wms4.git into develop

Inline Side-by-side
Showing 7 changed files with 249 additions and 14 deletions
ant-design-vue-jeecg/src/views/system/task/AgvTaskList.vue
  View file @adf201e
... ... @@ -154,7 +154,14 @@ export default {
154 154 {
155 155 title: '任务类型',
156 156 align: "center",
157   - dataIndex: 'taskType_dictText'
  157 + dataIndex: 'taskType_dictText',
  158 + filterMultiple: false,
  159 + filters: [
  160 + {text: '取放货任务', value: '100'},
  161 + {text: '行走任务', value: '200'},
  162 + {text: '取货任务', value: '300'},
  163 + {text: '放货任务', value: '400'},
  164 + ]
158 165 },
159 166 {
160 167 title: '容器编码',
... ... @@ -175,7 +182,15 @@ export default {
175 182 title: '任务状态',
176 183 align: "center",
177 184 dataIndex: 'status_dictText',
178   - scopedSlots: {customRender: 'status_dictText'}
  185 + scopedSlots: {customRender: 'status_dictText'},
  186 + filterMultiple: false,
  187 + filters: [
  188 + {text: '生成任务', value: '1'},
  189 + {text: '下发任务', value: '10'},
  190 + {text: '开始执行', value: '20'},
  191 + {text: '取货完成', value: '50'},
  192 + {text: '任务完成', value: '100'},
  193 + ]
179 194 },
180 195 {
181 196 title: '起始点位',
... ... @@ -252,6 +267,22 @@ export default {
252 267 },
253 268 },
254 269 methods: {
  270 + handleTableChange(pagination, filters, sorter) {
  271 + //分页、排序、筛选变化时触发
  272 + if (Object.keys(sorter).length > 0) {
  273 + this.isorter.column = sorter.field;
  274 + this.isorter.order = "ascend" == sorter.order ? "asc" : "desc"
  275 + }
  276 + //这种筛选方式只支持单选
  277 + if (filters && Object.keys(filters).length > 0 && filters.taskType_dictText) {
  278 + this.filters.taskType = filters.taskType_dictText[0];
  279 + }
  280 + if (filters && Object.keys(filters).length > 0 && filters.status_dictText) {
  281 + this.filters.status = filters.status_dictText[0];
  282 + }
  283 + this.ipagination = pagination;
  284 + this.loadData();
  285 + },
255 286 getStatusColor(status) {
256 287 const colors = {
257 288 '生成任务': 'green',
... ...
ant-design-vue-jeecg/src/views/system/task/AllTaskHeaderList.vue
  View file @adf201e
... ... @@ -232,7 +232,24 @@ export default {
232 232 title: '任务类型',
233 233 align: "center",
234 234 dataIndex: 'taskType_dictText',
235   - scopedSlots: {customRender: 'taskType_dictText'}
  235 + scopedSlots: {customRender: 'taskType_dictText'},
  236 + filterMultiple: false,
  237 + filters: [
  238 + {text: '整盘入库', value: '100'},
  239 + {text: '补充入库', value: '200'},
  240 + {text: '空容器入库', value: '500'},
  241 + {text: '空托盘组入库', value: '1100'},
  242 + {text: '整盘出库', value: '300'},
  243 + {text: '分拣出库', value: '400'},
  244 + {text: '空容器出库', value: '600'},
  245 + {text: '空托盘组出库', value: '1200'},
  246 + {text: '移库', value: '800'},
  247 + {text: '换站', value: '1000'},
  248 + {text: '空托盘组换站', value: '1300'},
  249 + {text: '盘点', value: '700'},
  250 + {text: '质检', value: '1400'},
  251 + {text: '出库查看', value: '900'},
  252 + ]
236 253 },
237 254 {
238 255 title: '容器编码',
... ... @@ -266,7 +283,15 @@ export default {
266 283 align: "center",
267 284 dataIndex: 'status_dictText',
268 285 key: 'status_dictText',
269   - scopedSlots: {customRender: 'status_dictText'}
  286 + scopedSlots: {customRender: 'status_dictText'},
  287 + filterMultiple: false,
  288 + filters: [
  289 + {text: '生成任务', value: '1'},
  290 + {text: '下发任务', value: '10'},
  291 + {text: '开始执行', value: '20'},
  292 + {text: '到达拣选台', value: '50'},
  293 + {text: '任务完成', value: '100'},
  294 + ]
270 295 },
271 296 {
272 297 title: '异常信息',
... ... @@ -377,6 +402,22 @@ export default {
377 402 }
378 403 },
379 404 methods: {
  405 + handleTableChange(pagination, filters, sorter) {
  406 + //分页、排序、筛选变化时触发
  407 + if (Object.keys(sorter).length > 0) {
  408 + this.isorter.column = sorter.field;
  409 + this.isorter.order = "ascend" == sorter.order ? "asc" : "desc"
  410 + }
  411 + //这种筛选方式只支持单选
  412 + if (filters && Object.keys(filters).length > 0 && filters.taskType_dictText) {
  413 + this.filters.taskType = filters.taskType_dictText[0];
  414 + }
  415 + if (filters && Object.keys(filters).length > 0 && filters.status_dictText) {
  416 + this.filters.status = filters.status_dictText[0];
  417 + }
  418 + this.ipagination = pagination;
  419 + this.loadData();
  420 + },
380 421 getStatusColor(status) {
381 422 const colors = {
382 423 '生成任务': 'green',
... ...
ant-design-vue-jeecg/src/views/system/task/CircleTaskHeaderList.vue
  View file @adf201e
... ... @@ -233,7 +233,13 @@ export default {
233 233 align: "center",
234 234 dataIndex: 'taskType_dictText',
235 235 customFilterDropdown: true,
236   - scopedSlots: {customRender: 'taskType_dictText'}
  236 + scopedSlots: {customRender: 'taskType_dictText'},
  237 + filterMultiple: false,
  238 + filters: [
  239 + {text: '盘点', value: '700'},
  240 + {text: '质检', value: '1400'},
  241 + {text: '出库查看', value: '900'},
  242 + ]
237 243 },
238 244 {
239 245 title: '容器编码',
... ... @@ -266,7 +272,15 @@ export default {
266 272 title: '任务状态',
267 273 align: "center",
268 274 dataIndex: 'status_dictText',
269   - scopedSlots: {customRender: 'status_dictText'}
  275 + scopedSlots: {customRender: 'status_dictText'},
  276 + filterMultiple: false,
  277 + filters: [
  278 + {text: '生成任务', value: '1'},
  279 + {text: '下发任务', value: '10'},
  280 + {text: '开始执行', value: '20'},
  281 + {text: '到达拣选台', value: '50'},
  282 + {text: '任务完成', value: '100'},
  283 + ]
270 284 },
271 285 {
272 286 title: '异常信息',
... ... @@ -376,6 +390,22 @@ export default {
376 390 }
377 391 },
378 392 methods: {
  393 + handleTableChange(pagination, filters, sorter) {
  394 + //分页、排序、筛选变化时触发
  395 + if (Object.keys(sorter).length > 0) {
  396 + this.isorter.column = sorter.field;
  397 + this.isorter.order = "ascend" == sorter.order ? "asc" : "desc"
  398 + }
  399 + //这种筛选方式只支持单选
  400 + if (filters && Object.keys(filters).length > 0 && filters.taskType_dictText) {
  401 + this.filters.taskType = filters.taskType_dictText[0];
  402 + }
  403 + if (filters && Object.keys(filters).length > 0 && filters.status_dictText) {
  404 + this.filters.status = filters.status_dictText[0];
  405 + }
  406 + this.ipagination = pagination;
  407 + this.loadData();
  408 + },
379 409 getStatusColor(status) {
380 410 const colors = {
381 411 '生成任务': 'green',
... ...
ant-design-vue-jeecg/src/views/system/task/ReceiptTaskHeaderList.vue
  View file @adf201e
... ... @@ -246,7 +246,14 @@ export default {
246 246 title: '任务类型',
247 247 align: "center",
248 248 dataIndex: 'taskType_dictText',
249   - scopedSlots: {customRender: 'taskType_dictText'}
  249 + scopedSlots: {customRender: 'taskType_dictText'},
  250 + filterMultiple: false,
  251 + filters: [
  252 + {text: '整盘入库', value: '100'},
  253 + {text: '补充入库', value: '200'},
  254 + {text: '空容器入库', value: '500'},
  255 + {text: '空托盘组入库', value: '1100'},
  256 + ]
250 257 },
251 258 {
252 259 title: '容器编码',
... ... @@ -280,7 +287,15 @@ export default {
280 287 align: "center",
281 288 dataIndex: 'status_dictText',
282 289 key: 'status_dictText',
283   - scopedSlots: {customRender: 'status_dictText'}
  290 + scopedSlots: {customRender: 'status_dictText'},
  291 + filterMultiple: false,
  292 + filters: [
  293 + {text: '生成任务', value: '1'},
  294 + {text: '下发任务', value: '10'},
  295 + {text: '开始执行', value: '20'},
  296 + {text: '到达拣选台', value: '50'},
  297 + {text: '任务完成', value: '100'},
  298 + ]
284 299 },
285 300 {
286 301 title: '异常信息',
... ... @@ -391,6 +406,22 @@ export default {
391 406 }
392 407 },
393 408 methods: {
  409 + handleTableChange(pagination, filters, sorter) {
  410 + //分页、排序、筛选变化时触发
  411 + if (Object.keys(sorter).length > 0) {
  412 + this.isorter.column = sorter.field;
  413 + this.isorter.order = "ascend" == sorter.order ? "asc" : "desc"
  414 + }
  415 + //这种筛选方式只支持单选
  416 + if (filters && Object.keys(filters).length > 0 && filters.taskType_dictText) {
  417 + this.filters.taskType = filters.taskType_dictText[0];
  418 + }
  419 + if (filters && Object.keys(filters).length > 0 && filters.status_dictText) {
  420 + this.filters.status = filters.status_dictText[0];
  421 + }
  422 + this.ipagination = pagination;
  423 + this.loadData();
  424 + },
394 425 getStatusColor(status) {
395 426 const colors = {
396 427 '生成任务': 'green',
... ...
ant-design-vue-jeecg/src/views/system/task/ShipmentTaskHeaderList.vue
  View file @adf201e
... ... @@ -242,7 +242,14 @@ export default {
242 242 title: '任务类型',
243 243 align: "center",
244 244 dataIndex: 'taskType_dictText',
245   - scopedSlots: {customRender: 'taskType_dictText'}
  245 + scopedSlots: {customRender: 'taskType_dictText'},
  246 + filterMultiple: false,
  247 + filters: [
  248 + {text: '整盘出库', value: '300'},
  249 + {text: '分拣出库', value: '400'},
  250 + {text: '空容器出库', value: '600'},
  251 + {text: '空托盘组出库', value: '1200'},
  252 + ]
246 253 },
247 254 {
248 255 title: '容器编码',
... ... @@ -276,7 +283,15 @@ export default {
276 283 align: "center",
277 284 dataIndex: 'status_dictText',
278 285 key: 'status_dictText',
279   - scopedSlots: {customRender: 'status_dictText'}
  286 + scopedSlots: {customRender: 'status_dictText'},
  287 + filterMultiple: false,
  288 + filters: [
  289 + {text: '生成任务', value: '1'},
  290 + {text: '下发任务', value: '10'},
  291 + {text: '开始执行', value: '20'},
  292 + {text: '到达拣选台', value: '50'},
  293 + {text: '任务完成', value: '100'},
  294 + ]
280 295 },
281 296 {
282 297 title: '异常信息',
... ... @@ -386,6 +401,22 @@ export default {
386 401 }
387 402 },
388 403 methods: {
  404 + handleTableChange(pagination, filters, sorter) {
  405 + //分页、排序、筛选变化时触发
  406 + if (Object.keys(sorter).length > 0) {
  407 + this.isorter.column = sorter.field;
  408 + this.isorter.order = "ascend" == sorter.order ? "asc" : "desc"
  409 + }
  410 + //这种筛选方式只支持单选
  411 + if (filters && Object.keys(filters).length > 0 && filters.taskType_dictText) {
  412 + this.filters.taskType = filters.taskType_dictText[0];
  413 + }
  414 + if (filters && Object.keys(filters).length > 0 && filters.status_dictText) {
  415 + this.filters.status = filters.status_dictText[0];
  416 + }
  417 + this.ipagination = pagination;
  418 + this.loadData();
  419 + },
389 420 getStatusColor(status) {
390 421 const colors = {
391 422 '生成任务': 'green',
... ...
ant-design-vue-jeecg/src/views/system/task/TaskHeaderHistoryList.vue
  View file @adf201e
... ... @@ -195,7 +195,24 @@ export default {
195 195 title: '任务类型',
196 196 align: "center",
197 197 dataIndex: 'taskType_dictText',
198   - scopedSlots: {customRender: 'taskType_dictText'}
  198 + scopedSlots: {customRender: 'taskType_dictText'},
  199 + filterMultiple: false,
  200 + filters: [
  201 + {text: '整盘入库', value: '100'},
  202 + {text: '补充入库', value: '200'},
  203 + {text: '空容器入库', value: '500'},
  204 + {text: '空托盘组入库', value: '1100'},
  205 + {text: '整盘出库', value: '300'},
  206 + {text: '分拣出库', value: '400'},
  207 + {text: '空容器出库', value: '600'},
  208 + {text: '空托盘组出库', value: '1200'},
  209 + {text: '移库', value: '800'},
  210 + {text: '换站', value: '1000'},
  211 + {text: '空托盘组换站', value: '1300'},
  212 + {text: '盘点', value: '700'},
  213 + {text: '质检', value: '1400'},
  214 + {text: '出库查看', value: '900'},
  215 + ]
199 216 },
200 217 {
201 218 title: '容器编码',
... ... @@ -229,7 +246,15 @@ export default {
229 246 align: "center",
230 247 dataIndex: 'status_dictText',
231 248 key: 'status_dictText',
232   - scopedSlots: {customRender: 'status_dictText'}
  249 + scopedSlots: {customRender: 'status_dictText'},
  250 + filterMultiple: false,
  251 + filters: [
  252 + {text: '生成任务', value: '1'},
  253 + {text: '下发任务', value: '10'},
  254 + {text: '开始执行', value: '20'},
  255 + {text: '到达拣选台', value: '50'},
  256 + {text: '任务完成', value: '100'},
  257 + ]
233 258 },
234 259 {
235 260 title: '异常信息',
... ... @@ -313,6 +338,22 @@ export default {
313 338 }
314 339 },
315 340 methods: {
  341 + handleTableChange(pagination, filters, sorter) {
  342 + //分页、排序、筛选变化时触发
  343 + if (Object.keys(sorter).length > 0) {
  344 + this.isorter.column = sorter.field;
  345 + this.isorter.order = "ascend" == sorter.order ? "asc" : "desc"
  346 + }
  347 + //这种筛选方式只支持单选
  348 + if (filters && Object.keys(filters).length > 0 && filters.taskType_dictText) {
  349 + this.filters.taskType = filters.taskType_dictText[0];
  350 + }
  351 + if (filters && Object.keys(filters).length > 0 && filters.status_dictText) {
  352 + this.filters.status = filters.status_dictText[0];
  353 + }
  354 + this.ipagination = pagination;
  355 + this.loadData();
  356 + },
316 357 getStatusColor(status) {
317 358 const colors = {
318 359 '生成任务': 'green',
... ...
ant-design-vue-jeecg/src/views/system/task/TransferTaskHeaderList.vue
  View file @adf201e
... ... @@ -228,7 +228,13 @@ export default {
228 228 title: '任务类型',
229 229 align: "center",
230 230 dataIndex: 'taskType_dictText',
231   - scopedSlots: {customRender: 'taskType_dictText'}
  231 + scopedSlots: {customRender: 'taskType_dictText'},
  232 + filterMultiple: false,
  233 + filters: [
  234 + {text: '移库', value: '800'},
  235 + {text: '换站', value: '1000'},
  236 + {text: '空托盘组换站', value: '1300'},
  237 + ]
232 238 },
233 239 {
234 240 title: '容器编码',
... ... @@ -266,7 +272,15 @@ export default {
266 272 title: '任务状态',
267 273 align: "center",
268 274 dataIndex: 'status_dictText',
269   - scopedSlots: {customRender: 'status_dictText'}
  275 + scopedSlots: {customRender: 'status_dictText'},
  276 + filterMultiple: false,
  277 + filters: [
  278 + {text: '生成任务', value: '1'},
  279 + {text: '下发任务', value: '10'},
  280 + {text: '开始执行', value: '20'},
  281 + {text: '到达拣选台', value: '50'},
  282 + {text: '任务完成', value: '100'},
  283 + ]
270 284 },
271 285 {
272 286 title: '异常信息',
... ... @@ -376,6 +390,22 @@ export default {
376 390 }
377 391 },
378 392 methods: {
  393 + handleTableChange(pagination, filters, sorter) {
  394 + //分页、排序、筛选变化时触发
  395 + if (Object.keys(sorter).length > 0) {
  396 + this.isorter.column = sorter.field;
  397 + this.isorter.order = "ascend" == sorter.order ? "asc" : "desc"
  398 + }
  399 + //这种筛选方式只支持单选
  400 + if (filters && Object.keys(filters).length > 0 && filters.taskType_dictText) {
  401 + this.filters.taskType = filters.taskType_dictText[0];
  402 + }
  403 + if (filters && Object.keys(filters).length > 0 && filters.status_dictText) {
  404 + this.filters.status = filters.status_dictText[0];
  405 + }
  406 + this.ipagination = pagination;
  407 + this.loadData();
  408 + },
379 409 getStatusColor(status) {
380 410 const colors = {
381 411 '生成任务': 'green',
... ...