出库物料选择

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

@@ -52,8 +52,9 @@ export default {
       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 })
+      const extWorkCenterName = this.basicData.extWorkCenteName || (this.basicData.extWorkCeter && this.basicData.extWorkCeter.extname)
+      if (extWorkCenterName) {
+        val.items.push({ fieldName: 'workcenter', operator: 'EQ', value: extWorkCenterName })
       }
       const el = this.$refs['materielTable']
       el.$refs.asCom.getData(val.items, val.items)
@@ -70,8 +71,14 @@ export default {
     },
     submitEvent() {
       console.log(this.selection)
-      if (this.selection.length) {
-        const data = this.selection.map(r => {
+      const selection = this.selection.filter(r => {
+        if (!this.basicData.inStorageRequestItems) {
+          return true
+        }
+        return !this.basicData.inStorageRequestItems.find(item => r.id === item.inventoryId)
+      })
+      if (selection.length) {
+        const data = selection.map(r => {
           return {
             'subTypeName': 'OutStorageExpireItem',
             'reqStatus': 'Apply',