入库申请

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

@@ -36,12 +36,12 @@ export default {
   },
 
   computed: {},
-  mounted() {
-  },
+  mounted() {},
   methods: {
     searchEvent(val) {
       // const materialType = this.findByNameVnode(this, 'DeeAsForm').form.materialType
-      val.items.push({ fieldName: 'subTypeName', operator: 'EQ', value: 'JobResponseOutStorageExpire' }/*, { fieldName: 'inventory.materialType', operator: 'EQ', value: materialType }*/)
+      val.items.push({ fieldName: 'subTypeName', operator: 'EQ', value: 'JobResponseOutStorageExpire' }/*, { fieldName: 'inventory.materialType', operator: 'EQ', value: materialType }*/,
+        { fieldName: 'state', operator: 'EQ', value: 'Finish' })
       const el = this.$refs['materielTable']
       el.$refs.asCom.getData(val.items, val.items)
     },
@@ -57,7 +57,11 @@ export default {
     },
     submitEvent() {
       if (this.selection.length) {
-        this.$emit('submitEvent', { formData: this.selection.map(item => item.inventory) })
+        const showData = this.findByNameVnode(this, 'DeeAsTable').showData
+        if (showData.length) {
+          this.selection = this.selection.filter(item => !showData.some(x => x.inventoryId === item.inventoryId))
+        }
+        this.$emit('submitEvent', { formData: this.selection })
       }
     },
     cancelEvent() {

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

@@ -32,6 +32,7 @@ export default {
   watch: {
     'form.billType'(val) {
       if (val) {
+        this.$set(this.form, 'materialType', this.form.materialTypeId || '')
         if (!this.isFirst) {
           this.$set(this.form, 'materialType', '')
         }