|
69 | 69 | <search-select
|
70 | 70 | ref="searchSelect"
|
71 | 71 | id="templateList"
|
72 |
| - :placeholder="$t('ID/流程名称/标签/更新人/创建人/子流程更新')" |
| 72 | + :placeholder="$t('ID/流程名称/标签/更新人/创建人/子流程更新/执行代理人')" |
73 | 73 | v-model="searchSelectValue"
|
74 | 74 | :search-list="searchList"
|
75 | 75 | @change="handleSearchValueChange">
|
|
455 | 455 | {
|
456 | 456 | id: 'editor',
|
457 | 457 | name: i18n.t('更新人')
|
| 458 | + }, |
| 459 | + { |
| 460 | + id: 'executor_proxy', |
| 461 | + name: i18n.t('执行代理人') |
458 | 462 | }
|
459 | 463 | ]
|
460 | 464 |
|
|
498 | 502 | label: i18n.t('分类'),
|
499 | 503 | min_width: 180
|
500 | 504 | },
|
| 505 | + { |
| 506 | + id: 'executor_proxy', |
| 507 | + label: i18n.t('执行代理人'), |
| 508 | + width: 120 |
| 509 | + }, |
501 | 510 | {
|
502 | 511 | id: 'creator_name',
|
503 | 512 | label: i18n.t('创建人'),
|
|
537 | 546 | editor = '',
|
538 | 547 | flowName = '',
|
539 | 548 | label_ids = '',
|
540 |
| - template_id = '' |
| 549 | + template_id = '', |
| 550 | + executor_proxy = '' |
541 | 551 | } = this.$route.query
|
542 | 552 | const searchList = [
|
543 | 553 | ...SEARCH_LIST,
|
|
624 | 634 | edit_time: edit_time ? edit_time.split(',') : ['', ''],
|
625 | 635 | label_ids: label_ids ? label_ids.split(',') : [],
|
626 | 636 | flowName,
|
627 |
| - template_id |
| 637 | + template_id, |
| 638 | + executor_proxy |
628 | 639 | },
|
629 | 640 | isInit: true, // 避免default-sort在初始化时去触发table的sort-change事件
|
630 | 641 | totalPage: 1,
|
|
819 | 830 | }
|
820 | 831 | },
|
821 | 832 | getQueryData () {
|
822 |
| - const { subprocessUpdateVal, creator, create_time, edit_time, flowName, label_ids, template_id, editor } = this.requestData |
| 833 | + const { subprocessUpdateVal, creator, create_time, edit_time, flowName, label_ids, template_id, editor, executor_proxy } = this.requestData |
823 | 834 |
|
824 | 835 | /**
|
825 | 836 | * 无子流程 has_subprocess=false
|
|
841 | 852 | project__id: this.project_id,
|
842 | 853 | new: true,
|
843 | 854 | id__in: tplIds,
|
844 |
| - pipeline_template__editor: editor || undefined |
| 855 | + pipeline_template__editor: editor || undefined, |
| 856 | + executor_proxy |
845 | 857 | }
|
846 | 858 | const keys = ['edit_time', '-edit_time', 'create_time', '-create_time']
|
847 | 859 | if (keys.includes(this.ordering)) {
|
|
1478 | 1490 | },
|
1479 | 1491 | updateUrl () {
|
1480 | 1492 | const { current, limit } = this.pagination
|
1481 |
| - const { category, create_time, edit_time, subprocessUpdateVal, creator, label_ids, flowName, template_id, editor } = this.requestData |
| 1493 | + const { category, create_time, edit_time, subprocessUpdateVal, creator, label_ids, flowName, template_id, editor, executor_proxy } = this.requestData |
1482 | 1494 | const filterObj = {
|
1483 | 1495 | limit,
|
1484 | 1496 | category,
|
|
1490 | 1502 | label_ids: label_ids && label_ids.length ? label_ids.join(',') : '',
|
1491 | 1503 | flowName: flowName,
|
1492 | 1504 | template_id,
|
1493 |
| - editor |
| 1505 | + editor, |
| 1506 | + executor_proxy |
1494 | 1507 | }
|
1495 | 1508 | const query = {}
|
1496 | 1509 | Object.keys(filterObj).forEach(key => {
|
|
0 commit comments