diff --git a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue
index 38ebcd11c..45065f6eb 100644
--- a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue
+++ b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue
@@ -84,7 +84,7 @@
 import download from '@/utils/download'
 import { ContainerMainRequest,ContainerMainRequestRules,ContainerDetailRequest,ContainerDetailRequestRules } from './containerMainRequest.data'
 import * as ContainerMainRequestApi from '@/api/wms/containerMainRequest'
-import * as ContainerDetailRequestApi from '@/api/wms/ContainerDetailRequest'
+import * as ContainerDetailRequestApi from '@/api/wms/containerDetailRequest'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
@@ -115,7 +115,7 @@ const { tableObject, tableMethods } = useTable({
     type:'SCRAP'
   }
   // toLocationCode.value = "SCRAP_CONTAIN"
-  businessType.value = 'ScrapContainerMenageRequest'
+  businessType.value = 'ScrapContainerManage'
   importFileName.value = '器具报废申请'
 } else if ( routeName.value == 'returnContainerMain') {
   tableObject.params = {
@@ -123,7 +123,7 @@ const { tableObject, tableMethods } = useTable({
   }
   // fromLocationCode.value = null
   // toLocationCode.value = "NULL_CONTAIN"
-  businessType.value = 'ReturnContainerMenageRequest'
+  businessType.value = 'ReturnContainerManage'
   importFileName.value = '器具返回申请'
 } else if ( routeName.value == 'moveContainerMainRequest') {
   tableObject.params = {
@@ -131,10 +131,10 @@ const { tableObject, tableMethods } = useTable({
   }
   // fromLocationCode.value = null
   // toLocationCode.value = null
-  businessType.value = 'MoveContainerMenageRequest'
+  businessType.value = 'MoveContainerManage'
   importFileName.value = '器具转移申请'
 } else if ( routeName.value == 'deliverContainerMainRequest') {
-  tableObject.params = {
+  tableObject.params = {InitialContainerManage
     type: 'DELIVER',
   }
   // fromLocationCode.value = null
@@ -142,7 +142,7 @@ const { tableObject, tableMethods } = useTable({
   businessType.value = 'DeliverContainerMainRequest'
   importFileName.value = '器具发运申请'
 } else if( routeName.value == 'containerMainRequest'){
-  businessType.value = 'ContainerMenageRequest'
+  businessType.value = 'ContainerManage'
   importFileName.value = '器具管理申请'
 }
 
diff --git a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue
index dadb6ac5c..3dc991349 100644
--- a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue
+++ b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue
@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -113,7 +113,7 @@ const { tableObject, tableMethods } = useTable({
   tableObject.params = {
     type:'INITIAL'
   }
-  businessType.value = 'InitialContainerManageRequest'
+  businessType.value = 'InitialContainerManage'
   importFileName.value = '器具初始化申请'
 } 
 
@@ -195,6 +195,15 @@ const updataTableColumns = (val) => {
 // 获得表格的各种操作
 const { getList, setSearchParams } = tableMethods
 
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
 // 列表头部按钮
 const HeadButttondata = [
   defaultButtons.defaultAddBtn({hasPermi:'wms:container-main-request:create'}), // 新增
@@ -247,15 +256,75 @@ const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['ma
     ]
 }
 
-// // 列表-操作按钮
-// const butttondata = [
-//   defaultButtons.mainListEditBtn({hasPermi:'wms:container-main-request:update'}), // 编辑
-//   defaultButtons.mainListDeleteBtn({hasPermi:'wms:container-main-request:delete'}), // 删除
-// ]
-
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
-  if (val == 'edit') { // 编辑
+  if (val == 'mainClose') { // 关闭
+    await message.confirm('确认要关闭吗？')
+    tableObject.loading = true
+    ContainerMainRequestApi.close(row.masterId).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainReAdd') { // 重新添加
+    await message.confirm('确认要重新添加吗？')
+    tableObject.loading = true
+    ContainerMainRequestApi.reAdd(row.masterId).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainSubmit') { // 提交审批
+    await message.confirm('确认要提交审批吗？')
+    tableObject.loading = true
+    ContainerMainRequestApi.submit(row.masterId).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainTurnDown') { // 驳回
+    await message.confirm('确认要驳回吗？')
+    tableObject.loading = true
+    ContainerMainRequestApi.refused(row.masterId).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainApprove') { // 审批通过
+    await message.confirm('确认要审批通过吗？')
+    tableObject.loading = true
+    ContainerMainRequestApi.agree(row.masterId).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'mainHandle') { // 处理
+    await message.confirm('确认要 处理吗？')
+    tableObject.loading = true
+    ContainerMainRequestApi.handle(row.masterId).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
+  } else if (val == 'edit') { // 编辑
     openForm('update', row)
   } else if (val == 'delete') { // 删除
     handleDelete(row.id)
@@ -303,6 +372,9 @@ const submitForm = async (formType,data) => {
   })
   try {
     if (formType === 'create') {
+      data.businessType = businessType.value
+      console.log(data.businessType,999);
+      
     await ContainerMainRequestApi.createContainerMainRequest(data)
     message.success(t('common.createSuccess'))
   } else {
diff --git a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts
index 0f4e928c3..e1f6cfe03 100644
--- a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts
+++ b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts
@@ -257,7 +257,7 @@ export const ContainerMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'action',
     isForm: false,
     table: {
-      width: 150,
+      width: 200,
       fixed: 'right'
     }
   }
@@ -352,6 +352,26 @@ export const ContainerDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '到库存状态',
+    field: 'toInventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+      type: 'Select'
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
   {
     label: '到数量',
     field: 'toQty',
@@ -438,7 +458,7 @@ export const ContainerDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'action',
     isForm: false,
     table: {
-      width: 150,
+      width: 200,
       fixed: 'right'
     }
   }