Commit f9a0fb95 authored by 15008242619's avatar 15008242619

Merge branch 'dev' of http://94.191.100.41/tfmom/tf-mom-web into dev

parents 608574e1 74e63b11
...@@ -208,7 +208,8 @@ export default { ...@@ -208,7 +208,8 @@ export default {
searchItems: { searchItems: {
items: [{ 'fieldName': 'aircraftType.defName', operator: 'EQ', value: val }], items: [{ 'fieldName': 'aircraftType.defName', operator: 'EQ', value: val }],
operator: 'AND' operator: 'AND'
} },
sortItem: [{ fieldName: 'defCode', sortOrder: 'asc' }]
} }
this.$api.searchApi('AircraftSorties', params) this.$api.searchApi('AircraftSorties', params)
.then((res) => { .then((res) => {
......
...@@ -1771,7 +1771,8 @@ export default { ...@@ -1771,7 +1771,8 @@ export default {
'value': this.form.airModel 'value': this.form.airModel
} }
] ]
} },
sortItem: [{ fieldName: 'defCode', sortOrder: 'asc' }]
} }
this.$api.searchApi('AircraftSorties', params).then(res => { this.$api.searchApi('AircraftSorties', params).then(res => {
const SORTIES = this.formFileds[0].data.find( const SORTIES = this.formFileds[0].data.find(
......
...@@ -1773,7 +1773,8 @@ export default { ...@@ -1773,7 +1773,8 @@ export default {
'value': this.form.airModel 'value': this.form.airModel
} }
] ]
} },
sortItem: [{ fieldName: 'defCode', sortOrder: 'asc' }]
} }
this.$api.searchApi('AircraftSorties', params).then(res => { this.$api.searchApi('AircraftSorties', params).then(res => {
const SORTIES = this.formFileds[0].data.find( const SORTIES = this.formFileds[0].data.find(
......
...@@ -1772,7 +1772,8 @@ export default { ...@@ -1772,7 +1772,8 @@ export default {
'value': this.form.airModel 'value': this.form.airModel
} }
] ]
} },
sortItem: [{ fieldName: 'defCode', sortOrder: 'asc' }]
} }
this.$api.searchApi('AircraftSorties', params).then(res => { this.$api.searchApi('AircraftSorties', params).then(res => {
const SORTIES = this.formFileds[0].data.find( const SORTIES = this.formFileds[0].data.find(
......
...@@ -116,7 +116,7 @@ export default { ...@@ -116,7 +116,7 @@ export default {
}, },
getSortiesList() { getSortiesList() {
this.sortiesData = [] this.sortiesData = []
const params = { 'searchItems': { 'items': [] }, 'sortItem': [{ 'fieldName': 'modifyTime', 'sortOrder': 'asc' }] } const params = { 'searchItems': { 'items': [] }, 'sortItem': [{ 'fieldName': 'defCode', 'sortOrder': 'asc' }] }
this.$api.searchApi('AircraftSorties', params).then(res => { this.$api.searchApi('AircraftSorties', params).then(res => {
if (res.items && res.items.content) { if (res.items && res.items.content) {
this.sortiesData = res.items.content.map(row => { this.sortiesData = res.items.content.map(row => {
......
...@@ -105,7 +105,8 @@ export default { ...@@ -105,7 +105,8 @@ export default {
searchItems: { searchItems: {
items: [{ 'fieldName': 'aircraftType.defName', operator: 'EQ', value: val }], items: [{ 'fieldName': 'aircraftType.defName', operator: 'EQ', value: val }],
operator: 'AND' operator: 'AND'
} },
sortItem: [{ fieldName: 'defCode', sortOrder: 'asc' }]
} }
this.$api.searchApi('AircraftSorties', params).then(res => { this.$api.searchApi('AircraftSorties', params).then(res => {
this.options = res.items.content.map(row => { this.options = res.items.content.map(row => {
......
...@@ -97,7 +97,8 @@ export default { ...@@ -97,7 +97,8 @@ export default {
searchItems: { searchItems: {
items: [{ 'fieldName': 'aircraftTypeId', operator: 'EQ', value: val }], items: [{ 'fieldName': 'aircraftTypeId', operator: 'EQ', value: val }],
operator: 'AND' operator: 'AND'
} },
sortItem: [{ fieldName: 'defCode', sortOrder: 'asc' }]
} }
this.$api.searchApi('AircraftSorties', params).then(res => { this.$api.searchApi('AircraftSorties', params).then(res => {
this.options = res.items.content.map(row => { this.options = res.items.content.map(row => {
......
...@@ -102,7 +102,8 @@ export default { ...@@ -102,7 +102,8 @@ export default {
} }
] ]
} }
] ],
sortItem: [{ fieldName: 'defCode', sortOrder: 'asc' }]
} }
this.options = [] this.options = []
this.loading = true this.loading = true
......
...@@ -655,7 +655,8 @@ export default { ...@@ -655,7 +655,8 @@ export default {
'value': this.form.airModel 'value': this.form.airModel
} }
] ]
} },
sortItem: [{ fieldName: 'defCode', sortOrder: 'asc' }]
} }
this.$api.searchApi('AircraftSorties', params).then(res => { this.$api.searchApi('AircraftSorties', params).then(res => {
const SORTIES = this.formFileds[0].data.find( const SORTIES = this.formFileds[0].data.find(
......
...@@ -102,7 +102,8 @@ export default { ...@@ -102,7 +102,8 @@ export default {
searchItems: { searchItems: {
items: [{ 'fieldName': 'aircraftTypeId', operator: 'EQ', value: val.split('+')[0] }], items: [{ 'fieldName': 'aircraftTypeId', operator: 'EQ', value: val.split('+')[0] }],
operator: 'AND' operator: 'AND'
} },
sortItem: [{ fieldName: 'defCode', sortOrder: 'asc' }]
} }
this.$api.searchApi('AircraftSorties', params).then(res => { this.$api.searchApi('AircraftSorties', params).then(res => {
this.options = res.items.content.map(row => { this.options = res.items.content.map(row => {
......
...@@ -235,7 +235,7 @@ export default { ...@@ -235,7 +235,7 @@ export default {
this.sortiesData = [] this.sortiesData = []
this.sorties = null this.sorties = null
} }
const params = { 'searchItems': { 'items': [{ 'fieldName': 'aircraftTypeId', 'operator': 'EQ', 'value': this.form.model }] }, 'sortItem': [{ 'fieldName': 'modifyTime', 'sortOrder': 'asc' }] } const params = { 'searchItems': { 'items': [{ 'fieldName': 'aircraftTypeId', 'operator': 'EQ', 'value': this.form.model }] }, sortItem: [{ fieldName: 'defCode', sortOrder: 'asc' }] }
params.openProps = [{ name: 'aircraftType' }] params.openProps = [{ name: 'aircraftType' }]
this.$api.searchApi('AircraftSorties', params) this.$api.searchApi('AircraftSorties', params)
.then((res) => { .then((res) => {
......
...@@ -341,12 +341,7 @@ export default { ...@@ -341,12 +341,7 @@ export default {
'operator': 'AND' 'operator': 'AND'
}, },
'openProps': [], 'openProps': [],
'sortItem': [ sortItem: [{ fieldName: 'defCode', sortOrder: 'asc' }],
{
'fieldName': 'modifyTime',
'sortOrder': 'desc'
}
],
'toValidateKeys': '' 'toValidateKeys': ''
} }
this.$api.searchApi('AircraftSorties', params).then(res => { this.$api.searchApi('AircraftSorties', params).then(res => {
......
...@@ -424,12 +424,7 @@ export default { ...@@ -424,12 +424,7 @@ export default {
'operator': 'AND' 'operator': 'AND'
}, },
'openProps': [], 'openProps': [],
'sortItem': [ sortItem: [{ fieldName: 'defCode', sortOrder: 'asc' }],
{
'fieldName': 'modifyTime',
'sortOrder': 'desc'
}
],
'toValidateKeys': '' 'toValidateKeys': ''
} }
this.$api.searchApi('AircraftSorties', params).then(res => { this.$api.searchApi('AircraftSorties', params).then(res => {
......
...@@ -323,8 +323,8 @@ export default { ...@@ -323,8 +323,8 @@ export default {
], ],
'sortItem': [ 'sortItem': [
{ {
'fieldName': 'modifyTime', 'fieldName': 'defCode',
'sortOrder': 'desc' 'sortOrder': 'asc'
} }
], ],
'toValidateKeys': '' 'toValidateKeys': ''
......
...@@ -135,7 +135,7 @@ export default { ...@@ -135,7 +135,7 @@ export default {
methods: { methods: {
getSortiesList() { getSortiesList() {
this.sortiesData = [] this.sortiesData = []
const params = { 'searchItems': { 'items': [{ 'fieldName': 'aircraftTypeId', 'operator': 'EQ', 'value': this.form.model }] }, 'sortItem': [{ 'fieldName': 'modifyTime', 'sortOrder': 'asc' }] } const params = { 'searchItems': { 'items': [{ 'fieldName': 'aircraftTypeId', 'operator': 'EQ', 'value': this.form.model }] }, sortItem: [{ fieldName: 'defCode', sortOrder: 'asc' }] }
params.openProps = [{ name: 'aircraftType' }] params.openProps = [{ name: 'aircraftType' }]
this.$api.searchApi('AircraftSorties', params).then(res => { this.$api.searchApi('AircraftSorties', params).then(res => {
if (res.items && res.items.content) { if (res.items && res.items.content) {
......
...@@ -53,6 +53,9 @@ ...@@ -53,6 +53,9 @@
<div v-show="!item.isOK" class="upgrade"> <div v-show="!item.isOK" class="upgrade">
升版中 升版中
</div> </div>
<div v-show="item.isGaceUpgrade" class="upgrade">
GACE升版中
</div>
</div> </div>
<div> <div>
<div> <div>
...@@ -379,6 +382,7 @@ export default { ...@@ -379,6 +382,7 @@ export default {
isQualified: p.isQualified, isQualified: p.isQualified,
isExit: p.isExit, isExit: p.isExit,
isOK: p.planVer === p.extProcessPlan.gaceVersion, isOK: p.planVer === p.extProcessPlan.gaceVersion,
isGaceUpgrade: p.extProcessPlan.upgrade,
// // 例外放行 // // 例外放行
isException: p.isException, isException: p.isException,
// 转序 // 转序
......
...@@ -142,7 +142,8 @@ export default { ...@@ -142,7 +142,8 @@ export default {
searchItems: { searchItems: {
items: [{ 'fieldName': 'aircraftTypeId', operator: 'EQ', value: this.model }], items: [{ 'fieldName': 'aircraftTypeId', operator: 'EQ', value: this.model }],
operator: 'AND' operator: 'AND'
} },
sortItem: [{ fieldName: 'defCode', sortOrder: 'asc' }]
} }
this.$api.searchApi('AircraftSorties', param).then((res) => { this.$api.searchApi('AircraftSorties', param).then((res) => {
this.sortiesData = [] this.sortiesData = []
......
...@@ -551,15 +551,15 @@ export default { ...@@ -551,15 +551,15 @@ export default {
*/ */
handleExport() { handleExport() {
const params = { const params = {
pageFrom: this.tablePagination.currentPage, // pageFrom: this.tablePagination.currentPage,
pageSize: this.tablePagination.pageSize, // pageSize: this.tablePagination.pageSize,
searchItems: { searchItems: {
items: [ items: [
{ // {
fieldName: 'sorties', // fieldName: 'sorties',
operator: 'EQ', // operator: 'EQ',
value: this.nodeData.serialNo // value: this.nodeData.serialNo
} // }
], ],
operator: 'AND' operator: 'AND'
}, },
...@@ -579,7 +579,7 @@ export default { ...@@ -579,7 +579,7 @@ export default {
value: this.nodeData.title value: this.nodeData.title
}) })
} }
const downloadTitle = '单架次指令标识-' + this.nodeData.title + '.xlsx' const downloadTitle = '单架次指令标识' + '.xlsx'
downloadFile(`ExtProcessPlan/download/excel?taskDefinitionKey=${this.$route.query.taskDefinitionKey}`, 'post', params).then(res => { downloadFile(`ExtProcessPlan/download/excel?taskDefinitionKey=${this.$route.query.taskDefinitionKey}`, 'post', params).then(res => {
this.$utils.downLoadFile(res, downloadTitle) this.$utils.downLoadFile(res, downloadTitle)
}) })
......
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