器具管理页面展示

src/views/wms/inventoryjobManage/containermanage/containerRecordMain/containerRecordMain.data.ts

@@ -57,9 +57,7 @@ export const ContainerRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isForm: false,
-    table: {
+    isTable:false
-      width: 150
-    },
   },
   {
     label: '备注',

src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue

@@ -79,7 +79,7 @@ const routeName = ref()
 routeName.value = route.name
 const businessType = ref()
 const importFileName = ref()
-const tableColumns = ref(ContainerRecordMain.allSchemas.tableColumns)
+const tableColumns = ref([...ContainerRecordMain.allSchemas.tableColumns,...ContainerRecordDetail.allSchemas.tableMainColumns])
 
 const { tableObject, tableMethods } = useTable({
   getListApi: ContainerRecordDetailApi.getContainerRecordDetailPage // 分页接口
@@ -93,36 +93,36 @@ const { tableObject, tableMethods } = useTable({
   tableObject.params = {
     type:'RETURN'
   }
-  ContainerRecordMain.allSchemas.formSchema.forEach(item=>{
-    if(item.field == 'type'){
-        item.value = "RETURN"
-    }});
   businessType.value = 'ReturnContainerManage'
-  importFileName.value = '器具返回申请'
+  importFileName.value = '器具返回记录'
 } else if ( routeName.value == 'MoveContainerManage') {
   tableObject.params = {
     type:'MOVE'
   }
-  ContainerRecordMain.allSchemas.formSchema.forEach(item=>{
-    if(item.field == 'type'){
-        item.value = "MOVE"
-    }});
   businessType.value = 'MoveContainerManage'
-  importFileName.value = '器具转移申请'
+  importFileName.value = '器具转移记录'
+} else if ( routeName.value == 'InitialContainerManage') {
+  tableObject.params = {
+    type:'INITIAL',
+  }
+  businessType.value = 'InitialContainerManage'
+  importFileName.value = '器具初始化记录'
+} 
+else if ( routeName.value == 'ScrapContainerManage') {
+  tableObject.params = {
+    type:'SCRAP'
+  }  
+  businessType.value = 'ScrapContainerManage'
+  importFileName.value = '器具报废记录'
 } else if ( routeName.value == 'DeliverContainerManage') {
   tableObject.params = {
     type: 'DELIVER',
   }
-  //主表字段赋值
-  ContainerRecordMain.allSchemas.formSchema.forEach(item=>{
-    if(item.field == 'type'){
-        item.value = "DELIVER"
-    }});
   businessType.value = 'DeliverContainerManage'
-  importFileName.value = '器具发运申请'
+  importFileName.value = '器具发运记录'
 } else if( routeName.value == 'ContainerManage'){
   businessType.value = 'ContainerManage'
-  importFileName.value = '器具管理申请'
+  importFileName.value = '器具管理记录'
 }
 
 
@@ -136,8 +136,8 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'wms:containerRecordMain:create'}), // 新增
+  defaultButtons.defaultAddBtn({hasPermi:'wms:container-record-detail:create'}), // 新增
-  defaultButtons.defaultExportBtn({hasPermi:'wms:containerRecordMain:export'}), // 导出
+  defaultButtons.defaultExportBtn({hasPermi:'wms:container-record-detail:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置