diff --git a/sgzb-ui/src/api/claimAndRefund/secondStore.js b/sgzb-ui/src/api/claimAndRefund/secondStore.js
index 25e951c7..29a09196 100644
--- a/sgzb-ui/src/api/claimAndRefund/secondStore.js
+++ b/sgzb-ui/src/api/claimAndRefund/secondStore.js
@@ -7,9 +7,16 @@ export function secondaryWarehouseList(query) {
       method: 'get',
       params: query
     })
-  }
-
-
+}
+
+// 获取操作记录
+export function getOperateList(query) {
+    return request({
+      url: '/material/secondaryWarehouse/getOperateList',
+      method: 'get',
+      params: query
+    })
+}
 
 
 
diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue b/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue
index 3c54a003..371c4a37 100644
--- a/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue
@@ -701,7 +701,7 @@ export default {
     },
     getDialogList() {
       let params = {
-        id: this.rowObj.id,
+        taskId: this.rowObj.taskId,
         agreementId: this.rowObj.agreementId,
         pageNum: this.dialogQueryParams.pageNum,
         pageSize: this.dialogQueryParams.pageSize,
diff --git a/sgzb-ui/src/views/claimAndRefund/secondStore/inStoreBook.vue b/sgzb-ui/src/views/claimAndRefund/secondStore/inStoreBook.vue
index 91ea47b5..89761f50 100644
--- a/sgzb-ui/src/views/claimAndRefund/secondStore/inStoreBook.vue
+++ b/sgzb-ui/src/views/claimAndRefund/secondStore/inStoreBook.vue
@@ -62,10 +62,10 @@
     <el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" align="center" prop="dictId" />
-      <el-table-column label="单位名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="类型名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="规格型号" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="退库数量" align="center" prop="dictName" :show-overflow-tooltip="true" />
+      <el-table-column label="单位名称" align="center" prop="unitName" :show-overflow-tooltip="true" />
+      <el-table-column label="类型名称" align="center" prop="typeName" :show-overflow-tooltip="true" />
+      <el-table-column label="规格型号" align="center" prop="modelName" :show-overflow-tooltip="true" />
+      <el-table-column label="退库数量" align="center" prop="num" :show-overflow-tooltip="true" />
       <el-table-column label="退料人员" align="center" prop="dictName" :show-overflow-tooltip="true" />
       <el-table-column label="退库人员" align="center" prop="dictName" :show-overflow-tooltip="true" />
       <el-table-column label="退库时间" align="center" prop="dictName" :show-overflow-tooltip="true" />
@@ -83,8 +83,9 @@
 </template>
 
 <script>
-import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect } from "@/api/system/user";
 import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";
+import { getOperateList  } from "@/api/claimAndRefund/secondStore";
+
 
 export default {
   name: "InStoreBook",
diff --git a/sgzb-ui/src/views/claimAndRefund/secondStore/outStoreBook.vue b/sgzb-ui/src/views/claimAndRefund/secondStore/outStoreBook.vue
index e6918257..82210a08 100644
--- a/sgzb-ui/src/views/claimAndRefund/secondStore/outStoreBook.vue
+++ b/sgzb-ui/src/views/claimAndRefund/secondStore/outStoreBook.vue
@@ -83,9 +83,8 @@
 </template>
 
 <script>
-import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect } from "@/api/system/user";
 import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";
-
+import { getOperateList  } from "@/api/claimAndRefund/secondStore";
 export default {
   name: "OutStoreBook",
   dicts: ['sys_normal_disable'],
diff --git a/sgzb-ui/src/views/claimAndRefund/secondStore/secondStore.vue b/sgzb-ui/src/views/claimAndRefund/secondStore/secondStore.vue
index b24c75fc..c12b8c84 100644
--- a/sgzb-ui/src/views/claimAndRefund/secondStore/secondStore.vue
+++ b/sgzb-ui/src/views/claimAndRefund/secondStore/secondStore.vue
@@ -59,18 +59,18 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="deviceList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" align="center" prop="dictId" />
-      <el-table-column label="单位名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="类型名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="规格型号" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="进场数量" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="退场数量" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="场内库存量" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="已出库数量" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="在库数量" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
+      <el-table-column label="单位名称" align="center" prop="unitName" :show-overflow-tooltip="true" />
+      <el-table-column label="类型名称" align="center" prop="typeName" :show-overflow-tooltip="true" />
+      <el-table-column label="规格型号" align="center" prop="modelName" :show-overflow-tooltip="true" />
+      <el-table-column label="进场数量" align="center" prop="jcNum" :show-overflow-tooltip="true" />
+      <el-table-column label="退场数量" align="center" prop="tcNUm" :show-overflow-tooltip="true" />
+      <el-table-column label="场内库存量" align="center" prop="kcNum" :show-overflow-tooltip="true" />
+      <el-table-column label="已出库数量" align="center" prop="ckNum" :show-overflow-tooltip="true" />
+      <el-table-column label="在库数量" align="center" prop="zkNum" :show-overflow-tooltip="true" />
+      <el-table-column label="计量单位" align="center" prop="nuitName" :show-overflow-tooltip="true" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -164,9 +164,8 @@
 </template>
 
 <script>
-import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect } from "@/api/system/user";
 import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";
-
+import { secondaryWarehouseList  } from "@/api/claimAndRefund/secondStore";
 export default {
   name: "SecondStore",
   dicts: ['sys_normal_disable'],
@@ -185,7 +184,7 @@ export default {
       // 总条数
       total: 0,
       // 字典表格数据
-      typeList: [],
+      deviceList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -229,8 +228,8 @@ export default {
     /** 查询字典类型列表 */
     getList() {
       this.loading = true;
-      listType(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-          this.typeList = response.rows;
+      secondaryWarehouseList(this.queryParams).then(response => {
+          this.deviceList = response.rows;
           this.total = response.total;
           this.loading = false;
         }