Skip to content

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

入库明细增加字段

parent 61f0582f
Show whitespace changes
Inline Side-by-side
Showing with 86 additions and 40 deletions
applications/dee-mes/src/privateComponents/components/PurchasingWarehousingNewOrEdit/index.vue
View file @ 15ac5dde
...@@ -405,14 +405,13 @@ export default { ...@@ -405,14 +405,13 @@ export default {
return value return value
} }
}, },
{ { title: '物料编码', key: 'typeCode', align: 'center', headerAlign: 'center', width: '100', formatter: (row, column, cellValue, index) => {
title: '编码', key: 'typeCode', headerAlign: 'center', formatter: (row, column, cellValue, index) => {
const value = row.resCode ? row.resCode : row.extMaterial ? row.extMaterial.resCode : '' const value = row.resCode ? row.resCode : row.extMaterial ? row.extMaterial.resCode : ''
return value return value
} }
}, },
{ {
title: '名称', key: 'resName', width: '120', headerAlign: 'center', formatter: (row, column, cellValue, index) => { title: '物料名称', key: 'resName', width: '120', headerAlign: 'center', formatter: (row, column, cellValue, index) => {
const value = row.resName ? row.resName : row.extMaterial ? row.extMaterial.resName : '' const value = row.resName ? row.resName : row.extMaterial ? row.extMaterial.resName : ''
return value return value
} }
...@@ -441,29 +440,47 @@ export default { ...@@ -441,29 +440,47 @@ export default {
return value return value
} }
}, },
{ title: '炉/批号', key: 'lotNo', width: '150', headerAlign: 'center' },
{ title: '到货标准/图号', key: 'arrivedDrawNo', width: '150', headerAlign: 'center' },
{ title: '到货版次', key: 'arrivalVer', width: '150', headerAlign: 'center' },
{ title: '系列号/序列号', key: 'serialNo', width: '150', headerAlign: 'center' }, { title: '系列号/序列号', key: 'serialNo', width: '150', headerAlign: 'center' },
{ title: '机型', key: 'airModel', headerAlign: 'center' }, { title: '机型', key: 'airModel', align: 'center', headerAlign: 'center' },
{ title: '架次', key: 'sorties', headerAlign: 'center' }, { title: '架次', key: 'sorties', align: 'center', headerAlign: 'center' },
{ title: '炉/批号', key: 'lotNo', width: '150', headerAlign: 'center' },
{ {
title: '计量单位', key: 'unitName', headerAlign: 'center', formatter: (row, column, cellValue, index) => { title: '计量单位', key: 'unitName', align: 'center', headerAlign: 'center', formatter: (row, column, cellValue, index) => {
const value = row.reqUnit ? row.reqUnit : row.extMaterial ? row.extMaterial.extUnit.unitName : '' const value = row.reqUnit ? row.reqUnit : row.extMaterial ? row.extMaterial.extUnit.unitName : ''
return value return value
} }
}, },
{ title: '入库数量', key: 'reqAmount', headerAlign: 'center' }, { title: '入库数量', key: 'reqAmount', align: 'center', headerAlign: 'center' },
{ {
title: '供应商', key: 'supplierFullName', headerAlign: 'center', formatter: (row, column, cellValue, index) => { title: '供应商', key: 'supplierFullName', align: 'center', headerAlign: 'center', formatter: (row, column, cellValue, index) => {
const value = row.extDxSipplier ? row.extDxSipplier.supplierFullName : row.supplier const value = row.extDxSipplier ? row.extDxSipplier.supplierFullName : row.supplier
return value return value
} }
}, },
// { title: '是否合格供应商', key: 'extDxSipplier.isValid', headerAlign: 'center' }, { title: '是否合格供应商', key: 'isSupplierY', width: '120', headerAlign: 'center', formatter: (row, column, cellValue, index) => {
{ title: '制造商', key: 'manufacturer', headerAlign: 'center' }, return cellValue ? '合格' : '不合格'
{ title: '到货日期', key: 'arrivalDate', headerAlign: 'center' }, } },
{ title: '生产日期', key: 'producedTime', headerAlign: 'center' }, { title: '制造商', key: 'manufacturer', align: 'center', headerAlign: 'center' },
{
title: '到货日期', key: 'arrivalDate', align: 'center', headerAlign: 'center', width: '120', formatter: (row, column, cellValue, index) => {
return row.arrivalDate && row.arrivalDate.split(' ')[0]
}
},
{
title: '生产日期', key: 'producedTime', align: 'center', headerAlign: 'center', width: '120', formatter: (row, column, cellValue, index) => {
return row.producedTime && row.producedTime.split(' ')[0]
}
},
{ title: '到货标准/图号', key: 'arrivedDrawNo', width: '150', headerAlign: 'center' },
{ title: '到货版次', key: 'arrivalVer', width: '150', headerAlign: 'center' },
{ title: '产品图号/版本', align: 'center', show: true, key: 'productDwawVer', sortable: true, minWidth: 150 },
{ title: 'ATP名称', align: 'center', show: true, key: 'atpName', sortable: true, minWidth: 150 },
{ title: 'ATP编号及版次', align: 'center', show: true, key: 'atpNo', sortable: true, minWidth: 150 },
{ title: '软件构型件号/版次', align: 'center', show: true, key: 'softConfPieceNo', sortable: true, minWidth: 170 },
{ title: '电子硬件构型件号/版本', align: 'center', show: true, key: 'elecHardwareConfPieceNo', sortable: true, minWidth: 210 },
{ title: '交付规范及版次', align: 'center', show: true, key: 'deliverySpec', sortable: true, minWidth: 150 },
{ title: '适航批准标签/批准放行证书', align: 'center', show: true, key: 'approvalCert', sortable: true, minWidth: 220 },
{ title: '是否新研产品', align: 'center', show: true, key: 'isNewlyProduct', sortable: true, minWidth: 140, formatter: (row, column, cellValue, index) => cellValue ? '是' : '否' },
{ title: '贮存条件', key: 'storageCondition', headerAlign: 'center' }, { title: '贮存条件', key: 'storageCondition', headerAlign: 'center' },
{ {
title: '随产品资料', key: 'withProductMaterial', width: '120', headerAlign: 'center', formatter: (row, column, cellValue, index) => { title: '随产品资料', key: 'withProductMaterial', width: '120', headerAlign: 'center', formatter: (row, column, cellValue, index) => {
......
applications/dee-mes/src/privateComponents/components/PurchasingWarehousingProcess/index.vue
View file @ 15ac5dde
...@@ -59,14 +59,13 @@ export default { ...@@ -59,14 +59,13 @@ export default {
return value return value
} }
}, },
{ { title: '物料编码', key: 'typeCode', align: 'center', headerAlign: 'center', width: '100', formatter: (row, column, cellValue, index) => {
title: '编码', key: 'typeCode', align: 'center', headerAlign: 'center', width: '100', formatter: (row, column, cellValue, index) => {
const value = row.resCode ? row.resCode : row.extMaterial ? row.extMaterial.resCode : '' const value = row.resCode ? row.resCode : row.extMaterial ? row.extMaterial.resCode : ''
return value return value
} }
}, },
{ {
title: '名称', key: 'resName', width: '120', headerAlign: 'center', formatter: (row, column, cellValue, index) => { title: '物料名称', key: 'resName', width: '120', headerAlign: 'center', formatter: (row, column, cellValue, index) => {
const value = row.resName ? row.resName : row.extMaterial ? row.extMaterial.resName : '' const value = row.resName ? row.resName : row.extMaterial ? row.extMaterial.resName : ''
return value return value
} }
...@@ -95,12 +94,10 @@ export default { ...@@ -95,12 +94,10 @@ export default {
return value return value
} }
}, },
{ title: '炉/批号', key: 'lotNo', width: '150', headerAlign: 'center' },
{ title: '到货标准/图号', key: 'arrivedDrawNo', width: '150', headerAlign: 'center' },
{ title: '到货版次', key: 'arrivalVer', width: '150', headerAlign: 'center' },
{ title: '系列号/序列号', key: 'serialNo', width: '150', headerAlign: 'center' }, { title: '系列号/序列号', key: 'serialNo', width: '150', headerAlign: 'center' },
{ title: '机型', key: 'airModel', align: 'center', headerAlign: 'center' }, { title: '机型', key: 'airModel', align: 'center', headerAlign: 'center' },
{ title: '架次', key: 'sorties', align: 'center', headerAlign: 'center' }, { title: '架次', key: 'sorties', align: 'center', headerAlign: 'center' },
{ title: '炉/批号', key: 'lotNo', width: '150', headerAlign: 'center' },
{ {
title: '计量单位', key: 'unitName', align: 'center', headerAlign: 'center', formatter: (row, column, cellValue, index) => { title: '计量单位', key: 'unitName', align: 'center', headerAlign: 'center', formatter: (row, column, cellValue, index) => {
const value = row.reqUnit ? row.reqUnit : row.extMaterial ? row.extMaterial.extUnit.unitName : '' const value = row.reqUnit ? row.reqUnit : row.extMaterial ? row.extMaterial.extUnit.unitName : ''
...@@ -114,7 +111,9 @@ export default { ...@@ -114,7 +111,9 @@ export default {
return value return value
} }
}, },
// { title: '是否合格供应商', key: 'extDxSipplier.isValid', headerAlign: 'center' }, { title: '是否合格供应商', key: 'isSupplierY', width: '120', headerAlign: 'center', formatter: (row, column, cellValue, index) => {
return cellValue ? '合格' : '不合格'
} },
{ title: '制造商', key: 'manufacturer', align: 'center', headerAlign: 'center' }, { title: '制造商', key: 'manufacturer', align: 'center', headerAlign: 'center' },
{ {
title: '到货日期', key: 'arrivalDate', align: 'center', headerAlign: 'center', width: '120', formatter: (row, column, cellValue, index) => { title: '到货日期', key: 'arrivalDate', align: 'center', headerAlign: 'center', width: '120', formatter: (row, column, cellValue, index) => {
...@@ -126,6 +125,16 @@ export default { ...@@ -126,6 +125,16 @@ export default {
return row.producedTime && row.producedTime.split(' ')[0] return row.producedTime && row.producedTime.split(' ')[0]
} }
}, },
{ title: '到货标准/图号', key: 'arrivedDrawNo', width: '150', headerAlign: 'center' },
{ title: '到货版次', key: 'arrivalVer', width: '150', headerAlign: 'center' },
{ title: '产品图号/版本', align: 'center', show: true, key: 'productDwawVer', sortable: true, minWidth: 150 },
{ title: 'ATP名称', align: 'center', show: true, key: 'atpName', sortable: true, minWidth: 150 },
{ title: 'ATP编号及版次', align: 'center', show: true, key: 'atpNo', sortable: true, minWidth: 150 },
{ title: '软件构型件号/版次', align: 'center', show: true, key: 'softConfPieceNo', sortable: true, minWidth: 170 },
{ title: '电子硬件构型件号/版本', align: 'center', show: true, key: 'elecHardwareConfPieceNo', sortable: true, minWidth: 210 },
{ title: '交付规范及版次', align: 'center', show: true, key: 'deliverySpec', sortable: true, minWidth: 150 },
{ title: '适航批准标签/批准放行证书', align: 'center', show: true, key: 'approvalCert', sortable: true, minWidth: 220 },
{ title: '是否新研产品', align: 'center', show: true, key: 'isNewlyProduct', sortable: true, minWidth: 140, formatter: (row, column, cellValue, index) => cellValue ? '是' : '否' },
{ title: '贮存条件', key: 'storageCondition', headerAlign: 'center' }, { title: '贮存条件', key: 'storageCondition', headerAlign: 'center' },
{ {
title: '随产品资料', key: 'withProductMaterial', align: 'center', headerAlign: 'center', width: '120', formatter: (row, column, cellValue, index) => { title: '随产品资料', key: 'withProductMaterial', align: 'center', headerAlign: 'center', width: '120', formatter: (row, column, cellValue, index) => {
......
applications/dee-mes/src/privateComponents/components/PurchasingWarehousingProcess_view/index.vue
View file @ 15ac5dde
...@@ -172,13 +172,13 @@ export default { ...@@ -172,13 +172,13 @@ export default {
} }
}, },
{ {
title: '编码', key: 'typeCode', align: 'center', headerAlign: 'center', width: '100', formatter: (row, column, cellValue, index) => { title: '物料编码', key: 'typeCode', align: 'center', headerAlign: 'center', width: '100', formatter: (row, column, cellValue, index) => {
const value = row.resCode ? row.resCode : row.extMaterial ? row.extMaterial.resCode : '' const value = row.resCode ? row.resCode : row.extMaterial ? row.extMaterial.resCode : ''
return value return value
} }
}, },
{ {
title: '名称', key: 'resName', width: '120', headerAlign: 'center', formatter: (row, column, cellValue, index) => { title: '物料名称', key: 'resName', width: '120', headerAlign: 'center', formatter: (row, column, cellValue, index) => {
const value = row.resName ? row.resName : row.extMaterial ? row.extMaterial.resName : '' const value = row.resName ? row.resName : row.extMaterial ? row.extMaterial.resName : ''
return value return value
} }
...@@ -207,12 +207,10 @@ export default { ...@@ -207,12 +207,10 @@ export default {
return value return value
} }
}, },
{ title: '炉/批号', key: 'lotNo', width: '150', headerAlign: 'center' },
{ title: '到货标准/图号', key: 'arrivedDrawNo', width: '150', headerAlign: 'center' },
{ title: '到货版次', key: 'arrivalVer', width: '150', headerAlign: 'center' },
{ title: '系列号/序列号', key: 'serialNo', width: '150', headerAlign: 'center' }, { title: '系列号/序列号', key: 'serialNo', width: '150', headerAlign: 'center' },
{ title: '机型', key: 'airModel', align: 'center', headerAlign: 'center' }, { title: '机型', key: 'airModel', align: 'center', headerAlign: 'center' },
{ title: '架次', key: 'sorties', align: 'center', headerAlign: 'center' }, { title: '架次', key: 'sorties', align: 'center', headerAlign: 'center' },
{ title: '炉/批号', key: 'lotNo', width: '150', headerAlign: 'center' },
{ {
title: '计量单位', key: 'unitName', align: 'center', headerAlign: 'center', formatter: (row, column, cellValue, index) => { title: '计量单位', key: 'unitName', align: 'center', headerAlign: 'center', formatter: (row, column, cellValue, index) => {
const value = row.reqUnit ? row.reqUnit : row.extMaterial ? row.extMaterial.extUnit.unitName : '' const value = row.reqUnit ? row.reqUnit : row.extMaterial ? row.extMaterial.extUnit.unitName : ''
...@@ -226,7 +224,9 @@ export default { ...@@ -226,7 +224,9 @@ export default {
return value return value
} }
}, },
// { title: '是否合格供应商', key: 'extDxSipplier.isValid', headerAlign: 'center' }, { title: '是否合格供应商', key: 'isSupplierY', width: '120', headerAlign: 'center', formatter: (row, column, cellValue, index) => {
return cellValue ? '合格' : '不合格'
} },
{ title: '制造商', key: 'manufacturer', align: 'center', headerAlign: 'center' }, { title: '制造商', key: 'manufacturer', align: 'center', headerAlign: 'center' },
{ {
title: '到货日期', key: 'arrivalDate', align: 'center', headerAlign: 'center', width: '120', formatter: (row, column, cellValue, index) => { title: '到货日期', key: 'arrivalDate', align: 'center', headerAlign: 'center', width: '120', formatter: (row, column, cellValue, index) => {
...@@ -238,6 +238,16 @@ export default { ...@@ -238,6 +238,16 @@ export default {
return row.producedTime && row.producedTime.split(' ')[0] return row.producedTime && row.producedTime.split(' ')[0]
} }
}, },
{ title: '到货标准/图号', key: 'arrivedDrawNo', width: '150', headerAlign: 'center' },
{ title: '到货版次', key: 'arrivalVer', width: '150', headerAlign: 'center' },
{ title: '产品图号/版本', align: 'center', show: true, key: 'productDwawVer', sortable: true, minWidth: 150 },
{ title: 'ATP名称', align: 'center', show: true, key: 'atpName', sortable: true, minWidth: 150 },
{ title: 'ATP编号及版次', align: 'center', show: true, key: 'atpNo', sortable: true, minWidth: 150 },
{ title: '软件构型件号/版次', align: 'center', show: true, key: 'softConfPieceNo', sortable: true, minWidth: 170 },
{ title: '电子硬件构型件号/版本', align: 'center', show: true, key: 'elecHardwareConfPieceNo', sortable: true, minWidth: 210 },
{ title: '交付规范及版次', align: 'center', show: true, key: 'deliverySpec', sortable: true, minWidth: 150 },
{ title: '适航批准标签/批准放行证书', align: 'center', show: true, key: 'approvalCert', sortable: true, minWidth: 220 },
{ title: '是否新研产品', align: 'center', show: true, key: 'isNewlyProduct', sortable: true, minWidth: 140, formatter: (row, column, cellValue, index) => cellValue ? '是' : '否' },
{ title: '贮存条件', key: 'storageCondition', headerAlign: 'center' }, { title: '贮存条件', key: 'storageCondition', headerAlign: 'center' },
{ {
title: '随产品资料', key: 'withProductMaterial', align: 'center', headerAlign: 'center', width: '120', formatter: (row, column, cellValue, index) => { title: '随产品资料', key: 'withProductMaterial', align: 'center', headerAlign: 'center', width: '120', formatter: (row, column, cellValue, index) => {
......
applications/dee-mes/src/privateComponents/components/PurchasingWarehousingView/index.vue
View file @ 15ac5dde
...@@ -40,13 +40,13 @@ export default { ...@@ -40,13 +40,13 @@ export default {
} }
}, },
{ {
title: '编码', key: 'typeCode', align: 'center', headerAlign: 'center', width: '100', formatter: (row, column, cellValue, index) => { title: '物料编码', key: 'typeCode', align: 'center', headerAlign: 'center', width: '100', formatter: (row, column, cellValue, index) => {
const value = row.resCode ? row.resCode : row.extMaterial ? row.extMaterial.resCode : '' const value = row.resCode ? row.resCode : row.extMaterial ? row.extMaterial.resCode : ''
return value return value
} }
}, },
{ {
title: '名称', key: 'resName', width: '120', headerAlign: 'center', formatter: (row, column, cellValue, index) => { title: '物料名称', key: 'resName', width: '120', headerAlign: 'center', formatter: (row, column, cellValue, index) => {
const value = row.resName ? row.resName : row.extMaterial ? row.extMaterial.resName : '' const value = row.resName ? row.resName : row.extMaterial ? row.extMaterial.resName : ''
return value return value
} }
...@@ -75,12 +75,10 @@ export default { ...@@ -75,12 +75,10 @@ export default {
return value return value
} }
}, },
{ title: '炉/批号', key: 'lotNo', width: '150', headerAlign: 'center' },
{ title: '到货标准/图号', key: 'arrivedDrawNo', width: '150', headerAlign: 'center' },
{ title: '到货版次', key: 'arrivalVer', width: '150', headerAlign: 'center' },
{ title: '系列号/序列号', key: 'serialNo', width: '150', headerAlign: 'center' }, { title: '系列号/序列号', key: 'serialNo', width: '150', headerAlign: 'center' },
{ title: '机型', key: 'airModel', align: 'center', headerAlign: 'center' }, { title: '机型', key: 'airModel', align: 'center', headerAlign: 'center' },
{ title: '架次', key: 'sorties', align: 'center', headerAlign: 'center' }, { title: '架次', key: 'sorties', align: 'center', headerAlign: 'center' },
{ title: '炉/批号', key: 'lotNo', width: '150', headerAlign: 'center' },
{ {
title: '计量单位', key: 'unitName', align: 'center', headerAlign: 'center', formatter: (row, column, cellValue, index) => { title: '计量单位', key: 'unitName', align: 'center', headerAlign: 'center', formatter: (row, column, cellValue, index) => {
const value = row.reqUnit ? row.reqUnit : row.extMaterial ? row.extMaterial.extUnit.unitName : '' const value = row.reqUnit ? row.reqUnit : row.extMaterial ? row.extMaterial.extUnit.unitName : ''
...@@ -94,7 +92,9 @@ export default { ...@@ -94,7 +92,9 @@ export default {
return value return value
} }
}, },
// { title: '是否合格供应商', key: 'extDxSipplier.isValid', headerAlign: 'center' }, { title: '是否合格供应商', key: 'isSupplierY', width: '120', headerAlign: 'center', formatter: (row, column, cellValue, index) => {
return cellValue ? '合格' : '不合格'
} },
{ title: '制造商', key: 'manufacturer', align: 'center', headerAlign: 'center' }, { title: '制造商', key: 'manufacturer', align: 'center', headerAlign: 'center' },
{ {
title: '到货日期', key: 'arrivalDate', align: 'center', headerAlign: 'center', width: '120', formatter: (row, column, cellValue, index) => { title: '到货日期', key: 'arrivalDate', align: 'center', headerAlign: 'center', width: '120', formatter: (row, column, cellValue, index) => {
...@@ -106,6 +106,16 @@ export default { ...@@ -106,6 +106,16 @@ export default {
return row.producedTime && row.producedTime.split(' ')[0] return row.producedTime && row.producedTime.split(' ')[0]
} }
}, },
{ title: '到货标准/图号', key: 'arrivedDrawNo', width: '150', headerAlign: 'center' },
{ title: '到货版次', key: 'arrivalVer', width: '150', headerAlign: 'center' },
{ title: '产品图号/版本', align: 'center', show: true, key: 'productDwawVer', sortable: true, minWidth: 150 },
{ title: 'ATP名称', align: 'center', show: true, key: 'atpName', sortable: true, minWidth: 150 },
{ title: 'ATP编号及版次', align: 'center', show: true, key: 'atpNo', sortable: true, minWidth: 150 },
{ title: '软件构型件号/版次', align: 'center', show: true, key: 'softConfPieceNo', sortable: true, minWidth: 170 },
{ title: '电子硬件构型件号/版本', align: 'center', show: true, key: 'elecHardwareConfPieceNo', sortable: true, minWidth: 210 },
{ title: '交付规范及版次', align: 'center', show: true, key: 'deliverySpec', sortable: true, minWidth: 150 },
{ title: '适航批准标签/批准放行证书', align: 'center', show: true, key: 'approvalCert', sortable: true, minWidth: 220 },
{ title: '是否新研产品', align: 'center', show: true, key: 'isNewlyProduct', sortable: true, minWidth: 140, formatter: (row, column, cellValue, index) => cellValue ? '是' : '否' },
{ title: '贮存条件', key: 'storageCondition', headerAlign: 'center' }, { title: '贮存条件', key: 'storageCondition', headerAlign: 'center' },
{ {
title: '随产品资料', key: 'withProductMaterial', align: 'center', headerAlign: 'center', width: '120', formatter: (row, column, cellValue, index) => { title: '随产品资料', key: 'withProductMaterial', align: 'center', headerAlign: 'center', width: '120', formatter: (row, column, cellValue, index) => {
......
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