diff --git a/sgzb-ui/src/api/store/putInStore.js b/sgzb-ui/src/api/store/putInStore.js
index 5e185b4b..dbf7ead5 100644
--- a/sgzb-ui/src/api/store/putInStore.js
+++ b/sgzb-ui/src/api/store/putInStore.js
@@ -3,7 +3,7 @@ import request from '@/utils/request'
 //机具退料入库
 export function getReturnOfMaterialsInfoAll(query) {
     return request({
-      url: '/material/returnOfMaterialsInfo/getReturnOfMaterialsInfoAll',
+      url: '/material/inventoryAndWarehousing/getList',
       method: 'get',
       params: query
     })
diff --git a/sgzb-ui/src/views/store/warehousing/putInStore.vue b/sgzb-ui/src/views/store/warehousing/putInStore.vue
index 1a054724..7961583b 100644
--- a/sgzb-ui/src/views/store/warehousing/putInStore.vue
+++ b/sgzb-ui/src/views/store/warehousing/putInStore.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container" id="devicesWarehousing">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px" @submit.native.prevent>
       <el-form-item label="关键字" label-width="auto" prop="keyWord">
         <el-input
           v-model="queryParams.keyWord"
@@ -10,48 +10,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <!-- <el-form-item label="提交入库时间">
-        <el-date-picker
-          v-model="queryParams.submitStorageTime"
-          style="width: 240px"
-          value-format="yyyy-MM-dd"
-          type="date"
-          range-separator="-"
-           placeholder="提交入库时间"
-        ></el-date-picker>
-      </el-form-item>
-      <el-form-item label="设备类型" prop="typeId">
-        <el-select
-          v-model="queryParams.typeId"
-          placeholder="请选择设备类型"
-          clearable filterable
-          style="width: 240px"
-        >
-          <el-option
-            v-for="typeItem in typeList"
-            :key="typeItem.typeId"
-            :label="typeItem.typeName"
-            :value="typeItem.typeId"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="规格型号" prop="modelId">
-        <el-select
-          v-model="queryParams.modelId"
-          placeholder="请选择规格型号"
-          clearable filterable
-          style="width: 240px"
-        >
-          <el-option
-            v-for="model in modelList"
-            :key="model.typeId"
-            :label="model.typeName"
-            :value="model.typeId"
-          />
-        </el-select>
-      </el-form-item> -->
      
-
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -60,76 +19,17 @@
       </el-form-item>
     </el-form>
 
-    <!-- <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          :disabled="single"
-          @click="handleAdd"
-          v-hasPermi="['system:dict:add']"
-        >入库审核</el-button>
-      </el-col>
-     <el-col :span="1.5">
-       <el-button
-         type="success"
-         plain
-         icon="el-icon-edit"
-         size="mini"
-         :disabled="single"
-         @click="handleUpdate"
-         v-hasPermi="['system:dict:edit']"
-       >修改</el-button>
-     </el-col>
-     <el-col :span="1.5">
-       <el-button
-         type="danger"
-         plain
-         icon="el-icon-delete"
-         size="mini"
-         :disabled="multiple"
-         @click="handleDelete"
-         v-hasPermi="['system:dict:remove']"
-       >删除</el-button>
-     </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row> -->
-
     <el-table v-loading="loading" :data="returnList" @selection-change="handleSelectionChange">
-      <!-- <el-table-column type="selection" width="55" align="center" /> -->
-      <el-table-column label="入库来源" align="center" prop="code" />
-      <el-table-column label="工程名称" align="center" prop="unitName" :show-overflow-tooltip="true" />
-      <el-table-column label="退料单位" align="center" prop="lotName" :show-overflow-tooltip="true" />
+      <el-table-column label="序号" type="index" width="55" align="center" />
+      <el-table-column label="入库来源" align="center" prop="putInType" />
+      <el-table-column label="工程名称" align="center" prop="projectName" :show-overflow-tooltip="true" />
+      <el-table-column label="退料单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
       <el-table-column label="单号" align="center" prop="kindName"  :show-overflow-tooltip="true"></el-table-column>
       <el-table-column label="设备/物资名称" align="center" prop="typeName"  :show-overflow-tooltip="true"></el-table-column>
       <el-table-column label="入库人" align="center" prop="modelName"  :show-overflow-tooltip="true"></el-table-column>
-      <el-table-column label="入库日期" align="center" prop="inputNum" :show-overflow-tooltip="true"></el-table-column>
-      <!-- <el-table-column label="退料时间" align="center" prop="returnTime" width="180"></el-table-column>
-      <el-table-column label="提交入库人员" align="center" prop="submitToStoragePersonnel" :show-overflow-tooltip="true" />
-      <el-table-column label="提交入库时间" align="center" prop="submitStorageTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column> -->
-      
-      <!-- <el-table-column label="状态" align="center" prop="status">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
-        </template>
-      </el-table-column> -->
-      <!-- <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" /> -->
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="入库日期" align="center" prop="createDate" :show-overflow-tooltip="true"></el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
+      <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -139,7 +39,7 @@
             v-hasPermi="['system:dict:edit']"
           >审核</el-button>
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
 
     <pagination
@@ -599,9 +499,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        dictName: undefined,
-        dictType: undefined,
-        status: undefined,
+        keyWord: "",
       },
       // 级联框禁用
       cascaderDisabled: false,