From a07bda0f35b985ce50b94ffcdcb5ea3e6c0d8d43 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Fri, 14 Jun 2024 09:06:15 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=9C=88=E5=8F=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerdock/customerdock.data.ts | 1 + .../customerManage/customerdock/index.vue | 25 +++++++++++-------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts b/src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts index 50709ae3a..11ceb2ccb 100644 --- a/src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts +++ b/src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts @@ -39,6 +39,7 @@ export const Customerdock = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明！！！', componentProps: { + enterSearch:true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择客户代码', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 diff --git a/src/views/wms/basicDataManage/customerManage/customerdock/index.vue b/src/views/wms/basicDataManage/customerManage/customerdock/index.vue index 06a9aaea8..76c7d12aa 100644 --- a/src/views/wms/basicDataManage/customerManage/customerdock/index.vue +++ b/src/views/wms/basicDataManage/customerManage/customerdock/index.vue @@ -150,23 +150,26 @@ const basicFormRef = ref() const openForm = (type: string, row?: any) => { if(type == "update"){ Customerdock.allSchemas.formSchema.forEach((item) => { - if (item.field == 'code') { - item.componentProps.disabled = true - item.componentProps.isSearchList = false - } - if (item.field == 'customerCode') { - item.componentProps.disabled = true - } - }) + if (item.field == 'code') { + item.componentProps.disabled = true + item.componentProps.isSearchList = false + } + if (item.field == 'customerCode') { + item.componentProps.disabled = true + item.componentProps.enterSearch = false + item.componentProps.isSearchList = false + } + }) }else { Customerdock.allSchemas.formSchema.forEach((item) => { if (item.field == 'code') { item.componentProps.disabled = false } if (item.field == 'customerCode') { - item.componentProps.disabled = false - item.componentProps.isSearchList = true - } + item.componentProps.disabled = false + item.componentProps.enterSearch = true + item.componentProps.isSearchList = true + } }) } basicFormRef.value.open(type, row) From 4317826659eb8da765cbd9d291185168c5b845df Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Fri, 14 Jun 2024 09:26:30 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=89=A9=E6=96=99form?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E5=8F=AF=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customeritem/customeritem.data.ts | 2 ++ .../customerManage/customeritem/index.vue | 24 ++++++++++++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts b/src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts index 21b99adbc..df7d8de52 100644 --- a/src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts +++ b/src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts @@ -26,6 +26,7 @@ export const Customeritem = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明！！！', componentProps: { + enterSearch:true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择客户代码', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 @@ -51,6 +52,7 @@ export const Customeritem = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明！！！', componentProps: { + enterSearch: true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择物料代码', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 diff --git a/src/views/wms/basicDataManage/customerManage/customeritem/index.vue b/src/views/wms/basicDataManage/customerManage/customeritem/index.vue index fc4d0ea36..da2ad21d2 100644 --- a/src/views/wms/basicDataManage/customerManage/customeritem/index.vue +++ b/src/views/wms/basicDataManage/customerManage/customeritem/index.vue @@ -41,12 +41,15 @@ @@ -66,6 +69,8 @@ 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 ItembasicApi from '@/api/wms/itembasic' +import { Itembasic } from '../../itemManage/itembasic/itembasic.data' defineOptions({ name: 'Customeritem' }) @@ -199,7 +204,24 @@ const formsSuccess = async (formType,data) => { basicFormRef.value.dialogVisible = false getList() } - +const onEnter = async (field,value)=>{ + console.log(field,value) + if(field=='itemCode'){ + basicFormRef.value.opensearchTable('itemCode', 'code', '物料基础信息', Itembasic.allSchemas, ItembasicApi.getItembasicPage,[{ + key: 'available', + value: 'TRUE', + action: '==', + isSearch: true, + isMainValue: false + },{ + key: 'code', + value: value, + action: '==', + isSearch: true, + isMainValue: false + }]) + } +} // 查询页面返回 const searchTableSuccess = (formField, searchField, val, formRef) => { nextTick(() => { From fa6e15fb497c39edd7971b44c53c9d075788d805 Mon Sep 17 00:00:00 2001 From: songguoqiang <765017469@qq.com> Date: Fri, 14 Jun 2024 09:28:41 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E4=B8=AD=E6=B7=BB=E5=8A=A0Bom=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=AD=97=E6=AE=B5=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productreceiptscrapRecordMain.data.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/productreceiptscrapRecordMain.data.ts b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/productreceiptscrapRecordMain.data.ts index b691f4a01..45af7677c 100644 --- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/productreceiptscrapRecordMain.data.ts +++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/productreceiptscrapRecordMain.data.ts @@ -457,6 +457,14 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( width: 150 }, }, + { + label: 'BOM版本', + field: 'bomVersion', + sort: 'custom', + table: { + width: 150 + }, + }, { label: '库存状态', field: 'inventoryStatus', From a3ab5dcebcab5c70b58cbf103c9690d4c9a00d50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com> Date: Fri, 14 Jun 2024 10:04:17 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=A4=87=E4=BB=B6=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sparePartsInLocationRecordDetail/index.ts | 58 +++ .../sparePartsInLocationRecordMain/index.ts | 72 ++++ .../sparePartsOutLocationDetailRecord.js | 54 +++ .../sparePartsOutLocationRecordMain/index.ts | 71 ++++ .../SparePartsOutLocationRecord.data.ts | 300 ++++++++++++++ .../eam/SparePartsOutLocationRecord/index.vue | 374 ++++++++++++++++++ .../eam/itemAccounts/itemAccounts.data.ts | 353 +++++++++-------- .../SparePartsApply.data.ts | 16 +- 8 files changed, 1120 insertions(+), 178 deletions(-) create mode 100644 src/api/eam/sparePartsInLocationRecordDetail/index.ts create mode 100644 src/api/eam/sparePartsInLocationRecordMain/index.ts create mode 100644 src/api/eam/sparePartsOutLocationRecordDetail/sparePartsOutLocationDetailRecord.js create mode 100644 src/api/eam/sparePartsOutLocationRecordMain/index.ts create mode 100644 src/views/eam/SparePartsOutLocationRecord/SparePartsOutLocationRecord.data.ts create mode 100644 src/views/eam/SparePartsOutLocationRecord/index.vue diff --git a/src/api/eam/sparePartsInLocationRecordDetail/index.ts b/src/api/eam/sparePartsInLocationRecordDetail/index.ts new file mode 100644 index 000000000..55c8eba4a --- /dev/null +++ b/src/api/eam/sparePartsInLocationRecordDetail/index.ts @@ -0,0 +1,58 @@ +import request from '@/config/axios' + +export interface SparePartsInLocationDetailRecordVO { + 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 getSparePartsInLocationDetailRecordPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/eam/spare-parts-in-location-detail-record/senior', data }) + } else { + return await request.get({ url: `/eam/spare-parts-in-location-detail-record/page`, params }) + } +} + +// 查询备件入库记录子详情 +export const getSparePartsInLocationDetailRecord = async (id: number) => { + return await request.get({ url: `/eam/spare-parts-in-location-detail-record/get?id=` + id }) +} + +// 新增备件入库记录子 +export const createSparePartsInLocationDetailRecord = async (data: SparePartsInLocationDetailRecordVO) => { + return await request.post({ url: `/eam/spare-parts-in-location-detail-record/create`, data }) +} + +// 修改备件入库记录子 +export const updateSparePartsInLocationDetailRecord = async (data: SparePartsInLocationDetailRecordVO) => { + return await request.put({ url: `/eam/spare-parts-in-location-detail-record/update`, data }) +} + +// 删除备件入库记录子 +export const deleteSparePartsInLocationDetailRecord = async (id: number) => { + return await request.delete({ url: `/eam/spare-parts-in-location-detail-record/delete?id=` + id }) +} + +// 导出备件入库记录子 Excel +export const exportSparePartsInLocationDetailRecord = async (params) => { + return await request.download({ url: `/eam/spare-parts-in-location-detail-record/export-excel`, params }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/eam/spare-parts-in-location-detail-record/get-import-template' }) +} \ No newline at end of file diff --git a/src/api/eam/sparePartsInLocationRecordMain/index.ts b/src/api/eam/sparePartsInLocationRecordMain/index.ts new file mode 100644 index 000000000..27ce7fb95 --- /dev/null +++ b/src/api/eam/sparePartsInLocationRecordMain/index.ts @@ -0,0 +1,72 @@ +import request from '@/config/axios' + +export interface SparePartsInLocationMainRecordVO { + 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 getSparePartsInLocationMainRecordPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = { ...params } + return await request.post({ url: '/eam/spare-parts-in-location-main-record/senior', data }) + } else { + return await request.get({ url: `/eam/spare-parts-in-location-main-record/page`, params }) + } +} + +// 查询备件入库记录主详情 +export const getSparePartsInLocationMainRecord = async (id: number) => { + return await request.get({ url: `/eam/spare-parts-in-location-main-record/get?id=` + id }) +} + +// 新增备件入库记录主 +export const createSparePartsInLocationMainRecord = async ( + data: SparePartsInLocationMainRecordVO +) => { + return await request.post({ url: `/eam/spare-parts-in-location-main-record/create`, data }) +} + +// 修改备件入库记录主 +export const updateSparePartsInLocationMainRecord = async ( + data: SparePartsInLocationMainRecordVO +) => { + return await request.put({ url: `/eam/spare-parts-in-location-main-record/update`, data }) +} + +// 删除备件入库记录主 +export const deleteSparePartsInLocationMainRecord = async (id: number) => { + return await request.delete({ url: `/eam/spare-parts-in-location-main-record/delete?id=` + id }) +} + +// 导出备件入库记录主 Excel +export const exportSparePartsInLocationMainRecord = async (params) => { + return await request.download({ + url: `/eam/spare-parts-in-location-main-record/export-excel`, + params + }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/eam/spare-parts-in-location-main-record/get-import-template' }) +} diff --git a/src/api/eam/sparePartsOutLocationRecordDetail/sparePartsOutLocationDetailRecord.js b/src/api/eam/sparePartsOutLocationRecordDetail/sparePartsOutLocationDetailRecord.js new file mode 100644 index 000000000..680825ba5 --- /dev/null +++ b/src/api/eam/sparePartsOutLocationRecordDetail/sparePartsOutLocationDetailRecord.js @@ -0,0 +1,54 @@ +import request from '@/utils/request' + +// 创建领用出库记录子 +export function createSparePartsOutLocationRecordDetail(data) { + return request({ + url: '/eam/spare-parts-out-location-detail-record/create', + method: 'post', + data: data + }) +} + +// 更新领用出库记录子 +export function updateSparePartsOutLocationRecordDetail(data) { + return request({ + url: '/eam/spare-parts-out-location-detail-record/update', + method: 'put', + data: data + }) +} + +// 删除领用出库记录子 +export function deleteSparePartsOutLocationRecordDetail(id) { + return request({ + url: '/eam/spare-parts-out-location-detail-record/delete?id=' + id, + method: 'delete' + }) +} + +// 获得领用出库记录子 +export function getSparePartsOutLocationRecordDetail(id) { + return request({ + url: '/eam/spare-parts-out-location-detail-record/get?id=' + id, + method: 'get' + }) +} + +// 获得领用出库记录子分页 +export function getSparePartsOutLocationRecordDetailPage(query) { + return request({ + url: '/eam/spare-parts-out-location-detail-record/page', + method: 'get', + params: query + }) +} + +// 导出领用出库记录子 Excel +export function exportSparePartsOutLocationRecordDetailExcel(query) { + return request({ + url: '/eam/spare-parts-out-location-detail-record/export-excel', + method: 'get', + params: query, + responseType: 'blob' + }) +} diff --git a/src/api/eam/sparePartsOutLocationRecordMain/index.ts b/src/api/eam/sparePartsOutLocationRecordMain/index.ts new file mode 100644 index 000000000..4f075cce1 --- /dev/null +++ b/src/api/eam/sparePartsOutLocationRecordMain/index.ts @@ -0,0 +1,71 @@ +import request from '@/config/axios' + +export interface SparePartsOutLocationRecordMainVO { + id: number + number: string + theme: 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 getSparePartsOutLocationRecordMainPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = { ...params } + return await request.post({ url: '/eam/spare-parts-out-location-main-record/senior', data }) + } else { + return await request.get({ url: `/eam/spare-parts-out-location-main-record/page`, params }) + } +} + +// 查询领用出库记录主详情 +export const getSparePartsOutLocationRecordMain = async (id: number) => { + return await request.get({ url: `/eam/spare-parts-out-location-main-record/get?id=` + id }) +} + +// 新增领用出库记录主 +export const createSparePartsOutLocationRecordMain = async ( + data: SparePartsOutLocationRecordMainVO +) => { + return await request.post({ url: `/eam/spare-parts-out-location-main-record/create`, data }) +} + +// 修改领用出库记录主 +export const updateSparePartsOutLocationRecordMain = async ( + data: SparePartsOutLocationRecordMainVO +) => { + return await request.put({ url: `/eam/spare-parts-out-location-main-record/update`, data }) +} + +// 删除领用出库记录主 +export const deleteSparePartsOutLocationRecordMain = async (id: number) => { + return await request.delete({ url: `/eam/spare-parts-out-location-main-record/delete?id=` + id }) +} + +// 导出领用出库记录主 Excel +export const exportSparePartsOutLocationRecordMain = async (params) => { + return await request.download({ + url: `/eam/spare-parts-out-location-main-record/export-excel`, + params + }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/eam/spare-parts-out-location-main-record/get-import-template' }) +} diff --git a/src/views/eam/SparePartsOutLocationRecord/SparePartsOutLocationRecord.data.ts b/src/views/eam/SparePartsOutLocationRecord/SparePartsOutLocationRecord.data.ts new file mode 100644 index 000000000..cc5804fdd --- /dev/null +++ b/src/views/eam/SparePartsOutLocationRecord/SparePartsOutLocationRecord.data.ts @@ -0,0 +1,300 @@ +import type { CrudSchema } from '@/hooks/web/useCrudSchemas' + +import * as ItemAccountsApi from '@/api/eam/itemAccounts' +import { ItemAccounts } from '@/views/eam/itemAccounts/itemAccounts.data' + +import { EquipmentAccounts } from '@/views/eam/equipmentAccounts/equipmentAccounts.data' +import * as EquipmentItemApi from '@/api/eam/equipmentAccounts' + +import { dateFormatter } from '@/utils/formatTime' + +export const SparePartsOutLocationRecordMain = useCrudSchemas( + reactive([ + { + label: '申请编号', + field: 'number', + sort: 'custom', + isSearch: true, + isForm: false + }, + { + label: '描述', + field: 'description', + sort: 'custom', + isSearch: true + }, + { + label: '申领备件总价', + field: 'sumVal', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false + }, + { + label: '流程状态', + field: 'status', + sort: 'custom', + dictType: DICT_TYPE.SPAREPARTS_APPLY_STATUS_ENUM, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + isSearch: true, + form: { + component: 'Select' + } + }, + { + label: '申请人', + field: 'applyer', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false + }, + { + label: '审核人', + field: 'approver', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + form: { + component: 'InputNumber', + value: 0 + } + }, + { + label: '审核内容', + field: 'approveContent', + sort: 'custom', + isSearch: true, + isTable: false, + isForm: false + }, + { + label: '审核时间', + field: 'approveTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: false, + isTable: false, + isForm: 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 + }, + { + label: '自动通过', + field: 'autoAgree', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false + }, + { + label: '直接生成记录', + field: 'directCreateRecord', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false + }, + { + label: '创建时间', + field: 'createTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: false, + isTable: 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: '操作', + field: 'action', + isForm: false, + table: { + width: 150, + fixed: 'right' + } + } + ]) +) + +//表单校验 +export const SparePartsOutLocationRecordMainRules = reactive({ + description: [{ required: true, message: '描述不能为空', trigger: 'change' }] +}) +/** + * @returns {Array} 备件申请子表 + */ +export const SparePartsOutLocationRecordDetail = useCrudSchemas( + reactive([ + { + 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: 'type', + dictType: DICT_TYPE.DEVICE_TYPE, + dictClass: 'string', + isTable: true, + sort: 'custom', + isSearch: false, + table: { + width: 150 + }, + tableForm: { + type: 'Select' + } + }, + { + label: '设备工装编号', + field: 'equipmentCode', + sort: 'custom', + table: { + width: 150 + }, + form: { + // labelMessage: '信息提示说明！！！', + 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 + } + ] + } + }, + tableForm: { + isInpuFocusShow: true, + searchListPlaceholder: '请选择备件编号', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '备件信息', // 查询弹窗标题 + searchAllSchemas: EquipmentAccounts.allSchemas, // 查询弹窗所需类 + searchPage: EquipmentItemApi.getEquipmentAccountsPage, // 查询弹窗所需分页方法 + searchCondition: [ + { + key: 'status', + value: 'NORMAL', + action: '==', + isSearch: true, + isMainValue: false + } + ] + } + }, + + { + label: '库存数量', + field: 'currentQty', + sort: 'custom', + isSearch: false, + tableForm: { + disabled: true + } + }, + { + label: '申领数量', + field: 'applyQty', + sort: 'custom', + isSearch: false + }, + { + label: '备注', + field: 'remark', + sort: 'custom', + isSearch: false + }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false, + table: { + width: 150, + fixed: 'right' + }, + isTableForm: false + } + ]) +) + +//表单校验 +export const SparePartsOutLocationRecordDetailRules = reactive({ + applyQty: [{ required: true, message: '请输入标包数量', trigger: 'blur' }] +}) diff --git a/src/views/eam/SparePartsOutLocationRecord/index.vue b/src/views/eam/SparePartsOutLocationRecord/index.vue new file mode 100644 index 000000000..61719219e --- /dev/null +++ b/src/views/eam/SparePartsOutLocationRecord/index.vue @@ -0,0 +1,374 @@ + + + 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 5/6] =?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 @@