@ -460,10 +460,9 @@
style = "width: 100%" > style = "width: 100%" >
< el -table -column type = "selection" header -align = " center " align = "center" width = "50" > < / e l - t a b l e - c o l u m n > < el -table -column type = "selection" header -align = " center " align = "center" width = "50" > < / e l - t a b l e - c o l u m n >
< el -table -column type = "index" label = "序号" width = "50" header -align = " center " align = "center" > < / e l - t a b l e - c o l u m n > < el -table -column type = "index" label = "序号" width = "50" header -align = " center " align = "center" > < / e l - t a b l e - c o l u m n >
< el -table -column prop = "testPartNo" label = "PLM物料编码/Test Part No." min -width = " 180 " header -align = " center " align = "left" :show-overflow-tooltip ="true" > < / e l - t a b l e - c o l u m n >
< el -table -column prop = "finalPartNo" label = "IFS物料编码/Final Part No." min -width = " 180 " header -align = " center " align = "left" :show-overflow-tooltip ="true" > < / e l - t a b l e - c o l u m n >
< el -table -column prop = "customerPartNo" label = "客户料号/Customer Part No." min -width = " 180 " header -align = " center " align = "left" :show-overflow-tooltip ="true" > < / e l - t a b l e - c o l u m n >
< el -table -column prop = "partDesc" label = "描述/Part Desc." min -width = " 220 " header -align = " center " align = "left" :show-overflow-tooltip ="true" > < / e l - t a b l e - c o l u m n >
< el -table -column prop = "finalPartNo" label = "IFS物料编码/Final Part No." min -width = " 150 " header -align = " center " align = "left" :show-overflow-tooltip ="true" > < / e l - t a b l e - c o l u m n >
< el -table -column prop = "partDesc" label = "描述/Part Desc." min -width = " 250 " header -align = " center " align = "left" :show-overflow-tooltip ="true" > < / e l - t a b l e - c o l u m n >
< el -table -column prop = "partStatus" label = "状态/Part Status" min -width = " 100 " header -align = " center " align = "left" :show-overflow-tooltip ="true" > < / e l - t a b l e - c o l u m n >
< / e l - t a b l e > < / e l - t a b l e >
< / div > < / div >
< / e l - t a b - p a n e > < / e l - t a b - p a n e >
@ -535,17 +534,14 @@
< el -dialog title = "选择项目物料" top = "15vh" width = "75%" :close-on-click-modal ="false" v -drag :visible.sync ="projectMaterialDialogFlag" > < el -dialog title = "选择项目物料" top = "15vh" width = "75%" :close-on-click-modal ="false" v -drag :visible.sync ="projectMaterialDialogFlag" >
< el -form :inline ="true" label -position = " top " :model ="projectMaterialSearchData" > < el -form :inline ="true" label -position = " top " :model ="projectMaterialSearchData" >
< el -form -item label = "PLM物料编码/Test Part No." >
< el -input v-model ="projectMaterialSearchData.testPartNo" clearable style="width: 150px" > < / el -input >
< / e l - f o r m - i t e m >
< el -form -item label = "描述/Part Desc" >
< el -input v-model ="projectMaterialSearchData.partDesc" clearable style="width: 150px" > < / el -input >
< / e l - f o r m - i t e m >
< el -form -item label = "IFS物料编码/Final Part No." > < el -form -item label = "IFS物料编码/Final Part No." >
< el -input v-model ="projectMaterialSearchData.finalPartNo" clearable style="width: 150px" > < / el -input > < el -input v-model ="projectMaterialSearchData.finalPartNo" clearable style="width: 150px" > < / el -input >
< / e l - f o r m - i t e m > < / e l - f o r m - i t e m >
< el -form -item label = "客户料号/Customer Part No." >
< el -input v-model ="projectMaterialSearchData.customerPartNo" clearable style="width: 150px" > < / el -input >
< el -form -item label = "描述/Part Desc" >
< el -input v-model ="projectMaterialSearchData.partDesc" clearable style="width: 200px" > < / el -input >
< / e l - f o r m - i t e m >
< el -form -item label = "状态/Part Status" >
< el -input v-model ="projectMaterialSearchData.partStatus" clearable style="width: 100px" > < / el -input >
< / e l - f o r m - i t e m > < / e l - f o r m - i t e m >
< el -form -item label = " " > < el -form -item label = " " >
< el -button type = "primary" @click ="searchProjectMaterialList" > 查询 < / el -button > < el -button type = "primary" @click ="searchProjectMaterialList" > 查询 < / el -button >
@ -562,10 +558,9 @@
: height = "320" : height = "320"
style = "width: 100%" > style = "width: 100%" >
< el -table -column type = "selection" header -align = " center " align = "center" width = "50" > < / e l - t a b l e - c o l u m n > < el -table -column type = "selection" header -align = " center " align = "center" width = "50" > < / e l - t a b l e - c o l u m n >
< el -table -column prop = "testPartNo" label = "PLM物料编码/Test Part No." min -width = " 180 " header -align = " center " align = "left" :show-overflow-tooltip ="true" > < / e l - t a b l e - c o l u m n >
< el -table -column prop = "finalPartNo" label = "IFS物料编码/Final Part No." min -width = " 180 " header -align = " center " align = "left" :show-overflow-tooltip ="true" > < / e l - t a b l e - c o l u m n >
< el -table -column prop = "customerPartNo" label = "客户料号/Customer Part No." min -width = " 180 " header -align = " center " align = "left" :show-overflow-tooltip ="true" > < / e l - t a b l e - c o l u m n >
< el -table -column prop = "partDesc" label = "描述/Part Desc." min -width = " 220 " header -align = " center " align = "left" :show-overflow-tooltip ="true" > < / e l - t a b l e - c o l u m n >
< el -table -column prop = "finalPartNo" label = "IFS物料编码/Final Part No." min -width = " 150 " header -align = " center " align = "left" :show-overflow-tooltip ="true" > < / e l - t a b l e - c o l u m n >
< el -table -column prop = "partDesc" label = "描述/Part Desc." min -width = " 250 " header -align = " center " align = "left" :show-overflow-tooltip ="true" > < / e l - t a b l e - c o l u m n >
< el -table -column prop = "partStatus" label = "状态/Part Status" min -width = " 100 " header -align = " center " align = "left" :show-overflow-tooltip ="true" > < / e l - t a b l e - c o l u m n >
< / e l - t a b l e > < / e l - t a b l e >
< el -pagination < el -pagination
style = "margin-top: 10px" style = "margin-top: 10px"
@ -872,10 +867,9 @@
: height = "secondHeight" : height = "secondHeight"
style = "width: 100%" > style = "width: 100%" >
< el -table -column type = "index" label = "序号" width = "50" header -align = " center " align = "center" > < / e l - t a b l e - c o l u m n > < el -table -column type = "index" label = "序号" width = "50" header -align = " center " align = "center" > < / e l - t a b l e - c o l u m n >
< el -table -column prop = "testPartNo" label = "PLM物料编码/Test Part No." min -width = " 180 " header -align = " center " align = "left" :show-overflow-tooltip ="true" > < / e l - t a b l e - c o l u m n >
< el -table -column prop = "finalPartNo" label = "IFS物料编码/Final Part No." min -width = " 180 " header -align = " center " align = "left" :show-overflow-tooltip ="true" > < / e l - t a b l e - c o l u m n >
< el -table -column prop = "customerPartNo" label = "客户料号/Customer Part No." min -width = " 180 " header -align = " center " align = "left" :show-overflow-tooltip ="true" > < / e l - t a b l e - c o l u m n >
< el -table -column prop = "partDesc" label = "描述/Part Desc." min -width = " 220 " header -align = " center " align = "left" :show-overflow-tooltip ="true" > < / e l - t a b l e - c o l u m n >
< el -table -column prop = "finalPartNo" label = "IFS物料编码/Final Part No." min -width = " 150 " header -align = " center " align = "left" :show-overflow-tooltip ="true" > < / e l - t a b l e - c o l u m n >
< el -table -column prop = "partDesc" label = "描述/Part Desc." min -width = " 250 " header -align = " center " align = "left" :show-overflow-tooltip ="true" > < / e l - t a b l e - c o l u m n >
< el -table -column prop = "partStatus" label = "状态/Part Status" min -width = " 100 " header -align = " center " align = "left" :show-overflow-tooltip ="true" > < / e l - t a b l e - c o l u m n >
< / e l - t a b l e > < / e l - t a b l e >
< / div > < / div >
< / e l - t a b - p a n e > < / e l - t a b - p a n e >
@ -1106,10 +1100,9 @@ export default {
customerId : undefined , customerId : undefined ,
} , } ,
projectMaterialSearchData : { projectMaterialSearchData : {
testPartNo : '' ,
partDesc : '' ,
finalPartNo : '' , finalPartNo : '' ,
customerPartNo : ''
partDesc : '' ,
partStatus : ''
} , } ,
projectMaterialList : [ ] , projectMaterialList : [ ] ,
projectMaterialSelections : [ ] , projectMaterialSelections : [ ] ,
@ -1986,10 +1979,9 @@ export default {
this . projectMaterialTotal = 0 this . projectMaterialTotal = 0
this . projectMaterialList = [ ] this . projectMaterialList = [ ]
this . projectMaterialSearchData = { this . projectMaterialSearchData = {
testPartNo : '' ,
partDesc : '' ,
finalPartNo : '' , finalPartNo : '' ,
customerPartNo : ''
partDesc : '' ,
partStatus : ''
} }
this . showModalFlag = ! ! ( row && ( row . status === '已完成' || ! this . authUpdate ) ) this . showModalFlag = ! ! ( row && ( row . status === '已完成' || ! this . authUpdate ) )
@ -2279,10 +2271,9 @@ export default {
site : this . $store . state . user . site , site : this . $store . state . user . site ,
projectId : this . modalData . projectId , projectId : this . modalData . projectId ,
endCustomer : this . modalData . endCustomer , endCustomer : this . modalData . endCustomer ,
testPartNo : this . projectMaterialSearchData . testPartNo ,
partDesc : this . projectMaterialSearchData . partDesc , partDesc : this . projectMaterialSearchData . partDesc ,
finalPartNo : this . projectMaterialSearchData . finalPartNo , finalPartNo : this . projectMaterialSearchData . finalPartNo ,
customerPartNo : this . projectMaterialSearchData . customerPartNo
partStatus : this . projectMaterialSearchData . partStatus
} }
api . getRohsProjectMaterialList ( params ) . then ( ( { data } ) => { api . getRohsProjectMaterialList ( params ) . then ( ( { data } ) => {
if ( data && data . code === 0 && data . page ) { if ( data && data . code === 0 && data . page ) {
@ -2368,9 +2359,8 @@ export default {
projectId : this . modalData . projectId , projectId : this . modalData . projectId ,
testPartNo : testPartNo , testPartNo : testPartNo ,
finalPartNo : row . finalPartNo || row . final_part_no || '' , finalPartNo : row . finalPartNo || row . final_part_no || '' ,
customerPartNo : row . customerPartNo || row . customer_part_no || '' ,
partDesc : row . partDesc || row . part_desc || '' , partDesc : row . partDesc || row . part_desc || '' ,
partSpec : row . partSpec || row . part_spec || ''
partStatus : row . partStatus || row . part_status || ''
} ) } )
} ) } )
return { return {
@ -2387,11 +2377,16 @@ export default {
normalizeMaterialListForSave ( materialList ) { normalizeMaterialListForSave ( materialList ) {
return ( materialList || [ ] ) . map ( ( item , index ) => { return ( materialList || [ ] ) . map ( ( item , index ) => {
return { return {
... item ,
lineNo : index + 1 ,
projectId : item . projectId || this . modalData . projectId || ''
site : item . site || this . modalData . site || '' ,
referenceNo : item . referenceNo || this . modalData . referenceNo || '' ,
projectId : item . projectId || this . modalData . projectId || '' ,
testPartNo : item . testPartNo || item . test_part_no || '' ,
finalPartNo : item . finalPartNo || item . final_part_no || '' ,
partDesc : item . partDesc || item . part_desc || '' ,
partStatus : item . partStatus || item . part_status || '' ,
lineNo : index + 1
} }
} )
} ) . filter ( item => item . testPartNo )
} , } ,
persistMaterialList ( materialList , successMsg , successCallback ) { persistMaterialList ( materialList , successMsg , successCallback ) {
const normalizedList = this . normalizeMaterialListForSave ( materialList ) const normalizedList = this . normalizeMaterialListForSave ( materialList )
fengyuan_yang
2 weeks ago