三期出库单明细参数调整

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

@@ -49,6 +49,9 @@ export default {
     searchEvent(val) {
       // const materialType = this.findByNameVnode(this, 'DeeAsForm').form.materialType
       val.items.push({ fieldName: 'subTypeName', operator: 'EQ', value: 'Inventory' }/*, { fieldName: 'inventory.materialType', operator: 'EQ', value: materialType }*/)
+      val.items.push({ fieldName: 'status', operator: 'EQ', value: 'disposed' })
+      val.items.push({ fieldName: 'usableAmount', operator: 'GT', value: 0 })
+      val.items.push({ fieldName: 'disposeDes', operator: 'LIKE', value: '三期' })
       if (this.basicData.extWorkCenteName) {
         val.items.push({ fieldName: 'workcenter', operator: 'EQ', value: this.basicData.extWorkCenteName })
       }
@@ -68,7 +71,44 @@ export default {
     submitEvent() {
       console.log(this.selection)
       if (this.selection.length) {
-        this.$emit('submitEvent', { formData: this.selection })
+        const data = this.selection.map(r => {
+          return {
+            'subTypeName': 'OutStorageExpireItem',
+            'reqStatus': 'Apply',
+            'outStorageId': r.jobResponseId,
+            'outStorageIdType': r.jobResponseIdType,
+            'inventoryId': r.id,
+            'inventoryIdType': this.$utils.getModelName4dxClassName(r),
+            'purchaseUnitId': r.jobResponse.jobOrder.extMaterial.extUnitId,
+            'purchaseUnitIdType': r.jobResponse.jobOrder.extMaterial.extUnitIdType,
+            'extDxSipplierId': r.jobResponse.jobOrder.extDxSipplierId,
+            'extDxSipplierIdType': r.jobResponse.jobOrder.extDxSipplierIdType,
+            extDxSipplier: r.jobResponse.jobOrder.extDxSipplier,
+            extMaterial: r.jobResponse.jobOrder.extMaterial,
+            storageZone: r.jobResponse.jobOrder.storageZone,
+            storageCondition: r.jobResponse.jobOrder.storageCondition,
+            'extMaterialId': r.jobResponse.jobOrder.extMaterialId,
+            'extMaterialIdType': r.jobResponse.jobOrder.extMaterialIdType,
+            'arrivalDate': r.jobResponse.jobOrder.arrivalDate,
+            'reqAmount': r.jobResponse.jobOrder.reqAmount,
+            'airModel': r.jobResponse.jobOrder.airModel,
+            'sorties': r.jobResponse.jobOrder.sorties,
+            'manufacturer': r.jobResponse.jobOrder.manufacturer,
+            'contractNo': r.jobResponse.jobOrder.contractNo,
+            'stockPrice': r.jobResponse.jobOrder.stockPrice,
+            'lotNo': r.jobResponse.jobOrder.lotNo,
+            'taxRate': r.jobResponse.jobOrder.taxRate,
+            'taxUnitPrice': r.jobResponse.jobOrder.taxUnitPrice,
+            'taxPrice': r.jobResponse.jobOrder.taxPrice,
+            'stockUnitPrice': r.jobResponse.jobOrder.stockUnitPrice,
+            'purchaseOrderNo': r.jobResponse.jobOrder.purchaseOrderNo,
+            'operator': 'ADD',
+            remark: r.jobResponse.jobOrder.remark,
+            'isRoot': r.jobResponse.jobOrder.isRoot
+
+          }
+        })
+        this.$emit('submitEvent', { formData: data })
       }
     },
     cancelEvent() {

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

@@ -9,11 +9,12 @@
     <dee-as-com
       v-if="data"
       refs="outerCasing"
+      model-name="InStorageRequestItem"
       :lay-config="{
         typeName: 'InStorageRequestItem',
-        layKey: '1c4983a2-6f51-49e4-95ee-2f5506b8e217'
+        layKey: 'test'
       }"
-      :basic-data="data"
+      :edit-id="data.id"
     />
   </div>
 </template>
@@ -92,6 +93,7 @@ export default {
       }
       post('JobResponseInStorage/search', param).then(res => {
         this.data = res.items.content[0]
+        this.$refs['outerCasing'].$refs.asCom.$refs.deeForm.form = this.data
       }).catch((err) => {
         console.log(err)
       })