From a16d2fde149af0415006e0e87156e3d7943c4ddf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Fri, 7 Jun 2024 13:29:00 +0800 Subject: [PATCH 001/104] a --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 871612b43..6966b07c3 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -## dev发布2024-06-01-001 +## dev发布2024-06-01-002 **xxxx.data.ts 文件配置说明** **form表单查询弹窗配置** form: { From 17d2e41149a408ff1fd29ca33f44ace6a964b4c9 Mon Sep 17 00:00:00 2001 From: chenfang Date: Fri, 7 Jun 2024 14:06:36 +0800 Subject: [PATCH 002/104] =?UTF-8?q?bom=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productreceiptscrap/productreceiptscrapRecordMain/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue index 091372a96..84962d800 100644 --- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue +++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue @@ -221,7 +221,7 @@ const tableFormButton = async (val , row) => { bomModelVisible.value = true DialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息' detatableDataBom.params = { - masterId: row.masterId + masterId: row.id } await getDetailListBom() } From 0890b8754aa13af74e040fc90e282e672d841d77 Mon Sep 17 00:00:00 2001 From: bjang03 Date: Fri, 7 Jun 2024 16:14:37 +0800 Subject: [PATCH 003/104] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D=201=E3=80=81?= =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91=E7=A5=A8?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E6=96=B0=E5=A2=9E=E6=97=A0=E6=B3=95=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E9=87=87=E8=B4=AD=E4=BB=B7=E6=A0=BC=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinvoiceRequestMain.data.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts index e56c65428..a38d68dcf 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts @@ -27,8 +27,8 @@ const requestsettingData = data?.list[0] || {} // id 转str 否则form回显匹配不到 userDept.id = userDept.id.toString() const userDeptArray:any = [userDept] - - const procurementCreators = await SupplierinvoiceRequestMainApi.queryUserInfoByRoleCode({ roleCode: 'procurement_role',pageSize: 1000,pageNo: 1,sort: '',by: 'ASC' }) + +const procurementCreators = await SupplierinvoiceRequestMainApi.queryUserInfoByRoleCode({ roleCode: 'purchase',pageSize: 1000,pageNo: 1,sort: '',by: 'ASC' }) /** * @returns {Array} 采购员列表 */ From 611c968b22e2e1185fd578314cb677713019c938 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Fri, 7 Jun 2024 16:14:38 +0800 Subject: [PATCH 004/104] =?UTF-8?q?=E5=A4=87=E4=BB=B6=E5=85=A5=E8=B4=A6?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eam/sparePartsInLocationDetail/index.ts | 58 +++ src/api/eam/sparePartsInLocationMain/index.ts | 65 +++ src/utils/dict.ts | 3 +- src/views/eam/sparePart/sparePart.data.ts | 3 +- src/views/eam/sparepartsinlocation/index.vue | 380 ++++++++++++++++++ .../sparePartsInLocationMain.data.ts | 322 +++++++++++++++ 6 files changed, 828 insertions(+), 3 deletions(-) create mode 100644 src/api/eam/sparePartsInLocationDetail/index.ts create mode 100644 src/api/eam/sparePartsInLocationMain/index.ts create mode 100644 src/views/eam/sparepartsinlocation/index.vue create mode 100644 src/views/eam/sparepartsinlocation/sparePartsInLocationMain.data.ts diff --git a/src/api/eam/sparePartsInLocationDetail/index.ts b/src/api/eam/sparePartsInLocationDetail/index.ts new file mode 100644 index 000000000..827687a36 --- /dev/null +++ b/src/api/eam/sparePartsInLocationDetail/index.ts @@ -0,0 +1,58 @@ +import request from '@/config/axios' + +export interface SparePartsInLocationDetailVO { + id: number + number: string + masterId: number + sparePartsCode: string + isRadeIn: string + applyQty: number + departmentCode: string + remark: string + siteId: string + available: string + deletionTime: Date + deleterId: byte[] + concurrencyStamp: number +} + +// 查询备件入库记录子列表 +export const getSparePartsInLocationDetailPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/eam/spare-parts-in-location-detail/senior', data }) + } else { + return await request.get({ url: `/eam/spare-parts-in-location-detail/page`, params }) + } +} + +// 查询备件入库记录子详情 +export const getSparePartsInLocationDetail = async (id: number) => { + return await request.get({ url: `/eam/spare-parts-in-location-detail/get?id=` + id }) +} + +// 新增备件入库记录子 +export const createSparePartsInLocationDetail = async (data: SparePartsInLocationDetailVO) => { + return await request.post({ url: `/eam/spare-parts-in-location-detail/create`, data }) +} + +// 修改备件入库记录子 +export const updateSparePartsInLocationDetail = async (data: SparePartsInLocationDetailVO) => { + return await request.put({ url: `/eam/spare-parts-in-location-detail/update`, data }) +} + +// 删除备件入库记录子 +export const deleteSparePartsInLocationDetail = async (id: number) => { + return await request.delete({ url: `/eam/spare-parts-in-location-detail/delete?id=` + id }) +} + +// 导出备件入库记录子 Excel +export const exportSparePartsInLocationDetail = async (params) => { + return await request.download({ url: `/eam/spare-parts-in-location-detail/export-excel`, params }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/eam/spare-parts-in-location-detail/get-import-template' }) +} \ No newline at end of file diff --git a/src/api/eam/sparePartsInLocationMain/index.ts b/src/api/eam/sparePartsInLocationMain/index.ts new file mode 100644 index 000000000..100f8fdb9 --- /dev/null +++ b/src/api/eam/sparePartsInLocationMain/index.ts @@ -0,0 +1,65 @@ +import request from '@/config/axios' + +export interface SparePartsInLocationMainVO { + id: number + number: string + theme: string + status: string + applyer: string + approver: number + approveContent: string + approveTime: Date + autoExamine: string + autoAgree: string + directCreateRecord: string + areaCode: string + locationCode: string + departmentCode: string + remark: string + siteId: string + available: string + deletionTime: Date + deleterId: byte[] + concurrencyStamp: number +} + +// 查询备件领用出库记录主列表 +export const getSparePartsInLocationMainPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/eam/spare-parts-in-location-main/senior', data }) + } else { + return await request.get({ url: `/eam/spare-parts-in-location-main/page`, params }) + } +} + +// 查询备件领用出库记录主详情 +export const getSparePartsInLocationMain = async (id: number) => { + return await request.get({ url: `/eam/spare-parts-in-location-main/get?id=` + id }) +} + +// 新增备件领用出库记录主 +export const createSparePartsInLocationMain = async (data: SparePartsInLocationMainVO) => { + return await request.post({ url: `/eam/spare-parts-in-location-main/create`, data }) +} + +// 修改备件领用出库记录主 +export const updateSparePartsInLocationMain = async (data: SparePartsInLocationMainVO) => { + return await request.put({ url: `/eam/spare-parts-in-location-main/update`, data }) +} + +// 删除备件领用出库记录主 +export const deleteSparePartsInLocationMain = async (id: number) => { + return await request.delete({ url: `/eam/spare-parts-in-location-main/delete?id=` + id }) +} + +// 导出备件领用出库记录主 Excel +export const exportSparePartsInLocationMain = async (params) => { + return await request.download({ url: `/eam/spare-parts-in-location-main/export-excel`, params }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/eam/spare-parts-in-location-main/get-import-template' }) +} \ No newline at end of file diff --git a/src/utils/dict.ts b/src/utils/dict.ts index 2b6969a8c..226390604 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -363,5 +363,6 @@ export enum DICT_TYPE { EAM_MAINTENANCE_URGENCY = 'eam_maintenance_urgency', // 维保紧急程度 EAM_MAINTENANCE_LEVEL = 'eam_maintenance_level', // 维保维修级别 EAM_REPAIR_STATUS = 'eam_repair_status', // 维修状态 - OFF_BACK_STATUS = 'off_back_status' + OFF_BACK_STATUS = 'off_back_status', + SPAREPARTS_APPLY_STATUS_ENUM = 'spareparts_apply_status_enum'// 流程状态 } diff --git a/src/views/eam/sparePart/sparePart.data.ts b/src/views/eam/sparePart/sparePart.data.ts index bd87fd3bf..86f74f2ab 100644 --- a/src/views/eam/sparePart/sparePart.data.ts +++ b/src/views/eam/sparePart/sparePart.data.ts @@ -25,7 +25,7 @@ export const SparePart = useCrudSchemas(reactive([ isSearch: false, isTable: false, isForm: false, - isDetail:false, + isDetail:false }, { label: '备件编号', @@ -197,7 +197,6 @@ export const SparePart = useCrudSchemas(reactive([ defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } }, - isForm: false, }, { label: '部门id', diff --git a/src/views/eam/sparepartsinlocation/index.vue b/src/views/eam/sparepartsinlocation/index.vue new file mode 100644 index 000000000..4371d9f2b --- /dev/null +++ b/src/views/eam/sparepartsinlocation/index.vue @@ -0,0 +1,380 @@ + + + diff --git a/src/views/eam/sparepartsinlocation/sparePartsInLocationMain.data.ts b/src/views/eam/sparepartsinlocation/sparePartsInLocationMain.data.ts new file mode 100644 index 000000000..b40f19427 --- /dev/null +++ b/src/views/eam/sparepartsinlocation/sparePartsInLocationMain.data.ts @@ -0,0 +1,322 @@ +import type { CrudSchema } from '@/hooks/web/useCrudSchemas' +import { dateFormatter } from '@/utils/formatTime' +import * as LocationApi from '@/api/wms/location' +import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data' +import * as ItemAccountsApi from '@/api/eam/itemAccounts' +import { ItemAccounts } from '@/views/eam/itemAccounts/itemAccounts.data' + + +// 表单校验 +export const SparePartsInLocationMainRules = reactive({ + number: [required], + theme: [required], + // status: [required], + // areaCode: [required], + // locationCode: [required], + concurrencyStamp: [required], +}) +// 备件入库主表 +export const SparePartsInLocationMain = useCrudSchemas(reactive([ + { + label: 'id', + field: 'id', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + }, + { + label: '编号', + field: 'number', + sort: 'custom', + isSearch: false, + isForm: false, + }, + { + label: '入库主题', + field: 'theme', + sort: 'custom', + isSearch: false, + }, + { + label: '流程状态', + field: 'status', + sort: 'custom', + isSearch: false, + isForm:false, + + dictType: DICT_TYPE.SPAREPARTS_APPLY_STATUS_ENUM, + dictClass: 'string', + + }, + { + label: '入库申请人', + field: 'applyer', + sort: 'custom', + isSearch: false, + }, + { + label: '审核人', + field: 'approver', + sort: 'custom', + isSearch: false, + }, + { + label: '审核内容', + field: 'approveContent', + sort: 'custom', + isSearch: false, + }, + { + label: '审核时间', + field: 'approveTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: false, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + valueFormat: 'x' + } + }, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + }, + { + label: '入库时间', + field: 'createTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: false, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + isForm: false, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + }, + { + label: '库位编号', + field: 'locationCode', + sort: 'custom', + isSearch: false, + form: { + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择库位编号', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '库位信息', // 查询弹窗标题 + searchAllSchemas: Location.allSchemas, // 查询弹窗所需类 + searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法 + searchCondition: [ + { + key: 'available', + value: 'TRUE', + isMainValue: false + } + ] + } + }, + }, + { + label: '库区编号', + field: 'areaCode', + sort: 'custom', + isSearch: false, + form: { + componentProps: { + disabled: true + } + } + }, + + { + label: '备注', + field: 'remark', + sort: 'custom', + isSearch: false, + }, + { + label: '创建时间', + field: 'createTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: false, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + isForm: false, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + }, + { + label: '操作', + field: 'action', + isForm: false, + table: { + width: 150, + fixed: 'right' + }, + isDetail:false + } +])) +// 备件入库子表 +export const SparePartsInLocationDetailRules = reactive({ + number: [required], + masterId: [required], + sparePartsCode: [required], + applyQty: [required], + concurrencyStamp: [required], +}) + +export const SparePartsInLocationDetail = useCrudSchemas(reactive([ + { + label: 'id', + field: 'id', + sort: 'custom', + + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + isTableForm:false + }, + { + label: '单号', + field: 'number', + sort: 'custom', + + isSearch: false, + isTable: false, + isForm: false, + isTableForm:false + }, + { + label: '主表ID', + field: 'masterId', + sort: 'custom', + form: { + component: 'InputNumber', + value: 0 + }, + isSearch: false, + isTable: false, + isForm: false, + isTableForm:false + }, + { + label: '备件编号', + field: 'sparePartsCode', + sort: 'custom', + table: { + width: 150 + }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择备件编号', // 输入框占位文本 + searchField: 'itemNumber', // 查询弹窗赋值字段 + searchTitle: '备件信息', // 查询弹窗标题 + searchAllSchemas: ItemAccounts.allSchemas, // 查询弹窗所需类 + searchPage: ItemAccountsApi.getItemAccountsPage, // 查询弹窗所需分页方法 + searchCondition: [ + { + key: 'available', + value: 'TRUE', + isMainValue: false + } + ] + } + }, + tableForm: { + isInpuFocusShow: true, + searchListPlaceholder: '请选择备件编号', // 输入框占位文本 + searchField: 'itemNumber', // 查询弹窗赋值字段 + searchTitle: '备件信息', // 查询弹窗标题 + searchAllSchemas: ItemAccounts.allSchemas, // 查询弹窗所需类 + searchPage: ItemAccountsApi.getItemAccountsPage, // 查询弹窗所需分页方法 + searchCondition: [ + { + key: 'available', + value: 'TRUE', + isMainValue: false + } + ] + } + }, + { + label: '库存数量', + field: 'currentQty', + sort: 'custom', + isSearch: false, + tableForm: { + disabled: true + }, + isDetail:false, + isTable:false + }, + { + label: '申领数量', + field: 'applyQty', + sort: 'custom', + isSearch: false + }, + { + label: '创建时间', + field: 'createTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: true, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + isForm: false, + isTableForm:false + }, + { + label: '备注', + field: 'remark', + sort: 'custom', + isSearch: true, + }, + { + label: '操作', + field: 'action', + isForm: false, + table: { + width: 150, + fixed: 'right' + }, + isTableForm:false + } +])) + From d36987c8233f1e4170534f0c9ab9a123f334ee6f Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Fri, 7 Jun 2024 16:18:36 +0800 Subject: [PATCH 005/104] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/dict.ts | 3 ++- .../inventoryinitRecordMain/index.vue | 2 +- .../inventoryinitRequestMain/index.vue | 23 ++++++++++++++++++- .../inventoryinitRequestMain.data.ts | 17 ++++++++++++++ 4 files changed, 42 insertions(+), 3 deletions(-) diff --git a/src/utils/dict.ts b/src/utils/dict.ts index 226390604..dd9d89dee 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -364,5 +364,6 @@ export enum DICT_TYPE { EAM_MAINTENANCE_LEVEL = 'eam_maintenance_level', // 维保维修级别 EAM_REPAIR_STATUS = 'eam_repair_status', // 维修状态 OFF_BACK_STATUS = 'off_back_status', - SPAREPARTS_APPLY_STATUS_ENUM = 'spareparts_apply_status_enum'// 流程状态 + SPAREPARTS_APPLY_STATUS_ENUM = 'spareparts_apply_status_enum',// 流程状态 + IS_LINE_ITEM = 'is_line_item', // 是否是线边 } diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/index.vue b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/index.vue index b3f3f93b1..e00ac3d7d 100644 --- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/index.vue +++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/index.vue @@ -222,7 +222,7 @@ const handleSelectionPoint = async ()=>{ window.open(src.value+'&asn_number='+res.cgLabel) } if(!res.cgLabel&&!res.zzLabel){ - message.error('包装不存在，无法打印') + message.warning('包装不存在，无法打印或者是线边物料数据不生成包装!') } }).catch(err => { console.log(err) diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue index 3d4e61e40..ec7d59008 100644 --- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue @@ -77,6 +77,9 @@ + + diff --git a/src/views/eam/basicSpotCheckOption/itemSelectSetForm.vue b/src/views/eam/basicSpotCheckOption/itemSelectSetForm.vue new file mode 100644 index 000000000..8791031d3 --- /dev/null +++ b/src/views/eam/basicSpotCheckOption/itemSelectSetForm.vue @@ -0,0 +1,387 @@ + + + + diff --git a/src/views/eam/inspectionItem/index.vue b/src/views/eam/inspectionItem/index.vue index 8e95cb776..256e1bbe2 100644 --- a/src/views/eam/inspectionItem/index.vue +++ b/src/views/eam/inspectionItem/index.vue @@ -65,6 +65,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import Detail from '@/components/Detail/src/Detail.vue' +import * as InspectionItemSelectSetApi from "@/api/eam/inspectionItemSelectSet"; defineOptions({ name: 'InspectionItem' }) @@ -253,11 +254,20 @@ const searchFormClick = (searchData) => { } const handleEnable = (row,enable) =>{ - message.confirm(t('您确定'+(enable=='TRUE'?'启用':'禁用')+'该项吗, 是否继续?')).then(() => { - row.available = enable - InspectionItemApi.updateInspectionItem(row).then(res => { + message.confirm(t('您确定'+(enable=='TRUE'?'启用':'禁用')+'该项吗, 是否继续?')).then(async () => { + try { + const params = ref({ + id: '', + available: '', + }) + params.value.id = row.id + params.value.available = 'TRUE' + await InspectionItemApi.updateEnableCode(params.value) message.success(t('common.updateSuccess')) - }) + // 刷新列表 + await getList() + } catch { + } }) } diff --git a/src/views/eam/spotCheckItem/spotCheckItem.data.ts b/src/views/eam/spotCheckItem/spotCheckItem.data.ts index a04484032..51edbbba5 100644 --- a/src/views/eam/spotCheckItem/spotCheckItem.data.ts +++ b/src/views/eam/spotCheckItem/spotCheckItem.data.ts @@ -26,6 +26,12 @@ export const SpotCheckItem = useCrudSchemas(reactive([ component:'InputNumber' }, }, + { + label: '点检名称', + field: 'name', + sort: 'custom', + isSearch: true + }, { label: '点检内容', field: 'content', From ba01db303f17a6d0f0da92f46063e524cc74c342 Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Thu, 13 Jun 2024 13:58:51 +0800 Subject: [PATCH 079/104] =?UTF-8?q?=E5=A4=87=E4=BB=B6=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/purchasereceiptRequestMain/index.ts | 10 ++++++++++ .../sparereceipt/sparereceiptRequestMain/index.vue | 6 +++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/api/wms/purchasereceiptRequestMain/index.ts b/src/api/wms/purchasereceiptRequestMain/index.ts index ba9f8a8a0..fa910cb1b 100644 --- a/src/api/wms/purchasereceiptRequestMain/index.ts +++ b/src/api/wms/purchasereceiptRequestMain/index.ts @@ -88,6 +88,16 @@ export const exportPurchasereceiptRequestMain = async (params) => { } } +// 导出备件收货申请 +export const exportSparereceiptRequestMain = async (params) => { + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({ url: `/wms/purchasereceipt-request-main/export-excel-spare-senior`, data }) + } else { + return await request.download({ url: `/wms/purchasereceipt-request-main/export-excel-spare`, params }) + } +} + // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/purchasereceipt-request-main/get-import-template' }) diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue index 9b1423043..8b39059f1 100644 --- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue @@ -542,8 +542,8 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true - const data = await PurchasereceiptRequestMainApi.exportPurchasereceiptRequestMain(tableObject.params) - download.excel(data, '采购收货申请主.xlsx') + const data = await PurchasereceiptRequestMainApi.exportSparereceiptRequestMain(tableObject.params) + download.excel(data, '备件收货申请.xlsx') } catch { } finally { exportLoading.value = false @@ -639,4 +639,4 @@ onMounted(async () => { getList() importTemplateData.templateUrl = await PurchasereceiptRequestMainApi.importTemplate() }) - \ No newline at end of file + From 3961e27684378d81aa910276b1467955b52b6f2e Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Thu, 13 Jun 2024 14:15:04 +0800 Subject: [PATCH 080/104] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?= =?UTF-8?q?=E7=A5=A8=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinvoiceRequestMain/index.vue | 1 + .../supplierinvoiceRequestMain.data.ts | 56 ++++++++++--------- 2 files changed, 31 insertions(+), 26 deletions(-) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue index 17bd9efa9..b03465d49 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue @@ -267,6 +267,7 @@ const searchTableSuccessDetail = async (formField, searchField, val, formRef,sea newRow['purchasePrice'] = item['purchasePrice'] newRow['invoicableQuantity'] = item['invoicableQuantity'] newRow['itemCode'] = item['itemCode'] + newRow['planArriveTime'] = item['prhRcpDate'] } tableData.value.push(newRow) }) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts index ef475c3e5..05ab4f7b9 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts @@ -1090,6 +1090,34 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive Date: Thu, 13 Jun 2024 14:42:02 +0800 Subject: [PATCH 081/104] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D=201=E3=80=81SCP?= =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E5=9B=9E=EF=BC=8C=E4=BE=9B=E5=BA=94?= =?UTF-8?q?=E5=95=86=E5=8F=AF=E4=BB=A5=E5=AF=B9=E6=98=8E=E7=BB=86=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E6=9B=B4=E6=94=B9=EF=BC=8C=E5=90=A6=E5=88=99=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E4=BE=9B=E5=BA=94=E5=95=86=E5=B7=A5=E4=BD=9C=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinvoiceRequestMain.data.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts index 05ab4f7b9..6cd315ed7 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts @@ -1140,7 +1140,7 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive Date: Thu, 13 Jun 2024 14:59:43 +0800 Subject: [PATCH 082/104] =?UTF-8?q?=E5=A4=87=E4=BB=B6=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/purchasereceiptJobMain/index.ts | 10 ++++++++++ src/api/wms/purchasereceiptRecordMain/index.ts | 12 +++++++++++- .../sparereceipt/sparereceiptJobMain/index.vue | 7 ++++--- .../sparereceipt/sparereceiptRecordMain/index.vue | 7 ++++--- 4 files changed, 29 insertions(+), 7 deletions(-) diff --git a/src/api/wms/purchasereceiptJobMain/index.ts b/src/api/wms/purchasereceiptJobMain/index.ts index 6db386db5..25f05c601 100644 --- a/src/api/wms/purchasereceiptJobMain/index.ts +++ b/src/api/wms/purchasereceiptJobMain/index.ts @@ -100,6 +100,16 @@ export const exportPurchasereceiptJobMain = async (params) => { } } + +// 导出备件收货任务 +export const exportSparereceiptJobMain = async (params) => { + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({ url: `/wms/purchasereceipt-job-main/export-excel-spare-senior`, data }) + } else { + return await request.download({ url: `/wms/purchasereceipt-job-main/export-excel-spare`, params }) + } +} // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/purchasereceipt-job-main/get-import-template' }) diff --git a/src/api/wms/purchasereceiptRecordMain/index.ts b/src/api/wms/purchasereceiptRecordMain/index.ts index 5f1ad8101..684984333 100644 --- a/src/api/wms/purchasereceiptRecordMain/index.ts +++ b/src/api/wms/purchasereceiptRecordMain/index.ts @@ -89,6 +89,16 @@ export const exportPurchasereceiptRecordMain = async (params) => { } } +// 导出备件收货记录 +export const exportSparereceiptRecordMain = async (params) => { + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({ url: `/wms/purchasereceipt-record-main/export-excel-spare-senior`, data }) + } else { + return await request.download({ url: `/wms/purchasereceipt-record-main/export-excel-spare`, params }) + } +} + // 导出采购收货记录主 Excel export const exportPurchasereceiptRecordMainSCP = async (params) => { if (params.isSearch) { @@ -112,4 +122,4 @@ export const createPutawayRequest = async (number:string) => { // 创建检验申请 export const createInspectRequest = async (number:string) => { return await request.post({ url: `/wms/purchasereceipt-record-main/createInspectRequest?number=`+number }) -} \ No newline at end of file +} diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue index 50460d582..33851cb6d 100644 --- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue +++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue @@ -73,6 +73,7 @@ import * as PurchasereceiptJobMainApi from '@/api/wms/purchasereceiptJobMain' import * as PurchasereceiptJobDetailApi from '@/api/wms/purchasereceiptJobDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' +import {exportSparereceiptJobMain} from "@/api/wms/purchasereceiptJobMain"; // 采购收货任务主 defineOptions({ name: 'PurchasereceiptJobMain' }) @@ -257,8 +258,8 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true - const data = await PurchasereceiptJobMainApi.exportPurchasereceiptJobMain(tableObject.params) - download.excel(data, '采购收货任务主.xlsx') + const data = await PurchasereceiptJobMainApi.exportSparereceiptJobMain(tableObject.params) + download.excel(data, '备件收货任务.xlsx') } catch { } finally { exportLoading.value = false @@ -278,4 +279,4 @@ const searchFormClick = (searchData) => { onMounted(async () => { getList() }) - \ No newline at end of file + diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/index.vue index 60d5ec2a0..f5270ed4f 100644 --- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/index.vue @@ -71,6 +71,7 @@ import * as PurchasereceiptRecordDetailApi from '@/api/wms/purchasereceiptRecord import * as defaultButtons from '@/utils/disposition/defaultButtons' import { PurchasereceiptRequestTabsList } from '@/utils/disposition/tabsList' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' +import {exportSparereceiptRecordMain} from "@/api/wms/purchasereceiptRecordMain"; // 采购收货记录主 defineOptions({ name: 'PurchasereceiptRecordMain' }) @@ -158,8 +159,8 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true - const data = await PurchasereceiptRecordMainApi.exportPurchasereceiptRecordMain(tableObject.params) - download.excel(data, '采购收货记录主.xlsx') + const data = await PurchasereceiptRecordMainApi.exportSparereceiptRecordMain(tableObject.params) + download.excel(data, '备件收货记录.xlsx') } catch { } finally { exportLoading.value = false @@ -190,4 +191,4 @@ const changeTabs = (data) =>{ onMounted(async () => { getList() }) - \ No newline at end of file + From f2682488459e225ee9f72ad87eaba3096954eed1 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Thu, 13 Jun 2024 15:19:30 +0800 Subject: [PATCH 083/104] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=BA=BF=E7=89=A9?= =?UTF-8?q?=E6=96=99=E5=85=B3=E7=B3=BB=E7=AE=A1=E7=90=86=EF=BC=9A=E4=BA=A7?= =?UTF-8?q?=E7=BA=BF=E4=BB=A3=E7=A0=81---SearchTable---SelectV2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 + src/components/Form/src/Form.vue | 3 +++ src/components/Form/src/helper.ts | 2 +- .../itemManage/productionlineitem/index.vue | 24 +++++++++---------- .../productionlineitem.data.ts | 22 ++++++++++++----- 5 files changed, 33 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 6966b07c3..648fbf09c 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,7 @@ form: { labelMessage: '信息提示说明！！！', componentProps: { + value:'undefined',//默认值，设置为'undefined'-->实际是undefined(解决SelectV2不显示占位符placeholder) enterSearch: true, //可输入回车 对应绑定事件：@onEnter="onEnter" isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择物料代码', // 输入框占位文本 diff --git a/src/components/Form/src/Form.vue b/src/components/Form/src/Form.vue index d9e8fc919..aa85fc5f5 100644 --- a/src/components/Form/src/Form.vue +++ b/src/components/Form/src/Form.vue @@ -464,4 +464,7 @@ export default defineComponent({ margin-right: 0 !important; margin-left: 0 !important; } +::v-deep(.el-select-v2 .el-icon) { + display: inline-flex; +} diff --git a/src/components/Form/src/helper.ts b/src/components/Form/src/helper.ts index 6f0ddafc5..ac3540f4d 100644 --- a/src/components/Form/src/helper.ts +++ b/src/components/Form/src/helper.ts @@ -127,7 +127,7 @@ export const initModel = (schema: FormSchema[], formModel: Recordable) => { } else if (v.component && v.component !== 'Divider') { const hasField = Reflect.has(model, v.field) // 如果先前已经有值存在，则不进行重新赋值，而是采用现有的值 - model[v.field] = hasField ? model[v.field] : v.value !== void 0 ? v.value : '' + model[v.field] = hasField ? model[v.field] : v.value === 'undefined' ? undefined : v.value !== void 0 ? v.value : '' } }) return model diff --git a/src/views/wms/basicDataManage/itemManage/productionlineitem/index.vue b/src/views/wms/basicDataManage/itemManage/productionlineitem/index.vue index 3ca414730..4599b7d87 100644 --- a/src/views/wms/basicDataManage/itemManage/productionlineitem/index.vue +++ b/src/views/wms/basicDataManage/itemManage/productionlineitem/index.vue @@ -152,25 +152,25 @@ const openForm = (type: string, row?: any) => { if(type == "update"){ Productionlineitem.allSchemas.formSchema.forEach((item) => { if (item.field == 'productionLineCode') { - item.componentProps.disabled = true - item.componentProps.isSearchList = false - } - if (item.field == 'itemCode') { - item.componentProps.disabled = true - item.componentProps.isSearchList = false - } - }) + item.componentProps.disabled = true + // item.componentProps.isSearchList = false + } + if (item.field == 'itemCode') { + item.componentProps.disabled = true + item.componentProps.isSearchList = false + } + }) }else { Productionlineitem.allSchemas.formSchema.forEach((item) => { if (item.field == 'productionLineCode') { item.componentProps.disabled = false - item.componentProps.isSearchList = true + // item.componentProps.isSearchList = true } if (item.field == 'itemCode') { - item.componentProps.disabled = false - item.componentProps.isSearchList = true - } + item.componentProps.disabled = false + item.componentProps.isSearchList = true + } }) } basicFormRef.value.open(type, row) diff --git a/src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts b/src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts index 1d3ce0f67..3524c8118 100644 --- a/src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts +++ b/src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts @@ -2,6 +2,7 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import { dateFormatter } from '@/utils/formatTime' import * as ProductionLineCodeApi from '@/api/wms/productionline' import { Productionline } from './../../factoryModeling/productionline/productionline.data' +import * as LocationApi from '@/api/wms/location' import * as ItembasicApi from '@/api/wms/itembasic' import { Itembasic } from './../itembasic/itembasic.data' @@ -10,6 +11,7 @@ const { t } = useI18n() // 国际化 const confgiData = await confgiApi.queryByKey("Productionlineitem") +const lineCodeData = await ProductionLineCodeApi.getProductionlinePage({isSearch:false}) /** * @returns {Array} 生产线物料关系 @@ -71,17 +73,25 @@ export const Productionlineitem = useCrudSchemas(reactive([ width: 150, fixed: 'left' }, + isForm:true, form: { + show:true, + component: 'SelectV2', + value:'undefined', // labelMessage: '信息提示说明！！！', componentProps: { - isSearchList: true, - searchListPlaceholder: '请选择生产线', + // isSearchList: true, + placeholder:'请选择库位代码', searchField: 'code', - searchTitle: '生产线信息', - searchAllSchemas: Productionline.allSchemas, - searchPage: ProductionLineCodeApi.getProductionlinePage + // searchTitle: '生产线信息', + // searchAllSchemas: Productionline.allSchemas, + // searchPage: ProductionLineCodeApi.getProductionlinePage + options:lineCodeData.list.map(item=>({ + label:item.code, + value:item.code + })) } - } + }, }, { label: '物料代码', From 488eca8ef49a6997490af196c1666e037cf7bbb8 Mon Sep 17 00:00:00 2001 From: chenfang Date: Thu, 13 Jun 2024 16:51:33 +0800 Subject: [PATCH 084/104] =?UTF-8?q?=E9=9A=90=E8=97=8F=E5=A4=84=E7=90=86?= =?UTF-8?q?=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deliversettlementManage/saleShipmentMainRequest/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue index d26b868f1..3a9d13a1d 100644 --- a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue +++ b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue @@ -226,7 +226,7 @@ const butttondata = (row,$index) => { defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:sale-shipment-main-request:submit'}), // 提交审批 defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:sale-shipment-main-request:refused'}), // 驳回 defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:sale-shipment-main-request:agree'}), // 审批通过 - defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3','8']),hasPermi:'wms:sale-shipment-main-request:handle'}), // 处理 + defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:sale-shipment-main-request:handle'}), // 处理 // defaultButtons.mainListDeleteBtn({hasPermi:'wms:sale-shipment-main-request:delete'}), // 删除 ] } From 8e152cb445a40afc4f0ad7dca43121b9dc22955e Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Thu, 13 Jun 2024 17:51:28 +0800 Subject: [PATCH 085/104] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?= =?UTF-8?q?=E7=A5=A8=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/itembasic/index.ts | 5 +++++ src/api/wms/productreceiptRequestDetail/index.ts | 5 +---- .../productreceiptscrapRequestMain/index.vue | 2 +- .../supplierinvoice/supplierinvoiceRequestMain/index.vue | 1 + .../supplierinvoiceRequestMain.data.ts | 5 ++++- 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/api/wms/itembasic/index.ts b/src/api/wms/itembasic/index.ts index a92781ac3..25f3566ec 100644 --- a/src/api/wms/itembasic/index.ts +++ b/src/api/wms/itembasic/index.ts @@ -108,4 +108,9 @@ export const selectConfigToItembasic = async (params) => { } else { return await request.get({ url: `/wms/itembasic/pageConfigToItembasic`, params }) } +} + +// 根据物料代码查计量单位 +export const getQueryItemCodeInfo = async (data) => { + return await request.post({ url: 'wms/itembasic/queryItemCodeInfo', data }) } \ No newline at end of file diff --git a/src/api/wms/productreceiptRequestDetail/index.ts b/src/api/wms/productreceiptRequestDetail/index.ts index 5301001fc..7b21ba14b 100644 --- a/src/api/wms/productreceiptRequestDetail/index.ts +++ b/src/api/wms/productreceiptRequestDetail/index.ts @@ -65,10 +65,7 @@ export const getProductreceiptRequestDetailPageScrap = async (params) => { return await request.get({ url: `/wms/productreceipt-request-detail/page`, params }) } } -// 根据物料代码查计量单位 -export const getQueryItemCodeInfo = async (data) => { - return await request.post({ url: 'wms/itembasic/queryItemCodeInfo', data }) -} + // 查询制品收货申请子详情 export const getProductreceiptRequestDetail = async (id: number) => { diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue index 0235a1311..0946338d2 100644 --- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue @@ -193,7 +193,7 @@ const searchTableSuccess = async (formField, searchField, val, formRef, type, ro row['secondPackQty'] = val[0]['packQty'] }else if(formField == 'itemCode'){ - let res = await ProductreceiptRequestDetailApi.getQueryItemCodeInfo({itemCodes:val.map(item=>item.itemCode).join(',')}) + let res = await ItembasicApi.getQueryItemCodeInfo({itemCodes:val.map(item=>item.itemCode).join(',')}) if(res.length>0){ row['uom'] = res[0]['uom'] } diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue index b03465d49..5d4bf5ba2 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue @@ -268,6 +268,7 @@ const searchTableSuccessDetail = async (formField, searchField, val, formRef,sea newRow['invoicableQuantity'] = item['invoicableQuantity'] newRow['itemCode'] = item['itemCode'] newRow['planArriveTime'] = item['prhRcpDate'] + newRow['arrivalQty'] = item['prhRcvd'] } tableData.value.push(newRow) }) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts index 6cd315ed7..9c99575ab 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts @@ -1099,9 +1099,12 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive Date: Thu, 13 Jun 2024 18:47:16 +0800 Subject: [PATCH 086/104] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E6=9C=88=E5=8F=B0=E5=89=8D=E7=AB=AF=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerdock/customerdock.data.ts | 71 ++++++++++--------- .../customerManage/customerdock/index.vue | 3 - .../deliverRequestMain.data.ts | 2 +- 3 files changed, 38 insertions(+), 38 deletions(-) diff --git a/src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts b/src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts index 27a5f66e5..50709ae3a 100644 --- a/src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts +++ b/src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts @@ -26,27 +26,8 @@ export const Customerdock = useCrudSchemas(reactive([ field: 'code', sort: 'custom', table: { - width: 150, - fixed: 'left' + width: 150 }, - form: { - // labelMessage: '信息提示说明！！！', - componentProps: { - isSearchList: true, // 开启查询弹窗 - searchListPlaceholder: '请选择月台代码', // 输入框占位文本 - searchField: 'code', // 查询弹窗赋值字段 - searchTitle: '月台基础信息', // 查询弹窗标题 - searchAllSchemas: Dock.allSchemas, // 查询弹窗所需类 - searchPage: DockApi.getDockPage, // 查询弹窗所需分页方法 - searchCondition: [{ - key: 'available', - value: 'TRUE', - action: '==', - isSearch: true, - isMainValue: false - }] - } - } }, { label: '客户代码', @@ -130,6 +111,17 @@ export const Customerdock = useCrudSchemas(reactive([ table: { width: 150 }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + isSearchList: true, + searchListPlaceholder: '请选择从仓库代码', + searchField: 'code', + searchTitle: '仓库基础信息', + searchAllSchemas: Warehouse.allSchemas, + searchPage: WarehouseApi.getWarehousePage, + } + } }, { label: '默认库位', @@ -142,20 +134,25 @@ export const Customerdock = useCrudSchemas(reactive([ form: { // // labelMessage: '信息提示说明！！！', componentProps: { - // disabled:true - // isSearchList: true, // 开启查询弹窗 - // searchListPlaceholder: '请选择库位代码', // 输入框占位文本 - // searchField: 'code', // 查询弹窗赋值字段 - // searchTitle: '库位基础信息', // 查询弹窗标题 - // searchAllSchemas: Location.allSchemas, // 查询弹窗所需类 - // searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法 - // searchCondition: [{ - // key: 'available', - // value: 'TRUE', - // action: '==', - // isSearch: true, - // isMainValue: false - // }] + disabled:true, + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择库位代码', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '库位基础信息', // 查询弹窗标题 + searchAllSchemas: Location.allSchemas, // 查询弹窗所需类 + searchPage: LocationApi.selectConfigToLocation, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'available', + value: 'TRUE', + isSearch: true, + isMainValue: false + }, + { + key: 'warehouseCode', + value: 'warehouseCode', + message: '请选择仓库', + isMainValue: true + }] } } }, @@ -313,6 +310,12 @@ export const CustomerdockRules = reactive({ customerCode: [ { required: true, message: '请输入客户代码', trigger: 'blur' } ], + warehouseCode: [ + { required: true, message: '请选择仓库', trigger: 'blur' } + ], + defaultLocationCode: [ + { required: true, message: '请选择默认库位', trigger: 'blur' } + ], available: [ { required: true, message: '请选择是否可用', trigger: 'change' } ], diff --git a/src/views/wms/basicDataManage/customerManage/customerdock/index.vue b/src/views/wms/basicDataManage/customerManage/customerdock/index.vue index a5436fa5c..06a9aaea8 100644 --- a/src/views/wms/basicDataManage/customerManage/customerdock/index.vue +++ b/src/views/wms/basicDataManage/customerManage/customerdock/index.vue @@ -156,15 +156,12 @@ const openForm = (type: string, row?: any) => { } if (item.field == 'customerCode') { item.componentProps.disabled = true - item.componentProps.isSearchList = false } }) - }else { Customerdock.allSchemas.formSchema.forEach((item) => { if (item.field == 'code') { item.componentProps.disabled = false - item.componentProps.isSearchList = true } if (item.field == 'customerCode') { item.componentProps.disabled = false diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts index 7e4d7b243..c3e5592b5 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts @@ -112,7 +112,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ searchField: 'code', // 查询弹窗赋值字段 searchTitle: '客户月台信息', // 查询弹窗标题 searchAllSchemas: Customerdock.allSchemas, // 查询弹窗所需类 - searchPage: CustomerdockApi.pageCustomerCodeToCustomerDock, // 查询弹窗所需分页方法 + searchPage: CustomerdockApi.getCustomerdockPage, // 查询弹窗所需分页方法 searchCondition: [{ key: 'available', value: 'TRUE', From 0b7b20b7f931923c8b6f1d01d6bd6979967b5dc4 Mon Sep 17 00:00:00 2001 From: songguoqiang <765017469@qq.com> Date: Thu, 13 Jun 2024 18:50:46 +0800 Subject: [PATCH 087/104] =?UTF-8?q?qms=E6=A3=80=E9=AA=8C=E6=96=B9=E6=A1=88?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=8B=86=E5=88=86=E8=A7=84=E5=88=99=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E5=AD=97=E6=AE=B5=EF=BC=8C=E6=96=B0=E5=A2=9E=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E9=BB=98=E8=AE=A4=E7=BB=99=E5=AD=97=E5=85=B8=E7=AC=AC?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/inspectionScheme/addForm.vue | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/views/qms/inspectionScheme/addForm.vue b/src/views/qms/inspectionScheme/addForm.vue index 540a2dc53..c96d8ffa4 100644 --- a/src/views/qms/inspectionScheme/addForm.vue +++ b/src/views/qms/inspectionScheme/addForm.vue @@ -157,7 +157,7 @@ - + @@ -733,7 +733,7 @@ const rules = ref({ description: [ { required: true, message: '请选择描述', trigger: 'blur' } ], - splitRule: [{ required: true, message: '请选择拆分规则', trigger: ['blur', 'change'] }], + // splitRule: [{ required: true, message: '请选择拆分规则', trigger: ['blur', 'change'] }], aql: [{ required: true, message: '请选择aql', trigger: ['blur', 'change'] }], inspectionLevel: [ { required: true, message: '请选择检验水平', trigger: ['blur', 'change'] }, @@ -957,6 +957,8 @@ const validateForm = (formRef) => { const submitForm = async () => { try { + const aa = await getStrDictOptions(DICT_TYPE.SPLIT_RULES);//拆分规则隐藏默认给第一字典值 + data.value.splitRule = aa[0].value const validateForm1 = await validateForm(formProcessRef.value) await formMainRef.value.validate() if (!data.value.process || data.value.process.length == 0) { From f9253d181ac79ca74d8cf8839a2954db10510021 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Thu, 13 Jun 2024 19:06:32 +0800 Subject: [PATCH 088/104] =?UTF-8?q?=E5=8F=91=E8=B4=A7=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deliverRequestMain.data.ts | 87 +++++++------------ .../deliver/deliverRequestMain/index.vue | 9 ++ 2 files changed, 41 insertions(+), 55 deletions(-) diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts index c3e5592b5..5963f219d 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts @@ -127,6 +127,38 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ } } }, + { + label: '到仓库', + field: 'toWarehouseCode', + sort: 'custom', + table: { + width: 150 + }, + isForm: true, + isTableForm:false, + isDetail:false, + form: { + componentProps: { + disabled:true + } + } + }, + { + label: '到库位', + field: 'toLocationCode', + sort: 'custom', + table: { + width: 150 + }, + isForm: true, + isTableForm:false, + isDetail:false, + form: { + componentProps: { + disabled:true + } + } + }, { label: '发货类型', field: 'deliverType', @@ -800,61 +832,6 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ width: 150 }, }, - { - label: '到仓库', - field: 'toWarehouseCode', - sort: 'custom', - table: { - width: 150 - }, - isForm: false, - }, - { - label: '到库位', - field: 'toLocationCode', - sort: 'custom', - table: { - width: 150 - }, - tableForm:{ - isInpuFocusShow: true, // 开启查询弹窗 - searchListPlaceholder: '请选择到库位代码', - searchField: 'code', - searchTitle: '库位基础信息', - searchAllSchemas: Location.allSchemas, - searchPage: WorkstationApi.selectAreaTypeToLocation, - searchCondition: [{ - key: 'available', - value: 'TRUE', - isMainValue: false - },{ - key: 'areaType', - value: "deliverType", - message:"请选择发货类型", - isMainValue: true - }] - }, - form: { - componentProps: { - isSearchList: true, - searchListPlaceholder: '请选择到库位代码', - searchField: 'code', - searchTitle: '库位基础信息', - searchAllSchemas: Location.allSchemas, - searchPage: WorkstationApi.selectAreaTypeToLocation, - searchCondition: [{ - key: 'available', - value: 'TRUE', - isMainValue: false - },{ - key: 'areaType', - value: "deliverType", - message:"请选择发货类型", - isMainValue: false - }] - } - }, - }, { label: '库存状态', field: 'inventoryStatus', diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue index fb6bd2c07..bb5838ae1 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue @@ -168,6 +168,10 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => console.log( val[0]); row['uom'] = val[0]['customerUom'] } + } else if(formField == 'customerDockCode') { + //客户月台 + setV['toWarehouseCode'] = val[0]['warehouseCode']//到仓库 + setV['toLocationCode'] = val[0]['defaultLocationCode']//到库位 } else { setV[formField] = val[0][searchField] } @@ -494,7 +498,12 @@ const flag = ref(false) // 主子数据 提交 const submitForm = async (formType, data) => { + flag.value = false data.subList = tableData.value // 拼接子表数据参数 + data.subList.forEach(item=>{ + item.toWarehouseCode = data.toWarehouseCode + item.toLocationCode = data.toLocationCode + }) let isExist = false tableData.value.forEach(item => { let rs = tableData.value.filter(filterItem => (filterItem.itemCode == item.itemCode)) From 6ef0ac6a58e711f85054de7a7e79ba03ec6732a6 Mon Sep 17 00:00:00 2001 From: gaojs <757918719@qq.com> Date: Thu, 13 Jun 2024 19:09:42 +0800 Subject: [PATCH 089/104] =?UTF-8?q?EAM=20=E2=80=94=E2=80=94>=20=20?= =?UTF-8?q?=E7=82=B9=E6=A3=80=E8=AE=A1=E5=88=92=20=E5=B7=A1=E6=A3=80?= =?UTF-8?q?=E8=AE=A1=E5=88=92=20=20=E7=8A=B6=E6=80=81=E6=B5=81=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/eam/planInspection/index.ts | 91 ++++ src/api/eam/planSpotCheck/index.ts | 91 ++++ src/utils/dict.ts | 2 + .../basicSpotCheckOption.data.ts | 1 - src/views/eam/maintenance/audiForm.vue | 6 +- src/views/eam/planInspection/audiForm.vue | 143 ++++++ src/views/eam/planInspection/index.vue | 419 +++++++++++++++++ .../eam/planInspection/planInspection.data.ts | 395 ++++++++++++++++ src/views/eam/planSpotCheck/audiForm.vue | 143 ++++++ src/views/eam/planSpotCheck/index.vue | 422 ++++++++++++++++++ .../eam/planSpotCheck/planSpotCheck.data.ts | 394 ++++++++++++++++ 11 files changed, 2104 insertions(+), 3 deletions(-) create mode 100644 src/api/eam/planInspection/index.ts create mode 100644 src/api/eam/planSpotCheck/index.ts create mode 100644 src/views/eam/planInspection/audiForm.vue create mode 100644 src/views/eam/planInspection/index.vue create mode 100644 src/views/eam/planInspection/planInspection.data.ts create mode 100644 src/views/eam/planSpotCheck/audiForm.vue create mode 100644 src/views/eam/planSpotCheck/index.vue create mode 100644 src/views/eam/planSpotCheck/planSpotCheck.data.ts diff --git a/src/api/eam/planInspection/index.ts b/src/api/eam/planInspection/index.ts new file mode 100644 index 000000000..10b3fbf24 --- /dev/null +++ b/src/api/eam/planInspection/index.ts @@ -0,0 +1,91 @@ +import request from '@/config/axios' +import {MaintenanceVO} from "@/api/eam/maintenance"; + +export interface PlanInspectionVO { + id: number + number: string + name: string + equipmentCode: string + type: string + optionCode: string + cycle: string + startTime: Date + endTime: Date + status: string + approver: number + approveContent: string + approveTime: Date + autoExamine: string + autoAgree: string + directCreateRecord: string + factoryAreaCode: string + workshopCode: string + lineCode: string + processCode: string + workstationCode: string + departmentCode: string + remark: string + siteId: string + available: string + deletionTime: Date + deleterId: byte[] + concurrencyStamp: number +} + +// 查询巡检计划列表 +export const getPlanInspectionPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/eam/plan-inspection/senior', data }) + } else { + return await request.get({ url: `/eam/plan-inspection/page`, params }) + } +} + +// 查询巡检计划详情 +export const getPlanInspection = async (id: number) => { + return await request.get({ url: `/eam/plan-inspection/get?id=` + id }) +} + +// 新增巡检计划 +export const createPlanInspection = async (data: PlanInspectionVO) => { + return await request.post({ url: `/eam/plan-inspection/create`, data }) +} + +// 修改巡检计划 +export const updatePlanInspection = async (data: PlanInspectionVO) => { + return await request.put({ url: `/eam/plan-inspection/update`, data }) +} + +// 修改巡检计划-审核 +export const updateInspectionPlanAudi = async (data: PlanInspectionVO) => { + return await request.post({ url: `/eam/plan-inspection/updateAudi`, data }) +} + +// 删除巡检计划 +export const deletePlanInspection = async (id: number) => { + return await request.delete({ url: `/eam/plan-inspection/delete?id=` + id }) +} + +// 导出巡检计划 Excel +export const exportPlanInspection = async (params) => { + return await request.download({ url: `/eam/plan-inspection/export-excel`, params }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/eam/plan-inspection/get-import-template' }) +} + + +// 启用 / 禁用 +export const updateEnableCode = async (data: PlanInspectionVO) => { + return await request.post({ url: `/eam/plan-inspection/ables` , data }) +} + + +// 修改计划状态 +export const updateInspectionPlan = async (data: PlanInspectionVO) => { + return await request.post({ url: `/eam/plan-inspection/updatePlan`, data }) +} diff --git a/src/api/eam/planSpotCheck/index.ts b/src/api/eam/planSpotCheck/index.ts new file mode 100644 index 000000000..9ed72a1cb --- /dev/null +++ b/src/api/eam/planSpotCheck/index.ts @@ -0,0 +1,91 @@ +import request from '@/config/axios' +import {PlanInspectionVO} from "@/api/eam/planInspection"; + +export interface PlanSpotCheckVO { + id: number + number: string + name: string + equipmentCode: string + type: string + optionCode: string + cycle: string + startTime: Date + endTime: Date + status: string + approver: number + approveContent: string + approveTime: Date + autoExamine: string + autoAgree: string + directCreateRecord: string + factoryAreaCode: string + workshopCode: string + lineCode: string + processCode: string + workstationCode: string + departmentCode: string + remark: string + siteId: string + available: string + deletionTime: Date + deleterId: byte[] + concurrencyStamp: number +} + +// 查询点检计划列表 +export const getPlanSpotCheckPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/eam/plan-spot-check/senior', data }) + } else { + return await request.get({ url: `/eam/plan-spot-check/page`, params }) + } +} + +// 查询点检计划详情 +export const getPlanSpotCheck = async (id: number) => { + return await request.get({ url: `/eam/plan-spot-check/get?id=` + id }) +} + +// 新增点检计划 +export const createPlanSpotCheck = async (data: PlanSpotCheckVO) => { + return await request.post({ url: `/eam/plan-spot-check/create`, data }) +} + +// 修改点检计划 +export const updatePlanSpotCheck = async (data: PlanSpotCheckVO) => { + return await request.put({ url: `/eam/plan-spot-check/update`, data }) +} + +// 修改巡检计划-审核 +export const updateSpotCheckPlanAudi = async (data: PlanSpotCheckVO) => { + return await request.post({ url: `/eam/plan-spot-check/updateAudi`, data }) +} + +// 删除点检计划 +export const deletePlanSpotCheck = async (id: number) => { + return await request.delete({ url: `/eam/plan-spot-check/delete?id=` + id }) +} + +// 导出点检计划 Excel +export const exportPlanSpotCheck = async (params) => { + return await request.download({ url: `/eam/plan-spot-check/export-excel`, params }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/eam/plan-spot-check/get-import-template' }) +} + + +// 启用 / 禁用 +export const updateEnableCode = async (data: PlanSpotCheckVO) => { + return await request.post({ url: `/eam/plan-spot-check/ables` , data }) +} + + +// 修改计划状态 +export const updateSpotCheckPlan = async (data: PlanSpotCheckVO) => { + return await request.post({ url: `/eam/plan-spot-check/updatePlan`, data }) +} diff --git a/src/utils/dict.ts b/src/utils/dict.ts index 3b08a2073..8a459e4bd 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -354,6 +354,8 @@ export enum DICT_TYPE { REPAIR_LEVEL = 'repair_level', //维修级别 IS_COMPLETED = 'is_completed', //是否完成 MAINTENANCE_CYCLE ='maintenance_cycle', // 保养周期 + INSPECTION_CYCLE ='inspection_cycle', // 巡检周期 + SPOTCHECK_CYCLE ='spotcheck_cycle', // 巡检周期 EAM_ORDER_STATUS = 'eam_order_status',// 工单状态 TOOL_CLASS = 'tool_class', //工装类型 TOOL_OUT_TYPE = 'tool_out_type', //工装出库类型 diff --git a/src/views/eam/basicSpotCheckOption/basicSpotCheckOption.data.ts b/src/views/eam/basicSpotCheckOption/basicSpotCheckOption.data.ts index 3bfc01c37..8a972074b 100644 --- a/src/views/eam/basicSpotCheckOption/basicSpotCheckOption.data.ts +++ b/src/views/eam/basicSpotCheckOption/basicSpotCheckOption.data.ts @@ -2,7 +2,6 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import { dateFormatter } from '@/utils/formatTime' import * as ItemApi from "@/api/eam/spotCheckSelectSet"; import {BasicSpotCheckSelectSet} from "@/views/eam/spotCheckSelectSet/spotCheckSelectSet.data"; -import {getBasicSpotCheckSelectSetPage} from "@/api/eam/spotCheckSelectSet"; // 表单校验 export const BasicSpotCheckOptionRules = reactive({ diff --git a/src/views/eam/maintenance/audiForm.vue b/src/views/eam/maintenance/audiForm.vue index fa8044e86..a20daf67c 100644 --- a/src/views/eam/maintenance/audiForm.vue +++ b/src/views/eam/maintenance/audiForm.vue @@ -95,8 +95,7 @@ defineExpose({ open }) // 提供 open 方法，用于打开弹窗 /** 提交表单 */ const submitForm = async (val) => { - //把success函数传递到父页面 - emit('success',formData.value.id) + // 校验表单 if (!basicFormRef) return const valid = await basicFormRef.value.validate() @@ -104,6 +103,9 @@ const submitForm = async (val) => { //发送数据 await MaintenanceApi.updateMaintenanceAudi(formData.value) + + //把success函数传递到父页面 + emit('success',formData.value.id) dialogVisible.value = false } diff --git a/src/views/eam/planInspection/audiForm.vue b/src/views/eam/planInspection/audiForm.vue new file mode 100644 index 000000000..045e7b7d4 --- /dev/null +++ b/src/views/eam/planInspection/audiForm.vue @@ -0,0 +1,143 @@ + + + + diff --git a/src/views/eam/planInspection/index.vue b/src/views/eam/planInspection/index.vue new file mode 100644 index 000000000..5ad07790f --- /dev/null +++ b/src/views/eam/planInspection/index.vue @@ -0,0 +1,419 @@ + + + diff --git a/src/views/eam/planInspection/planInspection.data.ts b/src/views/eam/planInspection/planInspection.data.ts new file mode 100644 index 000000000..a9bb8ef8c --- /dev/null +++ b/src/views/eam/planInspection/planInspection.data.ts @@ -0,0 +1,395 @@ +import type { CrudSchema } from '@/hooks/web/useCrudSchemas' +import { dateFormatter } from '@/utils/formatTime' +import {EquipmentAccounts} from "@/views/eam/equipmentAccounts/equipmentAccounts.data"; +import * as EquipmentItemApi from "@/api/eam/equipmentAccounts"; +import * as BasicInspectionApi from "@/api/eam/basicInspectionOption"; +import {BasicInspectionOption} from "@/views/eam/basicInspectionOption/basicInspectionOption.data"; +import {getBasicInspectionOptionPage} from "@/api/eam/basicInspectionOption"; +import {Workshop} from "@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data"; +import * as WorkshopApi from "@/api/wms/workshop"; + +// 表单校验 +export const PlanInspectionRules = reactive({ + number: [required], + name: [required], + equipmentCode: [required], + optionCode: [required], + cycle: [required], + startTime: [required], + endTime: [required], +}) + +export const PlanInspection = useCrudSchemas(reactive([ + { + label: 'id', + field: 'id', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + }, + { + label: '计划编号', + field: 'number', + sort: 'custom', + isSearch: true, + isForm: false, + isDetail:true, + }, + { + label: '计划名称', + field: 'name', + sort: 'custom', + isSearch: true, + }, + { + label: '设备类别', + field: 'type', + dictType: DICT_TYPE.DEVICE_TYPE, + dictClass: 'string', + sort: 'custom', + isSearch: false, + }, + { + label: '设备工装编号', + field: 'equipmentCode', + sort: 'custom', + isSearch: true, + isForm: true, + form: { + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchTitle: '设备信息', // 查询弹窗标题 + searchListPlaceholder: '请选择 设备编号', // 输入框占位文本 + searchAllSchemas: EquipmentAccounts.allSchemas, // 查询弹窗所需类 + searchField: 'code', // 查询弹窗赋值字段 + searchPage: EquipmentItemApi.getEquipmentAccountsPage, // 查询弹窗所需分页方法 + multiple:true, + searchCondition: [{ + key: 'status', + value: 'NORMAL', + action: '==', + isSearch: true, + isMainValue: false + }] + } + } + }, + { + label: '方案编号', + field: 'optionCode', + sort: 'custom', + isSearch: true, + isForm: true, + form: { + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchTitle: '巡检方案信息', // 查询弹窗标题 + searchListPlaceholder: '请选择巡检方案', // 输入框占位文本 + searchAllSchemas: BasicInspectionOption.allSchemas, // 查询弹窗所需类 + searchField: 'code', // 查询弹窗赋值字段 + searchPage: BasicInspectionApi.getBasicInspectionOptionPage, // 查询弹窗所需分页方法 + multiple:true, + searchCondition: [{ + key: 'available', + value: 'TRUE', + action: '==', + isSearch: true, + isMainValue: false + }] + } + } + }, + { + label: '计划类型', + field: 'cycle', + dictType: DICT_TYPE.INSPECTION_CYCLE, + dictClass: 'string', + sort: 'custom', + isSearch: true, + }, + { + label: '计划开始时间', + field: 'startTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: false, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + valueFormat: 'x' + } + }, + }, + { + label: '计划结束时间', + field: 'endTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: false, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + valueFormat: 'x' + } + }, + }, + { + label: '状态', + field: 'status', + sort: 'custom', + isSearch: true, + dictType: DICT_TYPE.EAM_PLAN_STATUS, + dictClass: 'string', + }, + { + label: '审核人', + field: 'approver', + sort: 'custom', + isSearch: false, + }, + { + label: '审核内容', + field: 'approveContent', + sort: 'custom', + isSearch: false, + }, + { + label: '审核时间', + field: 'approveTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: false, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + valueFormat: 'x' + } + }, + }, + { + label: '自动审核', + field: 'autoExamine', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + }, + { + label: '自动通过', + field: 'autoAgree', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + }, + { + label: '直接生成记录', + field: 'directCreateRecord', + sort: 'custom', + isSearch: false, + }, + { + label: '所属厂区编号', + field: 'factoryAreaCode', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + }, + { + label: '车间编号', + field: 'workshopCode', + sort: 'custom', + isSearch: false, + required: true, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '车间', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '车间信息', // 查询弹窗标题 + searchAllSchemas: Workshop.allSchemas, // 查询弹窗所需类 + searchPage: WorkshopApi.getWorkshopPage, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + }] + } + }, + }, + { + label: '产线编号', + field: 'lineCode', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + }, + { + label: '工序编号', + field: 'processCode', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + }, + { + label: '工位编号', + field: 'workstationCode', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + }, + { + label: '创建时间', + field: 'createTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + isForm: false, + }, + { + label: '部门id', + field: 'departmentCode', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + }, + { + label: '备注', + field: 'remark', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + }, + { + label: '地点ID', + field: 'siteId', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + }, + { + label: '是否可用', + field: 'available', + sort: 'custom', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + isTable: true, + isDetail: false, + isSearch: true, + isTableForm: false, + isForm: false, + }, + { + label: '删除时间', + field: 'deletionTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + valueFormat: 'x' + } + }, + }, + { + label: '删除人id', + field: 'deleterId', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + }, + { + label: '并发乐观锁', + field: 'concurrencyStamp', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + form: { + component: 'InputNumber', + value: 0 + }, + }, + { + label: '操作', + field: 'action', + isForm: false, + table: { + width: 150, + fixed: 'right' + } + } +])) diff --git a/src/views/eam/planSpotCheck/audiForm.vue b/src/views/eam/planSpotCheck/audiForm.vue new file mode 100644 index 000000000..7fbcfdcb1 --- /dev/null +++ b/src/views/eam/planSpotCheck/audiForm.vue @@ -0,0 +1,143 @@ + + + + diff --git a/src/views/eam/planSpotCheck/index.vue b/src/views/eam/planSpotCheck/index.vue new file mode 100644 index 000000000..cf19403c8 --- /dev/null +++ b/src/views/eam/planSpotCheck/index.vue @@ -0,0 +1,422 @@ + + + diff --git a/src/views/eam/planSpotCheck/planSpotCheck.data.ts b/src/views/eam/planSpotCheck/planSpotCheck.data.ts new file mode 100644 index 000000000..26636766a --- /dev/null +++ b/src/views/eam/planSpotCheck/planSpotCheck.data.ts @@ -0,0 +1,394 @@ +import type { CrudSchema } from '@/hooks/web/useCrudSchemas' +import { dateFormatter } from '@/utils/formatTime' +import {EquipmentAccounts} from "@/views/eam/equipmentAccounts/equipmentAccounts.data"; +import * as EquipmentItemApi from "@/api/eam/equipmentAccounts"; +import * as SpotCheckOptionApi from "@/api/eam/basicSpotCheckOption"; +import {BasicSpotCheckOption} from "@/views/eam/basicSpotCheckOption/basicSpotCheckOption.data"; +import {Workshop} from "@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data"; +import * as WorkshopApi from "@/api/wms/workshop"; + +// 表单校验 +export const PlanSpotCheckRules = reactive({ + number: [required], + name: [required], + equipmentCode: [required], + optionCode: [required], + cycle: [required], + startTime: [required], + endTime: [required], +}) + +export const PlanSpotCheck = useCrudSchemas(reactive([ + { + label: 'id', + field: 'id', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + }, + { + label: '计划编号', + field: 'number', + sort: 'custom', + isSearch: true, + isForm: false, + isDetail:true, + }, + { + label: '计划名称', + field: 'name', + sort: 'custom', + isSearch: true, + }, + { + label: '设备类别', + field: 'type', + dictType: DICT_TYPE.DEVICE_TYPE, + dictClass: 'string', + sort: 'custom', + isSearch: false, + }, + { + label: '设备工装编号', + field: 'equipmentCode', + sort: 'custom', + isSearch: true, + isForm: true, + form: { + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchTitle: '设备信息', // 查询弹窗标题 + searchListPlaceholder: '请选择 设备编号', // 输入框占位文本 + searchAllSchemas: EquipmentAccounts.allSchemas, // 查询弹窗所需类 + searchField: 'code', // 查询弹窗赋值字段 + searchPage: EquipmentItemApi.getEquipmentAccountsPage, // 查询弹窗所需分页方法 + multiple:true, + searchCondition: [{ + key: 'status', + value: 'NORMAL', + action: '==', + isSearch: true, + isMainValue: false + }] + } + } + }, + { + label: '方案编号', + field: 'optionCode', + sort: 'custom', + isSearch: true, + isForm: true, + form: { + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchTitle: '点检方案信息', // 查询弹窗标题 + searchListPlaceholder: '请选择点检方案', // 输入框占位文本 + searchAllSchemas: BasicSpotCheckOption.allSchemas, // 查询弹窗所需类 + searchField: 'code', // 查询弹窗赋值字段 + searchPage: SpotCheckOptionApi.getBasicSpotCheckOptionPage, // 查询弹窗所需分页方法 + multiple:true, + searchCondition: [{ + key: 'available', + value: 'TRUE', + action: '==', + isSearch: true, + isMainValue: false + }] + } + } + }, + { + label: '计划类型', + field: 'cycle', + dictType: DICT_TYPE.SPOTCHECK_CYCLE, + dictClass: 'string', + sort: 'custom', + isSearch: true, + }, + { + label: '计划开始时间', + field: 'startTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: false, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + valueFormat: 'x' + } + }, + }, + { + label: '计划结束时间', + field: 'endTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: false, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + valueFormat: 'x' + } + }, + }, + { + label: '状态', + field: 'status', + sort: 'custom', + isSearch: true, + dictType: DICT_TYPE.EAM_PLAN_STATUS, + dictClass: 'string', + }, + { + label: '审核人', + field: 'approver', + sort: 'custom', + isSearch: false, + }, + { + label: '审核内容', + field: 'approveContent', + sort: 'custom', + isSearch: false, + }, + { + label: '审核时间', + field: 'approveTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: false, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + valueFormat: 'x' + } + }, + }, + { + label: '自动审核', + field: 'autoExamine', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + }, + { + label: '自动通过', + field: 'autoAgree', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + }, + { + label: '直接生成记录', + field: 'directCreateRecord', + sort: 'custom', + isSearch: false, + }, + { + label: '所属厂区编号', + field: 'factoryAreaCode', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + }, + { + label: '车间编号', + field: 'workshopCode', + sort: 'custom', + isSearch: false, + required: true, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '车间', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '车间信息', // 查询弹窗标题 + searchAllSchemas: Workshop.allSchemas, // 查询弹窗所需类 + searchPage: WorkshopApi.getWorkshopPage, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + }] + } + }, + }, + { + label: '产线编号', + field: 'lineCode', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + }, + { + label: '工序编号', + field: 'processCode', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + }, + { + label: '工位编号', + field: 'workstationCode', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + }, + { + label: '创建时间', + field: 'createTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + isForm: false, + }, + { + label: '部门id', + field: 'departmentCode', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + }, + { + label: '备注', + field: 'remark', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + }, + { + label: '地点ID', + field: 'siteId', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + }, + { + label: '是否可用', + field: 'available', + sort: 'custom', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + isTable: true, + isDetail: false, + isSearch: true, + isTableForm: false, + isForm: false, + }, + { + label: '删除时间', + field: 'deletionTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + valueFormat: 'x' + } + }, + }, + { + label: '删除人id', + field: 'deleterId', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + }, + { + label: '并发乐观锁', + field: 'concurrencyStamp', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + form: { + component: 'InputNumber', + value: 0 + }, + }, + { + label: '操作', + field: 'action', + isForm: false, + table: { + width: 150, + fixed: 'right' + } + } +])) From ede6833fba603edb5655a823291d3a0c0468661b Mon Sep 17 00:00:00 2001 From: chenfang Date: Thu, 13 Jun 2024 19:23:41 +0800 Subject: [PATCH 090/104] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E4=BD=8D=E6=9F=A5=E8=AF=A2=E5=BA=93=E5=8C=BA=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/areabasic/index.ts | 5 +++++ .../basicDataManage/customerManage/customerdock/index.vue | 1 + 2 files changed, 6 insertions(+) diff --git a/src/api/wms/areabasic/index.ts b/src/api/wms/areabasic/index.ts index b0e97fffb..840e471db 100644 --- a/src/api/wms/areabasic/index.ts +++ b/src/api/wms/areabasic/index.ts @@ -23,6 +23,11 @@ export const getAreaPage = async (params) => { return await request.get({ url: `/wms/areabasic/page`, params }) } } + +// 查询库区列表 +export const selectAreabasicDOByCode = async (locationCode: String) => { + return await request.get({ url: `/wms/areabasic/getArea`, locationCode }) +} // 查询库区列表 export const getAreaList = async (params) => { return await request.get({ url: `/wms/areabasic/list`, params }) diff --git a/src/views/wms/basicDataManage/customerManage/customerdock/index.vue b/src/views/wms/basicDataManage/customerManage/customerdock/index.vue index 06a9aaea8..ef0c516cc 100644 --- a/src/views/wms/basicDataManage/customerManage/customerdock/index.vue +++ b/src/views/wms/basicDataManage/customerManage/customerdock/index.vue @@ -60,6 +60,7 @@ diff --git a/src/views/eam/itemAccounts/itemAccounts.data.ts b/src/views/eam/itemAccounts/itemAccounts.data.ts index f92091519..0f1284160 100644 --- a/src/views/eam/itemAccounts/itemAccounts.data.ts +++ b/src/views/eam/itemAccounts/itemAccounts.data.ts @@ -68,10 +68,25 @@ export const ItemAccounts = useCrudSchemas( } } }, + { + label: '备件分类', + field: 'classification', + sort: 'custom', + dictType: DICT_TYPE.PART_CLASS, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + isSearch: false, + form: { + component: 'Select', + componentProps: { + disabled: true + } + } + }, { label: '单价', field: 'singlePrice', sort: 'custom', + isTable: false, isSearch: false, form: { component: 'InputNumber', @@ -79,17 +94,18 @@ export const ItemAccounts = useCrudSchemas( } }, { - label: '库存数量', - field: 'qty', + label: '规格型号', + field: 'specifications', sort: 'custom', isSearch: false, form: { - component: 'InputNumber', - value: 0 + componentProps: { + disabled: true + } } }, { - label: '库位编号', + label: '存放位置', field: 'locationNumber', sort: 'custom', table: { @@ -125,6 +141,7 @@ export const ItemAccounts = useCrudSchemas( label: '库区编号', field: 'areaNumber', sort: 'custom', + isTable: false, isSearch: true, table: { width: 180 @@ -136,108 +153,96 @@ export const ItemAccounts = useCrudSchemas( } }, { - label: '品牌', - field: 'brand', - sort: 'custom', - isSearch: false, - form: { - componentProps: { - disabled: true - } - } - }, - { - label: '规格型号', - field: 'specifications', - sort: 'custom', - isSearch: false, - form: { - componentProps: { - disabled: true - } - } - }, - { - label: '是否全局', - field: 'isOverall', - sort: 'custom', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', // 默认都是字符串类型其他暂不考虑 - isSearch: false, - form: { - component: 'Switch', - value: 'TRUE', - componentProps: { - inactiveValue: 'FALSE', - activeValue: 'TRUE', - disabled: true - } - } - }, - { - label: '科目', - field: 'subject', - sort: 'custom', - dictType: DICT_TYPE.SUBJECT, - dictClass: 'string', // 默认都是字符串类型其他暂不考虑 - isSearch: false, - form: { - component: 'Select', - componentProps: { - disabled: true - } - } - }, - { - label: '科目代码', - field: 'subjectCode', - sort: 'custom', - isSearch: false, - form: { - componentProps: { - disabled: true - } - } - }, - { - label: '类别', - field: 'type', - sort: 'custom', - isSearch: false, - form: { - componentProps: { - disabled: true - } - } - }, - { - label: '区域', - field: 'region', - sort: 'custom', - dictType: DICT_TYPE.REGION, - dictClass: 'string', // 默认都是字符串类型其他暂不考虑 - isSearch: false, - form: { - component: 'Select', - componentProps: { - disabled: true - } - } - }, - { - label: '备件分类', - field: 'classification', + label: '库存数量', + field: 'qty', sort: 'custom', - dictType: DICT_TYPE.PART_CLASS, - dictClass: 'string', // 默认都是字符串类型其他暂不考虑 isSearch: false, form: { - component: 'Select', - componentProps: { - disabled: true - } + component: 'InputNumber', + value: 0 } }, + + // { + // label: '品牌', + // field: 'brand', + // sort: 'custom', + // isSearch: false, + // form: { + // componentProps: { + // disabled: true + // } + // } + // }, + + // { + // label: '是否全局', + // field: 'isOverall', + // sort: 'custom', + // dictType: DICT_TYPE.TRUE_FALSE, + // dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + // isSearch: false, + // form: { + // component: 'Switch', + // value: 'TRUE', + // componentProps: { + // inactiveValue: 'FALSE', + // activeValue: 'TRUE', + // disabled: true + // } + // } + // }, + // { + // label: '科目', + // field: 'subject', + // sort: 'custom', + // dictType: DICT_TYPE.SUBJECT, + // dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + // isSearch: false, + // form: { + // component: 'Select', + // componentProps: { + // disabled: true + // } + // } + // }, + // { + // label: '科目代码', + // field: 'subjectCode', + // sort: 'custom', + // isSearch: false, + // form: { + // componentProps: { + // disabled: true + // } + // } + // }, + // { + // label: '类别', + // field: 'type', + // sort: 'custom', + // isSearch: false, + // form: { + // componentProps: { + // disabled: true + // } + // } + // }, + // { + // label: '区域', + // field: 'region', + // sort: 'custom', + // dictType: DICT_TYPE.REGION, + // dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + // isSearch: false, + // form: { + // component: 'Select', + // componentProps: { + // disabled: true + // } + // } + // }, + { label: '计量单位', field: 'uom', @@ -263,79 +268,77 @@ export const ItemAccounts = useCrudSchemas( } } }, - { - label: '库存下限', - field: 'minInventory', - sort: 'custom', - isSearch: false, - form: { - component: 'InputNumber', - value: 0, - componentProps: { - disabled: true - } - } - }, - { - label: '库存上限', - field: 'maxInventory', - sort: 'custom', - isSearch: false, - form: { - component: 'InputNumber', - value: 0, - componentProps: { - disabled: true - } - } - }, - { - label: '更换周期', - field: 'replacementCycle', - sort: 'custom', - isSearch: false, - form: { - component: 'InputNumber', - value: 0, - componentProps: { - disabled: true - } - } - }, - { - label: '存放位置描述', - field: 'storageLocation', - sort: 'custom', - isSearch: false, - form: { - componentProps: { - disabled: true - } - } - }, - { - label: '备注', - field: 'remark', - sort: 'custom', - isSearch: false, - componentProps: { - disabled: true - } - }, - - { - label: '是否可用', - field: 'available', - sort: 'custom', - isSearch: false, - isTable: false, - isForm: false, - isDetail: false, - componentProps: { - disabled: true - } - }, - + // { + // label: '库存下限', + // field: 'minInventory', + // sort: 'custom', + // isSearch: false, + // form: { + // component: 'InputNumber', + // value: 0, + // componentProps: { + // disabled: true + // } + // } + // }, + // { + // label: '库存上限', + // field: 'maxInventory', + // sort: 'custom', + // isSearch: false, + // form: { + // component: 'InputNumber', + // value: 0, + // componentProps: { + // disabled: true + // } + // } + // }, + // { + // label: '更换周期', + // field: 'replacementCycle', + // sort: 'custom', + // isSearch: false, + // form: { + // component: 'InputNumber', + // value: 0, + // componentProps: { + // disabled: true + // } + // } + // }, + // { + // label: '存放位置描述', + // field: 'storageLocation', + // sort: 'custom', + // isSearch: false, + // form: { + // componentProps: { + // disabled: true + // } + // } + // }, + // { + // label: '备注', + // field: 'remark', + // sort: 'custom', + // isSearch: false, + // componentProps: { + // disabled: true + // } + // }, + // { + // label: '是否可用', + // field: 'available', + // sort: 'custom', + // isSearch: false, + // isTable: false, + // isForm: false, + // isDetail: false, + // componentProps: { + // disabled: true + // } + // }, { label: '操作', field: 'action', diff --git a/src/views/eam/sparePartsApplyMain/SparePartsApply.data.ts b/src/views/eam/sparePartsApplyMain/SparePartsApply.data.ts index b58324f71..799716543 100644 --- a/src/views/eam/sparePartsApplyMain/SparePartsApply.data.ts +++ b/src/views/eam/sparePartsApplyMain/SparePartsApply.data.ts @@ -28,16 +28,18 @@ export const SparePartsApplyMain = useCrudSchemas( field: 'sumVal', sort: 'custom', isSearch: false, + isTable: false, isForm: false }, { label: '流程状态', field: 'status', sort: 'custom', - isSearch: false, - isForm: false, + dictType: DICT_TYPE.SPAREPARTS_APPLY_STATUS_ENUM, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + isSearch: true, form: { - component: 'Radio' + component: 'Select' } }, { @@ -45,6 +47,7 @@ export const SparePartsApplyMain = useCrudSchemas( field: 'applyer', sort: 'custom', isSearch: false, + isTable: false, isForm: false }, { @@ -52,6 +55,7 @@ export const SparePartsApplyMain = useCrudSchemas( field: 'approver', sort: 'custom', isSearch: false, + isTable: false, isForm: false, form: { component: 'InputNumber', @@ -63,6 +67,7 @@ export const SparePartsApplyMain = useCrudSchemas( field: 'approveContent', sort: 'custom', isSearch: true, + isTable: false, isForm: false }, { @@ -71,6 +76,7 @@ export const SparePartsApplyMain = useCrudSchemas( sort: 'custom', formatter: dateFormatter, isSearch: false, + isTable: false, isForm: false, search: { component: 'DatePicker', @@ -93,6 +99,7 @@ export const SparePartsApplyMain = useCrudSchemas( field: 'autoExamine', sort: 'custom', isSearch: false, + isTable: false, isForm: false }, { @@ -100,6 +107,7 @@ export const SparePartsApplyMain = useCrudSchemas( field: 'autoAgree', sort: 'custom', isSearch: false, + isTable: false, isForm: false }, { @@ -107,6 +115,7 @@ export const SparePartsApplyMain = useCrudSchemas( field: 'directCreateRecord', sort: 'custom', isSearch: false, + isTable: false, isForm: false }, { @@ -115,6 +124,7 @@ export const SparePartsApplyMain = useCrudSchemas( sort: 'custom', formatter: dateFormatter, isSearch: false, + isTable: false, search: { component: 'DatePicker', componentProps: { From 306cc65bd076ba436b3d486437bf0509a5170398 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Fri, 14 Jun 2024 10:04:27 +0800 Subject: [PATCH 100/104] =?UTF-8?q?=E7=89=A9=E6=96=99=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E3=80=81=E4=BE=9B=E5=BA=94=E5=95=86=E7=AE=A1=E7=90=86=E3=80=81?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AE=A1=E7=90=86--=E6=94=BE=E5=A4=A7?= =?UTF-8?q?=E9=95=9C=E5=8F=AF=E8=BE=93=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerManage/customerdock/customerdock.data.ts | 2 ++ .../basicDataManage/customerManage/project/project.data.ts | 1 + .../wms/basicDataManage/customerManage/saleprice/index.vue | 2 ++ .../customerManage/saleprice/saleprice.data.ts | 2 ++ src/views/wms/basicDataManage/itemManage/bom/bom.data.ts | 3 +++ .../basicDataManage/itemManage/itemarea/itemarea.data.ts | 6 ++++++ .../itemManage/itemwarehouse/itemwarehouse.data.ts | 2 ++ .../productionlineitem/productionlineitem.data.ts | 1 + .../wms/basicDataManage/itemManage/stdcostprice/index.vue | 1 + .../itemManage/stdcostprice/stdcostprice.data.ts | 1 + .../supplierManage/purchaseprice/purchaseprice.data.ts | 2 ++ .../supplierManage/supplieritem/supplieritem.data.ts | 3 +++ 12 files changed, 26 insertions(+) diff --git a/src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts b/src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts index 11ceb2ccb..19102d554 100644 --- a/src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts +++ b/src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts @@ -115,6 +115,7 @@ export const Customerdock = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明！！！', componentProps: { + enterSearch:true, isSearchList: true, searchListPlaceholder: '请选择从仓库代码', searchField: 'code', @@ -135,6 +136,7 @@ export const Customerdock = useCrudSchemas(reactive([ form: { // // labelMessage: '信息提示说明！！！', componentProps: { + enterSearch:true, disabled:true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择库位代码', // 输入框占位文本 diff --git a/src/views/wms/basicDataManage/customerManage/project/project.data.ts b/src/views/wms/basicDataManage/customerManage/project/project.data.ts index dd300c97a..3ce4977d6 100644 --- a/src/views/wms/basicDataManage/customerManage/project/project.data.ts +++ b/src/views/wms/basicDataManage/customerManage/project/project.data.ts @@ -35,6 +35,7 @@ export const Project = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明！！！', componentProps: { + enterSearch:true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择客户代码', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 diff --git a/src/views/wms/basicDataManage/customerManage/saleprice/index.vue b/src/views/wms/basicDataManage/customerManage/saleprice/index.vue index 750133266..c9df169b4 100644 --- a/src/views/wms/basicDataManage/customerManage/saleprice/index.vue +++ b/src/views/wms/basicDataManage/customerManage/saleprice/index.vue @@ -156,6 +156,7 @@ const openForm = (type: string, row?: any) => { } if (item.field == 'itemCode') { item.componentProps.disabled = true + item.componentProps.enterSearch = false item.componentProps.isSearchList = false } }) @@ -167,6 +168,7 @@ const openForm = (type: string, row?: any) => { } if (item.field == 'itemCode') { item.componentProps.disabled = false + item.componentProps.enterSearch = true item.componentProps.isSearchList = true } }) diff --git a/src/views/wms/basicDataManage/customerManage/saleprice/saleprice.data.ts b/src/views/wms/basicDataManage/customerManage/saleprice/saleprice.data.ts index c94c25f57..25f750122 100644 --- a/src/views/wms/basicDataManage/customerManage/saleprice/saleprice.data.ts +++ b/src/views/wms/basicDataManage/customerManage/saleprice/saleprice.data.ts @@ -26,6 +26,7 @@ export const Saleprice = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明！！！', componentProps: { + enterSearch:true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择客户代码', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 @@ -51,6 +52,7 @@ export const Saleprice = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明！！！', componentProps: { + enterSearch:true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择物料代码', // 输入框占位文本 searchField: 'itemCode', // 查询弹窗赋值字段 diff --git a/src/views/wms/basicDataManage/itemManage/bom/bom.data.ts b/src/views/wms/basicDataManage/itemManage/bom/bom.data.ts index ed90ce54a..f33ea742b 100644 --- a/src/views/wms/basicDataManage/itemManage/bom/bom.data.ts +++ b/src/views/wms/basicDataManage/itemManage/bom/bom.data.ts @@ -25,6 +25,7 @@ export const Bom = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明！！！', componentProps: { + enterSearch: true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择物料代码', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 @@ -45,6 +46,7 @@ export const Bom = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明！！！', componentProps: { + enterSearch: true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择物料代码', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 @@ -92,6 +94,7 @@ export const Bom = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明！！！', componentProps: { + enterSearch: true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择工序代码', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 diff --git a/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts b/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts index 6aa8e1d5e..f74b10159 100644 --- a/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts +++ b/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts @@ -27,6 +27,7 @@ export const Itemarea = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明！！！', componentProps: { + enterSearch: true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择物料代码', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 @@ -52,6 +53,7 @@ export const Itemarea = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明！！！', componentProps: { + enterSearch: true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择库区代码', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 @@ -94,6 +96,7 @@ export const Itemarea = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明！！！', componentProps: { + enterSearch: true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择溢出库位代码', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 @@ -118,6 +121,7 @@ export const Itemarea = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明！！！', componentProps: { + enterSearch: true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择物料包装代码', // 输入框占位文本 searchField: 'packUnit', // 查询弹窗赋值字段 @@ -147,6 +151,7 @@ export const Itemarea = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明！！！', componentProps: { + enterSearch: true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择物料包装代码', // 输入框占位文本 searchField: 'packUnit', // 查询弹窗赋值字段 @@ -254,6 +259,7 @@ export const Itemarea = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明！！！', componentProps: { + enterSearch:true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择库区代码', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 diff --git a/src/views/wms/basicDataManage/itemManage/itemwarehouse/itemwarehouse.data.ts b/src/views/wms/basicDataManage/itemManage/itemwarehouse/itemwarehouse.data.ts index 1d3aa7d08..0d3f55203 100644 --- a/src/views/wms/basicDataManage/itemManage/itemwarehouse/itemwarehouse.data.ts +++ b/src/views/wms/basicDataManage/itemManage/itemwarehouse/itemwarehouse.data.ts @@ -19,6 +19,7 @@ export const Itemwarehouse = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明！！！', componentProps: { + enterSearch:true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择物料代码', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 @@ -46,6 +47,7 @@ export const Itemwarehouse = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明！！！', componentProps: { + enterSearch:true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择仓库代码', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 diff --git a/src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts b/src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts index 3524c8118..3e7bfd0b3 100644 --- a/src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts +++ b/src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts @@ -104,6 +104,7 @@ export const Productionlineitem = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明！！！', componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择物料代码', searchField: 'code', diff --git a/src/views/wms/basicDataManage/itemManage/stdcostprice/index.vue b/src/views/wms/basicDataManage/itemManage/stdcostprice/index.vue index 2a4b6a3a7..c4cf85020 100644 --- a/src/views/wms/basicDataManage/itemManage/stdcostprice/index.vue +++ b/src/views/wms/basicDataManage/itemManage/stdcostprice/index.vue @@ -58,6 +58,7 @@