diff --git a/src/option/basicdata/basicdataWarehouseTemp.js b/src/option/basicdata/basicdataWarehouseTemp.js
index d8c76bb7..e7d81ce9 100644
--- a/src/option/basicdata/basicdataWarehouseTemp.js
+++ b/src/option/basicdata/basicdataWarehouseTemp.js
@@ -300,7 +300,7 @@ export const columnList = [
       label: '操作',
       type: 6,
       values: '',
-      width: '130',
+      width: '160',
       checkarr: [],
       fixed: 'right',
       sortable: false,
diff --git a/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue b/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue
index dcc61045..a4d5db04 100644
--- a/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue
+++ b/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue
@@ -111,7 +111,7 @@ export default {
           },
           {
             label: '创建时间',
-            prop: 'operatorTime',
+            prop: 'createTime',
             type: 'input',
             addDisplay: false,
             editDisplay: false,
diff --git a/src/views/basicdata/warehouse/warehouse/basicdataWarehouseTemp.vue b/src/views/basicdata/warehouse/warehouse/basicdataWarehouseTemp.vue
index 8e1d8a72..f98a2b93 100644
--- a/src/views/basicdata/warehouse/warehouse/basicdataWarehouseTemp.vue
+++ b/src/views/basicdata/warehouse/warehouse/basicdataWarehouseTemp.vue
@@ -31,7 +31,9 @@
           <template v-if="slotProps.scope.column.label === '操作'">
             <div class="ElBtnClass">
               <div>
-                <!-- <el-button @click="view(slotProps.scope)">查看</el-button> -->
+                <el-button type="text" @click="view(slotProps.scope)">查看</el-button>
+                <el-button @click="view(slotProps.scope)">编辑</el-button>
+                <el-button @click="view(slotProps.scope)">删除</el-button>
               </div>
             </div>
           </template>
@@ -80,9 +82,13 @@ import {
 } from 'vue';
 import { columnList } from '@/option/basicdata/basicdataWarehouseTemp.js';
 import { $_getList } from '@/api/basicdata/basicdataWarehouse';
+import { ElMessage } from 'element-plus'
 const search = ref(false); //搜索展开
 const query = ref({}); //顶部搜索参数
-const searchChangeS = () => {};
+const searchChangeS = () => {
+    query.value={}
+    onLoad()
+};
 const searchHide = () => {};
 const details = reactive({
   /** 是否开启搜索 */
@@ -167,21 +173,37 @@ const showdrawer = _flag => {
   details.drawerShow = _flag;
 };
 // 页面初始化
-const onLoad=()=>{
+const onLoad=(val)=>{
     let data={
-        current: 1,
-        size: 30
+        current: page.currentPage,
+        size: page.pageSize,
+        ...val
     }
+    details.loadingObj.list=true;//开启表格加载
     $_getList(data).then(res=>{
         console.log(res);
+        if(res.data.code ==200){
+            if(res.data.data.records.length){
+                details.data  = res.data.data.records;//表格数据
+                details.page.total= res.data.data.total;//总条数
+            }
+        }
+    }).catch((res)=>{
+        ElMessage.error('获取失败联系后端管理员')
+    }).finally(()=>{
+        details.loadingObj.list=false;//关闭表格加载
     })
 }
 onLoad()
 // 每页多少条
 const sizeChange = val => {
+    page.pageSize=val
+    onLoad()
 };
 /** 页码改变执行的回调 */
 const currentChange = val => {  
+    page.currentPage=val
+    onLoad()
 };
 </script>
 
diff --git a/src/views/warehouse/warehouseStock/warehouseStock.vue b/src/views/warehouse/warehouseStock/warehouseStock.vue
index 4e6bf3dd..ece7bb59 100644
--- a/src/views/warehouse/warehouseStock/warehouseStock.vue
+++ b/src/views/warehouse/warehouseStock/warehouseStock.vue
@@ -283,7 +283,7 @@ export default {
           sortable: false,
         },
         {
-          prop: 'createTime',
+          prop: 'operatorTime',
           label: '操作时间',
           type: 4,
           values: '',