Skip to content

T
TF-MOM-WEB
Commit afe533db authored by xioln's avatar xioln
Browse files
Options

返厂入库修改

parent 1fa151ab
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 36 deletions
applications/dee-mes/src/privateComponents/components/AddPutStorageBackDetailDialog/index.vue
View file @ afe533db
...@@ -93,42 +93,35 @@ export default { ...@@ -93,42 +93,35 @@ export default {
return { return {
'subTypeName': 'InStorageRecallItem', 'subTypeName': 'InStorageRecallItem',
'reqStatus': 'Apply', 'reqStatus': 'Apply',
'inventory': { 'outStorageId': r.inventory.jobResponseId,
'testNo': r.inventory.testNo, 'outStorageIdType': r.inventory.jobResponseIdType,
'ispass': r.inventory.ispass, 'inventoryId': r.inventoryId,
'materialType': r.inventory.materialType, 'inventoryIdType': r.inventoryIdType,
'materialCode': r.inventory.materialCode, 'purchaseUnitId': r.inventory.jobResponse.jobOrder.extMaterial.extUnitId,
'materialName': r.inventory.materialName, 'purchaseUnitIdType': r.inventory.jobResponse.jobOrder.extMaterial.extUnitIdType,
'modelNo': r.inventory.modelNo, 'extDxSipplierId': r.inventory.jobResponse.jobOrder.extDxSipplierId,
'techspec': r.inventory.techspec, 'extDxSipplierIdType': r.inventory.jobResponse.jobOrder.extDxSipplierIdType,
'spce': r.inventory.spce, extDxSipplier: r.inventory.jobResponse.jobOrder.extDxSipplier,
'suppstatus': r.inventory.suppstatus, extMaterial: r.inventory.jobResponse.jobOrder.extMaterial,
'lotNo': r.inventory.lotNo, storageZone: r.inventory.jobResponse.jobOrder.storageZone,
'serno': r.inventory.serno, storageCondition: r.inventory.jobResponse.jobOrder.storageCondition,
'aircraftType': r.inventory.aircraftType, 'extMaterialId': r.inventory.jobResponse.jobOrder.extMaterialId,
'sorties': r.inventory.sorties, 'extMaterialIdType': r.inventory.jobResponse.jobOrder.extMaterialIdType,
// 'extUnit': { unitName: r.inventory.extUnit.unitName }, 'arrivalDate': r.inventory.jobResponse.jobOrder.arrivalDate,
'workcenter': r.inventory.workcenter, 'reqAmount': r.inventory.jobResponse.jobOrder.reqAmount,
'workunit': r.inventory.workunit, 'airModel': r.inventory.jobResponse.jobOrder.airModel,
'suppname': r.inventory.suppname, 'sorties': r.inventory.jobResponse.jobOrder.sorties,
'arrDate': r.inventory.arrDate, 'manufacturer': r.inventory.jobResponse.jobOrder.manufacturer,
'madDate': r.inventory.madDate, 'contractNo': r.inventory.jobResponse.jobOrder.contractNo,
'qualityPeriod': r.inventory.qualityPeriod, 'stockPrice': r.inventory.jobResponse.jobOrder.stockPrice,
'longPeriod': r.inventory.longPeriod, 'lotNo': r.inventory.jobResponse.jobOrder.lotNo,
'spotCheckPeriod': r.inventory.spotCheckPeriod, 'taxRate': r.inventory.jobResponse.jobOrder.taxRate,
'arrDrawNo': r.inventory.arrDrawNo, 'taxUnitPrice': r.inventory.jobResponse.jobOrder.taxUnitPrice,
'taxRate': r.inventory.taxRate, 'taxPrice': r.inventory.jobResponse.jobOrder.taxPrice,
'stockUnitPrice': r.inventory.stockUnitPrice, 'stockUnitPrice': r.inventory.jobResponse.jobOrder.stockUnitPrice,
'stockPrice': r.inventory.stockPrice, 'purchaseOrderNo': r.inventory.jobResponse.jobOrder.purchaseOrderNo,
'applyUserName': r.inventory.applyUserName,
'contractNo': r.inventory.contractNo
},
'reqAmount': r.reqAmount,
'arrivalVer': r.arrivalVer,
'taxUnitPrice': r.taxUnitPrice,
'taxPrice': r.taxPrice,
'remark': r.remark,
'operator': 'ADD', 'operator': 'ADD',
remark: r.inventory.jobResponse.jobOrder.remark,
'isRoot': r.inventory.jobResponse.jobOrder.isRoot 'isRoot': r.inventory.jobResponse.jobOrder.isRoot
} }
}) })
......
applications/dee-mes/src/privateComponents/components/PurchasingWarehousingNewOrEdit/index.vue
View file @ afe533db
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
</div> </div>
</dee-table> </dee-table>
<span style="position: absolute;top: calc(100% - 70px);left: calc(50% - 70px);}"> <span style="position: absolute;top: calc(100% - 70px);left: calc(50% - 70px);}">
<el-button type="primary" class="searchBtn" @click="submit">完成</el-button> <el-button type="primary" class="searchBtn" @click="submit">确认</el-button>
<el-button type="primary" class="searchBtn" @click="back">取消</el-button> <el-button type="primary" class="searchBtn" @click="back">取消</el-button>
</span> </span>
<storage-details ref="storageDetailsCreatOrEdit" :basic-data="detailsPropData" @addTableData="addTableData" /> <storage-details ref="storageDetailsCreatOrEdit" :basic-data="detailsPropData" @addTableData="addTableData" />
......
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