三期入库明细新增列表接口参数修改为器材编码模糊查询

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

@@ -33,6 +33,10 @@ export default {
     basicData: {
       type: Object,
       default: () => {}
+    },
+    parentTableData: {
+      type: Object,
+      default: () => {}
     }
   },
   data() {
@@ -71,9 +75,9 @@ export default {
       }
       if (this.basicData.materialType) {
         val.items.push({
-          fieldName: 'inventory.jobResponse.jobOrder.extMaterial.resType2Id',
-          operator: 'EQ',
-          value: this.basicData.materialType
+          fieldName: 'inventory.jobResponse.jobOrder.extMaterial.resType2.typeCode',
+          operator: 'LIKE',
+          value: this.parentTableData && this.parentTableData.materialType ? this.parentTableData.materialType.typeCode : this.basicData.materialType && this.basicData.materialType.includes('-') ? this.basicData.materialType.split('-')[1] + '%' : this.basicData.materialType
         })
       }
       val.items.push({

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

@@ -5,7 +5,7 @@
         v-for="(item,i) in materialTypeOptions"
         :key="i"
         :label="item.typeName"
-        :value="item.id"
+        :value="item.value"
       />
     </el-select>
   </div>
@@ -20,10 +20,21 @@ export default {
   name: 'MaterialType',
   components: {},
   props: {
-    form: {},
+    form: {
+      type: Object,
+      default: null
+    },
     itemObj: {
       type: Object,
       default: null
+    },
+    typeKey: {
+      type: String,
+      default: ''
+    },
+    formAttrs: {
+      type: Object,
+      default: null
     }
   },
   data() {
@@ -67,7 +78,14 @@ export default {
     getMaterialType(val) {
       this.isFirst = false
       getParentData({ billTypeCode: val }).then(res => {
-        this.materialTypeOptions = res.items.content || []
+        this.materialTypeOptions = res.items.content.map(item => {
+          if (this.formAttrs && this.formAttrs.layoutType === 'basicInfo_new_sanqiruku') {
+            item.value = `${item.id}-${item.typeName}`
+          } else {
+            item.value = item.id
+          }
+          return item
+        })
       })
     }
   }