物资修改搜索框

src/views/material/index.vue

@@ -2,54 +2,63 @@
   <div class="app-container">
     <div class="formSearch">
       <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="120x">
-        <el-form-item label="物品编号" prop="itemCode">
-          <el-input
-              style="width: 220px"
-              v-model="queryParams.itemCode"
-              placeholder="请输入物品编号"
-              clearable
-              @keyup.enter="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="物品名称" prop="itemId">
-          <el-input
-              style="width: 220px"
-              v-model="queryParams.itemId"
-              placeholder="请输入物品名称"
-              clearable
-              @keyup.enter="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="物品类型" prop="typeId">
-          <el-select
-              style="width: 220px"
-              v-model="queryParams.typeId"
-              placeholder="请选择物品类型"
-          >
-            <el-option
-                v-for="dict in material_type"
-                :key="dict.id"
-                :label="dict.typeName"
-                :value="dict.id"
-                style="width: 100%"
-            />
-          </el-select>
-        </el-form-item>
-        <!-- 操作按钮 -->
-        <el-form-item style="padding-left: 15%">
-          <el-button  @click="resetQuery" class="el-button-defalut">
-            <template #icon>
-              <img src="../../assets/icons/common/reset.png" height="25" width="24"/>
-            </template>
-            重置
-          </el-button>
-          <el-button type="primary"  @click="handleQuery" class="el-button-primary">
-            <template #icon>
-              <img src="../../assets/icons/common/search.png" height="24" width="24"/>
-            </template>
-            查询
-          </el-button>
-        </el-form-item>
+        <el-row :gutter="25">
+          <el-col :span="6">
+            <el-form-item label="物品编号" prop="itemCode">
+              <el-input
+                  style="width: 220px"
+                  v-model="queryParams.itemCode"
+                  placeholder="请输入物品编号"
+                  clearable
+                  @keyup.enter="handleQuery"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="物品名称" prop="itemId">
+              <el-input
+                  style="width: 220px"
+                  v-model="queryParams.itemId"
+                  placeholder="请输入物品名称"
+                  clearable
+                  @keyup.enter="handleQuery"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="物品类型" prop="typeId">
+              <el-select
+                  style="width: 220px"
+                  v-model="queryParams.typeId"
+                  placeholder="请选择物品类型"
+              >
+                <el-option
+                    v-for="dict in material_type"
+                    :key="dict.id"
+                    :label="dict.typeName"
+                    :value="dict.id"
+                    style="width: 100%"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item style="padding-left: 30px">
+              <el-button  @click="resetQuery" class="el-button-defalut">
+                <template #icon>
+                  <img src="../../assets/icons/common/reset.png" height="25" width="24"/>
+                </template>
+                重置
+              </el-button>
+              <el-button type="primary"  @click="handleQuery" class="el-button-primary">
+                <template #icon>
+                  <img src="../../assets/icons/common/search.png" height="24" width="24"/>
+                </template>
+                查询
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </div>
     <div class="contentTable" >

src/views/materialapply/index.vue

@@ -2,69 +2,59 @@
   <div class="app-container">
     <div class="formSearch">
       <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="80px">
-        <el-form-item label="项目组" prop="projectId" >
-          <el-select v-model="queryParams.projectId" placeholder="请选择项目" clearable style="width: 220px">
-            <el-option
-                v-for="dict in project_list"
-                :key="dict.id"
-                :label="dict.projectName"
-                :value="dict.id"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="申请人" prop="userName" style="width: 320px">
-          <el-input
-              v-model="queryParams.userName"
-              placeholder="请选择申请人"
-              clearable
-              @keyup.enter="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="状态" prop="checkStatus" >
-          <el-select v-model="queryParams.checkStatus" placeholder="请选择审核状态" clearable style="width: 220px;">
-            <el-option
-                v-for="dict in material_status"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-            />
-          </el-select>
-        </el-form-item>
-
-        <el-form-item style="padding-left: 10%">
-          <el-button  @click="resetQuery" class="el-button-defalut">
-            <template #icon>
-              <img src="../../assets/icons/common/reset.png" height="25" width="24"/>
-            </template>
-            重置
-          </el-button>
-          <el-button type="primary"  @click="handleQuery" class="el-button-primary">
-            <template #icon>
-              <img src="../../assets/icons/common/search.png" height="24" width="24"/>
-            </template>
-            查询
-          </el-button>
-<!--          <el-button size="large" type="text" @click="toggleSearch">
-            {{ isExpanded ? ' 收起' : ' 展开' }}
-            <el-icon class="el-icon&#45;&#45;right">
-              <arrow-down />
-            </el-icon>
-          </el-button>-->
-        </el-form-item>
-        <!-- 可折叠的查询条件 -->
-<!--        <transition>
-          <div v-if="isExpanded">
-            <el-form-item label="申请时间" prop="createTime" style="width: 320px ;margin-top: 20px">
-              <el-date-picker clearable
-                              v-model="queryParams.createTime"
-                              type="date"
-                              value-format="YYYY-MM-DD"
-                              placeholder="请选择申请时间">
-              </el-date-picker>
+        <el-row :gutter="25">
+          <el-col :span="6">
+            <el-form-item label="项目组" prop="projectId">
+              <el-select v-model="queryParams.projectId" placeholder="请选择项目" clearable style="width: 220px">
+                <el-option
+                    v-for="dict in project_list"
+                    :key="dict.id"
+                    :label="dict.projectName"
+                    :value="dict.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请人" prop="userName" width="220px">
+              <el-input
+                  v-model="queryParams.userName"
+                  placeholder="请选择申请人"
+                  clearable
+                  @keyup.enter="handleQuery"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="状态" prop="checkStatus">
+              <el-select v-model="queryParams.checkStatus" placeholder="请选择审核状态" clearable style="width: 220px;">
+                <el-option
+                    v-for="dict in material_status"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                />
+              </el-select>
             </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item style="margin-left: 30px">
+              <el-button @click="resetQuery" class="el-button-defalut">
+                <template #icon>
+                  <img src="../../assets/icons/common/reset.png" height="25" width="24"/>
+                </template>
+                重置
+              </el-button>
+              <el-button type="primary" @click="handleQuery" class="el-button-primary">
+                <template #icon>
+                  <img src="../../assets/icons/common/search.png" height="24" width="24"/>
+                </template>
+                查询
+              </el-button>
 
-          </div>
-        </transition>-->
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </div>
     <div class="contentTable">

src/views/materialentry/index.vue

@@ -2,49 +2,59 @@
   <div class="app-container">
     <div class="formSearch">
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="110x">
-      <el-form-item label="入库方式" prop="entryMethod">
-        <el-select v-model="queryParams.entryMethod" placeholder="请选择入库方式" clearable style="width: 180px">
-          <el-option
-            v-for="dict in entry_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="物品类型" prop="itemType">
-        <el-select v-model="queryParams.typeId" placeholder="请选择物品类型" clearable style="width: 180px">
-          <el-option
-              v-for="dict in material_type"
-              :key="dict.id"
-              :label="dict.typeName"
-              :value="dict.id"
-              style="width: 100%"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="物品名称" prop="itemName">
-        <el-input
-          v-model="queryParams.itemName"
-          placeholder="请输入物品名称"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item style="padding-left: 15%">
-        <el-button  @click="resetQuery" class="el-button-defalut">
-          <template #icon>
-            <img src="../../assets/icons/common/reset.png" height="25" width="24"/>
-          </template>
-          重置
-        </el-button>
-        <el-button type="primary"  @click="handleQuery" class="el-button-primary">
-          <template #icon>
-            <img src="../../assets/icons/common/search.png" height="24" width="24"/>
-          </template>
-          查询
-        </el-button>
-      </el-form-item>
+      <el-row :gutter="25">
+        <el-col :span="6">
+          <el-form-item label="入库方式" prop="entryMethod">
+            <el-select v-model="queryParams.entryMethod" placeholder="请选择入库方式" clearable style="width: 180px">
+              <el-option
+                  v-for="dict in entry_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="物品类型" prop="itemType">
+            <el-select v-model="queryParams.typeId" placeholder="请选择物品类型" clearable style="width: 180px">
+              <el-option
+                  v-for="dict in material_type"
+                  :key="dict.id"
+                  :label="dict.typeName"
+                  :value="dict.id"
+                  style="width: 100%"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="物品名称" prop="itemName">
+            <el-input
+                v-model="queryParams.itemName"
+                placeholder="请输入物品名称"
+                clearable
+                @keyup.enter="handleQuery"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item style="padding-left: 30px">
+            <el-button  @click="resetQuery" class="el-button-defalut">
+              <template #icon>
+                <img src="../../assets/icons/common/reset.png" height="25" width="24"/>
+              </template>
+              重置
+            </el-button>
+            <el-button type="primary"  @click="handleQuery" class="el-button-primary">
+              <template #icon>
+                <img src="../../assets/icons/common/search.png" height="24" width="24"/>
+              </template>
+              查询
+            </el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     </div>
     <div class="contentTable" >

src/views/materialreturn/index.vue

@@ -2,49 +2,58 @@
   <div class="app-container">
     <div class="formSearch">
       <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="80px">
-        <el-form-item label="项目组" prop="projectId" >
-          <el-select v-model="queryParams.projectId" placeholder="请选择项目" clearable style="width: 220px">
-            <el-option
-                v-for="dict in project_list"
-                :key="dict.id"
-                :label="dict.projectName"
-                :value="dict.id"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="姓名" prop="userName">
-          <el-input
-              v-model="queryParams.userName"
-              placeholder="请输入申请人姓名"
-              clearable
-              @keyup.enter="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="状态" prop="checkStatus">
-          <el-select v-model="queryParams.checkStatus" placeholder="请选择审批状态" clearable style="width: 220px;">
-            <el-option
-                v-for="dict in material_status"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-            />
-          </el-select>
-        </el-form-item>
-
-        <el-form-item style="padding-left: 10%">
-          <el-button  @click="resetQuery" class="el-button-defalut">
-            <template #icon>
-              <img src="../../assets/icons/common/reset.png" height="25" width="24"/>
-            </template>
-            重置
-          </el-button>
-          <el-button type="primary"  @click="handleQuery" class="el-button-primary">
-            <template #icon>
-              <img src="../../assets/icons/common/search.png" height="24" width="24"/>
-            </template>
-            查询
-          </el-button>
-        </el-form-item>
+        <el-row :gutter="25">
+          <el-col :span="6">
+            <el-form-item label="项目组" prop="projectId">
+              <el-select v-model="queryParams.projectId" placeholder="请选择项目" clearable style="width: 220px">
+                <el-option
+                    v-for="dict in project_list"
+                    :key="dict.id"
+                    :label="dict.projectName"
+                    :value="dict.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="申请人" prop="userName" width="220px">
+              <el-input
+                  v-model="queryParams.userName"
+                  placeholder="请选择申请人"
+                  clearable
+                  @keyup.enter="handleQuery"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="状态" prop="checkStatus">
+              <el-select v-model="queryParams.checkStatus" placeholder="请选择审核状态" clearable style="width: 220px;">
+                <el-option
+                    v-for="dict in material_status"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item style="margin-left: 30px">
+              <el-button @click="resetQuery" class="el-button-defalut">
+                <template #icon>
+                  <img src="../../assets/icons/common/reset.png" height="25" width="24"/>
+                </template>
+                重置
+              </el-button>
+              <el-button type="primary" @click="handleQuery" class="el-button-primary">
+                <template #icon>
+                  <img src="../../assets/icons/common/search.png" height="24" width="24"/>
+                </template>
+                查询
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </div>
     <div class="contentTable">