ERP相关_领用出库下材料领用类型修改

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

@@ -61,17 +61,12 @@ export default {
   data() {
     const that = this
     return {
-      typeName: that.basicData.typeName || 'OutStorageMaterialUse',
-      options: [
-        {
-          label: '材料领用',
-          value: 'OutStorageMaterialUse'
-        }
-      ],
+      typeName: that.basicData.typeName || 'materialUse',
+      options: [],
       showCmp: true,
       cmpOptions: {
         typeName: 'OutStorageUse',
-        layKey: 'outStorageUseApplyAdd_OutStorageMaterialUse'
+        layKey: 'outStorageUseApplyAdd_materialUse'
       },
       bindForm: {},
       outStorageUseId: ''//
@@ -106,7 +101,7 @@ export default {
     })
   },
   mounted() {
-    // this.getUseRequestTypes()
+    this.getUseRequestTypes()
   },
   // 组件方法
   methods: {
@@ -116,13 +111,13 @@ export default {
       const dicData = await this.$utils.getDicListByCode('UseRequestType')
       // 当前登陆人为孙瑶雪 和dexadmin的时候下拉可以看到试验领用，其他人看不到
       // if (user === '孙瑶雪' || user === 'dexadmin') {
-      //   this.options = dicData.filter(item => item.label !== '无指令领用')
+      // this.options = dicData.filter(item => item.label !== '无指令领用')
       // } else if (user === '李晓倩' || user === '刘瑞' && Number(userId) === 1626782725550) {
       //   this.options = dicData.filter(item => item.label !== '无指令领用' && item.label !== '试验领用')
       // } else {
       //   this.options = dicData.filter(item => item.label !== '试验领用' && item.label !== '无指令领用' && item.label !== '紧急领用')
       // }
-      this.options = dicData.filter(item => item.label === '材料领用')
+      this.options = dicData.filter(item => item.label === '材料领用' || item.label === '换件领用')
     },
     dataChangeHandler(val) {
       if (val) {

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

@@ -71,7 +71,7 @@ export default {
       handler(val) {
         switch (val) {
           case 'useAO' :
-          case 'OutStorageMaterialUse':
+          case 'materialUse':
           case 'NoMachineMaterialUse':
           case 'UrgentUse':
             this.amountItemLabel = '申领数量'
@@ -108,7 +108,7 @@ export default {
         if (valid && this.selection) {
           const typeName = this.basicData.useRequestType
           const data = [{
-            'subTypeName': `${typeName}Item`,
+            'subTypeName': `OutStorageMaterialUseItem`,
             'extMaterial': this.selection.extMaterial,
             'extMaterialId': this.selection.extMaterialId,
             'erpInventoryId': this.selection.id,

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

@@ -119,8 +119,8 @@ export default {
         if (val && val.useRequestType) {
           if (val.useRequestType === 'noAO' || val.useRequestType === 'testUse' || val.useRequestType === 'FOUse') {
             this.$set(this.cmpOptions, 'layKey', `add_outStorageUseItem_noAO`)
-          } else if (val.useRequestType === 'OutStorageMaterialUse' || val.useRequestType === 'NoMachineMaterialUse') {
-            this.$set(this.cmpOptions, 'layKey', `add_outStorageUseItem_OutStorageMaterialUse`)
+          } else if (val.useRequestType === 'materialUse' || val.useRequestType === 'NoMachineMaterialUse') {
+            this.$set(this.cmpOptions, 'layKey', `add_outStorageUseItem_materialUse`)
           } else {
             this.$set(this.cmpOptions, 'layKey', `add_outStorageUseItem_${val.useRequestType}`)
           }

applications/dee-mes/src/privateComponents/components/ERP_OutStorageOutConfirm/components/left.vue

@@ -115,7 +115,7 @@ export default {
           'items': [{
             'fieldName': 'subTypeName',
             'operator': 'EQ',
-            'value': 'OutStorageMaterialUse'
+            'value': 'materialUse'
           },
           {
             'fieldName': 'state',

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

@@ -69,7 +69,7 @@ export default {
       //   this.maxNum = maxAmount
       // }
       this.$emit('input', this.reqAmount)
-      if (this.form.id && this.parentType_Inject !== '退库入库' && !this.form.subTypeName.includes('BackItem') && this.parentType_Inject !== 'OutStorageMaterialUse') {
+      if (this.form.id && this.parentType_Inject !== '退库入库' && !this.form.subTypeName.includes('BackItem') && this.parentType_Inject !== 'materialUse') {
         this.changeAmount()
       }
     },