Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
T
TF-MOM-WEB
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
TFMOM
TF-MOM-WEB
Commits
f9a0fb95
Commit
f9a0fb95
authored
Jul 03, 2024
by
15008242619
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of
http://94.191.100.41/tfmom/tf-mom-web
into dev
parents
608574e1
74e63b11
Hide whitespace changes
Inline
Side-by-side
Showing
18 changed files
with
39 additions
and
35 deletions
+39
-35
dialog.vue
...mponents/components/AddEquipmentPut/components/dialog.vue
+2
-1
index.vue
...mponents/components/BatchSignEditInstorageItems/index.vue
+2
-1
storageDetailsCreateCom.vue
...torageRecallItemCom/component/storageDetailsCreateCom.vue
+2
-1
storageDetailsCreateCom.vue
...arehousingNewOrEdit/component/storageDetailsCreateCom.vue
+2
-1
index.vue
.../src/privateComponents/components/SearchSorties/index.vue
+1
-1
index.vue
.../privateComponents/components/SortiesNameSelect/index.vue
+2
-1
index.vue
.../src/privateComponents/components/SortiesSelect/index.vue
+2
-1
index.vue
.../src/privateComponents/components/StationSelect/index.vue
+2
-1
index.vue
...ivateComponents/components/StorageDetailsCreate/index.vue
+2
-1
index.vue
...c/privateComponents/components/getSortiesSelect/index.vue
+2
-1
search.vue
...assemblyPlanManagement/assemblyPlanMaintenance/search.vue
+1
-1
index.vue
...views/assemblyPlanManagement/inspectionDispatch/index.vue
+1
-6
index.vue
...ews/assemblyPlanManagement/instructionsDispatch/index.vue
+1
-6
index1.vue
...iews/assemblyPlanManagement/instructionsIssued/index1.vue
+2
-2
searchBar.vue
...semblyPlanManagement/stationPlanMaintenance/searchBar.vue
+1
-1
index.vue
.../views/taskReception/components/taskReceiveCard/index.vue
+4
-0
index.vue
...views/taskReception/components/taskReceiveTable/index.vue
+2
-1
index.vue
...instructionIdentificationBatch/components/right/index.vue
+8
-8
No files found.
applications/dee-mes/src/privateComponents/components/AddEquipmentPut/components/dialog.vue
View file @
f9a0fb95
...
...
@@ -208,7 +208,8 @@ export default {
searchItems
:
{
items
:
[{
'fieldName'
:
'aircraftType.defName'
,
operator
:
'EQ'
,
value
:
val
}],
operator
:
'AND'
}
},
sortItem
:
[{
fieldName
:
'defCode'
,
sortOrder
:
'asc'
}]
}
this
.
$api
.
searchApi
(
'AircraftSorties'
,
params
)
.
then
((
res
)
=>
{
...
...
applications/dee-mes/src/privateComponents/components/BatchSignEditInstorageItems/index.vue
View file @
f9a0fb95
...
...
@@ -1771,7 +1771,8 @@ export default {
'value'
:
this
.
form
.
airModel
}
]
}
},
sortItem
:
[{
fieldName
:
'defCode'
,
sortOrder
:
'asc'
}]
}
this
.
$api
.
searchApi
(
'AircraftSorties'
,
params
).
then
(
res
=>
{
const
SORTIES
=
this
.
formFileds
[
0
].
data
.
find
(
...
...
applications/dee-mes/src/privateComponents/components/InStorageRecallItemCom/component/storageDetailsCreateCom.vue
View file @
f9a0fb95
...
...
@@ -1773,7 +1773,8 @@ export default {
'value'
:
this
.
form
.
airModel
}
]
}
},
sortItem
:
[{
fieldName
:
'defCode'
,
sortOrder
:
'asc'
}]
}
this
.
$api
.
searchApi
(
'AircraftSorties'
,
params
).
then
(
res
=>
{
const
SORTIES
=
this
.
formFileds
[
0
].
data
.
find
(
...
...
applications/dee-mes/src/privateComponents/components/PurchasingWarehousingNewOrEdit/component/storageDetailsCreateCom.vue
View file @
f9a0fb95
...
...
@@ -1772,7 +1772,8 @@ export default {
'value'
:
this
.
form
.
airModel
}
]
}
},
sortItem
:
[{
fieldName
:
'defCode'
,
sortOrder
:
'asc'
}]
}
this
.
$api
.
searchApi
(
'AircraftSorties'
,
params
).
then
(
res
=>
{
const
SORTIES
=
this
.
formFileds
[
0
].
data
.
find
(
...
...
applications/dee-mes/src/privateComponents/components/SearchSorties/index.vue
View file @
f9a0fb95
...
...
@@ -116,7 +116,7 @@ export default {
},
getSortiesList
()
{
this
.
sortiesData
=
[]
const
params
=
{
'searchItems'
:
{
'items'
:
[]
},
'sortItem'
:
[{
'fieldName'
:
'
modifyTim
e'
,
'sortOrder'
:
'asc'
}]
}
const
params
=
{
'searchItems'
:
{
'items'
:
[]
},
'sortItem'
:
[{
'fieldName'
:
'
defCod
e'
,
'sortOrder'
:
'asc'
}]
}
this
.
$api
.
searchApi
(
'AircraftSorties'
,
params
).
then
(
res
=>
{
if
(
res
.
items
&&
res
.
items
.
content
)
{
this
.
sortiesData
=
res
.
items
.
content
.
map
(
row
=>
{
...
...
applications/dee-mes/src/privateComponents/components/SortiesNameSelect/index.vue
View file @
f9a0fb95
...
...
@@ -105,7 +105,8 @@ export default {
searchItems
:
{
items
:
[{
'fieldName'
:
'aircraftType.defName'
,
operator
:
'EQ'
,
value
:
val
}],
operator
:
'AND'
}
},
sortItem
:
[{
fieldName
:
'defCode'
,
sortOrder
:
'asc'
}]
}
this
.
$api
.
searchApi
(
'AircraftSorties'
,
params
).
then
(
res
=>
{
this
.
options
=
res
.
items
.
content
.
map
(
row
=>
{
...
...
applications/dee-mes/src/privateComponents/components/SortiesSelect/index.vue
View file @
f9a0fb95
...
...
@@ -97,7 +97,8 @@ export default {
searchItems
:
{
items
:
[{
'fieldName'
:
'aircraftTypeId'
,
operator
:
'EQ'
,
value
:
val
}],
operator
:
'AND'
}
},
sortItem
:
[{
fieldName
:
'defCode'
,
sortOrder
:
'asc'
}]
}
this
.
$api
.
searchApi
(
'AircraftSorties'
,
params
).
then
(
res
=>
{
this
.
options
=
res
.
items
.
content
.
map
(
row
=>
{
...
...
applications/dee-mes/src/privateComponents/components/StationSelect/index.vue
View file @
f9a0fb95
...
...
@@ -102,7 +102,8 @@ export default {
}
]
}
]
],
sortItem
:
[{
fieldName
:
'defCode'
,
sortOrder
:
'asc'
}]
}
this
.
options
=
[]
this
.
loading
=
true
...
...
applications/dee-mes/src/privateComponents/components/StorageDetailsCreate/index.vue
View file @
f9a0fb95
...
...
@@ -655,7 +655,8 @@ export default {
'value'
:
this
.
form
.
airModel
}
]
}
},
sortItem
:
[{
fieldName
:
'defCode'
,
sortOrder
:
'asc'
}]
}
this
.
$api
.
searchApi
(
'AircraftSorties'
,
params
).
then
(
res
=>
{
const
SORTIES
=
this
.
formFileds
[
0
].
data
.
find
(
...
...
applications/dee-mes/src/privateComponents/components/getSortiesSelect/index.vue
View file @
f9a0fb95
...
...
@@ -102,7 +102,8 @@ export default {
searchItems
:
{
items
:
[{
'fieldName'
:
'aircraftTypeId'
,
operator
:
'EQ'
,
value
:
val
.
split
(
'+'
)[
0
]
}],
operator
:
'AND'
}
},
sortItem
:
[{
fieldName
:
'defCode'
,
sortOrder
:
'asc'
}]
}
this
.
$api
.
searchApi
(
'AircraftSorties'
,
params
).
then
(
res
=>
{
this
.
options
=
res
.
items
.
content
.
map
(
row
=>
{
...
...
applications/dee-mes/src/views/assemblyPlanManagement/assemblyPlanMaintenance/search.vue
View file @
f9a0fb95
...
...
@@ -235,7 +235,7 @@ export default {
this
.
sortiesData
=
[]
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'
}]
this
.
$api
.
searchApi
(
'AircraftSorties'
,
params
)
.
then
((
res
)
=>
{
...
...
applications/dee-mes/src/views/assemblyPlanManagement/inspectionDispatch/index.vue
View file @
f9a0fb95
...
...
@@ -341,12 +341,7 @@ export default {
'operator'
:
'AND'
},
'openProps'
:
[],
'sortItem'
:
[
{
'fieldName'
:
'modifyTime'
,
'sortOrder'
:
'desc'
}
],
sortItem
:
[{
fieldName
:
'defCode'
,
sortOrder
:
'asc'
}],
'toValidateKeys'
:
''
}
this
.
$api
.
searchApi
(
'AircraftSorties'
,
params
).
then
(
res
=>
{
...
...
applications/dee-mes/src/views/assemblyPlanManagement/instructionsDispatch/index.vue
View file @
f9a0fb95
...
...
@@ -424,12 +424,7 @@ export default {
'operator'
:
'AND'
},
'openProps'
:
[],
'sortItem'
:
[
{
'fieldName'
:
'modifyTime'
,
'sortOrder'
:
'desc'
}
],
sortItem
:
[{
fieldName
:
'defCode'
,
sortOrder
:
'asc'
}],
'toValidateKeys'
:
''
}
this
.
$api
.
searchApi
(
'AircraftSorties'
,
params
).
then
(
res
=>
{
...
...
applications/dee-mes/src/views/assemblyPlanManagement/instructionsIssued/index1.vue
View file @
f9a0fb95
...
...
@@ -323,8 +323,8 @@ export default {
],
'sortItem'
:
[
{
'fieldName'
:
'
modifyTim
e'
,
'sortOrder'
:
'
de
sc'
'fieldName'
:
'
defCod
e'
,
'sortOrder'
:
'
a
sc'
}
],
'toValidateKeys'
:
''
...
...
applications/dee-mes/src/views/assemblyPlanManagement/stationPlanMaintenance/searchBar.vue
View file @
f9a0fb95
...
...
@@ -135,7 +135,7 @@ export default {
methods
:
{
getSortiesList
()
{
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'
}]
this
.
$api
.
searchApi
(
'AircraftSorties'
,
params
).
then
(
res
=>
{
if
(
res
.
items
&&
res
.
items
.
content
)
{
...
...
applications/dee-mes/src/views/taskReception/components/taskReceiveCard/index.vue
View file @
f9a0fb95
...
...
@@ -53,6 +53,9 @@
<div
v-show=
"!item.isOK"
class=
"upgrade"
>
升版中
</div>
<div
v-show=
"item.isGaceUpgrade"
class=
"upgrade"
>
GACE升版中
</div>
</div>
<div>
<div>
...
...
@@ -379,6 +382,7 @@ export default {
isQualified
:
p
.
isQualified
,
isExit
:
p
.
isExit
,
isOK
:
p
.
planVer
===
p
.
extProcessPlan
.
gaceVersion
,
isGaceUpgrade
:
p
.
extProcessPlan
.
upgrade
,
// // 例外放行
isException
:
p
.
isException
,
// 转序
...
...
applications/dee-mes/src/views/taskReception/components/taskReceiveTable/index.vue
View file @
f9a0fb95
...
...
@@ -142,7 +142,8 @@ export default {
searchItems
:
{
items
:
[{
'fieldName'
:
'aircraftTypeId'
,
operator
:
'EQ'
,
value
:
this
.
model
}],
operator
:
'AND'
}
},
sortItem
:
[{
fieldName
:
'defCode'
,
sortOrder
:
'asc'
}]
}
this
.
$api
.
searchApi
(
'AircraftSorties'
,
param
).
then
((
res
)
=>
{
this
.
sortiesData
=
[]
...
...
applications/dee-task-center/src/views/workflow/task-center/myPlanTask/instructionIdentificationBatch/components/right/index.vue
View file @
f9a0fb95
...
...
@@ -551,15 +551,15 @@ export default {
*/
handleExport
()
{
const
params
=
{
pageFrom
:
this
.
tablePagination
.
currentPage
,
pageSize
:
this
.
tablePagination
.
pageSize
,
//
pageFrom: this.tablePagination.currentPage,
//
pageSize: this.tablePagination.pageSize,
searchItems
:
{
items
:
[
{
fieldName
:
'sorties'
,
operator
:
'EQ'
,
value
:
this
.
nodeData
.
serialNo
}
//
{
//
fieldName: 'sorties',
//
operator: 'EQ',
//
value: this.nodeData.serialNo
//
}
],
operator
:
'AND'
},
...
...
@@ -579,7 +579,7 @@ export default {
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
=>
{
this
.
$utils
.
downLoadFile
(
res
,
downloadTitle
)
})
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment