器具页面字段展示调整

src/api/wms/containerMainRequest/index.ts

@@ -43,8 +43,75 @@ export const deleteContainerMainRequest = async (id: number) => {
 
 // 导出器具管理申请主 Excel
 export const exportContainerMainRequest = async (params) => {
+  params.businessType = 'ContainerManage'
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = { ...params }
+    return await request.post({ url: '/wms/container-main-request/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/container-main-request/export-excel`, params })
+  }
+}
+
+// 导出初始化器具管理申请主 Excel
+export const exportInitialContainerMainRequest = async (params) => {
+  params.businessType = 'InitialContainerManage'
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = { ...params }
+    return await request.post({ url: '/wms/container-main-request/export-excel-senior', data })
+  } else {
     return await request.download({ url: `/wms/container-main-request/export-excel`, params })
   }
+}
+
+// 导出初始化器具管理申请主 Excel
+export const exportScrapContainerMainRequest = async (params) => {
+  params.businessType = 'ScrapContainerManage'
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = { ...params }
+    return await request.post({ url: '/wms/container-main-request/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/container-main-request/export-excel`, params })
+  }
+}
+
+// 导出移动器具管理申请主 Excel
+export const exportMoveContainerMainRequest = async (params) => {
+  params.businessType = 'MoveContainerManage'
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = { ...params }
+    return await request.post({ url: '/wms/container-main-request/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/container-main-request/export-excel`, params })
+  }
+}
+
+// 导出返回器具管理申请主 Excel
+export const exportReturnContainerMainRequest = async (params) => {
+  params.businessType = 'ReturnContainerManage'
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = { ...params }
+    return await request.post({ url: '/wms/container-main-request/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/container-main-request/export-excel`, params })
+  }
+}
+
+// 导出发运器具管理申请主 Excel
+export const exportDeliverContainerMainRequest = async (params) => {
+  params.businessType = 'DeliverContainerManage'
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = { ...params }
+    return await request.post({ url: '/wms/container-main-request/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/container-main-request/export-excel`, params })
+  }
+}
 
 // 下载用户导入模板
 export const importTemplate = () => {

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

@@ -96,6 +96,7 @@ export const ContainerMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'remark',
     sort: 'custom',
     isSearch: true,
+    isTable: false
   },
   {
     label: '部门',
@@ -219,9 +220,7 @@ export const ContainerMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
-    table: {
-      width: 200
-    },
+    isTable: false,
     isForm: false,
   },
   {
@@ -247,9 +246,7 @@ export const ContainerMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'siteId',
     sort: 'custom',
     isForm: false,
-    table: {
-      width: 100
-    },
+    isTable: false,
   },
   {
     label: '操作',
@@ -439,6 +436,7 @@ export const ContainerDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
     label: '备注',
     field: 'remark',
     sort: 'custom',
+    isTable: false
   },
   {
     label: '创建时间',
@@ -453,9 +451,7 @@ export const ContainerDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
-    table: {
-      width: 200
-    },
+    isTable: false,
     isForm: false,
     isTableForm: false
   },
@@ -495,6 +491,8 @@ export const ContainerDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
     label: '操作',
     field: 'action',
     isForm: false,
+    hiddenInMain:true,
+    isTableForm: false,
     table: {
       width: 150,
       fixed: 'right'

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

@@ -298,7 +298,7 @@ const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['ma
     return []
   }
     return [
-    defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:container-main-request:close'}), // 关闭
+    defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['2','3','4','6']),hasPermi:'wms:container-main-request:close'}), // 关闭
         defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:container-main-request:reAdd'}), //重新添加
         defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:container-main-request:submit'}), // 提交审批
         defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:container-main-request:refused'}), // 驳回
@@ -466,8 +466,19 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    if(routeName.value == 'ReturnContainerManageRequest'){
+      const data = await ContainerMainRequestApi.exportReturnContainerMainRequest(tableObject.params)
+      download.excel(data, '器具返回申请.xlsx')
+        }else if ( routeName.value == 'MoveContainerManageRequest') {
+          const data = await ContainerMainRequestApi.exportMoveContainerMainRequest(tableObject.params)
+          download.excel(data, '器具转移申请.xlsx')
+        }else if ( routeName.value == 'DeliverContainerManageRequest') {
+          const data = await ContainerMainRequestApi.exportDeliverContainerMainRequest(tableObject.params)
+          download.excel(data, '器具发运申请.xlsx')
+        }else{
           const data = await ContainerMainRequestApi.exportContainerMainRequest(tableObject.params)
-    download.excel(data, '器具管理申请主.xlsx')
+          download.excel(data, '器具管理申请.xlsx')
+        }
   } catch {
   } finally {
     exportLoading.value = false

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

@@ -63,6 +63,7 @@ export const ContainerRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '备注',
     field: 'remark',
     sort: 'custom',
+    isTable: false
   },
   {
     label: '部门',
@@ -112,9 +113,7 @@ export const ContainerRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'siteId',
     sort: 'custom',
     isForm: false,
-    table: {
-      width: 100
-    },
+    isTable: false,
   },
   {
     label: '创建时间',
@@ -129,9 +128,7 @@ export const ContainerRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
-    table: {
-      width: 200
-    },
+    isTable: false,
     isForm: false,
   },
   {
@@ -220,6 +217,7 @@ export const ContainerRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '备注',
     field: 'remark',
     sort: 'custom',
+    isTable: false
   },
   {
     label: '创建时间',
@@ -234,9 +232,7 @@ export const ContainerRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
-    table: {
-      width: 200
-    },
+    isTable: false,
     isForm: false,
     isTableForm: false
   },
@@ -276,6 +272,8 @@ export const ContainerRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '操作',
     field: 'action',
     isForm: false,
+    hiddenInMain:true,
+    isTableForm: false,
     table: {
       width: 150,
       fixed: 'right'

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

@@ -250,7 +250,7 @@ const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['ma
     return []
   }
     return [
-    defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:container-main-request:close'}), // 关闭
+    defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['2','3','4','6']),hasPermi:'wms:container-main-request:close'}), // 关闭
         defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:container-main-request:reAdd'}), //重新添加
         defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:container-main-request:submit'}), // 提交审批
         defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:container-main-request:refused'}), // 驳回
@@ -420,8 +420,8 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
-    const data = await ContainerMainRequestApi.exportContainerMainRequest(tableObject.params)
-    download.excel(data, '器具管理申请主.xlsx')
+    const data = await ContainerMainRequestApi.exportInitialContainerMainRequest(tableObject.params)
+    download.excel(data, '初始化器具管理申请主.xlsx')
   } catch {
   } finally {
     exportLoading.value = false
@@ -436,7 +436,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: 'importFileName.xlsx'
+  templateTitle: importFileName.value + '.xlsx'
 })
 // 导入成功之后
 const importSuccess = () => {

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

@@ -100,6 +100,7 @@ export const ContainerMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'remark',
     sort: 'custom',
     isSearch: true,
+    isTable:false,
   },
   {
     label: '部门',
@@ -223,9 +224,7 @@ export const ContainerMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
-    table: {
-      width: 200
-    },
+    isTable:false,
     isForm: false,
   },
   {
@@ -251,9 +250,7 @@ export const ContainerMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'siteId',
     sort: 'custom',
     isForm: false,
-    table: {
-      width: 100
-    },
+    isTable:false,
   },
   {
     label: '操作',
@@ -410,6 +407,7 @@ export const ContainerDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
     label: '备注',
     field: 'remark',
     sort: 'custom',
+    isTable:false,
   },
   {
     label: '创建时间',
@@ -424,9 +422,7 @@ export const ContainerDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
-    table: {
-      width: 200
-    },
+    isTable:false,
     isForm: false,
     isTableForm: false
   },
@@ -466,6 +462,8 @@ export const ContainerDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
     label: '操作',
     field: 'action',
     isForm: false,
+    hiddenInMain:true,
+    isTableForm: false,
     table: {
       width: 200,
       fixed: 'right'

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

@@ -273,7 +273,7 @@ const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['ma
     return []
   }
     return [
-    defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:container-main-request:close'}), // 关闭
+    defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['2','3','4','6']),hasPermi:'wms:container-main-request:close'}), // 关闭
         defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:container-main-request:reAdd'}), //重新添加
         defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:container-main-request:submit'}), // 提交审批
         defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:container-main-request:refused'}), // 驳回
@@ -446,8 +446,8 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
-    const data = await ContainerMainRequestApi.exportContainerMainRequest(tableObject.params)
-    download.excel(data, '器具管理申请主.xlsx')
+    const data = await ContainerMainRequestApi.exportScrapContainerMainRequest(tableObject.params)
+    download.excel(data, '报废器具管理申请主.xlsx')
   } catch {
   } finally {
     exportLoading.value = false

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

@@ -96,6 +96,7 @@ export const ContainerMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'remark',
     sort: 'custom',
     isSearch: true,
+    isTable: false
   },
   {
     label: '部门',
@@ -219,9 +220,7 @@ export const ContainerMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
-    table: {
-      width: 200
-    },
+    isTable: false,
     isForm: false,
   },
   {
@@ -247,9 +246,7 @@ export const ContainerMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'siteId',
     sort: 'custom',
     isForm: false,
-    table: {
-      width: 100
-    },
+    isTable: false,
   },
   {
     label: '操作',
@@ -437,6 +434,7 @@ export const ContainerDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
     label: '备注',
     field: 'remark',
     sort: 'custom',
+    isTable: false
   },
   {
     label: '创建时间',
@@ -451,9 +449,7 @@ export const ContainerDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
-    table: {
-      width: 200
-    },
+    isTable: false,
     isForm: false,
     isTableForm: false
   },
@@ -493,6 +489,8 @@ export const ContainerDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
     label: '操作',
     field: 'action',
     isForm: false,
+    hiddenInMain:true,
+    isTableForm: false,
     table: {
       width: 150,
       fixed: 'right'