From 702f599da032deafede232601b6c42d9cb407b29 Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Thu, 14 Dec 2023 14:59:38 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=B8=8B=E8=BD=BDexcel=E5=90=8E=E7=BC=80?= =?UTF-8?q?=E5=90=8D=E4=BF=AE=E6=94=B9=E4=B8=BAxlsx?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inspect/inspectJobMain/index.vue | 2 +- .../inspect/inspectRecordMain/index.vue | 2 +- .../inspect/inspectRequestMain/index.vue | 2 +- .../purchasereceiptRequestMain/index.vue | 2 +- .../purchasereturnJobMain/index.vue | 2 +- .../purchasereturnRecordMain/index.vue | 2 +- .../putaway/putawayJobMain/index.vue | 2 +- .../putaway/putawayRecordMain/index.vue | 2 +- .../putaway/putawayRequestMain/index.vue | 2 +- .../putawayRequestMain.data.ts | 20 ------------------- 10 files changed, 9 insertions(+), 29 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/index.vue b/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/index.vue index 185cda2e2..e97dd0f17 100644 --- a/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/index.vue +++ b/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/index.vue @@ -219,7 +219,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await InspectJobMainApi.exportInspectJobMain(setSearchParams) - download.excel(data, '检验任务主.xls') + download.excel(data, '检验任务主.xlsx') } catch { } finally { exportLoading.value = false diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue b/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue index b01941ee7..89faa5418 100644 --- a/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue @@ -144,7 +144,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await InspectRecordMainApi.exportInspectRecordMain(setSearchParams) - download.excel(data, '检验记录主.xls') + download.excel(data, '检验记录主.xlsx') } catch { } finally { exportLoading.value = false diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue index 3d81e720b..e47062cfe 100644 --- a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue @@ -307,7 +307,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await InspectRequestMainApi.exportInspectRequestMain(setSearchParams) - download.excel(data, '检验申请主.xls') + download.excel(data, '检验申请主.xlsx') } catch { } finally { exportLoading.value = false diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue index a187bd907..114061bd4 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue @@ -350,7 +350,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '采购收货申请主导入模版.xls' + templateTitle: '采购收货申请主导入模版.xlsx' }) // 导入成功之后 diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue index 8e4e1899b..2f93489e8 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue @@ -219,7 +219,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await PurchasereturnJobMainApi.exportPurchasereturnJobMain(setSearchParams) - download.excel(data, '采购退货任务主.xls') + download.excel(data, '采购退货任务主.xlsx') } catch { } finally { exportLoading.value = false diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue index 042310b1c..e4fca8ac9 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue @@ -142,7 +142,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await PurchasereturnRecordMainApi.exportPurchasereturnRecordMain(setSearchParams) - download.excel(data, '采购退货记录主.xls') + download.excel(data, '采购退货记录主.xlsx') } catch { } finally { exportLoading.value = false diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue index 4beac21ea..9d473aab7 100644 --- a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue +++ b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue @@ -219,7 +219,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await PutawayJobMainApi.exportPutawayJobMain(setSearchParams) - download.excel(data, '上架任务主.xls') + download.excel(data, '上架任务主.xlsx') } catch { } finally { exportLoading.value = false diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue index d467266f7..8bed0a9c2 100644 --- a/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue @@ -142,7 +142,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await PutawayRecordMainApi.exportPutawayRecordMain(setSearchParams) - download.excel(data, '上架记录主.xls') + download.excel(data, '上架记录主.xlsx') } catch { } finally { exportLoading.value = false diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue index d494d66eb..b2a5b9731 100644 --- a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue @@ -312,7 +312,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await PutawayRequestMainApi.exportPutawayRequestMain(setSearchParams) - download.excel(data, '上架申请主.xls') + download.excel(data, '上架申请主.xlsx') } catch { } finally { exportLoading.value = false diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts index 5d4f6410d..6deeaa543 100644 --- a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts @@ -37,26 +37,6 @@ const userDept = userStore.userSelfInfo.dept * @returns {Array} 上架申请主表 */ export const PutawayRequestMain = useCrudSchemas(reactive([ - { - label: '到货检验记录单号', - field: 'inspectRecordNumber', - sort: 'custom', - table: { - width: 150 - }, - isSearch: true, - form: { - // labelMessage: '信息提示说明！！！', - componentProps: { - isSearchList: true, // 开启查询弹窗 - searchListPlaceholder: '请选择到货检验记录单号', // 输入框占位文本 - searchField: 'code', // 查询弹窗赋值字段 - searchTitle: '到货检验信息', // 查询弹窗标题 - searchAllSchemas: InspectRequestMain.allSchemas, // 查询弹窗所需类 - searchPage: InspectRequestMainApi.getInspectRequestMainPage // 查询弹窗所需分页方法 - } - } - }, { label: '从仓库代码', field: 'fromWarehouseCode', From 94910030c6e8df2bbfe89ca3d86e5e83fd7a05d5 Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Thu, 14 Dec 2023 15:08:51 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9excel=E5=90=8E=E7=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/infra/apiAccessLog/index.vue | 2 +- src/views/infra/apiErrorLog/index.vue | 2 +- src/views/infra/config/index.vue | 2 +- src/views/infra/job/index.vue | 2 +- src/views/infra/job/logger/index.vue | 2 +- src/views/system/dict/data/index.vue | 2 +- src/views/system/dict/index.vue | 2 +- src/views/system/errorCode/index.vue | 2 +- src/views/system/loginlog/index.vue | 2 +- src/views/system/operatelog/index.vue | 2 +- src/views/system/post/index.vue | 2 +- src/views/system/role/index.vue | 2 +- src/views/system/sensitiveWord/index.vue | 2 +- src/views/system/serialNumber/index.vue | 2 +- src/views/system/sms/log/index.vue | 2 +- src/views/system/sms/template/index.vue | 2 +- src/views/system/tenant/index.vue | 2 +- src/views/system/user/UserImportForm.vue | 2 +- src/views/system/user/index.vue | 2 +- src/views/wms/basicDataManage/labelManage/barbasic/index.vue | 4 ++-- .../putaway/putawayRequestMain/index.vue | 2 +- .../supplierdeliver/demandforecastingMain/index.vue | 4 ++-- .../supplierdeliver/purchaseMain/index.vue | 2 +- .../supplierdeliver/purchasePlanMain/index.vue | 4 ++-- .../supplierdeliver/supplierdeliverRecordMain/index.vue | 2 +- .../supplierdeliver/supplierdeliverRequestMain/index.vue | 4 ++-- 26 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/views/infra/apiAccessLog/index.vue b/src/views/infra/apiAccessLog/index.vue index 2306a3972..245f43334 100644 --- a/src/views/infra/apiAccessLog/index.vue +++ b/src/views/infra/apiAccessLog/index.vue @@ -153,7 +153,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await ApiAccessLogApi.exportApiAccessLog(queryParams) - download.excel(data, 'API 访问日志.xls') + download.excel(data, 'API 访问日志.xlsx') } catch { } finally { exportLoading.value = false diff --git a/src/views/infra/apiErrorLog/index.vue b/src/views/infra/apiErrorLog/index.vue index 4e6c41e4d..683675545 100644 --- a/src/views/infra/apiErrorLog/index.vue +++ b/src/views/infra/apiErrorLog/index.vue @@ -235,7 +235,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await ApiErrorLogApi.exportApiErrorLog(queryParams) - download.excel(data, '异常日志.xls') + download.excel(data, '异常日志.xlsx') } catch { } finally { exportLoading.value = false diff --git a/src/views/infra/config/index.vue b/src/views/infra/config/index.vue index 82554cbe8..85b4fc991 100644 --- a/src/views/infra/config/index.vue +++ b/src/views/infra/config/index.vue @@ -155,7 +155,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await ConfigApi.exportConfig(queryParams) - download.excel(data, '参数配置.xls') + download.excel(data, '参数配置.xlsx') } catch { } finally { exportLoading.value = false diff --git a/src/views/infra/job/index.vue b/src/views/infra/job/index.vue index 20b6220cc..d662abc17 100644 --- a/src/views/infra/job/index.vue +++ b/src/views/infra/job/index.vue @@ -155,7 +155,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await JobApi.exportJob(queryParams) - download.excel(data, '定时任务.xls') + download.excel(data, '定时任务.xlsx') } catch { } finally { exportLoading.value = false diff --git a/src/views/infra/job/logger/index.vue b/src/views/infra/job/logger/index.vue index afeb3c641..a9fb08f97 100644 --- a/src/views/infra/job/logger/index.vue +++ b/src/views/infra/job/logger/index.vue @@ -182,7 +182,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await JobLogApi.exportJobLog(queryParams) - download.excel(data, '定时任务执行日志.xls') + download.excel(data, '定时任务执行日志.xlsx') } catch { } finally { exportLoading.value = false diff --git a/src/views/system/dict/data/index.vue b/src/views/system/dict/data/index.vue index 2811f06aa..f07f1ae6a 100644 --- a/src/views/system/dict/data/index.vue +++ b/src/views/system/dict/data/index.vue @@ -194,7 +194,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await DictDataApi.exportDictData(queryParams) - download.excel(data, '字典数据.xls') + download.excel(data, '字典数据.xlsx') } catch { } finally { exportLoading.value = false diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue index a89733519..f9a257af4 100644 --- a/src/views/system/dict/index.vue +++ b/src/views/system/dict/index.vue @@ -161,7 +161,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await DictTypeApi.exportDictType(queryParams) - download.excel(data, '字典类型.xls') + download.excel(data, '字典类型.xlsx') } catch { } finally { exportLoading.value = false diff --git a/src/views/system/errorCode/index.vue b/src/views/system/errorCode/index.vue index ade9c8fd2..dac5240a0 100644 --- a/src/views/system/errorCode/index.vue +++ b/src/views/system/errorCode/index.vue @@ -157,7 +157,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await ErrorCodeApi.excelErrorCode(queryParams) - download.excel(data, '错误码.xls') + download.excel(data, '错误码.xlsx') } catch { } finally { exportLoading.value = false diff --git a/src/views/system/loginlog/index.vue b/src/views/system/loginlog/index.vue index 9071915ef..997fcef9d 100644 --- a/src/views/system/loginlog/index.vue +++ b/src/views/system/loginlog/index.vue @@ -126,7 +126,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await LoginLogApi.exportLoginLog(queryParams) - download.excel(data, '登录日志.xls') + download.excel(data, '登录日志.xlsx') } catch { } finally { exportLoading.value = false diff --git a/src/views/system/operatelog/index.vue b/src/views/system/operatelog/index.vue index 09800d92a..3bfd3d20e 100644 --- a/src/views/system/operatelog/index.vue +++ b/src/views/system/operatelog/index.vue @@ -145,7 +145,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await OperateLogApi.exportOperateLog(queryParams) - download.excel(data, '操作日志.xls') + download.excel(data, '操作日志.xlsx') } catch { } finally { exportLoading.value = false diff --git a/src/views/system/post/index.vue b/src/views/system/post/index.vue index 59b454233..6c2ae14ce 100644 --- a/src/views/system/post/index.vue +++ b/src/views/system/post/index.vue @@ -143,7 +143,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await PostApi.exportPost(queryParams) - download.excel(data, '岗位列表.xls') + download.excel(data, '岗位列表.xlsx') } catch { } finally { exportLoading.value = false diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue index 93dae9676..9a58903d9 100644 --- a/src/views/system/role/index.vue +++ b/src/views/system/role/index.vue @@ -250,7 +250,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await RoleApi.exportRole(queryParams) - download.excel(data, '角色列表.xls') + download.excel(data, '角色列表.xlsx') } catch { } finally { exportLoading.value = false diff --git a/src/views/system/sensitiveWord/index.vue b/src/views/system/sensitiveWord/index.vue index ce2a0b426..e01a3be2a 100644 --- a/src/views/system/sensitiveWord/index.vue +++ b/src/views/system/sensitiveWord/index.vue @@ -175,7 +175,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await SensitiveWordApi.exportSensitiveWord(queryParams) - download.excel(data, '敏感词.xls') + download.excel(data, '敏感词.xlsx') } catch { } finally { exportLoading.value = false diff --git a/src/views/system/serialNumber/index.vue b/src/views/system/serialNumber/index.vue index 2e7361408..0806906d5 100644 --- a/src/views/system/serialNumber/index.vue +++ b/src/views/system/serialNumber/index.vue @@ -168,7 +168,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await SerialNumberApi.exportSerialNumber(queryParams) - download.excel(data, '流水号规则.xls') + download.excel(data, '流水号规则.xlsx') } catch { } finally { exportLoading.value = false diff --git a/src/views/system/sms/log/index.vue b/src/views/system/sms/log/index.vue index 99be8508b..bc7c3ff60 100644 --- a/src/views/system/sms/log/index.vue +++ b/src/views/system/sms/log/index.vue @@ -171,7 +171,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await SmsLogApi.exportSmsLog(queryParams) - download.excel(data, '短信日志.xls') + download.excel(data, '短信日志.xlsx') } catch { } finally { exportLoading.value = false diff --git a/src/views/system/sms/template/index.vue b/src/views/system/sms/template/index.vue index 9bd0f9dd4..b9e478c60 100644 --- a/src/views/system/sms/template/index.vue +++ b/src/views/system/sms/template/index.vue @@ -197,7 +197,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await SmsTemplateApi.exportSmsTemplate(queryParams) - download.excel(data, '短信模板.xls') + download.excel(data, '短信模板.xlsx') } catch { } finally { exportLoading.value = false diff --git a/src/views/system/tenant/index.vue b/src/views/system/tenant/index.vue index 5de1ccc8f..e2650dbe4 100644 --- a/src/views/system/tenant/index.vue +++ b/src/views/system/tenant/index.vue @@ -177,7 +177,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await TenantApi.exportTenant(queryParams) - download.excel(data, '租户列表.xls') + download.excel(data, '租户列表.xlsx') } catch { } finally { exportLoading.value = false diff --git a/src/views/system/user/UserImportForm.vue b/src/views/system/user/UserImportForm.vue index 51b1702f9..b391087a9 100644 --- a/src/views/system/user/UserImportForm.vue +++ b/src/views/system/user/UserImportForm.vue @@ -130,6 +130,6 @@ const importTemplate = async () => { console.log(await UserApi.importUserTemplate()); const res = await UserApi.importUserTemplate() - download.excel(res, '用户导入模版.xls') + download.excel(res, '用户导入模版.xlsx') } diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index 4d2d7e2d4..632aa0442 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -195,7 +195,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await UserApi.exportUser(queryParams) - download.excel(data, '用户数据.xls') + download.excel(data, '用户数据.xlsx') } catch { } finally { exportLoading.value = false diff --git a/src/views/wms/basicDataManage/labelManage/barbasic/index.vue b/src/views/wms/basicDataManage/labelManage/barbasic/index.vue index c75936594..bf430e928 100644 --- a/src/views/wms/basicDataManage/labelManage/barbasic/index.vue +++ b/src/views/wms/basicDataManage/labelManage/barbasic/index.vue @@ -191,7 +191,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await BarbasicApi.exportBarbasic(setSearchParams) - download.excel(data, '条码实体基类.xls') + download.excel(data, '条码实体基类.xlsx') } catch { } finally { exportLoading.value = false @@ -206,7 +206,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '条码实体基类导入模版.xls' + templateTitle: '条码实体基类导入模版.xlsx' }) // 导入成功之后 const importSuccess = () => { diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue index b2a5b9731..cd36991e3 100644 --- a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue @@ -365,7 +365,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '上架申请主导入模版.xls' + templateTitle: '上架申请主导入模版.xlsx' }) // 导入成功之后 diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue index 6b8f42654..1e32e2031 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue @@ -245,7 +245,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await DemandforecastingMainApi.exportDemandforecastingMain(setSearchParams) - download.excel(data, '要货预测主.xls') + download.excel(data, '要货预测主.xlsx') } catch { } finally { exportLoading.value = false @@ -298,7 +298,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '要货预测主导入模版.xls' + templateTitle: '要货预测主导入模版.xlsx' }) // 导入成功之后 diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue index aa6d75e96..3828f181e 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue @@ -273,7 +273,7 @@ // 发起导出 exportLoading.value = true const data = await PurchaseMainApi.exportPurchaseMain(setSearchParams) - download.excel(data, '采购订单主.xls') + download.excel(data, '采购订单主.xlsx') } catch { } finally { exportLoading.value = false diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue index f710dbf28..2bd8b58e6 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue @@ -323,7 +323,7 @@ // 发起导出 exportLoading.value = true const data = await PurchasePlanMainApi.exportPurchasePlanMain(setSearchParams) - download.excel(data, '要货计划主.xls') + download.excel(data, '要货计划主.xlsx') } catch { } finally { exportLoading.value = false @@ -409,7 +409,7 @@ // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '要货计划主导入模版.xls' + templateTitle: '要货计划主导入模版.xlsx' }) // 导入成功之后 diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue index 2c86695d9..6e2a6aa2a 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue @@ -144,7 +144,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await SupplierdeliverRecordMainApi.exportSupplierdeliverRecordMain(setSearchParams) - download.excel(data, '供应商发货记录主.xls') + download.excel(data, '供应商发货记录主.xlsx') } catch { } finally { exportLoading.value = false diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue index cb4ea2e11..4b1114023 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue @@ -341,7 +341,7 @@ // 发起导出 exportLoading.value = true const data = await SupplierdeliverRequestMainApi.exportSupplierdeliverRequestMain(setSearchParams) - download.excel(data, '供应商发货申请主.xls') + download.excel(data, '供应商发货申请主.xlsx') } catch { } finally { exportLoading.value = false @@ -520,7 +520,7 @@ // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '供应商发货申请主导入模版.xls' + templateTitle: '供应商发货申请主导入模版.xlsx' }) // 导入成功之后 From 219b5c17950211d5802dd2c839bbba2b066ac124 Mon Sep 17 00:00:00 2001 From: yejiaxing <591141169@qq.com> Date: Thu, 14 Dec 2023 15:18:50 +0800 Subject: [PATCH 3/4] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliverRecordMain.data.ts | 191 +++--- .../purchaseclaimRequestMain/index.vue | 565 +++++++++--------- 2 files changed, 380 insertions(+), 376 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts index f2d892e51..91f14629f 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts @@ -391,57 +391,136 @@ export const SupplierdeliverRecordMainRules = reactive({ * @returns {Array} 供应商发货记录子表 */ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive([ + // { + // label: '从包装号', + // field: 'fromPackingNumber', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, + // { + // label: '到包装号', + // field: 'toPackingNumber', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, + // { + // label: '从批次', + // field: 'fromBatch', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, + // { + // label: '到批次', + // field: 'toBatch', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, + // { + // label: '替代批次', + // field: 'altBatch', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, + // { + // label: '从器具号', + // field: 'fromContainerNumber', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, + // { + // label: '到器具号', + // field: 'toContainerNumber', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, + { + label: '订单号', + field: 'poNumber', + sort: 'custom', + table: { + width: 150 + }, + }, { - label: '从包装号', - field: 'fromPackingNumber', + label: '订单行', + field: 'poLine', sort: 'custom', table: { width: 150 }, }, { - label: '到包装号', - field: 'toPackingNumber', + label: '物品代码', + field: 'itemCode', sort: 'custom', table: { width: 150 }, }, { - label: '从批次', - field: 'fromBatch', + label: '数量', + field: 'qty', sort: 'custom', table: { width: 150 }, + form: { + component: 'InputNumber', + } }, { - label: '到批次', - field: 'toBatch', + label: '标包数量', + field: 'stdPackQty', sort: 'custom', table: { width: 150 }, + form: { + component: 'InputNumber', + } }, { - label: '替代批次', - field: 'altBatch', + label: '标包单位', + field: 'stdPackUnit', + dictType: DICT_TYPE.PACK_UNIT, + dictClass: 'string', + isTable: true, sort: 'custom', table: { width: 150 }, }, { - label: '从器具号', - field: 'fromContainerNumber', + label: '供应商计量数量', + field: 'supplierQty', sort: 'custom', table: { width: 150 }, + form: { + component: 'InputNumber', + } }, { - label: '到器具号', - field: 'toContainerNumber', + label: '供应商计量单位', + field: 'supplierUom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: true, sort: 'custom', table: { width: 150 @@ -507,66 +586,7 @@ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive } }, }, - { - label: '订单号', - field: 'poNumber', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '订单行', - field: 'poLine', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '标包数量', - field: 'stdPackQty', - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'InputNumber', - } - }, - { - label: '标包单位', - field: 'stdPackUnit', - dictType: DICT_TYPE.PACK_UNIT, - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '供应商计量数量', - field: 'supplierQty', - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'InputNumber', - } - }, - { - label: '供应商计量单位', - field: 'supplierUom', - dictType: DICT_TYPE.UOM, - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - }, + { label: '从库位代码', field: 'fromLocationCode', @@ -631,14 +651,7 @@ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive width: 150 }, }, - { - label: '物品代码', - field: 'itemCode', - sort: 'custom', - table: { - width: 150 - }, - }, + { label: '物品名称', field: 'itemName', @@ -671,17 +684,7 @@ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive width: 150 }, }, - { - label: '数量', - field: 'qty', - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'InputNumber', - } - }, + { label: '计量单位', field: 'uom', @@ -803,4 +806,4 @@ export const SupplierdeliverRecordDetailRules = reactive({ creator: [ { required: true, message: '请输入创建者', trigger: 'blur' } ], -}) \ No newline at end of file +}) diff --git a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue index f33c2960d..aafbe5238 100644 --- a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue +++ b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue @@ -7,19 +7,13 @@ - + - @@ -34,317 +28,324 @@
- - + + - + @searchTableSuccessDetail="searchTableSuccessDetail" /> - + From 4fb4c5abdc8dabda78eb75988a870cd9278755bd Mon Sep 17 00:00:00 2001 From: yejiaxing <591141169@qq.com> Date: Thu, 14 Dec 2023 15:19:13 +0800 Subject: [PATCH 4/4] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliverRequestMain/index.vue | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue index 4b1114023..0c850f78d 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue @@ -109,9 +109,14 @@ if(formField=='ppNumber'){ // 获取子表数据 getBomDisassemble - PurchasePlanDetailApi.getPurchasePlanDetailList({ number: val[0]['number']}).then(res => { if (res) tableData.value = res; tableData.value.forEach(item=>{ item.batch = item.toBatch - item.qty = 1 - }) }).catch(err => { console.log(err) }) + PurchasePlanDetailApi.getPurchasePlanDetailList({ + number: val[0]['number']}).then(res => { + if (res) tableData.value = res; + tableData.value.forEach(item=>{ + item.batch = item.toBatch + item.qty = 1 + }) + }).catch(err => { console.log(err) }) } formRef.setValues(setV) }