Browse Source

Merge branch 'hella_online_20240803' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into hella_online_20240803

hella_online_20240815
wangyufei 3 months ago
parent
commit
9c76dc0aef
  1. 3
      src/views/wms/productionManage/productdismantle/productdismantleJobMain/index.vue
  2. 3
      src/views/wms/productionManage/productdismantle/productdismantleRecordMain/index.vue
  3. 3
      src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue
  4. 3
      src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue
  5. 3
      src/views/wms/productionManage/productputaway/productputawayRecordMain/index.vue
  6. 5
      src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue
  7. 3
      src/views/wms/productionManage/productrepair/productrepairRecordMain/index.vue
  8. 5
      src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue
  9. 3
      src/views/wms/productionManage/productscrap/productscrapJobMain/index.vue
  10. 3
      src/views/wms/productionManage/productscrap/productscrapRecordMain/index.vue
  11. 5
      src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue

3
src/views/wms/productionManage/productdismantle/productdismantleJobMain/index.vue

@ -73,6 +73,7 @@ import * as ProductdismantleJobMainApi from '@/api/wms/productdismantleJobMain'
import * as ProductdismantleJobDetailApi from '@/api/wms/productdismantleJobDetail'
import * as defaultButtons from '@/utils/disposition/defaultButtons'
import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
import { formatDate } from '@/utils/formatTime'
//
defineOptions({ name: 'ProductdismantleJobMain' })
@ -223,7 +224,7 @@ const handleExport = async () => {
//
exportLoading.value = true
const data = await ProductdismantleJobMainApi.exportProductdismantleJobMain(tableObject.params)
download.excel(data, '制品拆解任务主.xlsx')
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/productionManage/productdismantle/productdismantleRecordMain/index.vue

@ -93,6 +93,7 @@ import * as ProductdismantleRecordDetailApi from '@/api/wms/productdismantleReco
import * as DismantleRecordDetailbApi from '@/api/wms/dismantleRecordDetailb'
import * as defaultButtons from '@/utils/disposition/defaultButtons'
import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
import { formatDate } from '@/utils/formatTime'
//
defineOptions({ name: 'ProductdismantleRecordMain' })
@ -226,7 +227,7 @@ const handleExport = async () => {
//
exportLoading.value = true
const data = await ProductdismantleRecordMainApi.exportProductdismantleRecordMain(tableObject.params)
download.excel(data, '制品拆解记录主.xlsx')
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue

@ -112,6 +112,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
import * as BomDismantleApi from '@/api/wms/bomDismantle'
import * as dismantleRequestDetailbApi from '@/api/wms/dismantleRequestDetailb'
import * as BomApi from "@/api/wms/bom";
import { formatDate } from '@/utils/formatTime'
//
@ -541,7 +542,7 @@ const handleExport = async () => {
//
exportLoading.value = true
const data = await ProductdismantleRequestMainApi.exportProductdismantleRequestMain(tableObject.params)
download.excel(data, '制品拆解申请主.xlsx')
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue

@ -76,6 +76,7 @@ import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
import {getAccessToken} from "@/utils/auth";
import { getJmreportBaseUrl } from '@/utils/systemParam'
import * as SwitchApi from '@/api/wms/switch'
import { formatDate } from '@/utils/formatTime'
//
defineOptions({ name: 'ProductputawayJobMain' })
@ -246,7 +247,7 @@ const handleExport = async () => {
//
exportLoading.value = true
const data = await ProductputawayJobMainApi.exportProductputawayJobMain(tableObject.params)
download.excel(data, '制品上架任务主.xlsx')
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/productionManage/productputaway/productputawayRecordMain/index.vue

@ -68,6 +68,7 @@ import * as ProductputawayRecordMainApi from '@/api/wms/productputawayRecordMain
import * as ProductputawayRecordDetailApi from '@/api/wms/productputawayRecordDetail'
import * as defaultButtons from '@/utils/disposition/defaultButtons'
import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
import { formatDate } from '@/utils/formatTime'
//
defineOptions({ name: 'ProductputawayRecordMain' })
@ -156,7 +157,7 @@ const handleExport = async () => {
//
exportLoading.value = true
const data = await ProductputawayRecordMainApi.exportProductputawayRecordMain(tableObject.params)
download.excel(data, '制品上架记录主.xlsx')
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

5
src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue

@ -88,6 +88,7 @@ import { ProductputawayRequestMain,ProductputawayRequestMainRules,Productputaway
import * as ProductputawayRequestMainApi from '@/api/wms/productputawayRequestMain'
import * as ProductputawayRequestDetailApi from '@/api/wms/productputawayRequestDetail'
import * as defaultButtons from '@/utils/disposition/defaultButtons'
import { formatDate } from '@/utils/formatTime'
//
defineOptions({ name: 'ProductputawayRequestMain' })
@ -342,7 +343,7 @@ const handleExport = async () => {
//
exportLoading.value = true
const data = await ProductputawayRequestMainApi.exportProductputawayRequestMain(tableObject.params)
download.excel(data, '制品上架申请主.xlsx')
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false
@ -416,7 +417,7 @@ const handleImport = () => {
//
const importTemplateData = reactive({
templateUrl: '',
templateTitle: '制品上架申请主导入模版.xlsx'
templateTitle: `${route.meta.title}】导入模版.xlsx`
})
//

3
src/views/wms/productionManage/productrepair/productrepairRecordMain/index.vue

@ -96,6 +96,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
import * as BomDismantleApi from "@/api/wms/bomDismantle";
import {getBomDismantleRecordPage} from "@/api/wms/bomDismantle";
import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
import { formatDate } from '@/utils/formatTime'
//
defineOptions({ name: 'ProductrepairRecordMain' })
@ -265,7 +266,7 @@ const handleExport = async () => {
//
exportLoading.value = true
const data = await ProductrepairRecordMainApi.exportProductrepairRecordMain(tableObject.params)
download.excel(data, '制品返修记录主.xlsx')
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

5
src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue

@ -117,6 +117,7 @@ import * as BomDismantleApi from '@/api/wms/bomDismantle'
import * as dismantleRequestDetailbApi from "@/api/wms/dismantleRequestDetailb";
import {updateProductscrapDetailRequestBom} from "@/api/wms/productrepairRequestMain";
import * as BomApi from "@/api/wms/bom";
import { formatDate } from '@/utils/formatTime'
//
@ -575,7 +576,7 @@ const handleExport = async () => {
//
exportLoading.value = true
const data = await ProductrepairRequestMainApi.exportProductrepairRequestMain(tableObject.params)
download.excel(data, '制品返修申请主.xlsx')
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false
@ -680,7 +681,7 @@ const handleImport = () => {
//
const importTemplateData = reactive({
templateUrl: '',
templateTitle: '制品返修申请主导入模版.xlsx'
templateTitle: `${route.meta.title}】导入模版.xlsx`
})
//

3
src/views/wms/productionManage/productscrap/productscrapJobMain/index.vue

@ -73,6 +73,7 @@ import * as ProductscrapJobMainApi from '@/api/wms/productscrapJobMain'
import * as ProductscrapJobDetailApi from '@/api/wms/productscrapJobDetail'
import * as defaultButtons from '@/utils/disposition/defaultButtons'
import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
import { formatDate } from '@/utils/formatTime'
//
defineOptions({ name: 'ProductscrapJobMain' })
@ -223,7 +224,7 @@ const handleExport = async () => {
//
exportLoading.value = true
const data = await ProductscrapJobMainApi.exportProductscrapJobMain(tableObject.params)
download.excel(data, '制品报废任务主.xlsx')
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/productionManage/productscrap/productscrapRecordMain/index.vue

@ -95,6 +95,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
import * as BomDismantleApi from "@/api/wms/bomDismantle";
import {getProductscrapBomDismantleRecordPage} from "@/api/wms/bomDismantle";
import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
import { formatDate } from '@/utils/formatTime'
//
defineOptions({ name: 'ProductscrapRecordMain' })
@ -266,7 +267,7 @@ const handleExport = async () => {
//
exportLoading.value = true
const data = await ProductscrapRecordMainApi.exportProductscrapRecordMain(tableObject.params)
download.excel(data, '制品报废记录主.xlsx')
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

5
src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue

@ -122,6 +122,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
import * as BomDismantleApi from "@/api/wms/bomDismantle"
import * as BomApi from "@/api/wms/bom";
import * as BalanceApi from "@/api/wms/balance";
import { formatDate } from '@/utils/formatTime'
//
defineOptions({ name: 'ProductscrapRequestMain' })
@ -676,7 +677,7 @@ const handleExport = async () => {
//
exportLoading.value = true
const data = await ProductscrapRequestMainApi.exportProductscrapRequestMain(tableObject.params)
download.excel(data, '制品报废申请主.xlsx')
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false
@ -803,7 +804,7 @@ const handleImport = () => {
//
const importTemplateData = reactive({
templateUrl: '',
templateTitle: '制品报废申请主导入模版.xlsx'
templateTitle: `${route.meta.title}】导入模版.xlsx`
})
//

Loading…
Cancel
Save