供外出库

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

@@ -30,6 +30,10 @@ export default {
       type: Object,
       default: () => {}
     },
+    middleForm: {
+      type: Object,
+      default: () => {}
+    },
     value: {
       type: [Number, String, Object],
       default: () => ''
@@ -43,16 +47,17 @@ export default {
   },
   computed: {},
   watch: {
-    form: {
+    'form.sorties': {
       immediate: true,
       deep: true,
       handler(val) {
-        if (val.aircraftType && val.sorties) {
+        console.log('val', val)
+        if (val) {
           const params = {
             searchItems: {
               items: [
-                { 'fieldName': 'aircraftTypeId', operator: 'EQ', value: val.aircraftType },
-                { 'fieldName': 'aircraftSortiesId', operator: 'EQ', value: val.sorties }
+                { 'fieldName': 'aircraftTypeId', operator: 'EQ', value: this.form.aircraftType.split('+')[0] },
+                { 'fieldName': 'aircraftSortiesId', operator: 'EQ', value: val.split('+')[0] }
               ],
               operator: 'AND'
             }
@@ -70,7 +75,6 @@ export default {
     }
   },
   created() {
-    // 初始化数据
   },
   methods: {
     changeVal() {

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

@@ -132,8 +132,12 @@ export default {
       this.dialogVisible = false
     },
     occupy() {
+      const form = { ...this.form }
+      form.aircraftType = form.aircraftType.split('+')[1]
+      form.sorties = form.sorties.split('+')[1]
+
       const param = {
-        ...this.form,
+        ...form,
         inStorageRequestItems: this.tableData,
         subTypeName: 'OutStorageOut',
         operator: 'ADD'

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

@@ -30,6 +30,10 @@ export default {
       type: Object,
       default: () => {}
     },
+    middleForm: {
+      type: Object,
+      default: () => {}
+    },
     value: {
       type: [Number, String, Object],
       default: () => ''
@@ -43,21 +47,21 @@ export default {
   },
   computed: {},
   watch: {
-    form: {
+    'form.aircraftType': {
       immediate: true,
       deep: true,
       handler(val) {
-        if (val.aircraftType) {
+        if (val) {
           const params = {
             searchItems: {
-              items: [{ 'fieldName': 'aircraftTypeId', operator: 'EQ', value: val.aircraftType }],
+              items: [{ 'fieldName': 'aircraftTypeId', operator: 'EQ', value: val.split('+')[0] }],
               operator: 'AND'
             }
           }
           this.$api.searchApi('AircraftSorties', params).then(res => {
             this.options = res.items.content.map(row => {
               return {
-                value: row.id,
+                value: row.id + '+' + row.defName,
                 label: row.defName
               }
             })