Merge branch 'master' of http://115.190.214.62:3001/Teams/kunshan-bzfm-mes-vue

src/views/materialManagement/productionMaterial/MmMaterial.vue

@@ -14,8 +14,8 @@
                 <el-input v-model="queryParams.materialName" placeholder="请输入物料名称" />
             </el-form-item>
             <el-form-item label="物料分类名称" prop="categoryName">
-                <el-select v-model="value" filterable placeholder="请选择" @visible-change="handleCategoryNameChange">
+                <el-select v-model="queryParams.categoryCode" placeholder="请选择">
-                    <el-option v-for="item in categoryNameOptions" :key="item.value" :label="item.label" :value="item.value"> </el-option>
+                    <el-option v-for="item in materialCategoryOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
                 </el-select>
             </el-form-item>
             <el-form-item>
@@ -419,7 +419,7 @@ function handleDelete(row) {
         })
 }
 // 物料分类名称下拉列表
-const categoryNameOptions = reactive([])
+const materialCategoryOptions = ref([])
 
 // 物料分类名称下拉列表 可见性变化时触发
 function handleCategoryNameChange(visible) {
@@ -427,11 +427,14 @@ function handleCategoryNameChange(visible) {
         getMmMaterialCategoryOptions().then((res) => {
             const { code, data } = res
             if (code == 200) {
-                categoryNameOptions.value = data
+                console.log(data)
+                materialCategoryOptions.value = data
             }
         })
+    } else if (err) {
+        console.log(err)
     }
 }
-
+handleGetMmMaterialCategoryOptions()
 handleQuery()
 </script>