WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH

Browse Source
This commit is contained in:
zyx.net
2023-04-13 10:26:07 +08:00
parent 6228f9e01a d88d964fd7
commit 0f8b252b8b
5 changed files with 95 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue
+5 -2
View File
@@ -83,6 +83,7 @@
align: 'left',
dataIndex: 'flowTypeShow',
ellipsis: true,
sorter: true,
width: 241
},
{
@@ -90,6 +91,7 @@
align: 'left',
dataIndex: 'taskDefinitionKeyName',
ellipsis: true,
sorter: true,
width: 208
},
{
@@ -118,6 +120,7 @@
align: 'left',
dataIndex: 'endTime',
ellipsis: true,
sorter: true,
width: 108
},
// {
@@ -349,9 +352,9 @@
tableOnChange(pagination, filters, sorter) {
this.orderBy = sorter.order == 'ascend' ? '1' : '2'
if (sorter.columnKey == 'flowTypeShow') {
this.orderByField = 'flowType'
this.orderByField = 'flow_type'
} else if (sorter.columnKey == 'taskDefinitionKeyName') {
this.orderByField = 'taskDefinitionKey'
this.orderByField = 'task_definition_key'
} else {
this.orderByField = sorter.columnKey
}
jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue
+2 -2
View File
@@ -426,9 +426,9 @@
tableOnChange(pagination, filters, sorter) {
this.orderBy = sorter.order == 'ascend' ? '1' : '2'
if (sorter.columnKey == 'flowTypeShow') {
this.orderByField = 'flowType'
this.orderByField = 'flow_type'
} else if (sorter.columnKey == 'taskDefinitionKeyName') {
this.orderByField = 'taskDefinitionKey'
this.orderByField = 'task_definition_key'
} else {
this.orderByField = sorter.columnKey
}
jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue
+5 -2
View File
@@ -88,6 +88,7 @@
align: 'left',
dataIndex: 'flowTypeShow',
ellipsis: true,
sorter: true,
width: 241
},
{
@@ -95,6 +96,7 @@
align: 'left',
dataIndex: 'taskDefinitionKeyName',
ellipsis: true,
sorter: true,
width: 208
},
{
@@ -116,6 +118,7 @@
align: 'left',
dataIndex: 'endTime',
ellipsis: true,
sorter: true,
width: 108
},
// {
@@ -342,9 +345,9 @@
tableOnChange(pagination, filters, sorter) {
this.orderBy = sorter.order == 'ascend' ? '1' : '2'
if (sorter.columnKey == 'flowTypeShow') {
this.orderByField = 'flowType'
this.orderByField = 'flow_type'
} else if (sorter.columnKey == 'taskDefinitionKeyName') {
this.orderByField = 'taskDefinitionKey'
this.orderByField = 'task_definition_key'
} else {
this.orderByField = sorter.columnKey
}