Merge remote-tracking branch 'origin/master_hella' into master_hella

src/api/wms/containerMainRequest/index.ts

@@ -47,7 +47,7 @@ export const exportContainerMainRequest = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
     const data = { ...params }
-    return await request.post({ url: '/wms/container-main-request/export-excel-senior', data })
+    return await request.downloadPost({ url: '/wms/container-main-request/export-excel-senior', data })
   } else {
     return await request.download({ url: `/wms/container-main-request/export-excel`, params })
   }
@@ -59,7 +59,7 @@ export const exportInitialContainerMainRequest = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
     const data = { ...params }
-    return await request.post({ url: '/wms/container-main-request/export-excel-senior', data })
+    return await request.downloadPost({ url: '/wms/container-main-request/export-excel-senior', data })
   } else {
     return await request.download({ url: `/wms/container-main-request/export-excel`, params })
   }
@@ -71,7 +71,7 @@ export const exportScrapContainerMainRequest = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
     const data = { ...params }
-    return await request.post({ url: '/wms/container-main-request/export-excel-senior', data })
+    return await request.downloadPost({ url: '/wms/container-main-request/export-excel-senior', data })
   } else {
     return await request.download({ url: `/wms/container-main-request/export-excel`, params })
   }
@@ -83,7 +83,7 @@ export const exportMoveContainerMainRequest = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
     const data = { ...params }
-    return await request.post({ url: '/wms/container-main-request/export-excel-senior', data })
+    return await request.downloadPost({ url: '/wms/container-main-request/export-excel-senior', data })
   } else {
     return await request.download({ url: `/wms/container-main-request/export-excel`, params })
   }
@@ -95,7 +95,7 @@ export const exportReturnContainerMainRequest = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
     const data = { ...params }
-    return await request.post({ url: '/wms/container-main-request/export-excel-senior', data })
+    return await request.downloadPost({ url: '/wms/container-main-request/export-excel-senior', data })
   } else {
     return await request.download({ url: `/wms/container-main-request/export-excel`, params })
   }
@@ -107,7 +107,7 @@ export const exportDeliverContainerMainRequest = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
     const data = { ...params }
-    return await request.post({ url: '/wms/container-main-request/export-excel-senior', data })
+    return await request.downloadPost({ url: '/wms/container-main-request/export-excel-senior', data })
   } else {
     return await request.download({ url: `/wms/container-main-request/export-excel`, params })
   }
@@ -146,4 +146,4 @@ export const agree = (id) => {
 // 处理
 export const handle = (id) => {
   return request.put({ url: '/wms/container-main-request/handle?id=' + id })
-}
+}

src/api/wms/containerRecordMain/index.ts

@@ -47,10 +47,17 @@ export const deleteContainerRecordMain = async (id: number) => {
 
 // 导出器具管理记录主 Excel
 export const exportContainerRecordMain = async (params) => {
-  return await request.download({ url: `/wms/container-record-main/export-excel`, params })
+  // return await request.download({ url: `/wms/container-record-main/export-excel`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = { ...params }
+    return await request.downloadPost({ url: '/wms/container-record-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/container-record-main/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/container-record-main/get-import-template' })
-}
+}

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

@@ -92,11 +92,11 @@ export const ContainerMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '备注',
-    field: 'remark',
+    label: '主备注',
+    field: 'mainRemark',
     sort: 'custom',
     isSearch: false,
-    isTable: false
+    isTable: true
   },
   {
     label: '部门',
@@ -501,10 +501,10 @@ export const ContainerDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '备注',
+    label: '子备注',
     field: 'remark',
     sort: 'custom',
-    isTable: false
+    isTable: true
   },
   {
     label: '创建时间',

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

@@ -143,7 +143,7 @@ const { getList, setSearchParams } = tableMethods
 // 列表头部按钮
 const HeadButttondata = [
   // defaultButtons.defaultAddBtn({hasPermi:`wms:{routeName.value}:create`}), // 新增
-  defaultButtons.defaultExportBtn({hasPermi:`wms:{routeName.value}:export`}), // 导出
+  defaultButtons.defaultExportBtn(null), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置

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

@@ -96,11 +96,11 @@ export const ContainerMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '备注',
-    field: 'remark',
+    label: '主备注',
+    field: 'mainRemark',
     sort: 'custom',
     isSearch: false,
-    isTable:false,
+    isTable:true,
   },
   {
     label: '部门',
@@ -468,10 +468,10 @@ export const ContainerDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '备注',
+    label: '子备注',
     field: 'remark',
     sort: 'custom',
-    isTable:false,
+    isTable:true,
   },
   {
     label: '创建时间',

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

@@ -92,11 +92,11 @@ export const ContainerMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '备注',
-    field: 'remark',
+    label: '主备注',
+    field: 'mainRemark',
     sort: 'custom',
     isSearch: false,
-    isTable: false
+    isTable: true
   },
   {
     label: '部门',
@@ -502,10 +502,10 @@ export const ContainerDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '备注',
+    label: '子备注',
     field: 'remark',
     sort: 'custom',
-    isTable: false
+    isTable: true
   },
   {
     label: '创建时间',