Browse Source

采购退货之前导出文件名字,1. 翻包记录页面没有申请单号的数据,模板中也没有 2.生产收料记录中的申请单号名字改为生产收料任务单号,

linshi20240813
zhang_li 4 months ago
parent
commit
89db9793e6
  1. 16
      src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts
  2. 3
      src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
  3. 6
      src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
  4. 5
      src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/index.vue
  5. 4
      src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
  6. 3
      src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue
  7. 6
      src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue
  8. 5
      src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
  9. 3
      src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue
  10. 3
      src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/index.vue
  11. 4
      src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue

16
src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts

@ -11,14 +11,14 @@ export const PackageoverMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 180 width: 180
}, },
}, },
{ // {
label: '申请单号', // label: '申请单号',
field: 'requestNumber', // field: 'requestNumber',
sort: 'custom', // sort: 'custom',
table: { // table: {
width: 180 // width: 180
}, // },
}, // },
{ {
label: '任务单据号', label: '任务单据号',
field: 'jobNumber', field: 'jobNumber',

3
src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue

@ -104,6 +104,7 @@ import * as PurchasereceiptJobDetailApi from '@/api/wms/purchasereceiptJobDetail
import * as defaultButtons from '@/utils/disposition/defaultButtons' import * as defaultButtons from '@/utils/disposition/defaultButtons'
import { CACHE_KEY, useCache } from '@/hooks/web/useCache' import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
import { getReportUrl } from '@/utils/systemParam' import { getReportUrl } from '@/utils/systemParam'
import { formatDate } from '@/utils/formatTime'
// //
defineOptions({ name: 'PurchasereceiptJobMain' }) defineOptions({ name: 'PurchasereceiptJobMain' })
@ -363,7 +364,7 @@ const handleExport = async () => {
// //
exportLoading.value = true exportLoading.value = true
const data = await PurchasereceiptJobMainApi.exportPurchasereceiptJobMain(tableObject.params) const data = await PurchasereceiptJobMainApi.exportPurchasereceiptJobMain(tableObject.params)
download.excel(data, '采购收货任务主.xlsx') download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
} catch { } catch {
} finally { } finally {
exportLoading.value = false exportLoading.value = false

6
src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue

@ -115,6 +115,8 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
import { PurchasereceiptRequestTabsList } from '@/utils/disposition/tabsList' import { PurchasereceiptRequestTabsList } from '@/utils/disposition/tabsList'
import { CACHE_KEY, useCache } from '@/hooks/web/useCache' import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
import { getReportUrl } from '@/utils/systemParam' import { getReportUrl } from '@/utils/systemParam'
import { formatDate } from '@/utils/formatTime'
// //
defineOptions({ name: 'PurchasereceiptRecordMain' }) defineOptions({ name: 'PurchasereceiptRecordMain' })
const message = useMessage() // const message = useMessage() //
@ -303,10 +305,10 @@ const handleExport = async () => {
exportLoading.value = true exportLoading.value = true
if(routeName.value.includes('SCP')){ if(routeName.value.includes('SCP')){
const data = await PurchasereceiptRecordMainApi.exportPurchasereceiptRecordMainSCP(tableObject.params) const data = await PurchasereceiptRecordMainApi.exportPurchasereceiptRecordMainSCP(tableObject.params)
download.excel(data, `${t('ts.采购收货记录主')}.xlsx`) download.excel(data, `${route.meta.title}】【${formatDate(new Date())}.xlsx`)
}else{ }else{
const data = await PurchasereceiptRecordMainApi.exportPurchasereceiptRecordMain(tableObject.params) const data = await PurchasereceiptRecordMainApi.exportPurchasereceiptRecordMain(tableObject.params)
download.excel(data, `${t('ts.采购收货记录主')}.xlsx`) download.excel(data, `${route.meta.title}】【${formatDate(new Date())}.xlsx`)
} }
} catch { } catch {
} finally { } finally {

5
src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/index.vue

@ -115,6 +115,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
import { PurchasereceiptRefuseRequestTabsList } from '@/utils/disposition/tabsList' import { PurchasereceiptRefuseRequestTabsList } from '@/utils/disposition/tabsList'
import { CACHE_KEY, useCache } from '@/hooks/web/useCache' import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
import { getReportUrl } from '@/utils/systemParam' import { getReportUrl } from '@/utils/systemParam'
import { formatDate } from '@/utils/formatTime'
// //
defineOptions({ name: 'PurchasereceiptRecordRefuseMain' }) defineOptions({ name: 'PurchasereceiptRecordRefuseMain' })
const message = useMessage() // const message = useMessage() //
@ -292,10 +293,10 @@ const handleExport = async () => {
exportLoading.value = true exportLoading.value = true
if(routeName.value.includes('SCP')){ if(routeName.value.includes('SCP')){
const data = await PurchasereceiptRecordMainApi.exportPurchasereceiptRecordMainSCP(tableObject.params) const data = await PurchasereceiptRecordMainApi.exportPurchasereceiptRecordMainSCP(tableObject.params)
download.excel(data, `${t('ts.采购收货记录主')}.xlsx`) download.excel(data, `${route.meta.title}】【${formatDate(new Date())}.xlsx`)
}else{ }else{
const data = await PurchasereceiptRecordMainApi.exportPurchasereceiptRecordRefuseMain(tableObject.params) const data = await PurchasereceiptRecordMainApi.exportPurchasereceiptRecordRefuseMain(tableObject.params)
download.excel(data, `${t('ts.采购拒收记录主')}.xlsx`) download.excel(data, `${route.meta.title}】【${formatDate(new Date())}.xlsx`)
} }
} catch { } catch {
} finally { } finally {

4
src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue

@ -762,7 +762,7 @@ const handleExport = async () => {
// //
exportLoading.value = true exportLoading.value = true
const data = await PurchasereceiptRequestMainApi.exportPurchasereceiptRequestMain(tableObject.params) const data = await PurchasereceiptRequestMainApi.exportPurchasereceiptRequestMain(tableObject.params)
download.excel(data, '采购收货申请主.xlsx') download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
} catch { } catch {
} finally { } finally {
exportLoading.value = false exportLoading.value = false
@ -838,7 +838,7 @@ const handleImport = () => {
// //
const importTemplateData = reactive({ const importTemplateData = reactive({
templateUrl: '', templateUrl: '',
templateTitle: '采购收货申请主导入模版.xlsx' templateTitle: `${route.meta.title}】导入模版.xlsx`
}) })
// //

3
src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue

@ -73,6 +73,7 @@ import * as PurchasereturnJobMainApi from '@/api/wms/purchasereturnJobMain'
import * as PurchasereturnJobDetailApi from '@/api/wms/purchasereturnJobDetail' import * as PurchasereturnJobDetailApi from '@/api/wms/purchasereturnJobDetail'
import * as defaultButtons from '@/utils/disposition/defaultButtons' import * as defaultButtons from '@/utils/disposition/defaultButtons'
import { CACHE_KEY, useCache } from '@/hooks/web/useCache' import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
import { formatDate } from '@/utils/formatTime'
// 退 // 退
defineOptions({ name: 'PurchasereturnJobMain' }) defineOptions({ name: 'PurchasereturnJobMain' })
@ -238,7 +239,7 @@ const handleExport = async () => {
// //
exportLoading.value = true exportLoading.value = true
const data = await PurchasereturnJobMainApi.exportPurchasereturnJobMain(tableObject.params) const data = await PurchasereturnJobMainApi.exportPurchasereturnJobMain(tableObject.params)
download.excel(data, '采购退货任务主.xlsx') download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
} catch { } catch {
} finally { } finally {
exportLoading.value = false exportLoading.value = false

6
src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue

@ -70,6 +70,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
import { getAccessToken } from '@/utils/auth' import { getAccessToken } from '@/utils/auth'
import { CACHE_KEY, useCache } from '@/hooks/web/useCache' import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
import { getJmreportBaseUrl } from '@/utils/systemParam' import { getJmreportBaseUrl } from '@/utils/systemParam'
import { formatDate } from '@/utils/formatTime'
// 退 // 退
defineOptions({ name: 'PurchasereturnRecordMain' }) defineOptions({ name: 'PurchasereturnRecordMain' })
@ -170,12 +171,11 @@ const handleExport = async () => {
exportLoading.value = true exportLoading.value = true
if(routeName.value.includes('SCP')){ if(routeName.value.includes('SCP')){
const data = await PurchasereturnRecordMainApi.exportPurchasereturnRecordMainSCP(tableObject.params) const data = await PurchasereturnRecordMainApi.exportPurchasereturnRecordMainSCP(tableObject.params)
download.excel(data, `${t('ts.采购退货记录主')}.xlsx`) download.excel(data, `${route.meta.title}】【${formatDate(new Date())}.xlsx`)
}else{ }else{
const data = await PurchasereturnRecordMainApi.exportPurchasereturnRecordMain(tableObject.params) const data = await PurchasereturnRecordMainApi.exportPurchasereturnRecordMain(tableObject.params)
download.excel(data, `${t('ts.采购退货记录主')}.xlsx`) download.excel(data, `${route.meta.title}】【${formatDate(new Date())}.xlsx`)
} }
} catch { } catch {
} finally { } finally {
exportLoading.value = false exportLoading.value = false

5
src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue

@ -139,6 +139,7 @@ import { getAccessToken } from '@/utils/auth'
import * as BalanceApi from '@/api/wms/balance' import * as BalanceApi from '@/api/wms/balance'
import { async } from '@antv/x6/lib/registry/marker/async' import { async } from '@antv/x6/lib/registry/marker/async'
import { getJmreportBaseUrl } from '@/utils/systemParam' import { getJmreportBaseUrl } from '@/utils/systemParam'
import { formatDate } from '@/utils/formatTime'
// 退 // 退
defineOptions({ name: 'PurchasereturnRequestMain' }) defineOptions({ name: 'PurchasereturnRequestMain' })
@ -758,7 +759,7 @@ const handleExport = async () => {
const data = await PurchasereturnRequestMainApi.exportPurchasereturnRequestMain( const data = await PurchasereturnRequestMainApi.exportPurchasereturnRequestMain(
tableObject.params tableObject.params
) )
download.excel(data, '采购退货申请主.xlsx') download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
} catch { } catch {
} finally { } finally {
exportLoading.value = false exportLoading.value = false
@ -983,7 +984,7 @@ const handleImport = () => {
// //
const importTemplateData = reactive({ const importTemplateData = reactive({
templateUrl: '', templateUrl: '',
templateTitle: '采购退货申请主导入模版.xlsx' templateTitle: `${route.meta.title}】导入模版.xlsx`
}) })
// //

3
src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue

@ -74,6 +74,7 @@ import * as PurchasereceiptJobDetailApi from '@/api/wms/purchasereceiptJobDetail
import * as defaultButtons from '@/utils/disposition/defaultButtons' import * as defaultButtons from '@/utils/disposition/defaultButtons'
import { CACHE_KEY, useCache } from '@/hooks/web/useCache' import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
import {exportSparereceiptJobMain} from "@/api/wms/purchasereceiptJobMain"; import {exportSparereceiptJobMain} from "@/api/wms/purchasereceiptJobMain";
import { formatDate } from '@/utils/formatTime'
// //
defineOptions({ name: 'PurchasereceiptJobMain' }) defineOptions({ name: 'PurchasereceiptJobMain' })
@ -259,7 +260,7 @@ const handleExport = async () => {
// //
exportLoading.value = true exportLoading.value = true
const data = await PurchasereceiptJobMainApi.exportSparereceiptJobMain(tableObject.params) const data = await PurchasereceiptJobMainApi.exportSparereceiptJobMain(tableObject.params)
download.excel(data, '备件收货任务.xlsx') download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
} catch { } catch {
} finally { } finally {
exportLoading.value = false exportLoading.value = false

3
src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/index.vue

@ -85,6 +85,7 @@ const routeName = ref()
routeName.value = route.name routeName.value = route.name
const tableColumns = ref([...PurchasereceiptRecordMain.allSchemas.tableColumns,...PurchasereceiptRecordDetail.allSchemas.tableMainColumns]) const tableColumns = ref([...PurchasereceiptRecordMain.allSchemas.tableColumns,...PurchasereceiptRecordDetail.allSchemas.tableMainColumns])
const detailAllSchemas = ref(PurchasereceiptRecordDetail.allSchemas) const detailAllSchemas = ref(PurchasereceiptRecordDetail.allSchemas)
import { formatDate } from '@/utils/formatTime'
// //
const updataTableColumns = (val) => { const updataTableColumns = (val) => {
@ -160,7 +161,7 @@ const handleExport = async () => {
// //
exportLoading.value = true exportLoading.value = true
const data = await PurchasereceiptRecordMainApi.exportSparereceiptRecordMain(tableObject.params) const data = await PurchasereceiptRecordMainApi.exportSparereceiptRecordMain(tableObject.params)
download.excel(data, '备件收货记录.xlsx') download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
} catch { } catch {
} finally { } finally {
exportLoading.value = false exportLoading.value = false

4
src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue

@ -561,7 +561,7 @@ const handleExport = async () => {
// //
exportLoading.value = true exportLoading.value = true
const data = await PurchasereceiptRequestMainApi.exportSparereceiptRequestMain(tableObject.params) const data = await PurchasereceiptRequestMainApi.exportSparereceiptRequestMain(tableObject.params)
download.excel(data, '备件收货申请.xlsx') download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
} catch { } catch {
} finally { } finally {
exportLoading.value = false exportLoading.value = false
@ -628,7 +628,7 @@ const handleImport = () => {
// //
const importTemplateData = reactive({ const importTemplateData = reactive({
templateUrl: '', templateUrl: '',
templateTitle: '采购收货申请主导入模版.xlsx' templateTitle: `${route.meta.title}】导入模版.xlsx`
}) })
// //

Loading…
Cancel
Save