Commit 0fda22f5 authored by jingnan's avatar jingnan 👀

采购人员填写保存产品信息后,未录入信息的框能自动填写“/”

parent 05079df3
...@@ -2004,14 +2004,14 @@ export default { ...@@ -2004,14 +2004,14 @@ export default {
// 'reqAmount': this.form.reqAmount, // 'reqAmount': this.form.reqAmount,
'extDxSipplierId': this.basicData.extDxSipplierId || '', 'extDxSipplierId': this.basicData.extDxSipplierId || '',
'extDxSipplierIdType': 'ExtDxSipplier', 'extDxSipplierIdType': 'ExtDxSipplier',
'manufacturer': this.form.manufacturer, 'manufacturer': this.form.manufacturer || '/',
'arrivalDate': this.form.arrivalDate, 'arrivalDate': this.form.arrivalDate,
'producedTime': this.form.producedTime, 'producedTime': this.form.producedTime,
'storageCondition': this.form.storageCondition, 'storageCondition': this.form.storageCondition || '/',
'withProductMaterial': Array.isArray(this.form.withProductMaterial) ? this.form.withProductMaterial.join(';') : this.form.withProductMaterial, 'withProductMaterial': Array.isArray(this.form.withProductMaterial) ? this.form.withProductMaterial.join(';') : this.form.withProductMaterial || '/',
'urgency': this.form.urgency, 'urgency': this.form.urgency,
'arrivedDrawNo': this.form.arrivedDrawNo, 'arrivedDrawNo': this.form.arrivedDrawNo || '/',
'arrivalVer': this.form.arrivalVer, 'arrivalVer': this.form.arrivalVer || '/',
'stockUnitPrice': this.form.stockUnitPrice, 'stockUnitPrice': this.form.stockUnitPrice,
'taxRate': this.form.taxRate, 'taxRate': this.form.taxRate,
'stockPrice': this.form.stockPrice, 'stockPrice': this.form.stockPrice,
...@@ -2023,20 +2023,21 @@ export default { ...@@ -2023,20 +2023,21 @@ export default {
'inventoryReqId': this.basicData.id, 'inventoryReqId': this.basicData.id,
'inventoryReqIdType': 'InventoryRequest', 'inventoryReqIdType': 'InventoryRequest',
'contractNo': this.form.contractNo, 'contractNo': this.form.contractNo,
'deviationNo': this.form.deviationNo, 'deviationNo': this.form.deviationNo || '/',
'isRoot': !this.isChild, 'isRoot': !this.isChild,
'subEquipment': this.form.subEquipment, 'subEquipment': this.form.subEquipment || '/',
'productDwawVer': this.form.productDwawVer, 'productDwawVer': this.form.productDwawVer || '/',
'atpName': this.form.atpName, 'atpName': this.form.atpName || '/',
'atpNo': this.form.atpNo, 'atpNo': this.form.atpNo || '/',
'softConfPieceNo': this.form.softConfPieceNo, 'softConfPieceNo': this.form.softConfPieceNo || '/',
'elecHardwareConfPieceNo': this.form.elecHardwareConfPieceNo, 'elecHardwareConfPieceNo': this.form.elecHardwareConfPieceNo || '/',
'approvalCert': this.form.approvalCert, 'approvalCert': this.form.approvalCert || '/',
'isNewlyProduct': this.form.isNewlyProduct, 'isNewlyProduct': this.form.isNewlyProduct || false,
'reqUnit': this.form.reqUnit, 'reqUnit': this.form.reqUnit || '/',
'remark': this.form.remark, 'remark': this.form.remark || '/',
'operateType': this.operateType, 'operateType': this.operateType,
'MaterialResCode': this.form.resCode 'MaterialResCode': this.form.resCode,
'deliverySpec': this.basicData.deliverySpec || '/'
} }
this.$emit('addTableData', newTableData) this.$emit('addTableData', newTableData)
this.handleClose() this.handleClose()
......
...@@ -1854,11 +1854,11 @@ export default { ...@@ -1854,11 +1854,11 @@ export default {
// 带出物料相关默认值 // 带出物料相关默认值
const SELECT_MATERIAL = this.material.find((item) => item.resCode === v) const SELECT_MATERIAL = this.material.find((item) => item.resCode === v)
if (SELECT_MATERIAL) { if (SELECT_MATERIAL) {
this.$set(this.form, 'modelNo', SELECT_MATERIAL.modelNo || '') this.$set(this.form, 'modelNo', SELECT_MATERIAL.modelNo || '/')
this.$set(this.form, 'techSpec', SELECT_MATERIAL.techSpec || '') this.$set(this.form, 'techSpec', SELECT_MATERIAL.techSpec || '/')
this.$set(this.form, 'spec', SELECT_MATERIAL.spec || '') this.$set(this.form, 'spec', SELECT_MATERIAL.spec || '/')
this.$set(this.form, 'supplyStatus', SELECT_MATERIAL.supplyStatus || '') this.$set(this.form, 'supplyStatus', SELECT_MATERIAL.supplyStatus || '/')
this.$set(this.form, 'reqUnit', SELECT_MATERIAL.extUnit && SELECT_MATERIAL.extUnit.unitName || '') this.$set(this.form, 'reqUnit', SELECT_MATERIAL.extUnit && SELECT_MATERIAL.extUnit.unitName || '/')
this.$set(this.form, 'resName', SELECT_MATERIAL.resName) this.$set(this.form, 'resName', SELECT_MATERIAL.resName)
this.$set(this.form, 'extMaterial', SELECT_MATERIAL) this.$set(this.form, 'extMaterial', SELECT_MATERIAL)
// this.extMaterialId = SELECT_MATERIAL.id || '' // this.extMaterialId = SELECT_MATERIAL.id || ''
...@@ -1997,17 +1997,17 @@ export default { ...@@ -1997,17 +1997,17 @@ export default {
'lotNo': this.form.lotNo, 'lotNo': this.form.lotNo,
'airModel': this.form.airModel, 'airModel': this.form.airModel,
'sorties': this.form.sorties, 'sorties': this.form.sorties,
'reqAmount': this.form.reqAmount, 'reqAmount': this.form.reqAmount || 0,
'extDxSipplierId': this.basicData.extDxSipplierId || '', 'extDxSipplierId': this.basicData.extDxSipplierId || '',
'extDxSipplierIdType': 'ExtDxSipplier', 'extDxSipplierIdType': 'ExtDxSipplier',
'manufacturer': this.form.manufacturer, 'manufacturer': this.form.manufacturer || '/',
'arrivalDate': this.form.arrivalDate, 'arrivalDate': this.form.arrivalDate,
'producedTime': this.form.producedTime, 'producedTime': this.form.producedTime,
'storageCondition': this.form.storageCondition, 'storageCondition': this.form.storageCondition || '/',
'withProductMaterial': Array.isArray(this.form.withProductMaterial) ? this.form.withProductMaterial.join(';') : this.form.withProductMaterial, 'withProductMaterial': Array.isArray(this.form.withProductMaterial) ? this.form.withProductMaterial.join(';') : this.form.withProductMaterial || '/',
'urgency': this.form.urgency, 'urgency': this.form.urgency,
'arrivedDrawNo': this.form.arrivedDrawNo, 'arrivedDrawNo': this.form.arrivedDrawNo || '/',
'arrivalVer': this.form.arrivalVer, 'arrivalVer': this.form.arrivalVer || '/',
'stockUnitPrice': this.form.stockUnitPrice, 'stockUnitPrice': this.form.stockUnitPrice,
'taxRate': this.form.taxRate, 'taxRate': this.form.taxRate,
'stockPrice': this.form.stockPrice, 'stockPrice': this.form.stockPrice,
...@@ -2019,20 +2019,21 @@ export default { ...@@ -2019,20 +2019,21 @@ export default {
'inventoryReqId': this.basicData.id, 'inventoryReqId': this.basicData.id,
'inventoryReqIdType': 'InventoryRequest', 'inventoryReqIdType': 'InventoryRequest',
'contractNo': this.form.contractNo, 'contractNo': this.form.contractNo,
'deviationNo': this.form.deviationNo, 'deviationNo': this.form.deviationNo || '/',
'isRoot': !this.isChild, 'isRoot': !this.isChild,
'subEquipment': this.form.subEquipment, 'subEquipment': this.form.subEquipment || '/',
'productDwawVer': this.form.productDwawVer, 'productDwawVer': this.form.productDwawVer || '/',
'atpName': this.form.atpName, 'atpName': this.form.atpName || '/',
'atpNo': this.form.atpNo, 'atpNo': this.form.atpNo || '/',
'softConfPieceNo': this.form.softConfPieceNo, 'softConfPieceNo': this.form.softConfPieceNo || '/',
'elecHardwareConfPieceNo': this.form.elecHardwareConfPieceNo, 'elecHardwareConfPieceNo': this.form.elecHardwareConfPieceNo || '/',
'approvalCert': this.form.approvalCert, 'approvalCert': this.form.approvalCert || '/',
'isNewlyProduct': this.form.isNewlyProduct, 'isNewlyProduct': this.form.isNewlyProduct || false,
'reqUnit': this.form.reqUnit, 'reqUnit': this.form.reqUnit || '/',
'remark': this.form.remark, 'remark': this.form.remark || '/',
'operateType': this.operateType, 'operateType': this.operateType,
'MaterialResCode': this.form.resCode 'MaterialResCode': this.form.resCode,
'deliverySpec': this.basicData.deliverySpec || '/'
} }
this.$emit('addTableData', newTableData) this.$emit('addTableData', newTableData)
this.handleClose() this.handleClose()
......
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