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_20240819
ljlong_2630 4 months ago
parent
commit
9bb1630f13
  1. 3
      .env.development
  2. 3
      .env.prod
  3. 3
      .env.test
  4. 3
      .env.test-scp
  5. 3
      public/systemConfig.js
  6. 4
      src/api/login/index.ts
  7. 5
      src/api/wms/purchasereturnRequestDetail/index.ts
  8. 4
      src/api/wms/purchasereturnRequestMain/index.ts
  9. 1
      src/utils/dict.ts
  10. 10
      src/utils/systemParam.ts
  11. 15
      src/views/login/components/LoginForm.vue
  12. 3
      src/views/qms/inspectionQ3/index.vue
  13. 3
      src/views/system/serialNumber/index.vue
  14. 3
      src/views/system/tenant/index.vue
  15. 3
      src/views/wms/agvManage/agvLocationrelation/index.vue
  16. 3
      src/views/wms/basicDataManage/customerManage/customer/index.vue
  17. 3
      src/views/wms/basicDataManage/customerManage/customerDeliveryForecast/index.vue
  18. 3
      src/views/wms/basicDataManage/customerManage/customerdock/index.vue
  19. 3
      src/views/wms/basicDataManage/customerManage/customeritem/index.vue
  20. 3
      src/views/wms/basicDataManage/customerManage/project/index.vue
  21. 3
      src/views/wms/basicDataManage/customerManage/saleprice/index.vue
  22. 3
      src/views/wms/basicDataManage/documentSetting/businesstype/index.vue
  23. 3
      src/views/wms/basicDataManage/documentSetting/documentsetting/index.vue
  24. 3
      src/views/wms/basicDataManage/documentSetting/jobsetting/index.vue
  25. 3
      src/views/wms/basicDataManage/documentSetting/plansetting/index.vue
  26. 3
      src/views/wms/basicDataManage/documentSetting/recordsetting/index.vue
  27. 3
      src/views/wms/basicDataManage/documentSetting/requestsetting/index.vue
  28. 3
      src/views/wms/basicDataManage/documentSetting/switch/index.vue
  29. 3
      src/views/wms/basicDataManage/documentSetting/transactiontype/index.vue
  30. 3
      src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue
  31. 3
      src/views/wms/basicDataManage/factoryModeling/dock/index.vue
  32. 3
      src/views/wms/basicDataManage/factoryModeling/enterprise/index.vue
  33. 3
      src/views/wms/basicDataManage/factoryModeling/location/index.vue
  34. 3
      src/views/wms/basicDataManage/factoryModeling/locationgroup/index.vue
  35. 3
      src/views/wms/basicDataManage/factoryModeling/process/index.vue
  36. 3
      src/views/wms/basicDataManage/factoryModeling/productionline/index.vue
  37. 3
      src/views/wms/basicDataManage/factoryModeling/warehouse/index.vue
  38. 3
      src/views/wms/basicDataManage/factoryModeling/workshop/index.vue
  39. 3
      src/views/wms/basicDataManage/factoryModeling/workstation/index.vue
  40. 3
      src/views/wms/basicDataManage/itemManage/bom/index.vue
  41. 3
      src/views/wms/basicDataManage/itemManage/itemarea/index.vue
  42. 3
      src/views/wms/basicDataManage/itemManage/itembasic/index.vue
  43. 3
      src/views/wms/basicDataManage/itemManage/itempackage/index.vue
  44. 3
      src/views/wms/basicDataManage/itemManage/itemwarehouse/index.vue
  45. 3
      src/views/wms/basicDataManage/itemManage/packageunit/index.vue
  46. 3
      src/views/wms/basicDataManage/itemManage/productionitemcodeSpareitemcode/index.vue
  47. 3
      src/views/wms/basicDataManage/itemManage/productionlineitem/index.vue
  48. 3
      src/views/wms/basicDataManage/itemManage/relegate/relegateRecord/index.vue
  49. 3
      src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue
  50. 3
      src/views/wms/basicDataManage/itemManage/stdcostprice/index.vue
  51. 3
      src/views/wms/basicDataManage/labelManage/barcode/index.vue
  52. 3
      src/views/wms/basicDataManage/labelManage/callmaterials/index.vue
  53. 3
      src/views/wms/basicDataManage/labelManage/locationLabel/index.vue
  54. 3
      src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue
  55. 3
      src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue
  56. 3
      src/views/wms/basicDataManage/labelManage/utensilPackage/index.vue
  57. 3
      src/views/wms/basicDataManage/orderManage/carrier/index.vue
  58. 3
      src/views/wms/basicDataManage/orderManage/owner/index.vue
  59. 3
      src/views/wms/basicDataManage/orderManage/team/index.vue
  60. 3
      src/views/wms/basicDataManage/strategySetting/configurationsetting/index.vue
  61. 3
      src/views/wms/basicDataManage/strategySetting/paramsetting/index.vue
  62. 3
      src/views/wms/basicDataManage/strategySetting/rule/index.vue
  63. 3
      src/views/wms/basicDataManage/subject/mstr/index.vue
  64. 3
      src/views/wms/basicDataManage/subject/qadCostcentre/index.vue
  65. 3
      src/views/wms/basicDataManage/subject/qadProject/index.vue
  66. 3
      src/views/wms/basicDataManage/subject/subjectAccount/index.vue
  67. 5
      src/views/wms/basicDataManage/supplierManage/purchaseprice/index.vue
  68. 5
      src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue
  69. 3
      src/views/wms/basicDataManage/systemSetting/accountcalendar/index.vue
  70. 3
      src/views/wms/basicDataManage/systemSetting/currencyexchange/index.vue
  71. 3
      src/views/wms/basicDataManage/systemSetting/systemcalendar/index.vue
  72. 3
      src/views/wms/buttMesManage/mesBarCode/index.vue
  73. 3
      src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/index.vue
  74. 3
      src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue
  75. 3
      src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/index.vue
  76. 3
      src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/index.vue
  77. 3
      src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
  78. 3
      src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/index.vue
  79. 3
      src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/index.vue
  80. 3
      src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue
  81. 3
      src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue
  82. 5
      src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
  83. 5
      src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue
  84. 3
      src/views/wms/deliversettlementManage/deliverplan/saleMain/index.vue
  85. 3
      src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue
  86. 3
      src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue
  87. 3
      src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue
  88. 3
      src/views/wms/deliversettlementManage/stockup/stockupMainRecord/index.vue
  89. 3
      src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue
  90. 3
      src/views/wms/inventoryManage/balance/index.vue
  91. 3
      src/views/wms/inventoryManage/expectin/index.vue
  92. 3
      src/views/wms/inventoryManage/expectout/index.vue
  93. 3
      src/views/wms/inventoryManage/locationcapacity/index.vue
  94. 3
      src/views/wms/inventoryManage/package/index.vue
  95. 3
      src/views/wms/inventoryManage/transaction/index.vue
  96. 3
      src/views/wms/inventoryManage/transferlog/index.vue
  97. 29
      src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
  98. 27
      src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
  99. 57
      src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
  100. 3
      src/views/wms/issueManage/issue/issueJobMain/index.vue

3
.env.development

@ -41,3 +41,6 @@ VITE_TENANT='["长春1379","成都1397","长春2379"]'
# 查看质检报告环境
VITE_REPORT_URL = 'http://dev.ccwin-in.com:25400'
# 是否需要验证码
VITE_NEED_CODE = true

3
.env.prod

@ -45,3 +45,6 @@ VITE_REPORT_URL = 'http://dev.ccwin-in.com:25400'
# 登录系统升级的提示
VITE_SYSTERM_UPDATE_ALERT = true
VITE_SYSTERM_UPDATE_URL = 'https://scptest.faway-hella.com/'
# 是否需要验证码
VITE_NEED_CODE = true

3
.env.test

@ -41,3 +41,6 @@ VITE_TENANT='["长春","成都"]'
# 查看质检报告环境
VITE_REPORT_URL = 'http://dev.ccwin-in.com:25400'
# 是否需要验证码
VITE_NEED_CODE = true

3
.env.test-scp

@ -42,3 +42,6 @@ VITE_TENANT='["长春1379","成都1397","长春2379"]'
# 查看质检报告环境
VITE_REPORT_URL = 'http://dev.ccwin-in.com:25400'
# 是否需要验证码
VITE_NEED_CODE = false

3
public/systemConfig.js

@ -12,5 +12,6 @@ let systemConfig = {
// 租户配置
tenant: '["成都"]',
systermUpdateAlert: true,
systermUpdateUrl: 'https://scptest.faway-hella.com/'
systermUpdateUrl: 'https://scptest.faway-hella.com/',
needCode:false
}

4
src/api/login/index.ts

@ -16,7 +16,9 @@ export interface SmsLoginVO {
export const login = (data: UserLoginVO) => {
return request.post({ url: '/system/auth/login', data })
}
export const loginNoCode = (data: UserLoginVO) => {
return request.post({ url: '/system/auth/loginNoCode', data })
}
// 刷新访问令牌
export const refreshToken = () => {
return request.post({ url: '/system/auth/refresh-token?refreshToken=' + getRefreshToken() })

5
src/api/wms/purchasereturnRequestDetail/index.ts

@ -37,6 +37,11 @@ export const getPurchasereturnRequestDetailPage = async (params) => {
return await request.get({ url: `/wms/purchasereturn-request-detail/page`, params })
}
}
// 查询采购退货申请子列表
export const getPurchasereturnRequestDetailEditData = async (params) => {
return await request.get({ url: `/wms/purchasereturn-request-main/editReturnNew`, params })
}
// 物料供应商查询
export const getPurchasereturnSupplierByCode = async (params) => {
return await request.get({ url: `/wms/supplieritem/querySupplierByCode`, params })

4
src/api/wms/purchasereturnRequestMain/index.ts

@ -61,6 +61,10 @@ export const createPurchasereturnRequestMainNew = async (data: PurchasereturnReq
export const updatePurchasereturnRequestMain = async (data: PurchasereturnRequestMainVO) => {
return await request.put({ url: `/wms/purchasereturn-request-main/update`, data })
}
// 修改采购退货申请主 --新版
export const updatePurchasereturnRequestMainNew = async (data: PurchasereturnRequestMainVO) => {
return await request.post({ url: `/wms/purchasereturn-request-main/updateReturnNew`, data })
}
// 删除采购退货申请主
export const deletePurchasereturnRequestMain = async (id: number) => {

1
src/utils/dict.ts

@ -399,4 +399,5 @@ export enum DICT_TYPE {
PURCHASE_JOB_STATUS = 'purchase_job_status', // 采购收货任务状态
PUBLISHE_STATUS = 'publishe_status', // 采购收货任务状态
PUBLISHE_STATUS_FIRST_INSPECTION = 'publishe_status_first_inspection', // 首件检验记录发布状态
RETURN_REASON_TYPE = 'return_reason_type', // 采购退货原因类型
}

10
src/utils/systemParam.ts

@ -6,6 +6,7 @@ const reportUrl = ref(import.meta.env.VITE_REPORT_URL)
const tenant = ref(import.meta.env.VITE_TENANT)
const systermUpdateAlert = ref(import.meta.env.VITE_SYSTERM_UPDATE_ALERT)
const systermUpdateUrl = ref(import.meta.env.VITE_SYSTERM_UPDATE_URL)
const needCode = ref(import.meta.env.VITE_NEED_CODE)
const mode = ref(import.meta.env.MODE)
// 获取baseUrl
@ -75,4 +76,13 @@ export const getSystermUpdateUrl = () => {
return systermUpdateUrl.value
}
}
//是否需要验证码
export const getNeedCode = () => {
if(mode.value === 'prod') {
return systemConfig.needCode
} else {
return needCode.value
}
}

15
src/views/login/components/LoginForm.vue

@ -33,7 +33,7 @@
:prefix-icon="iconLock" show-password type="password" @keyup.enter="getCode()" style="height: 42px;" />
</el-form-item>
</el-col>
<el-col :span="24" style="padding-right: 10px; padding-left: 10px">
<el-col :span="24" style="padding-right: 10px; padding-left: 10px" v-if="needCode!='false'">
<el-form-item prop="code">
<div class="flex w-[100%]">
<el-input v-model="loginData.loginForm.code" :placeholder="t('login.codePlaceholder')"
@ -96,7 +96,8 @@
import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
import * as DeptApi from '@/api/system/dept'
import { getTenant } from '@/utils/systemParam'
import { getSystermUpdateAlert,getSystermUpdateUrl } from '@/utils/systemParam'
import { getSystermUpdateAlert,getSystermUpdateUrl,getNeedCode } from '@/utils/systemParam'
const needCode = ref(getNeedCode())
defineOptions({ name: 'LoginForm' })
@ -173,6 +174,9 @@
// }
// }
function getCode() {
if(needCode.value=='false'){
return
}
getCodeImg().then(res => {
captchaEnabled.value = res.captchaEnabled === undefined ? true : res.captchaEnabled;
if (captchaEnabled.value) {
@ -229,7 +233,12 @@
if (!data) {
return
}
const res = await LoginApi.login(loginData.loginForm)
let res = null
if(needCode.value=='false'){
res = await LoginApi.loginNoCode(loginData.loginForm)
}else{
res = await LoginApi.login(loginData.loginForm)
}
if (!res) {
console.log('登录-195')
getCode()

3
src/views/qms/inspectionQ3/index.vue

@ -365,8 +365,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await InspectionQ3MainApi.exportInspectionQ3Main(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/system/serialNumber/index.vue

@ -170,8 +170,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await SerialNumberApi.exportSerialNumber(queryParams)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/system/tenant/index.vue

@ -178,8 +178,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await TenantApi.exportTenant(queryParams)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/agvManage/agvLocationrelation/index.vue

@ -243,8 +243,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await AgvLocationrelationApi.exportAgvLocationrelation(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/basicDataManage/customerManage/customer/index.vue

@ -233,8 +233,9 @@ const handleExport = async () => {
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await CustomerApi.exportCustomer(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/basicDataManage/customerManage/customerDeliveryForecast/index.vue

@ -221,8 +221,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await CustomerDeliveryForecastApi.exportCustomerDeliveryForecast(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/basicDataManage/customerManage/customerdock/index.vue

@ -247,8 +247,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await CustomerdockApi.exportCustomerdock(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/basicDataManage/customerManage/customeritem/index.vue

@ -271,8 +271,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await CustomeritemApi.exportCustomeritem(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/basicDataManage/customerManage/project/index.vue

@ -241,8 +241,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await ProjectApi.exportProject(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/basicDataManage/customerManage/saleprice/index.vue

@ -245,8 +245,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await SalepriceApi.exportSaleprice(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/basicDataManage/documentSetting/businesstype/index.vue

@ -365,8 +365,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await BusinesstypeApi.exportBusinesstype(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/basicDataManage/documentSetting/documentsetting/index.vue

@ -213,8 +213,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await DocumentsettingApi.exportDocumentsetting(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/basicDataManage/documentSetting/jobsetting/index.vue

@ -213,8 +213,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await JobsettingApi.exportJobsetting(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/basicDataManage/documentSetting/plansetting/index.vue

@ -214,8 +214,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await PlansettingApi.exportPlansetting(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/basicDataManage/documentSetting/recordsetting/index.vue

@ -214,8 +214,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await RecordsettingApi.exportRecordsetting(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/basicDataManage/documentSetting/requestsetting/index.vue

@ -214,8 +214,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await RequestsettingApi.exportRequestsetting(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/basicDataManage/documentSetting/switch/index.vue

@ -189,8 +189,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await SwitchApi.exportSwitch(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/basicDataManage/documentSetting/transactiontype/index.vue

@ -215,8 +215,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await TransactiontypeApi.exportTransactiontype(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue

@ -247,8 +247,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await AreaApi.exportArea(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/basicDataManage/factoryModeling/dock/index.vue

@ -261,8 +261,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await DockApi.exportDock(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/basicDataManage/factoryModeling/enterprise/index.vue

@ -229,8 +229,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await EnterpriseApi.exportEnterprise(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/basicDataManage/factoryModeling/location/index.vue

@ -265,8 +265,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await LocationApi.exportLocation(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/basicDataManage/factoryModeling/locationgroup/index.vue

@ -246,8 +246,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await LocationgroupApi.exportLocationgroup(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/basicDataManage/factoryModeling/process/index.vue

@ -253,8 +253,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await ProcessApi.exportProcess(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/basicDataManage/factoryModeling/productionline/index.vue

@ -246,8 +246,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await ProductionlineApi.exportProductionline(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/basicDataManage/factoryModeling/warehouse/index.vue

@ -226,8 +226,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await WarehouseApi.exportWarehouse(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/basicDataManage/factoryModeling/workshop/index.vue

@ -228,8 +228,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await WorkshopApi.exportWorkshop(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/basicDataManage/factoryModeling/workstation/index.vue

@ -255,8 +255,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await WorkstationApi.exportWorkstation(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/basicDataManage/itemManage/bom/index.vue

@ -258,8 +258,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await BomApi.exportBom(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/basicDataManage/itemManage/itemarea/index.vue

@ -335,8 +335,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await ItemareaApi.exportItemarea(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/basicDataManage/itemManage/itembasic/index.vue

@ -286,8 +286,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await ItembasicApi.exportItembasic(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/basicDataManage/itemManage/itempackage/index.vue

@ -325,8 +325,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await ItempackagingApi.exportItempackaging(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/basicDataManage/itemManage/itemwarehouse/index.vue

@ -229,8 +229,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await ItemwarehouseApi.exportItemwarehouse(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/basicDataManage/itemManage/packageunit/index.vue

@ -270,8 +270,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await PackageunitApi.exportPackageunit(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/basicDataManage/itemManage/productionitemcodeSpareitemcode/index.vue

@ -239,8 +239,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await ProductionitemcodeSpareitemcodeApi.exportProductionitemcodeSpareitemcode(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/basicDataManage/itemManage/productionlineitem/index.vue

@ -245,8 +245,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await ProductionlineitemApi.exportProductionlineitem(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/basicDataManage/itemManage/relegate/relegateRecord/index.vue

@ -234,8 +234,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await RelegateRecordMainApi.exportRelegateRecordMain(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue

@ -715,8 +715,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await RelegateRequestMainApi.exportRelegateRequestMain(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/basicDataManage/itemManage/stdcostprice/index.vue

@ -238,8 +238,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await StdcostpriceApi.exportStdcostprice(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/basicDataManage/labelManage/barcode/index.vue

@ -218,8 +218,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await BarcodeApi.exportBarcode(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/basicDataManage/labelManage/callmaterials/index.vue

@ -290,8 +290,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await CallmaterialsApi.exportCallmaterials(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/basicDataManage/labelManage/locationLabel/index.vue

@ -177,8 +177,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await BarbasicApi.exportBarbasic(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue

@ -246,8 +246,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await BarbasicApi.exportBarbasic(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue

@ -247,8 +247,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await BarbasicApi.exportBarbasic(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/basicDataManage/labelManage/utensilPackage/index.vue

@ -229,8 +229,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await BarbasicApi.exportBarbasic(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/basicDataManage/orderManage/carrier/index.vue

@ -233,8 +233,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await CarrierApi.exportCarrier(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/basicDataManage/orderManage/owner/index.vue

@ -234,8 +234,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await OwnerApi.exportOwner(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/basicDataManage/orderManage/team/index.vue

@ -228,8 +228,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await TeamApi.exportTeam(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/basicDataManage/strategySetting/configurationsetting/index.vue

@ -210,8 +210,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await ConfigurationsettingApi.exportConfigurationsetting(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/basicDataManage/strategySetting/paramsetting/index.vue

@ -181,8 +181,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await ParamsettingApi.exportParamsetting(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/basicDataManage/strategySetting/rule/index.vue

@ -213,8 +213,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await RuleApi.exportRule(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/basicDataManage/subject/mstr/index.vue

@ -212,8 +212,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await MstrApi.exportMstr(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/basicDataManage/subject/qadCostcentre/index.vue

@ -221,8 +221,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await QadCostcentreApi.exportQadCostcentre(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/basicDataManage/subject/qadProject/index.vue

@ -221,8 +221,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await QadProjectApi.exportQadProject(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/basicDataManage/subject/subjectAccount/index.vue

@ -230,8 +230,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await SubjectAccountApi.exportSubjectAccount(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

5
src/views/wms/basicDataManage/supplierManage/purchaseprice/index.vue

@ -245,12 +245,13 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
if(routeName.value.includes('SCP')){
const data = await PurchasepriceApi.exportPurchasepriceSCP(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
}else{
const data = await PurchasepriceApi.exportPurchaseprice(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
}
} catch {
} finally {

5
src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue

@ -260,12 +260,13 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
if(routeName.value.includes('SCP')){
const data = await SupplieritemApi.exportSupplieritemSCP(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
}else{
const data = await SupplieritemApi.exportSupplieritem(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
}
} catch {
} finally {

3
src/views/wms/basicDataManage/systemSetting/accountcalendar/index.vue

@ -214,8 +214,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await AccountcalendarApi.exportAccountcalendar(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/basicDataManage/systemSetting/currencyexchange/index.vue

@ -215,8 +215,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await CurrencyexchangeApi.exportCurrencyexchange(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/basicDataManage/systemSetting/systemcalendar/index.vue

@ -214,8 +214,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await SystemcalendarApi.exportSystemcalendar(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/buttMesManage/mesBarCode/index.vue

@ -223,8 +223,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await MesBarCodeApi.exportMesBarCode(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/index.vue

@ -156,8 +156,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await CustomerreceiptRecordMainApi.exportCustomerreceiptRecordMain(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue

@ -326,8 +326,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await CustomerreceiptRequestMainApi.exportCustomerreceiptRequestMain(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/index.vue

@ -365,8 +365,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await CustomerreturnJobMainApi.exportCustomerreturnJobMain(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/index.vue

@ -162,8 +162,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await CustomerreturnRecordMainApi.exportCustomerreturnRecordMain(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue

@ -653,8 +653,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await CustomerreturnRequestMainApi.exportCustomerreturnRequestMain(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/index.vue

@ -156,8 +156,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await CustomersettleRecordMainApi.exportCustomersettleRecordMain(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/index.vue

@ -337,8 +337,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await CustomersettleRequestMainApi.exportCustomersettleRequestMain(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue

@ -350,8 +350,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await DeliverJobMainApi.exportDeliverJobMain(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue

@ -184,8 +184,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await DeliverRecordMainApi.exportDeliverRecordMain(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

5
src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue

@ -474,12 +474,13 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
if(routeName.value == 'DeliverRequestMain'){
const data = await DeliverRequestMainApi.exportDeliverRequestMain(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
}else{
const data = await DeliverRequestMainApi.exportZZBJDeliverRequestMain(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
}
} catch {
} finally {

5
src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue

@ -433,12 +433,13 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
if(routeName.value == 'DeliverRequestMain'){
const data = await DeliverPlanMainApi.exportDeliverPlanMain(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
}else{
const data = await DeliverPlanMainApi.exportZZBJDeliverPlanMain(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
}
} catch {
} finally {

3
src/views/wms/deliversettlementManage/deliverplan/saleMain/index.vue

@ -253,8 +253,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await SaleMainApi.exportSaleMain(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue

@ -206,8 +206,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await SaleShipmentMainRecordApi.exportSaleShipmentMainRecord(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue

@ -447,8 +447,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await SaleShipmentMainApi.exportSaleShipmentMain(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue

@ -239,8 +239,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await StockupJobMainApi.exportStockupMainJob(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/deliversettlementManage/stockup/stockupMainRecord/index.vue

@ -157,8 +157,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await StockupMainRecordApi.exportStockupMainRecord(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue

@ -411,8 +411,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await StockupMainRequestApi.exportStockupMainRequest(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/inventoryManage/balance/index.vue

@ -298,8 +298,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await BalanceApi.exportBalance(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/inventoryManage/expectin/index.vue

@ -226,8 +226,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await ExpectinApi.exportExpectin(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/inventoryManage/expectout/index.vue

@ -225,8 +225,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await ExpectoutApi.exportExpectout(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/inventoryManage/locationcapacity/index.vue

@ -180,8 +180,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await LocationcapacityApi.exportLocationcapacity(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/inventoryManage/package/index.vue

@ -250,8 +250,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await PackageApi.exportPackage(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/inventoryManage/transaction/index.vue

@ -181,8 +181,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await TransactionApi.exportTransaction(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

3
src/views/wms/inventoryManage/transferlog/index.vue

@ -180,8 +180,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await ExpectinApi.exportTransferlog(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

29
src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts

@ -26,6 +26,33 @@ export const ScrapJobMain = useCrudSchemas(
},
isSearch: true
},
{
label: 'Q1通知单号',
field: 'q1Number',
sort: 'custom',
table: {
width: 180
},
isSearch: false
},
{
label: 'Q2通知单号',
field: 'q2Number',
sort: 'custom',
table: {
width: 180
},
isSearch: false
},
{
label: 'Q3通知单号',
field: 'q3Number',
sort: 'custom',
table: {
width: 180
},
isSearch: false
},
{
label: '状态',
field: 'status',
@ -465,7 +492,7 @@ export const ScrapJobMain = useCrudSchemas(
type: 'daterange',
defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
}
},
}
},
{
label: '创建者',

27
src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts

@ -35,6 +35,33 @@ export const ScrapRecordMain = useCrudSchemas(
},
isSearch: true
},
{
label: 'Q1通知单号',
field: 'q1Number',
sort: 'custom',
table: {
width: 180
},
isSearch: false
},
{
label: 'Q2通知单号',
field: 'q2Number',
sort: 'custom',
table: {
width: 180
},
isSearch: false
},
{
label: 'Q3通知单号',
field: 'q3Number',
sort: 'custom',
table: {
width: 180
},
isSearch: false
},
{
label: '申请时间',
field: 'requestTime',

57
src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue

@ -483,7 +483,8 @@ const handleHandle = async (id: number) => {
/** 添加/修改操作 */
const formRef = ref()
const openForm = async (type: string, row?: number) => {
const openForm = async (type: string, row?: any) => {
if (type == 'create') {
ScrapRequestMain.allSchemas.formSchema.forEach((item) => {
if (item.field == 'q1Number' || item.field == 'q2Number' || item.field == 'q3Number') {
item.componentProps.enterSearch = true
@ -491,6 +492,60 @@ const openForm = async (type: string, row?: number) => {
item.componentProps.disabled = false
}
})
} else {
if (row.q1Number) {
ScrapRequestMain.allSchemas.formSchema.forEach((item) => {
if (item.field == 'q1Number') {
item.componentProps.enterSearch = true
item.componentProps.isSearchList = true
item.componentProps.disabled = false
}
if (item.field == 'q2Number' || item.field == 'q3Number') {
item.componentProps.enterSearch = false
item.componentProps.isSearchList = false
item.componentProps.disabled = true
}
})
}
if (row.q2Number) {
ScrapRequestMain.allSchemas.formSchema.forEach((item) => {
if (item.field == 'q2Number') {
item.componentProps.enterSearch = true
item.componentProps.isSearchList = true
item.componentProps.disabled = false
}
if (item.field == 'q1Number' || item.field == 'q3Number') {
item.componentProps.enterSearch = false
item.componentProps.isSearchList = false
item.componentProps.disabled = true
}
})
}
if (row.q3Number) {
ScrapRequestMain.allSchemas.formSchema.forEach((item) => {
if (item.field == 'q3Number') {
item.componentProps.enterSearch = true
item.componentProps.isSearchList = true
item.componentProps.disabled = false
}
if (item.field == 'q1Number' || item.field == 'q2Number') {
item.componentProps.enterSearch = false
item.componentProps.isSearchList = false
item.componentProps.disabled = true
}
})
}
if (!row.q3Number && !row.q2Number && !row.q1Number) {
ScrapRequestMain.allSchemas.formSchema.forEach((item) => {
if (item.field == 'q1Number' || item.field == 'q2Number' || item.field == 'q3Number') {
item.componentProps.enterSearch = true
item.componentProps.isSearchList = true
item.componentProps.disabled = false
}
})
}
}
tableData.value = [] //
formRef.value.open(type, row)
}

3
src/views/wms/issueManage/issue/issueJobMain/index.vue

@ -300,8 +300,9 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const excelTitle = ref(route.meta.title)
const data = await IssueJobMainApi.exportIssueJobMain(tableObject.params)
download.excel(data, `${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
exportLoading.value = false

Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save