组件调整

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

@@ -29,6 +29,12 @@ export default {
   componentName: '添加三期出库物料明细弹框',
   name: 'AddOutStorageMaterialDetailDialog',
   components: {},
+  props: {
+    basicData: {
+      type: Object,
+      default: () => {}
+    }
+  },
   data() {
     return {
       selection: [],
@@ -43,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 }*/)
+      if (this.basicData.extWorkCenteName) {
+        val.items.push({ fieldName: 'workcenter', operator: 'EQ', value: this.basicData.extWorkCenteName })
+      }
       const el = this.$refs['materielTable']
       el.$refs.asCom.getData(val.items, val.items)
     },

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

@@ -105,11 +105,10 @@ export default {
       })
     },
     update() {
-      let item = null
+      const item = this.warehouseOptions.find(r => (r.id + '') === this.cloneValue)
       if (this.dataType === 'string') {
         this.$emit('input', this.cloneValue)
       } else {
-        item = this.warehouseOptions.find(r => r.id === this.cloneValue)
         this.$emit('input', item)
       }
       this.syncOut(item)