diff --git a/ruoyi-ui/src/views/ehs/ehsMaterial/indexAll.vue b/ruoyi-ui/src/views/ehs/ehsMaterial/indexAll.vue
index a0aad64..9e27442 100644
--- a/ruoyi-ui/src/views/ehs/ehsMaterial/indexAll.vue
+++ b/ruoyi-ui/src/views/ehs/ehsMaterial/indexAll.vue
@@ -21,6 +21,16 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="物资名称"   prop="classSecond">
+        <el-cascader style="width:500px"
+                     placeholder="请选择物资名称"
+                     v-model="queryParams.materialName"
+                     :options="options"
+                     @visible-change="visbChange"
+                     :props="{ multiple: false, checkStrictly: true }"
+                     @change="handleQueryChange"></el-cascader>
+      </el-form-item>
+
       <el-form-item label="性质"   prop="materialType">
         <el-select v-model="queryParams.materialType" placeholder="请选择性质" clearable>
           <el-option
@@ -30,14 +40,6 @@
             :value="dict.value"
           ></el-option>
         </el-select>
-      </el-form-item
-      >
-      <el-form-item label="物资名称"   prop="classSecond">
-        <el-cascader style="width:500px"
-                     v-model="queryParams.materialNameId"
-                     :options="options"
-                     :props="{ multiple: false, checkStrictly: true }"
-                     @change="handleQueryChange"></el-cascader>
       </el-form-item>
 
       <el-form-item label="物资关键字" prop="classNameKey" label-width="98px">
@@ -430,8 +432,8 @@
           this.materialJson[i-1] = data ;
 
         }
-          this.options=this.materialJson[0];
-        console.log(this.materialJson);
+        // this.options = this.materialJson[0].concat(this.materialJson[1], this.materialJson[2], this.materialJson[3], this.materialJson[7]);
+        // this.options = this.materialJson[0];
         this.getList();
       },
       setMaterialClassJson() {
@@ -451,6 +453,11 @@
         }*/
         console.log(this.materialJson);
       },
+      visbChange(val) {
+        if (val && this.options.length == 0) {
+          return this.$message.warning("请先选择物资分类");
+        }
+      },
       /** 单位信息列表 */
       getListAllDept() {
         console.log(this.$store.state.user.deptId);
@@ -685,6 +692,8 @@
       },
       classFirstChange(value){
         this.options = this.materialJson[value-1];
+        console.log(this.queryParams.materialName,"materialName");
+        this.queryParams.materialName = null;
         /*if (value == 1){
           this.options = material1;
         }else if (value == 2){