diff --git a/src/views/wms/equipment/index.vue b/src/views/wms/equipment/index.vue
index c3905d7..b245ff6 100644
--- a/src/views/wms/equipment/index.vue
+++ b/src/views/wms/equipment/index.vue
@@ -59,6 +59,22 @@
           />
         </el-select>
       </el-form-item>
+
+      <el-form-item label="设备类别(组线/设备)" prop="equipmentStatus">
+        <el-select
+          v-model="queryParams.equipmentCategory"
+          placeholder="设备类别(组线/设备)"
+          style="width: 180px"
+          clearable
+        >
+          <el-option
+            v-for="dict in dict.type.equipment_category"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button
           type="primary"
@@ -184,7 +200,7 @@
           ></el-switch>
         </template>
       </el-table-column>
-      <el-table-column prop="equipmentStatus" label="设备状态" width="80">
+      <el-table-column prop="equipmentStatus" label="设备状态" width="100">
         <template slot-scope="scope">
           <dict-tag
             :options="dict.type.equipment_status"
@@ -192,6 +208,14 @@
           />
         </template>
       </el-table-column>
+      <el-table-column prop="equipmentCategory" label="设备类别(组线/设备)" width="150">
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.equipment_category"
+            :value="scope.row.equipmentCategory"
+          />
+        </template>
+      </el-table-column>
       <el-table-column
         label="设备类型编码"
         align="center"
@@ -460,6 +484,24 @@
               </el-form-item>
             </el-col>
           </el-row>
+          <el-row :gutter="10" class="mb8">
+            <el-col :span="8">
+              <el-form-item label="设备类别" prop="equipmentCategory">
+                <el-select
+                  v-model="form.equipmentCategory"
+                  placeholder="请选择设备类别"
+                  style="width: 195px"
+                >
+                  <el-option
+                    v-for="dict in dict.type.equipment_category"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
           <el-row :gutter="10" class="mb8">
             <el-col :span="24">
               <el-form-item label="设备二维码" prop="qrFileList">
@@ -910,7 +952,7 @@ import ItemSelectPerson from "./single.vue";
 
 export default {
   name: "Equipment",
-  dicts: ["sys_normal_disable", "equ_type", "equipment_status"],
+  dicts: ["sys_normal_disable", "equ_type", "equipment_status","equipment_category"],
   components: { EquipmentSpareParts ,ItemSelectPerson},
   data() {
     return {