diff --git a/src/api/wms/offlinesettlementRecordMain/index.ts b/src/api/wms/offlinesettlementRecordMain/index.ts index f93eabe92..da771ba9a 100644 --- a/src/api/wms/offlinesettlementRecordMain/index.ts +++ b/src/api/wms/offlinesettlementRecordMain/index.ts @@ -53,7 +53,13 @@ export const deleteOfflinesettlementRecordMain = async (id: number) => { // 导出下线结算记录主 Excel export const exportOfflinesettlementRecordMain = async (params) => { - return await request.download({ url: `/wms/offlinesettlement-record-main/export-excel`, params }) + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/offlinesettlement-record-main/export-excel-senior', data }) + } else { + return await request.download({ url: `/wms/offlinesettlement-record-main/export-excel`, params }) + } } // 下载用户导入模板 diff --git a/src/api/wms/offlinesettlementRequestMain/index.ts b/src/api/wms/offlinesettlementRequestMain/index.ts index ccdeb8d2d..0dcbb20bc 100644 --- a/src/api/wms/offlinesettlementRequestMain/index.ts +++ b/src/api/wms/offlinesettlementRequestMain/index.ts @@ -53,7 +53,13 @@ export const deleteOfflinesettlementRequestMain = async (id: number) => { // 导出下线结算申请主 Excel export const exportOfflinesettlementRequestMain = async (params) => { - return await request.download({ url: `/wms/offlinesettlement-request-main/export-excel`, params }) + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/offlinesettlement-request-main/export-excel-senior', data }) + } else { + return await request.download({ url: `/wms/offlinesettlement-request-main/export-excel`, params }) + } } // 下载用户导入模板 diff --git a/src/api/wms/onlinesettlementRecordMain/index.ts b/src/api/wms/onlinesettlementRecordMain/index.ts index bacbd72d4..31018c0e9 100644 --- a/src/api/wms/onlinesettlementRecordMain/index.ts +++ b/src/api/wms/onlinesettlementRecordMain/index.ts @@ -53,7 +53,13 @@ export const deleteOnlinesettlementRecordMain = async (id: number) => { // 导出上线结算记录主 Excel export const exportOnlinesettlementRecordMain = async (params) => { - return await request.download({ url: `/wms/onlinesettlement-record-main/export-excel`, params }) + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/onlinesettlement-record-main/export-excel-senior', data }) + } else { + return await request.download({ url: `/wms/onlinesettlement-record-main/export-excel`, params }) + } } // 下载用户导入模板 diff --git a/src/api/wms/onlinesettlementRequestMain/index.ts b/src/api/wms/onlinesettlementRequestMain/index.ts index 119078788..6f6238f40 100644 --- a/src/api/wms/onlinesettlementRequestMain/index.ts +++ b/src/api/wms/onlinesettlementRequestMain/index.ts @@ -53,7 +53,13 @@ export const deleteOnlinesettlementRequestMain = async (id: number) => { // 导出上线结算申请主 Excel export const exportOnlinesettlementRequestMain = async (params) => { - return await request.download({ url: `/wms/onlinesettlement-request-main/export-excel`, params }) + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/onlinesettlement-request-main/export-excel-senior', data }) + } else { + return await request.download({ url: `/wms/onlinesettlement-request-main/export-excel`, params }) + } } // 下载用户导入模板 diff --git a/src/api/wms/packageunit/index.ts b/src/api/wms/packageunit/index.ts index df62a5c11..ae9b04f92 100644 --- a/src/api/wms/packageunit/index.ts +++ b/src/api/wms/packageunit/index.ts @@ -56,7 +56,13 @@ export const deletePackageunit = async (id: number) => { // 导出物品包装规格信息 Excel export const exportPackageunit = async (params) => { - return await request.download({ url: `/wms/packageunit/export-excel`, params }) + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/packageunit/export-excel-senior', data }) + } else { + return await request.download({ url: `/wms/packageunit/export-excel`, params }) + } } // 下载用户导入模板 diff --git a/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts b/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts index 9f2d10efa..c5e1778db 100644 --- a/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts +++ b/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts @@ -438,14 +438,6 @@ export const rules = reactive({ { required: true, message: '请输入名称', trigger: 'blur' }, { max: 50, message: '不得超过50个字符', trigger: 'blur' }, ], - desc1: [ - { required: true, message: '请输入描述1', trigger: 'blur' }, - { max: 50, message: '不得超过50个字符', trigger: 'blur' }, - ], - desc2: [ - { required: true, message: '请输入描述2', trigger: 'blur' }, - { max: 50, message: '不得超过50个字符', trigger: 'blur' }, - ], status: [ { required: true, message: '请选择状态', trigger: 'change' }, ], @@ -479,36 +471,11 @@ export const rules = reactive({ type: [ { required: true, message: '请选择类型', trigger: 'change' }, ], - category: [ - { required: true, message: '请选择种类', trigger: 'change' }, - ], - itemGroup: [ - { required: true, message: '请选择分组', trigger: 'change' }, - ], - color: [ - { required: true, message: '请选择颜色', trigger: 'change' }, - ], - configuration: [ - { required: true, message: '请选择配置', trigger: 'change' }, - ], - project: [ - { required: true, message: '请输入项目', trigger: 'blur' }, - { max: 50, message: '不得超过50个字符', trigger: 'blur' }, - ], - eqLevel: [ - { required: true, message: '请选择质量等级', trigger: 'change' }, - ], validityDays: [ { required: true, message: '请输入有效天数', trigger: 'change' }, ], available: [ { required: true, message: '请选择是否可用', trigger: 'change' }, ], - activeTime: [ - { required: true, message: '请输入生效时间', trigger: 'change' }, - ], - expireTime: [ - { required: true, message: '请输入失效时间', trigger: 'change' }, - ], }) console.log(Itembasic) \ No newline at end of file