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
6a022601
Commit
6a022601
authored
Dec 27, 2023
by
jingnan
👀
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
入库bug修改
parent
672b3218
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
40 additions
and
25 deletions
+40
-25
index.vue
...ts/components/AddPutStorageMaterialDetailDialog/index.vue
+39
-24
index.vue
...Components/components/PurchasingWarehousingView/index.vue
+1
-1
No files found.
applications/dee-mes/src/privateComponents/components/AddPutStorageMaterialDetailDialog/index.vue
View file @
6a022601
...
...
@@ -41,8 +41,21 @@ export default {
defaultData
:
{}
}
},
computed
:
{},
watch
:
{
basicData
:
{
immediate
:
true
,
deep
:
true
,
handler
()
{
setTimeout
(()
=>
{
this
.
searchEvent
({
items
:
[],
operator
:
'AND'
})
},
500
)
}
}
},
mounted
()
{},
methods
:
{
searchEvent
(
val
)
{
...
...
@@ -90,6 +103,7 @@ export default {
}
const
data
=
this
.
selection
.
map
(
r
=>
{
return
{
...
r
.
inventory
.
jobResponse
.
jobOrder
,
'subTypeName'
:
'InStorageExpireItem'
,
'reqStatus'
:
'Apply'
,
'outStorageId'
:
r
.
id
,
...
...
@@ -99,30 +113,31 @@ export default {
'inventoryIdType'
:
r
.
inventoryIdType
,
'purchaseUnitId'
:
r
.
inventory
.
jobResponse
.
jobOrder
.
extMaterial
.
extUnitId
,
'purchaseUnitIdType'
:
r
.
inventory
.
jobResponse
.
jobOrder
.
extMaterial
.
extUnitIdType
,
'extDxSipplierId'
:
r
.
inventory
.
jobResponse
.
jobOrder
.
extDxSipplierId
,
'extDxSipplierIdType'
:
r
.
inventory
.
jobResponse
.
jobOrder
.
extDxSipplierIdType
,
extDxSipplier
:
r
.
inventory
.
jobResponse
.
jobOrder
.
extDxSipplier
,
extMaterial
:
r
.
inventory
.
jobResponse
.
jobOrder
.
extMaterial
,
storageZone
:
r
.
inventory
.
jobResponse
.
jobOrder
.
storageZone
,
storageCondition
:
r
.
inventory
.
jobResponse
.
jobOrder
.
storageCondition
,
'extMaterialId'
:
r
.
inventory
.
jobResponse
.
jobOrder
.
extMaterialId
,
'extMaterialIdType'
:
r
.
inventory
.
jobResponse
.
jobOrder
.
extMaterialIdType
,
'arrivalDate'
:
r
.
inventory
.
jobResponse
.
jobOrder
.
arrivalDate
,
'reqAmount'
:
r
.
inventory
.
jobResponse
.
jobOrder
.
reqAmount
,
'airModel'
:
r
.
inventory
.
jobResponse
.
jobOrder
.
airModel
,
'sorties'
:
r
.
inventory
.
jobResponse
.
jobOrder
.
sorties
,
'manufacturer'
:
r
.
inventory
.
jobResponse
.
jobOrder
.
manufacturer
,
'contractNo'
:
r
.
inventory
.
jobResponse
.
jobOrder
.
contractNo
,
'stockPrice'
:
r
.
inventory
.
jobResponse
.
jobOrder
.
stockPrice
,
'lotNo'
:
r
.
inventory
.
jobResponse
.
jobOrder
.
lotNo
,
'taxRate'
:
r
.
inventory
.
jobResponse
.
jobOrder
.
taxRate
,
'taxUnitPrice'
:
r
.
inventory
.
jobResponse
.
jobOrder
.
taxUnitPrice
,
'taxPrice'
:
r
.
inventory
.
jobResponse
.
jobOrder
.
taxPrice
,
'stockUnitPrice'
:
r
.
inventory
.
jobResponse
.
jobOrder
.
stockUnitPrice
,
'purchaseOrderNo'
:
r
.
inventory
.
jobResponse
.
jobOrder
.
purchaseOrderNo
,
//
'extDxSipplierId': r.inventory.jobResponse.jobOrder.extDxSipplierId,
//
'extDxSipplierIdType': r.inventory.jobResponse.jobOrder.extDxSipplierIdType,
//
extDxSipplier: r.inventory.jobResponse.jobOrder.extDxSipplier,
//
extMaterial: r.inventory.jobResponse.jobOrder.extMaterial,
//
storageZone: r.inventory.jobResponse.jobOrder.storageZone,
//
storageCondition: r.inventory.jobResponse.jobOrder.storageCondition,
//
'extMaterialId': r.inventory.jobResponse.jobOrder.extMaterialId,
//
'extMaterialIdType': r.inventory.jobResponse.jobOrder.extMaterialIdType,
//
'arrivalDate': r.inventory.jobResponse.jobOrder.arrivalDate,
//
'reqAmount': r.inventory.jobResponse.jobOrder.reqAmount,
//
'airModel': r.inventory.jobResponse.jobOrder.airModel,
//
'sorties': r.inventory.jobResponse.jobOrder.sorties,
//
'manufacturer': r.inventory.jobResponse.jobOrder.manufacturer,
//
'contractNo': r.inventory.jobResponse.jobOrder.contractNo,
//
'stockPrice': r.inventory.jobResponse.jobOrder.stockPrice,
//
'lotNo': r.inventory.jobResponse.jobOrder.lotNo,
//
'taxRate': r.inventory.jobResponse.jobOrder.taxRate,
//
'taxUnitPrice': r.inventory.jobResponse.jobOrder.taxUnitPrice,
//
'taxPrice': r.inventory.jobResponse.jobOrder.taxPrice,
//
'stockUnitPrice': r.inventory.jobResponse.jobOrder.stockUnitPrice,
//
'purchaseOrderNo': r.inventory.jobResponse.jobOrder.purchaseOrderNo,
'operator'
:
'ADD'
,
remark
:
r
.
inventory
.
jobResponse
.
jobOrder
.
remark
,
'isRoot'
:
r
.
inventory
.
jobResponse
.
jobOrder
.
isRoot
id
:
null
// remark: r.inventory.jobResponse.jobOrder.remark,
// 'isRoot': r.inventory.jobResponse.jobOrder.isRoot
}
})
...
...
applications/dee-mes/src/privateComponents/components/PurchasingWarehousingView/index.vue
View file @
6a022601
...
...
@@ -87,7 +87,7 @@ export default {
{
title
:
'含税单价'
,
key
:
'taxUnitPrice'
,
align
:
'center'
,
headerAlign
:
'center'
},
{
title
:
'含税金额'
,
key
:
'taxPrice'
,
align
:
'center'
,
headerAlign
:
'center'
},
{
title
:
'税率'
,
key
:
'taxRate'
,
align
:
'center'
,
headerAlign
:
'center'
},
{
title
:
'报检人'
,
key
:
'
applyU
serName'
,
align
:
'center'
,
headerAlign
:
'center'
},
{
title
:
'报检人'
,
key
:
'
creator.u
serName'
,
align
:
'center'
,
headerAlign
:
'center'
},
{
title
:
'接受仓库'
,
key
:
'extname'
,
align
:
'center'
,
headerAlign
:
'center'
,
formatter
:
(
row
,
column
,
cellValue
,
index
)
=>
{
const
value
=
row
.
storageZone
&&
typeof
(
row
.
storageZone
)
===
'object'
?
row
.
storageZone
.
extname
:
row
.
storageZoneName
...
...
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