diff --git a/src/views/user/goodsManagement/index.vue b/src/views/user/goodsManagement/index.vue
index f3a3bb7..90674ab 100644
--- a/src/views/user/goodsManagement/index.vue
+++ b/src/views/user/goodsManagement/index.vue
@@ -441,9 +441,10 @@ const equipRules = ref({
             trigger: 'blur',
         },
     ],
-    // deviceWeight: [//
-    //     { required: true, message: "整机重量不能为空", trigger: "blur" }
-    // ],
+    deviceWeight: [
+        //
+        { required: true, message: '整机重量不能为空', trigger: 'blur' },
+    ],
 })
 // 弹框保存提交
 const submitBtn = () => {
@@ -691,55 +692,107 @@ const handleRemove = (list: any, index: Number) => {
 <template>
     <!-- 样式修改 -->
     <!-- 商品管理 -->
+    <el-form :model="queryParams" ref="queryFormRef" :inline="true" size="default" label-width="0">
+        <!-- 表单搜索 -->
+        <el-row>
+            <el-col :span="6">
+                <el-form-item prop="deviceName">
+                    <el-input
+                        v-model.trim="queryParams.deviceName"
+                        style="width: 100%"
+                        clearable
+                        placeholder="请输入装备名称"
+                    />
+                </el-form-item>
+            </el-col>
+            <el-col :span="6">
+                <el-form-item prop="code">
+                    <el-input
+                        v-model.trim="queryParams.code"
+                        style="width: 100%"
+                        clearable
+                        placeholder="请输入装备编号"
+                    />
+                </el-form-item>
+            </el-col>
+            <el-col :span="6">
+                <el-form-item prop="maStatus">
+                    <el-select
+                        style="width: 100%"
+                        v-model="queryParams.maStatus"
+                        clearable
+                        placeholder="请选择装备状态"
+                    >
+                        <el-option label="草稿状态" value="0"></el-option>
+                        <el-option label="上架" value="1"></el-option>
+                        <el-option label="下架" value="2"></el-option>
+                        <el-option label="在租" value="3"></el-option>
+                    </el-select>
+                </el-form-item>
+            </el-col>
+            <el-col :span="6">
+                <el-form-item prop="deviceTypeList">
+                    <el-cascader
+                        v-model="deviceTypeList"
+                        :show-all-levels="false"
+                        :options="deviceTypeTree"
+                        :props="partTypeTreeProps"
+                        filterable
+                        clearable
+                        collapse-tags
+                        style="width: 100%"
+                        placeholder="请选择装备类目"
+                        ref="deviceTypeCascader"
+                        @change="deviceTypeChange"
+                    ></el-cascader>
+                </el-form-item>
+            </el-col>
+        </el-row>
 
-    <el-form :model="queryParams" ref="queryFormRef" :inline="true" size="small" label-width="auto">
-        <el-form-item label="装备名称：" prop="deviceName">
-            <el-input v-model.trim="queryParams.deviceName" style="width: 160px" clearable />
-        </el-form-item>
-        <el-form-item label="装备编号：" prop="code">
-            <el-input v-model.trim="queryParams.code" style="width: 160px" clearable />
-        </el-form-item>
-        <el-form-item label="装备状态：" prop="maStatus">
-            <el-select style="width: 160px" v-model="queryParams.maStatus" clearable>
-                <el-option label="草稿状态" value="0"></el-option>
-                <el-option label="上架" value="1"></el-option>
-                <el-option label="下架" value="2"></el-option>
-                <el-option label="在租" value="3"></el-option>
-            </el-select>
-        </el-form-item>
-        <el-form-item label="装备类目：" prop="deviceTypeList">
-            <el-cascader
-                v-model="deviceTypeList"
-                :show-all-levels="false"
-                :options="deviceTypeTree"
-                :props="partTypeTreeProps"
-                filterable
-                clearable
-                collapse-tags
-                style="width: 160px"
-                placeholder="请选择装备类目"
-                ref="deviceTypeCascader"
-                @change="deviceTypeChange"
-            ></el-cascader>
-        </el-form-item>
-        <el-form-item label="更新时间：" prop="dateRange">
-            <el-date-picker
-                v-model="dateRange"
-                type="datetimerange"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                range-separator="至"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-            >
-            </el-date-picker>
-        </el-form-item>
-        <el-form-item>
-            <el-button type="primary" @click="queryTableList">查询</el-button>
-            <el-button type="success" @click="resetTableList(queryFormRef)">重置</el-button>
-            <el-button type="primary" @click="equipmentDeployment">装备新增</el-button>
-            <el-button type="warning" @click="handleUpdateUpDown(null, 2)">批量上架</el-button>
-            <el-button type="warning" @click="handleUpdateUpDown(null, 1)">批量下架</el-button>
-        </el-form-item>
+        <el-row>
+            <el-col :span="6">
+                <el-form-item prop="dateRange">
+                    <el-date-picker
+                        style="width: 100%"
+                        v-model="dateRange"
+                        type="datetimerange"
+                        value-format="yyyy-MM-dd HH:mm:ss"
+                        range-separator="至"
+                        start-placeholder="更新开始日期"
+                        end-placeholder="更新结束日期"
+                    >
+                    </el-date-picker>
+                </el-form-item>
+            </el-col>
+            <el-col :span="18">
+                <el-form-item>
+                    <el-button class="primary-lease" type="primary" @click="queryTableList"
+                        >查询</el-button
+                    >
+                    <el-button
+                        class="primary-lease"
+                        type="primary"
+                        @click="resetTableList(queryFormRef)"
+                        >重置</el-button
+                    >
+                    <el-button class="primary-lease" type="primary" @click="equipmentDeployment"
+                        >装备新增</el-button
+                    >
+                    <el-button
+                        class="primary-lease"
+                        type="primary"
+                        @click="handleUpdateUpDown(null, 2)"
+                        >批量上架</el-button
+                    >
+                    <el-button
+                        class="primary-lease"
+                        type="primary"
+                        @click="handleUpdateUpDown(null, 1)"
+                        >批量下架</el-button
+                    >
+                </el-form-item>
+            </el-col>
+        </el-row>
     </el-form>
 
     <!-- 表格 -->
@@ -748,8 +801,7 @@ const handleRemove = (list: any, index: Number) => {
         style="width: auto"
         row-key="maId"
         show-overflow-tooltip
-        max-height="400px"
-        :header-cell-style="{ background: '#3E98FF', color: '#fff' }"
+        :header-cell-style="{ background: '#00a288', color: '#fff' }"
         @selection-change="handleSelectionChange"
     >
         <el-table-column type="selection" width="55" align="center" :reserve-selection="true" />
@@ -927,7 +979,8 @@ const handleRemove = (list: any, index: Number) => {
                 <!-- <el-form-item label="装备编号" prop="code">
                     <el-input
                         autocomplete="off"
-                        style="width: 350px" maxlength="40"
+                        style="width: 350px"
+                        maxlength="40"
                         v-model="equipmentDeploymentParams.code"
                         clearable
                     />
@@ -1390,4 +1443,9 @@ const handleRemove = (list: any, index: Number) => {
     font-size: 12px;
     margin-left: 20px;
 }
+
+:deep.el-form--inline .el-form-item {
+    margin-right: 6px;
+    width: 95%;
+}
 </style>