返厂入库修改

applications/dee-mes/src/privateComponents/components/AddPutStorageBackDetailDialog/index.vue

@@ -93,42 +93,35 @@ export default {
           return {
             'subTypeName': 'InStorageRecallItem',
             'reqStatus': 'Apply',
-            'inventory': {
-              'testNo': r.inventory.testNo,
-              'ispass': r.inventory.ispass,
-              'materialType': r.inventory.materialType,
-              'materialCode': r.inventory.materialCode,
-              'materialName': r.inventory.materialName,
-              'modelNo': r.inventory.modelNo,
-              'techspec': r.inventory.techspec,
-              'spce': r.inventory.spce,
-              'suppstatus': r.inventory.suppstatus,
-              'lotNo': r.inventory.lotNo,
-              'serno': r.inventory.serno,
-              'aircraftType': r.inventory.aircraftType,
-              'sorties': r.inventory.sorties,
-              // 'extUnit': { unitName: r.inventory.extUnit.unitName },
-              'workcenter': r.inventory.workcenter,
-              'workunit': r.inventory.workunit,
-              'suppname': r.inventory.suppname,
-              'arrDate': r.inventory.arrDate,
-              'madDate': r.inventory.madDate,
-              'qualityPeriod': r.inventory.qualityPeriod,
-              'longPeriod': r.inventory.longPeriod,
-              'spotCheckPeriod': r.inventory.spotCheckPeriod,
-              'arrDrawNo': r.inventory.arrDrawNo,
-              'taxRate': r.inventory.taxRate,
-              'stockUnitPrice': r.inventory.stockUnitPrice,
-              'stockPrice': r.inventory.stockPrice,
-              'applyUserName': r.inventory.applyUserName,
-              'contractNo': r.inventory.contractNo
-            },
-            'reqAmount': r.reqAmount,
-            'arrivalVer': r.arrivalVer,
-            'taxUnitPrice': r.taxUnitPrice,
-            'taxPrice': r.taxPrice,
-            'remark': r.remark,
+            'outStorageId': r.inventory.jobResponseId,
+            'outStorageIdType': r.inventory.jobResponseIdType,
+            'inventoryId': r.inventoryId,
+            '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,
             'operator': 'ADD',
+            remark: r.inventory.jobResponse.jobOrder.remark,
             'isRoot': r.inventory.jobResponse.jobOrder.isRoot
           }
         })

applications/dee-mes/src/privateComponents/components/PurchasingWarehousingNewOrEdit/index.vue

@@ -27,7 +27,7 @@
       </div>
     </dee-table>
     <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>
     </span>
     <storage-details ref="storageDetailsCreatOrEdit" :basic-data="detailsPropData" @addTableData="addTableData" />