Merge branch 'dev' of http://94.191.100.41/tfmom/tf-mom-web into dev

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

@@ -4,7 +4,7 @@
  * @Description:退库入库申请明细
 -->
 <template>
-  <div v-if="form&&form.subTypeName" :style="layoutStyle" class="addInStorageBackItem">
+  <div :style="layoutStyle" class="addInStorageBackItem">
     <dee-as-com
       ref="table"
       :im-show-table-data="imShowTableData"

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

@@ -91,7 +91,7 @@ export default {
             'extMaterialId': r.jobResponse.jobOrder.extMaterialId,
             'extMaterialIdType': r.jobResponse.jobOrder.extMaterialIdType,
             'arrivalDate': r.jobResponse.jobOrder.arrivalDate,
-            'reqAmount': r.usableAmount,
+            'reqAmount': r.amount,
             'airModel': r.jobResponse.jobOrder.airModel,
             'sorties': r.jobResponse.jobOrder.sorties,
             'manufacturer': r.jobResponse.jobOrder.manufacturer,

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

@@ -91,6 +91,7 @@ export default {
         }
         const data = this.selection.map(r => {
           return {
+            'allocatedAmount': r.allocatedAmount,
             'subTypeName': 'InStorageRecallItem',
             'reqStatus': 'Apply',
             'outStorageId': r.id,
@@ -101,14 +102,14 @@ export default {
             '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,
+            '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,
+            'reqAmount': r.allocatedAmount,
             'airModel': r.inventory.jobResponse.jobOrder.airModel,
             'sorties': r.inventory.jobResponse.jobOrder.sorties,
             'manufacturer': r.inventory.jobResponse.jobOrder.manufacturer,
@@ -121,7 +122,7 @@ export default {
             'stockUnitPrice': r.inventory.jobResponse.jobOrder.stockUnitPrice,
             'purchaseOrderNo': r.inventory.jobResponse.jobOrder.purchaseOrderNo,
             'operator': 'ADD',
-            remark: r.inventory.jobResponse.jobOrder.remark,
+            'remark': r.inventory.jobResponse.jobOrder.remark,
             'isRoot': r.inventory.jobResponse.jobOrder.isRoot
           }
         })

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

@@ -6,7 +6,7 @@
 */
 <template>
   <div class="outStorageCallBack-reqAmount">
-    <el-input-number v-model="scope.row.reqAmount" :min="0" :max="maxNum" />
+    <el-input-number v-model="scope.row.reqAmount" :min="0" :max="maxNum" @change="handleChange" />
   </div>
 </template>
 <script>
@@ -35,11 +35,7 @@ export default {
   },
   computed: {
     maxNum() {
-      if (this.form.inventory && this.form.inventory.usableAmount) {
-        return this.form.inventory.usableAmount
-      } else {
-        return 99999
-      }
+      return this.form.allocatedAmount // 返厂入库
     }
   },
   created() {
@@ -60,7 +56,7 @@ export default {
     //     this.$utils.showMessageWarning(`退库数量不能大于可用库存数量(${this.form.inventory.usableAmount})`)
     //     return
     //   }
-      this.$emit('input', this.reqAmount)
+      this.$emit('input', this.scope.row.reqAmount)
     }
   }
 }