Skip to content

T
TF-MOM-WEB
Commit b686fd75 authored by jingnan's avatar jingnan 👀
Browse files
Options

计划模块增加所有属性的排序

parent 8e191fbb
Show whitespace changes
Inline Side-by-side
Showing with 57 additions and 36 deletions
applications/dee-mes/src/views/assemblyPlanManagement/inspectionDispatch/index.vue
View file @ b686fd75
...@@ -69,6 +69,7 @@ ...@@ -69,6 +69,7 @@
@pagination-current-change="paginationCurrentChange" @pagination-current-change="paginationCurrentChange"
@pagination-size-change="handleSizeChange" @pagination-size-change="handleSizeChange"
@selection-change="selectionChange" @selection-change="selectionChange"
@sort-change="handleSortChange"
> >
<dee-tools slot="header" :tools="tools" mode="normal" /> <dee-tools slot="header" :tools="tools" mode="normal" />
</dee-up-table> </dee-up-table>
...@@ -156,11 +157,12 @@ export default { ...@@ -156,11 +157,12 @@ export default {
width: '70' width: '70'
}, },
columns: [ columns: [
{ title: '机上区域', key: 'extProcessPlan.area', align: 'left', minWidth: 120 }, { title: '机上区域', key: 'extProcessPlan.area', align: 'left', minWidth: 120, sortable: true },
{ {
title: '指令号', title: '指令号',
key: 'extProcessPlan.serialNumber', key: 'extProcessPlan.serialNumber',
align: 'left', align: 'left',
sortable: true,
minWidth: 330, minWidth: 330,
component: { component: {
render: (h, params) => { render: (h, params) => {
...@@ -192,23 +194,23 @@ export default { ...@@ -192,23 +194,23 @@ export default {
} }
} }
}, },
{ title: '指令名称', key: 'extProcessPlan.name', align: 'left', minWidth: 280 }, { title: '指令名称', key: 'extProcessPlan.name', align: 'left', minWidth: 280, sortable: true },
{ title: '机型', key: 'extProcessPlan.planeType', align: 'left' }, { title: '机型', key: 'extProcessPlan.planeType', align: 'left', sortable: true },
{ title: '架次', key: 'extProcessPlan.sorties', align: 'left' }, { title: '架次', key: 'extProcessPlan.sorties', align: 'left', sortable: true },
{ title: '站位', key: 'extProcessPlan.positionNumber', align: 'left' }, { title: '站位', key: 'extProcessPlan.positionNumber', align: 'left', sortable: true },
{ title: '工时定额', key: 'extProcessPlan.opHour', align: 'left' }, { title: '工时定额', key: 'extProcessPlan.opHour', align: 'left', sortable: true, minWidth: 120 },
{ title: '工时', key: 'extProcessPlan.workHour', align: 'left' }, { title: '工时', key: 'extProcessPlan.workHour', align: 'left', sortable: true },
{ title: '计划员', key: 'planner.name', align: 'left' }, { title: '计划员', key: 'planner.name', align: 'left' },
{ title: '工艺员', key: 'extProcessPlan.noteName', align: 'left' }, { title: '工艺员', key: 'extProcessPlan.noteName', align: 'left' },
{ title: '计划开始', key: 'scheduledStart', align: 'left', { title: '计划开始', key: 'scheduledStart', align: 'left',
formatter(row, column) { formatter(row, column) {
return row.scheduledStart ? row.scheduledStart.substr(0, 10) : '' return row.scheduledStart ? row.scheduledStart.substr(0, 10) : ''
} }, minWidth: 140, sortable: true
}, },
{ title: '计划结束', key: 'scheduledEnd', align: 'left', { title: '计划结束', key: 'scheduledEnd', align: 'left',
formatter(row, column) { formatter(row, column) {
return row.scheduledEnd ? row.scheduledEnd.substr(0, 10) : '' return row.scheduledEnd ? row.scheduledEnd.substr(0, 10) : ''
} }, minWidth: 140, sortable: true
} }
], ],
tableData: [], tableData: [],
...@@ -286,7 +288,11 @@ export default { ...@@ -286,7 +288,11 @@ export default {
], ],
groupUserTotal: 0, groupUserTotal: 0,
groupUserPage: 1, groupUserPage: 1,
isLoading: false isLoading: false,
sortItem: [{
'fieldName': 'modifyTime',
'sortOrder': 'desc'
}]
} }
}, },
computed: { computed: {
...@@ -549,12 +555,7 @@ export default { ...@@ -549,12 +555,7 @@ export default {
] ]
} }
], ],
'sortItem': [ 'sortItem': this.sortItem
{
'fieldName': 'modifyTime',
'sortOrder': 'desc'
}
]
} }
if (this.searchFormData.sortiesName) { if (this.searchFormData.sortiesName) {
params.searchItems.children[0].items.push({ params.searchItems.children[0].items.push({
...@@ -652,6 +653,14 @@ export default { ...@@ -652,6 +653,14 @@ export default {
this.groupUserPage++ this.groupUserPage++
this.getGroupUser() this.getGroupUser()
} }
},
handleSortChange({ column, prop, order }) {
if (prop && order) {
this.sortItem = [{ fieldName: prop, sortOrder: order.includes('asc') ? 'asc' : 'desc' }]
} else {
this.sortItem = [{ 'fieldName': 'modifyTime', 'sortOrder': 'desc' }]
}
this.getInstructionsDispatchList()
} }
} }
} }
......
applications/dee-mes/src/views/assemblyPlanManagement/instructionsDispatch/index.vue
View file @ b686fd75
...@@ -74,6 +74,7 @@ ...@@ -74,6 +74,7 @@
@pagination-current-change="paginationCurrentChange" @pagination-current-change="paginationCurrentChange"
@pagination-size-change="handleSizeChange" @pagination-size-change="handleSizeChange"
@selection-change="selectionChange" @selection-change="selectionChange"
@sort-change="handleSortChange"
> >
<dee-tools slot="header" :tools="tools" mode="normal" /> <dee-tools slot="header" :tools="tools" mode="normal" />
</dee-up-table> </dee-up-table>
...@@ -213,11 +214,12 @@ export default { ...@@ -213,11 +214,12 @@ export default {
width: '70' width: '70'
}, },
columns: [ columns: [
{ title: '机上区域', key: 'extProcessPlan.area', align: 'left', minWidth: 120 }, { title: '机上区域', key: 'extProcessPlan.area', align: 'left', minWidth: 120, sortable: true },
{ {
title: '指令号', title: '指令号',
key: 'extProcessPlan.serialNumber', key: 'extProcessPlan.serialNumber',
align: 'left', align: 'left',
sortable: true,
minWidth: 330, minWidth: 330,
component: { component: {
render: (h, params) => { render: (h, params) => {
...@@ -249,31 +251,33 @@ export default { ...@@ -249,31 +251,33 @@ export default {
} }
} }
}, },
{ title: '指令名称', key: 'extProcessPlan.name', align: 'left', minWidth: 280 }, { title: '指令名称', key: 'extProcessPlan.name', align: 'left', minWidth: 280, sortable: true },
{ title: '是否协同', { title: '是否协同',
key: 'extProcessPlan.name', key: 'extProcessPlan.name',
align: 'left', align: 'left',
minWidth: 120,
sortable: true,
formatter(row) { formatter(row) {
return row.cooperatives ? '协同' : '' return row.cooperatives ? '协同' : ''
} }
}, },
{ title: '机型', key: 'extProcessPlan.planeType', align: 'left' }, { title: '机型', key: 'extProcessPlan.planeType', align: 'left', sortable: true },
{ title: '架次', key: 'extProcessPlan.sorties', align: 'left' }, { title: '架次', key: 'extProcessPlan.sorties', align: 'left', sortable: true },
{ title: '站位', key: 'extProcessPlan.positionNumber', align: 'left' }, { title: '站位', key: 'extProcessPlan.positionNumber', align: 'left', sortable: true },
{ title: '工作包名称', key: 'extProcessPlan.extWorkPackageLinks[0].source.name', align: 'left' }, { title: '工作包名称', key: 'extProcessPlan.extWorkPackageLinks[0].source.name', align: 'left', sortable: true, minWidth: 140 },
{ title: '技能点', key: 'extProcessPlan.workCode', align: 'left' }, { title: '技能点', key: 'extProcessPlan.workCode', align: 'left', sortable: true, minWidth: 140 },
{ title: '工时定额', key: 'extProcessPlan.opHour', align: 'left' }, { title: '工时定额', key: 'extProcessPlan.opHour', align: 'left', sortable: true, minWidth: 140 },
{ title: '工时', key: 'extProcessPlan.workHour', align: 'left' }, { title: '工时', key: 'extProcessPlan.workHour', align: 'left', sortable: true },
{ title: '计划员', key: 'planner.name', align: 'left' }, { title: '计划员', key: 'planner.name', align: 'left' },
{ title: '工艺员', key: 'extProcessPlan.noteName', align: 'left' }, { title: '工艺员', key: 'extProcessPlan.noteName', align: 'left' },
{ title: '计划开始', key: 'scheduledStart', align: 'left', { title: '计划开始', key: 'scheduledStart', align: 'left', minWidth: 140,
formatter(row, column) { formatter(row, column) {
return row.scheduledStart ? row.scheduledStart.substr(0, 10) : '' return row.scheduledStart ? row.scheduledStart.substr(0, 10) : ''
} }, }, sortable: true },
{ title: '计划结束', key: 'scheduledEnd', align: 'left', { title: '计划结束', key: 'scheduledEnd', align: 'left', minWidth: 140,
formatter(row, column) { formatter(row, column) {
return row.scheduledEnd ? row.scheduledEnd.substr(0, 10) : '' return row.scheduledEnd ? row.scheduledEnd.substr(0, 10) : ''
} }, sortable: true
} }
], ],
tableData: [], tableData: [],
...@@ -366,7 +370,11 @@ export default { ...@@ -366,7 +370,11 @@ export default {
groupUserPage: 1, groupUserPage: 1,
mainUserId: null, mainUserId: null,
postionList: [], postionList: [],
isLoading: false isLoading: false,
sortItem: [{
'fieldName': 'modifyTime',
'sortOrder': 'desc'
}]
} }
}, },
computed: { computed: {
...@@ -629,12 +637,7 @@ export default { ...@@ -629,12 +637,7 @@ export default {
'name': 'cooperatives' 'name': 'cooperatives'
} }
], ],
'sortItem': [ 'sortItem': this.sortItem
{
'fieldName': 'modifyTime',
'sortOrder': 'desc'
}
]
} }
if (this.searchFormData.sorties) { if (this.searchFormData.sorties) {
params.searchItems.children[0].items.push({ params.searchItems.children[0].items.push({
...@@ -738,6 +741,14 @@ export default { ...@@ -738,6 +741,14 @@ export default {
this.groupUserPage++ this.groupUserPage++
this.getGroupUser() this.getGroupUser()
} }
},
handleSortChange({ column, prop, order }) {
if (prop && order) {
this.sortItem = [{ fieldName: prop, sortOrder: order.includes('asc') ? 'asc' : 'desc' }]
} else {
this.sortItem = [{ 'fieldName': 'modifyTime', 'sortOrder': 'desc' }]
}
this.getInstructionsDispatchList()
} }
} }
} }
......
applications/dee-mes/src/views/assemblyPlanManagement/instructionsIssued/components/stationPlanList.vue
View file @ b686fd75
...@@ -768,6 +768,7 @@ export default { ...@@ -768,6 +768,7 @@ export default {
} }
} }
.right-container { .right-container {
background-color: #fff;
margin-left: 20px; margin-left: 20px;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment