领用出库增加FO领用和试验领用

applications/dee-mes/src/privateComponents/components/AddOutStorageUseDetails/components/AddOutStorageUseDetailDialog.vue

@@ -69,18 +69,25 @@ export default {
     'basicData.useRequestType': {
       immediate: true,
       handler(val) {
-        this.$set(this.cmpOptions, 'layKey', `outStorageUseMaterial_Add_${val}`)
         switch (val) {
           case 'useAO' :
-          case 'noAO':
           case 'materialUse':
             this.amountItemLabel = '申领数量'
+            this.$set(this.cmpOptions, 'layKey', `outStorageUseMaterial_Add_${val}`)
+            break
+          case 'noAO':
+          case 'testUse':
+          case 'FOUse':
+            this.amountItemLabel = '申领数量'
+            this.$set(this.cmpOptions, 'layKey', `outStorageUseMaterial_Add_noAO`)
             break
           case 'swapUse':
             this.amountItemLabel = '换件数量'
+            this.$set(this.cmpOptions, 'layKey', `outStorageUseMaterial_Add_${val}`)
             break
           case 'scrapUse':
             this.amountItemLabel = '报废数量'
+            this.$set(this.cmpOptions, 'layKey', `outStorageUseMaterial_Add_${val}`)
             break
           default:
             break

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

@@ -117,10 +117,14 @@ export default {
       deep: true,
       handler(val) {
         if (val && val.useRequestType) {
+          if (val.useRequestType === 'noAO' || val.useRequestType === 'testUse' || val.useRequestType === 'FOUse') {
+            this.$set(this.cmpOptions, 'layKey', `add_outStorageUseItem_noAO`)
+          } else {
             this.$set(this.cmpOptions, 'layKey', `add_outStorageUseItem_${val.useRequestType}`)
           }
         }
       }
+    }
   },
   mounted() {
     if (this.basicData && this.basicData.id) {
@@ -255,8 +259,8 @@ export default {
     },
     occupy() {
       const form = Object.assign({}, this.form)
-      form.aircraftType = form.aircraftType.includes('+') && form.aircraftType.split('+')[1] || form.aircraftType
-      form.sorties = form.sorties.includes('+') && form.sorties.split('+')[1] || form.sorties
+      form.aircraftType = form.aircraftType && form.aircraftType.includes('+') && form.aircraftType.split('+')[1] || form.aircraftType
+      form.sorties = form.sorties && form.sorties.includes('+') && form.sorties.split('+')[1] || form.sorties
       const typeName = this.basicData.useRequestType
       const param = {
         ...form,