diff --git a/README.md b/README.md index 7787e8e4a..c9ab210f8 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,7 @@ form: { labelMessage: '信息提示说明!!!', componentProps: { + enterSearch: true, //可输入回车 对应绑定事件:@onEnter="onEnter" isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择物料代码', // 输入框占位文本 searchField: 'itemCode', // 查询弹窗赋值字段 diff --git a/index.html b/index.html index b558105c9..847a1533b 100644 --- a/index.html +++ b/index.html @@ -138,7 +138,7 @@
-
%VITE_APP_TITLE%
+
%VITE_APP_TITLE%
diff --git a/src/api/eam/sparePart/index.ts b/src/api/eam/sparePart/index.ts index 8ae1f345a..58ef9f2bc 100644 --- a/src/api/eam/sparePart/index.ts +++ b/src/api/eam/sparePart/index.ts @@ -7,23 +7,19 @@ export interface SparePartVO { brand: string specifications: string isOverall: string - isConstant: string subject: string subjectCode: string - category: string + type: string + images: string region: string classification: string uom: string singlePrice: number - stockAge: number - reprocurement: number - safetyStock: number - cost: string - purchaser: string - financer: string - purchaseTime: Date - isFramework: string - isRadeIn: string + manufacturer: string + minInventory: number + maxInventory: number + replacementCycle: number + storageLocation: string departmentCode: string remark: string siteId: string @@ -38,38 +34,38 @@ export const getSparePartPage = async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} - return await request.post({ url: '/eam/sparepart/spare-part/senior', data }) + return await request.post({ url: '/eam/basic/spare-part/senior', data }) } else { - return await request.get({ url: `/eam/sparepart/spare-part/page`, params }) + return await request.get({ url: `/eam/basic/spare-part/page`, params }) } } // 查询备件基础详情 export const getSparePart = async (id: number) => { - return await request.get({ url: `/eam/sparepart/spare-part/get?id=` + id }) + return await request.get({ url: `/eam/basic/spare-part/get?id=` + id }) } // 新增备件基础 export const createSparePart = async (data: SparePartVO) => { - return await request.post({ url: `/eam/sparepart/spare-part/create`, data }) + return await request.post({ url: `/eam/basic/spare-part/create`, data }) } // 修改备件基础 export const updateSparePart = async (data: SparePartVO) => { - return await request.put({ url: `/eam/sparepart/spare-part/update`, data }) + return await request.put({ url: `/eam/basic/spare-part/update`, data }) } // 删除备件基础 export const deleteSparePart = async (id: number) => { - return await request.delete({ url: `/eam/sparepart/spare-part/delete?id=` + id }) + return await request.delete({ url: `/eam/basic/spare-part/delete?id=` + id }) } // 导出备件基础 Excel export const exportSparePart = async (params) => { - return await request.download({ url: `/eam/sparepart/spare-part/export-excel`, params }) + return await request.download({ url: `/eam/basic/spare-part/export-excel`, params }) } // 下载用户导入模板 export const importTemplate = () => { - return request.download({ url: '/eam/sparepart/spare-part/get-import-template' }) -} \ No newline at end of file + return request.download({ url: '/eam/basic/spare-part/get-import-template' }) +} diff --git a/src/api/wms/countJobMain/index.ts b/src/api/wms/countJobMain/index.ts index 3d9c2a5e8..2f685a8cf 100644 --- a/src/api/wms/countJobMain/index.ts +++ b/src/api/wms/countJobMain/index.ts @@ -89,5 +89,13 @@ export const importTemplate = () => { // 关闭盘点任务主 export const closeCountJobMain = (id: number) => { - return request.download({ url: '/wms/count-job-main/close?id=' + id }) + return request.put({ url: '/wms/count-job-main/close?id=' + id }) } + +// 关闭盘点任务主 +export const handleExportCountJob = async (id: number) => { + let params = { + masterId:id + } + return await request.download({ url: `/wms/count-job-main/export-excel-single`, params }) +} \ No newline at end of file diff --git a/src/components/ImportForm/src/ImportDetailForm.vue b/src/components/ImportForm/src/ImportDetailForm.vue new file mode 100644 index 000000000..bda6ffdfe --- /dev/null +++ b/src/components/ImportForm/src/ImportDetailForm.vue @@ -0,0 +1,339 @@ + + + + + diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue index 61242caf5..2de165246 100644 --- a/src/components/TableForm/src/TableForm.vue +++ b/src/components/TableForm/src/TableForm.vue @@ -64,7 +64,7 @@ v-model="row[headerItem.field]" clearable :type="headerItem?.tableForm?.inputType" - :placeholder="headerItem?.tableForm?.placeholder || '请输入' + headerItem.label" + :placeholder="t(`ts.${headerItem?.tableForm?.placeholder || '请输入' + headerItem.label}`)" :disabled="headerItem?.tableForm?.disabled ? true: headerItem?.tableForm?.isInpuFocusShow ? true : false" style="flex:1" @blur="inputStringBlur(headerItem.field, row[headerItem.field], row)" diff --git a/src/components/UploadFile/src/UploadFile.vue b/src/components/UploadFile/src/UploadFile.vue index bf3cc4895..f952d235e 100644 --- a/src/components/UploadFile/src/UploadFile.vue +++ b/src/components/UploadFile/src/UploadFile.vue @@ -23,10 +23,10 @@ {{ title }}