From b24e4cfbf1edc4eb07baa624614df4921eda8c6b Mon Sep 17 00:00:00 2001 From: bjang03 <259278618@qq.com> Date: Tue, 9 Jul 2024 08:54:30 +0800 Subject: [PATCH 01/38] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D=20HL-3915?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../countManage/count/countPlanMain/index.vue | 37 ++++++++++--------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/src/views/wms/countManage/count/countPlanMain/index.vue b/src/views/wms/countManage/count/countPlanMain/index.vue index 5d7c2ecb9..4395f9e9d 100644 --- a/src/views/wms/countManage/count/countPlanMain/index.vue +++ b/src/views/wms/countManage/count/countPlanMain/index.vue @@ -108,40 +108,41 @@ From ce880b8d3789fef363e8ec0e77af09cf53628348 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Tue, 9 Jul 2024 11:25:47 +0800 Subject: [PATCH 15/38] =?UTF-8?q?=E5=88=B6=E5=93=81=E8=BF=94=E4=BF=AE?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E4=BF=AE=E6=94=B9=E4=B8=BA=E8=AF=B7=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E8=BF=94=E4=BF=AE=E7=94=9F=E4=BA=A7=E7=BA=BF=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=EF=BC=8C=E9=A1=B5=E9=9D=A2=E9=87=8C=E7=9A=84=E8=AF=B7?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E7=94=9F=E4=BA=A7=E7=BA=BF=E4=BB=A3=E7=A0=81?= =?UTF-8?q?->=E8=AF=B7=E9=80=89=E6=8B=A9=E8=BF=94=E4=BF=AE=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E7=BA=BF=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productrepairRequestMain/productrepairRequestMain.data.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts index 309e89bc0..bdcb195cd 100644 --- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts +++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts @@ -566,7 +566,7 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive },{ key: 'productionLineCode', value: 'productionLineCode', - message: '请填写生产线代码！', + message: '请选择返修生产线代码！', isMainValue: true }] }, @@ -586,7 +586,7 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive },{ key: 'productionLineCode', value: 'productionLineCode', - message: '请填写生产线代码！', + message: '请选择返修生产线代码！', isMainValue: true }] } From daeed16deef6588c17c69bef1ec5a640da965c81 Mon Sep 17 00:00:00 2001 From: bjang03 <259278618@qq.com> Date: Tue, 9 Jul 2024 11:27:12 +0800 Subject: [PATCH 16/38] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D=20HL-3897=EF=BC=8CH?= =?UTF-8?q?L-3908?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../count/countPlanMain/countPlanMain.data.ts | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts index defc2b3f5..4247edc61 100644 --- a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts +++ b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts @@ -106,20 +106,20 @@ export const CountPlanMain = useCrudSchemas(reactive([ value: 'BY_INEVNEOTY' } }, - { - label: '限值', - field: 'limitedValue', - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'InputNumber', - componentProps:{ - disabled:false - } - } - }, + // { + // label: '限值', + // field: 'limitedValue', + // sort: 'custom', + // table: { + // width: 150 + // }, + // form: { + // component: 'InputNumber', + // componentProps:{ + // disabled:false + // } + // } + // }, { label: '物料忽略名单', field: 'ignoreListOfItem', From 7f0caef857bc781f071e979b77131e0ab8743134 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Tue, 9 Jul 2024 11:28:54 +0800 Subject: [PATCH 17/38] =?UTF-8?q?QMS=E6=A3=80=E9=AA=8C=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=EF=BC=8C=E7=82=B9=E5=87=BB=E6=89=A7=E8=A1=8C=E5=90=8E=EF=BC=8C?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E9=BB=98=E8=AE=A4=E6=98=BE=E7=A4=BA=E7=AC=AC?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E6=A3=80=E9=AA=8C=E4=BB=BB=E5=8A=A1(?= =?UTF-8?q?=E7=9B=AE=E5=89=8D=E7=B3=BB=E7=BB=9F=E6=98=BE=E7=A4=BA=E7=9A=84?= =?UTF-8?q?=E6=98=AF=E6=9C=80=E5=90=8E=E4=B8=80=E4=B8=AA=E6=A3=80=E9=AA=8C?= =?UTF-8?q?=E5=B7=A5=E5=BA=8F)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/inspectionJob/addForm.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/qms/inspectionJob/addForm.vue b/src/views/qms/inspectionJob/addForm.vue index 6cf33a50e..592b812f5 100644 --- a/src/views/qms/inspectionJob/addForm.vue +++ b/src/views/qms/inspectionJob/addForm.vue @@ -664,7 +664,7 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any list = await InspectionJobDetailPageApi.getInspectionJobDetailList(row.id) data.value.packageList = await InspectionJobPackageApi.getInspectionJobPackageList(row.id) list.forEach((item, index) => { - // editableTabsValue.value = index + 1 + editableTabsValue.value = 1 item.name = index + 1 item.inspectionJobCharacteristicsUpdateReqVO = item.inspectionJobCharacteristicsRespVO item.isPass = '' //判断是否显示对号错误图标 From 4df92b480ed470dad1dcfbd57ab4bb4a1acf5849 Mon Sep 17 00:00:00 2001 From: gaojs <757918719@qq.com> Date: Tue, 9 Jul 2024 11:56:49 +0800 Subject: [PATCH 18/38] =?UTF-8?q?WMS=20=E2=80=94=E2=80=94>=20bug=20?= =?UTF-8?q?=E8=B0=83=E6=8B=A8=E5=87=BA=E5=BA=93=EF=BC=8C=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E8=AE=A1=E9=87=8F=E5=8D=95=E4=BD=8D=E6=B2=A1=E6=9C=89=E5=B8=A6?= =?UTF-8?q?=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../transferissue/transferissueRequestMain/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue index 24d0df98b..ae1397bce 100644 --- a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue @@ -115,6 +115,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => row['packingNumber'] = val[0]['packingNumber'] row['containerNumber'] = val[0]['containerNumber'] row['batch'] = val[0]['batch'] + row['uom'] = val[0]['uom'] row['inventoryStatus'] = val[0]['inventoryStatus'] row['fromLocationCode'] = val[0]['locationCode'] row['itemCode'] = val[0]['itemCode'] From fb2329ec2b9bcc130216a1c81c8a50385d44f177 Mon Sep 17 00:00:00 2001 From: gaojs <757918719@qq.com> Date: Tue, 9 Jul 2024 13:15:37 +0800 Subject: [PATCH 19/38] =?UTF-8?q?WMS=20=E2=80=94=E2=80=94>=20bug=20?= =?UTF-8?q?=E8=B0=83=E6=8B=A8=E5=87=BA=E5=BA=93=E6=96=B0=E5=A2=9E=EF=BC=8C?= =?UTF-8?q?=E8=AE=A1=E9=87=8F=E5=8D=95=E4=BD=8D=E6=B2=A1=E6=9C=89=E5=B8=A6?= =?UTF-8?q?=E5=87=BA=EF=BC=8C=E5=B9=B6=E4=B8=8D=E8=83=BD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../transferissueRequestMain/transferissueRequestMain.data.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts index dd7828519..4c5170a52 100644 --- a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts @@ -692,7 +692,8 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive( width: 150 }, tableForm: { - type: 'Select' + type: 'Select', + disabled: true, } }, { From 921fe8876971c28507fc16bf6f98fbbb5654764a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com> Date: Tue, 9 Jul 2024 14:32:34 +0800 Subject: [PATCH 20/38] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../index.ts | 24 +- .../SparePartsOutLocationRecord.data.ts | 133 +++--- .../eam/SparePartsOutLocationRecord/index.vue | 2 +- src/views/eam/itemAccounts/index.vue | 15 +- .../eam/itemAccounts/itemAccounts.data.ts | 3 + .../maintainExperience.data.ts | 164 ++++---- .../repairExperience/repairExperience.data.ts | 205 +++++---- .../eam/sparePartsInLocationRecord/index.vue | 7 +- .../sparePartsInLocationRecordMain.data.ts | 392 ++++++++---------- src/views/eam/sparepartsinlocation/index.vue | 49 +-- 10 files changed, 459 insertions(+), 535 deletions(-) diff --git a/src/api/eam/sparePartsOutLocationRecordDetail/index.ts b/src/api/eam/sparePartsOutLocationRecordDetail/index.ts index c4ea46811..afffa390c 100644 --- a/src/api/eam/sparePartsOutLocationRecordDetail/index.ts +++ b/src/api/eam/sparePartsOutLocationRecordDetail/index.ts @@ -28,45 +28,49 @@ export const getSparePartsOutLocationDetailRecordPage = 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 }) + return await request.post({ url: '/eam/spare-parts-out-location-detail-record/senior', data }) } else { - return await request.get({ url: `/eam/spare-parts-in-location-main-record/page`, params }) + return await request.get({ url: `/eam/spare-parts-out-location-detail-record/page`, params }) } } // 查询备件入库记录主详情 export const getSparePartsOutLocationDetailRecord = async (id: number) => { - return await request.get({ url: `/eam/spare-parts-in-location-main-record/get?id=` + id }) + return await request.get({ url: `/eam/spare-parts-out-location-detail-record/get?id=` + id }) } // 新增备件入库记录主 export const createSparePartsOutLocationDetailRecord = async ( - data: SparePartsInLocationMainRecordVO + data: SparePartsOutLocationRecordDetailVO ) => { - return await request.post({ url: `/eam/spare-parts-in-location-main-record/create`, data }) + return await request.post({ url: `/eam/spare-parts-out-location-detail-record/create`, data }) } // 修改备件入库记录主 export const updateSparePartsOutLocationDetailRecord = async ( - data: SparePartsInLocationMainRecordVO + data: SparePartsOutLocationRecordDetailVO ) => { - return await request.put({ url: `/eam/spare-parts-in-location-main-record/update`, data }) + return await request.put({ url: `/eam/spare-parts-out-location-detail-record/update`, data }) } // 删除备件入库记录主 export const deleteSparePartsOutLocationDetailRecord = async (id: number) => { - return await request.delete({ url: `/eam/spare-parts-in-location-main-record/delete?id=` + id }) + return await request.delete({ + url: `/eam/spare-parts-out-location-detail-record/delete?id=` + id + }) } // 导出备件入库记录主 Excel export const exportSparePartsOutLocationDetailRecord = async (params) => { return await request.download({ - url: `/eam/spare-parts-in-location-main-record/export-excel`, + url: `/eam/spare-parts-out-location-detail-record/export-excel`, params }) } // 下载用户导入模板 export const importTemplate = () => { - return request.download({ url: '/eam/spare-parts-in-location-main-record/get-import-template' }) + return request.download({ + url: '/eam/spare-parts-out-location-detail-record/get-import-template' + }) } diff --git a/src/views/eam/SparePartsOutLocationRecord/SparePartsOutLocationRecord.data.ts b/src/views/eam/SparePartsOutLocationRecord/SparePartsOutLocationRecord.data.ts index 56a2508a2..b42a0405e 100644 --- a/src/views/eam/SparePartsOutLocationRecord/SparePartsOutLocationRecord.data.ts +++ b/src/views/eam/SparePartsOutLocationRecord/SparePartsOutLocationRecord.data.ts @@ -11,113 +11,88 @@ import { dateFormatter } from '@/utils/formatTime' export const SparePartsOutLocationRecordMain = useCrudSchemas( reactive([ { - label: '编号', - field: 'number', + label: '备件编号', + field: 'sparePartsCode', sort: 'custom', isSearch: true, - isForm: false + isForm: false, + table: { + width: 180, + fixed: 'left' + } }, { - label: '出库编号', - field: 'requestNumber', + label: '备件名称', + field: 'name', sort: 'custom', isSearch: true, - isForm: false + table: { + width: 110 + } }, { - label: '入库主题', - field: 'theme', + label: '备件名称', + field: 'name', sort: 'custom', - isSearch: true + isSearch: true, + table: { + width: 110 + } }, { - label: '入库类型', - field: 'type', + label: '备件类型', + field: 'classification', sort: 'custom', - dictType: DICT_TYPE.PUT_IN_TYPE, - dictClass: 'string' + dictType: DICT_TYPE.PART_CLASS, + dictClass: 'string', + isSearch: false, + isTable: true, + tableForm: { + type: 'Select' + } }, { - label: '流程状态', - field: 'status', - sort: 'custom', - isSearch: false, - isForm: false, - - dictType: DICT_TYPE.SPAREPARTS_APPLY_STATUS_ENUM, - dictClass: 'string' + label: '规格型号', + field: 'specifications', + sort: 'custom' }, + { - label: '入库申请人', - field: 'applyer', - sort: 'custom', - isSearch: false + label: '存放位置', + field: 'locationCode', + sort: 'custom' }, { - label: '审核人', - field: 'approver', + label: '计量单位', + field: 'uom', sort: 'custom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', isSearch: false, - isForm: false + isTable: true, + tableForm: { + type: 'Select' + } }, { - label: '审核内容', - field: 'approveContent', - sort: 'custom', - isSearch: false, - isForm: false + label: '生产厂家', + field: 'brand', + sort: 'custom' }, { - label: '审核时间', - field: 'approveTime', - sort: 'custom', - formatter: dateFormatter, - isSearch: 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' - } - }, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - } + label: '申请单号', + field: 'requestNumber', + sort: 'custom' }, { - 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: 'applyQty', + sort: 'custom' }, - { - label: '备注', - field: 'remark', - sort: 'custom', - isSearch: false + label: '出库时问', + field: 'createTime', + sort: 'custom' } ]) ) diff --git a/src/views/eam/SparePartsOutLocationRecord/index.vue b/src/views/eam/SparePartsOutLocationRecord/index.vue index 35ed57fbc..7cff87de1 100644 --- a/src/views/eam/SparePartsOutLocationRecord/index.vue +++ b/src/views/eam/SparePartsOutLocationRecord/index.vue @@ -153,7 +153,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef) => { // 子表新增的时候选择表格之后需要会显得字段 const Echo = [] const { tableObject, tableMethods } = useTable({ - getListApi: SparePartsOutLocationRecordMainApi.getSparePartsOutLocationRecordMainPage // 分页接口 + getListApi: SparePartsOutLocationRecordDetailApi.getSparePartsOutLocationDetailRecordPage // 分页接口 }) // 获得表格的各种操作 diff --git a/src/views/eam/itemAccounts/index.vue b/src/views/eam/itemAccounts/index.vue index 3e8f617a3..1085c7899 100644 --- a/src/views/eam/itemAccounts/index.vue +++ b/src/views/eam/itemAccounts/index.vue @@ -60,20 +60,7 @@ - + ([ - { - label: 'id', - field: 'id', - sort: 'custom', - }, - { - label: '经验标题', - field: 'name', - sort: 'custom', - isSearch: true, - }, - { - label: '经验内容', - field: 'content', - sort: 'custom', - isTable:true, - form: { - componentProps: { - type: 'textarea', - height: 200 +export const MaintainExperience = useCrudSchemas( + reactive([ + { + label: '经验标题', + field: 'name', + sort: 'custom', + isSearch: true + }, + { + label: '经验内容', + field: 'content', + sort: 'custom', + isTable: true, + form: { + componentProps: { + type: 'textarea', + height: 200 + } + } + }, + + { + label: '保养工单编号', + field: 'maintainNumber', + sort: 'custom', + isSearch: true, + isForm: false + }, + { + label: '工单类型', + field: 'orderType', + sort: 'custom', + isForm: false, + isTable: false, + form: { + component: 'SelectV2' } }, - }, - - { - label: '保养工单编号', - field: 'maintainNumber', - sort: 'custom', - isSearch: true, - isForm: false, - }, - { - label: '工单类型', - field: 'orderType', - sort: 'custom', - isForm: false, - isTable: false, - form: { - component: 'SelectV2' + { + label: '来源字典', + field: 'sources', + sort: 'custom', + dictType: DICT_TYPE.EAM_MAINTENANCE_SOURCES, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + isSearch: false, + isForm: false + }, + { + label: '保养类型', + field: 'type', + sort: 'custom', + dictType: DICT_TYPE.DEVICE_TYPE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + isSearch: false, + isForm: false }, - }, - { - label: '来源字典', - field: 'sources', - sort: 'custom', - dictType: DICT_TYPE.EAM_MAINTENANCE_SOURCES, - dictClass: 'string', // 默认都是字符串类型其他暂不考虑 - isSearch: false, - isForm:false - }, - { - label: '保养类型', - field: 'type', - sort: 'custom', - dictType: DICT_TYPE.DEVICE_TYPE, - dictClass: 'string', // 默认都是字符串类型其他暂不考虑 - isSearch: false, - isForm:false - }, - { - label: '设备/工装编号', - field: 'equipmentCode', - sort: 'custom', - isSearch:false, - isForm:false - }, - { - label: '设备/工装名称', - field: 'equipmentName', - sort: 'custom', - isSearch:false, - isForm:false - }, - { - label: '创建时间', - field: 'createTime', - sort: 'custom', - formatter: dateFormatter, - isForm: false, - detail:{ - dateFormat: 'YYYY-MM-DD HH:mm:ss' + { + label: '设备/工装编号', + field: 'equipmentCode', + sort: 'custom', + isSearch: false, + isForm: false + }, + { + label: '设备/工装名称', + field: 'equipmentName', + sort: 'custom', + isSearch: false, + isForm: false + }, + { + label: '创建时间', + field: 'createTime', + sort: 'custom', + formatter: dateFormatter, + isForm: false, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + } } - }, - - - -])) + ]) +) diff --git a/src/views/eam/repairExperience/repairExperience.data.ts b/src/views/eam/repairExperience/repairExperience.data.ts index 3f0e48465..0582461b7 100644 --- a/src/views/eam/repairExperience/repairExperience.data.ts +++ b/src/views/eam/repairExperience/repairExperience.data.ts @@ -4,114 +4,109 @@ import { dateFormatter } from '@/utils/formatTime' // 表单校验 export const RepairExperienceRules = reactive({ name: [required], - repairNumber: [required], + repairNumber: [required] }) -export const RepairExperience = useCrudSchemas(reactive([ +export const RepairExperience = useCrudSchemas( + reactive([ + { + label: '经验标题', + field: 'name', + sort: 'custom', + isSearch: true + }, + { + label: '维修工单编号', + field: 'repairNumber', + sort: 'custom', + isSearch: true, - { - label: 'id', - field: 'id', - sort: 'custom', - }, - { - label: '经验标题', - field: 'name', - sort: 'custom', - isSearch: true, - }, - { - label: '维修工单编号', - field: 'repairNumber', - sort: 'custom', - isSearch: true, - - isForm: false, - }, - { - label: '经验内容', - field: 'content', - sort: 'custom', - isSearch:false, - form: { - component: 'Input', - componentProps: { - type:'textarea', - valueHtml: '', - height: 200 + isForm: false + }, + { + label: '经验内容', + field: 'content', + sort: 'custom', + isSearch: false, + form: { + component: 'Input', + componentProps: { + type: 'textarea', + valueHtml: '', + height: 200 + } } }, - }, - - { - label: '来源字典', - field: 'sources', - sort: 'custom', - dictType: DICT_TYPE.EAM_MAINTENANCE_SOURCES, - dictClass: 'string', // 默认都是字符串类型其他暂不考虑 - isSearch: false, - isForm:false - }, - { - label: '报修类型', - field: 'type', - sort: 'custom', - dictType: DICT_TYPE.DEVICE_TYPE, - dictClass: 'string', // 默认都是字符串类型其他暂不考虑 - isSearch: false, - isForm:false - }, - { - label: '设备/工装编号', - field: 'equipmentCode', - sort: 'custom', - isSearch:false, - isForm:false - }, - { - label: '设备/工装名称', - field: 'equipmentName', - sort: 'custom', - isSearch:false, - isForm:false - }, - { - label: '故障时间', - field: 'faultTime', - formatter: dateFormatter, - sort: 'custom', - isSearch:false, - isForm:false, - detail:{ - dateFormat: 'YYYY-MM-DD HH:mm:ss' - } - }, - { - label: '故障类型', - field: 'faultType', - sort: 'custom', - isSearch: false, - isForm:false - }, - { - label: '创建人', - field: 'createTime', - sort: 'custom', - isSearch:false, - isForm:false, - isTable:false, - isDetail:false - }, - { - label: '创建时间', - field: 'createTime', - sort: 'custom', - formatter: dateFormatter, - isForm: false, - isSearch:false, - detail:{ - dateFormat: 'YYYY-MM-DD HH:mm:ss' + + { + label: '来源字典', + field: 'sources', + sort: 'custom', + dictType: DICT_TYPE.EAM_MAINTENANCE_SOURCES, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + isSearch: false, + isForm: false + }, + { + label: '报修类型', + field: 'type', + sort: 'custom', + dictType: DICT_TYPE.DEVICE_TYPE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + isSearch: false, + isForm: false + }, + { + label: '设备/工装编号', + field: 'equipmentCode', + sort: 'custom', + isSearch: false, + isForm: false + }, + { + label: '设备/工装名称', + field: 'equipmentName', + sort: 'custom', + isSearch: false, + isForm: false + }, + { + label: '故障时间', + field: 'faultTime', + formatter: dateFormatter, + sort: 'custom', + isSearch: false, + isForm: false, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + } + }, + { + label: '故障类型', + field: 'faultType', + sort: 'custom', + isSearch: false, + isForm: false + }, + { + label: '创建人', + field: 'createTime', + sort: 'custom', + isSearch: false, + isForm: false, + isTable: false, + isDetail: false + }, + { + label: '创建时间', + field: 'createTime', + sort: 'custom', + formatter: dateFormatter, + isForm: false, + isSearch: false, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + } } - }, - -])) + ]) +) diff --git a/src/views/eam/sparePartsInLocationRecord/index.vue b/src/views/eam/sparePartsInLocationRecord/index.vue index 86aefd08e..981c0e399 100644 --- a/src/views/eam/sparePartsInLocationRecord/index.vue +++ b/src/views/eam/sparePartsInLocationRecord/index.vue @@ -44,7 +44,7 @@ - + { // 子表新增的时候选择表格之后需要会显得字段 const Echo = [] const { tableObject, tableMethods } = useTable({ - getListApi: SparePartsInLocationRecordMainApi.getSparePartsInLocationRecordMainPage // 分页接口 + getListApi: SparePartsInLocationRecordDetailApi.getSparePartsInLocationRecordDetailPage // 分页接口 }) // 获得表格的各种操作 @@ -100,12 +100,11 @@ const HeadButttondata = [ defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null) // 设置 - ] // 头部按钮事件 const buttonBaseClick = (val, item) => { -if (val == 'refresh') { + if (val == 'refresh') { // 刷新 getList() } else if (val == 'filtrate') { diff --git a/src/views/eam/sparePartsInLocationRecord/sparePartsInLocationRecordMain.data.ts b/src/views/eam/sparePartsInLocationRecord/sparePartsInLocationRecordMain.data.ts index c0d7b7b30..44e521d7d 100644 --- a/src/views/eam/sparePartsInLocationRecord/sparePartsInLocationRecordMain.data.ts +++ b/src/views/eam/sparePartsInLocationRecord/sparePartsInLocationRecordMain.data.ts @@ -3,129 +3,102 @@ import { dateFormatter } from '@/utils/formatTime' import * as ItemAccountsApi from '@/api/eam/itemAccounts' import { ItemAccounts } from '@/views/eam/itemAccounts/itemAccounts.data' - // 表单校验 export const SparePartsInLocationRecordMainRules = reactive({ number: [required], theme: [required], - type: [required], + type: [required] }) // 备件入库主表 -export const SparePartsInLocationRecordMain = 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, - }, - { - label: '入库主题', - field: 'theme', - sort: 'custom', - isSearch: true, - },{ - label: '入库类型', - field: 'type', - sort: 'custom', - dictType: DICT_TYPE.PUT_IN_TYPE, - dictClass: 'string', - - }, - { - 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, - isForm:false - }, - { - label: '审核内容', - field: 'approveContent', - sort: 'custom', - isSearch: false, - isForm:false - }, - { - label: '审核时间', - field: 'approveTime', - sort: 'custom', - formatter: dateFormatter, - isSearch: 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')] +export const SparePartsInLocationRecordMain = useCrudSchemas( + reactive([ + { + label: '备件编号', + field: 'sparePartsCode', + sort: 'custom', + isSearch: true, + isForm: false, + table: { + width: 180, + fixed: 'left' } }, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - valueFormat: 'x' + { + label: '备件名称', + field: 'name', + sort: 'custom', + isSearch: true, + table: { + width: 110 } }, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + { + label: '备件名称', + field: 'name', + sort: 'custom', + isSearch: true, + table: { + width: 110 + } }, - }, - { - 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')] + { + label: '备件类型', + field: 'classification', + sort: 'custom', + dictType: DICT_TYPE.PART_CLASS, + dictClass: 'string', + isSearch: false, + isTable: true, + tableForm: { + type: 'Select' } }, - isForm: false, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + + { + label: '规格型号', + field: 'specifications', + sort: 'custom' }, - }, - - { - label: '备注', - field: 'remark', - sort: 'custom', - isSearch: false, - }, -])) + { + label: '存放位置', + field: 'locationCode', + sort: 'custom' + }, + { + label: '计量单位', + field: 'uom', + sort: 'custom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isSearch: false, + isTable: true, + tableForm: { + type: 'Select' + } + }, + { + label: '生产厂家', + field: 'brand', + sort: 'custom' + }, + { + label: '申请单号', + field: 'requestNumber', + sort: 'custom' + }, + { + label: '申领数量', + field: 'applyQty', + sort: 'custom' + }, + { + label: '出库时问', + field: 'createTime', + sort: 'custom' + } + ]) +) // 备件入库子表 export const SparePartsInLocationRecordDetailRules = reactive({ number: [required], @@ -133,24 +106,42 @@ export const SparePartsInLocationRecordDetailRules = reactive({ locationCode: [required], areaCode: [required], sparePartsCode: [required], - applyQty: [required], + applyQty: [required] }) -export const SparePartsInLocationRecordDetail = useCrudSchemas(reactive([ - { - label: '库位编号', - field: 'locationCode', - sort: 'custom', - isSearch: false, - form: { - componentProps: { - isSearchList: true, // 开启查询弹窗 - searchListPlaceholder: '请选择库位编号', // 输入框占位文本 - searchField: 'code', // 查询弹窗赋值字段 - searchTitle: '库位信息', // 查询弹窗标题 - - searchAllSchemas: ItemAccounts.allSchemas, // 查询弹窗所需类 - searchPage: ItemAccountsApi.getItemAccountsPage, // 查询弹窗所需分页方法 +export const SparePartsInLocationRecordDetail = useCrudSchemas( + reactive([ + { + label: '库位编号', + field: 'locationCode', + sort: 'custom', + isSearch: false, + form: { + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择库位编号', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + 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', @@ -160,99 +151,80 @@ export const SparePartsInLocationRecordDetail = useCrudSchemas(reactive { // 查询页面返回 const searchTableSuccess = (formField, searchField, val, formRef, type, row) => { - nextTick(() => { - const setV = {} - setV[formField] = val[0][searchField] - console.log(11, val[0]) - if (type == 'tableForm') { - if (formField == 'locationCode') { - row['locationCode'] = val[0].locationNumber - row['areaCode'] = val[0].areaNumber - row['sparePartsCode'] = val[0].itemNumber - row['currentQty'] = val[0].qty - row['isRadeIn'] = val[0].isRadeIn - } - } else { - if (formField == 'locationCode') { - setV['locationCode'] = val[0].locationNumber - setV['areaCode'] = val[0].areaNumber - setV['sparePartsCode'] = val[0].itemNumber - setV['currentQty'] = val[0].qty - setV['isRadeIn'] = val[0].isRadeIn - } + nextTick(() => { + const setV = {} + setV[formField] = val[0][searchField] + console.log(11, val[0]) + if (type == 'tableForm') { + if (formField == 'locationCode') { + row['locationCode'] = val[0].locationNumber + row['areaCode'] = val[0].areaNumber + row['sparePartsCode'] = val[0].itemNumber + row['currentQty'] = val[0].qty + row['isRadeIn'] = val[0].isRadeIn + } + } else { + if (formField == 'locationCode') { + setV['locationCode'] = val[0].locationNumber + setV['areaCode'] = val[0].areaNumber + setV['sparePartsCode'] = val[0].itemNumber + setV['currentQty'] = val[0].qty + setV['isRadeIn'] = val[0].isRadeIn } - formRef.setValues(setV) - }) + } + formRef.setValues(setV) + }) } // 查询页面返回——详情 const searchTableSuccessDetail = (formField, searchField, val, formRef) => { @@ -363,11 +363,6 @@ const submitForm = async (formType, data) => { data.subList = tableData.value // 拼接子表数据参数 console.log(formRef.value) formRef.value.formLoading = true - let isHave = data.subList.some(item=>item.applyQty>item.currentQty) - if(isHave){ - message.warning('申领数量不能大于库存数量') - return - } try { if (formType === 'create') { await SparePartsInLocationMainApi.createSparePartsInLocationMain(data) From 600812e7a9becb8749c82488f34d65fa91b81a7b Mon Sep 17 00:00:00 2001 From: gaojs <757918719@qq.com> Date: Tue, 9 Jul 2024 14:35:04 +0800 Subject: [PATCH 21/38] =?UTF-8?q?WMS=20=E2=80=94=E2=80=94>=20bug=20=20?= =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE=E7=AE=A1=E7=90=86->?= =?UTF-8?q?=E7=89=A9=E6=96=99=E7=AE=A1=E7=90=86->=E7=89=A9=E6=96=99?= =?UTF-8?q?=E5=8C=85=E8=A3=85=E4=BF=A1=E6=81=AF=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=97=B6=E7=82=B9=E5=87=BB=E5=8C=85=E8=A3=85=E8=A7=84=E6=A0=BC?= =?UTF-8?q?=EF=BC=8C=E8=BF=9B=E5=85=A5=E5=8C=85=E8=A3=85=E8=A7=84=E6=A0=BC?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=A1=B5=E9=9D=A2=EF=BC=8C=E8=AF=A5=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=B1=95=E7=A4=BA=E5=8C=85=E8=A3=85=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=EF=BC=8C=E4=BD=86=E6=98=AF=E4=B8=BB=E9=A1=B5=E9=9D=A2=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E5=8C=85=E8=A3=85=E7=B1=BB=E5=9E=8B=E7=9A=84=E5=B1=95?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../itemManage/itempackage/itempackage.data.ts | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts b/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts index 6a2d7c6e4..04e2537e2 100644 --- a/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts +++ b/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts @@ -95,6 +95,17 @@ export const Itempackaging = useCrudSchemas(reactive([ isForm:false, isDetail:false }, + { + label: '包装类型', + field: 'packType', + dictType: DICT_TYPE.PACK_UNIT_TYPE, + dictClass: 'string', + sort: 'custom', + isSearch: true, + table: { + width: 150 + }, + }, { label: '包装数量', field: 'packQty', From 36719fde427035b27cc5b38c77a46ead1e72fdce Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Tue, 9 Jul 2024 14:35:37 +0800 Subject: [PATCH 22/38] =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E7=AC=AC=E4=B8=80=E4=B8=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Detail/src/Detail.vue | 3 +++ src/components/Tabs/src/Tabs.vue | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue index 52b781867..82af70806 100644 --- a/src/components/Detail/src/Detail.vue +++ b/src/components/Detail/src/Detail.vue @@ -625,6 +625,9 @@ const titleNameRef = ref() const titleValueRef = ref() const count =ref(0) const openDetail = async (row: any, titleName: any, titleValue: any, tableName: any) => { + if(tabRef.value){ + tabRef.value.changeCurrent(0) + } annexTableData.value = [] titleNameRef.value = titleName titleValueRef.value = titleValue diff --git a/src/components/Tabs/src/Tabs.vue b/src/components/Tabs/src/Tabs.vue index 8c22163f6..57add6cef 100644 --- a/src/components/Tabs/src/Tabs.vue +++ b/src/components/Tabs/src/Tabs.vue @@ -32,7 +32,13 @@ const change = (item, index) => { current.value = index emit('change',item,index) } + +const changeCurrent = (index) =>{ + change(props.tabsList[index],index) +} const emit = defineEmits(['change']) +defineExpose({ changeCurrent}) + From 2b9af5013e894aa2f629468db77083110ecd4bee Mon Sep 17 00:00:00 2001 From: gaojs <757918719@qq.com> Date: Tue, 9 Jul 2024 14:51:17 +0800 Subject: [PATCH 23/38] =?UTF-8?q?WMS=20=E2=80=94=E2=80=94>=20bug=20=20?= =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE=E7=AE=A1=E7=90=86->?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AE=A1=E7=90=86->=E9=A1=B9=E7=9B=AE=20?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=97=B6=E5=AE=A2=E6=88=B7=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=98=AF=E5=BF=85=E5=A1=AB=E9=A1=B9=E4=BD=86=E6=98=AF=E6=9C=AA?= =?UTF-8?q?=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/basicDataManage/customerManage/project/project.data.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/views/wms/basicDataManage/customerManage/project/project.data.ts b/src/views/wms/basicDataManage/customerManage/project/project.data.ts index 622fbb5ed..95da14f67 100644 --- a/src/views/wms/basicDataManage/customerManage/project/project.data.ts +++ b/src/views/wms/basicDataManage/customerManage/project/project.data.ts @@ -205,6 +205,9 @@ export const ProjectRules = reactive({ name: [ { max: 50, message: '不得超过50个字符', trigger: 'blur' } ], + customerCode: [ + { required: true,message: '请输入客户代码', trigger: 'blur' } + ], remark: [ { max: 50, message: '不得超过50个字符', trigger: 'blur' } ], From 7beb3514cb9de52492bb9d30ee826fbd3514b787 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Tue, 9 Jul 2024 14:57:38 +0800 Subject: [PATCH 24/38] =?UTF-8?q?=E8=A1=A5=E6=96=99=E7=94=B3=E8=AF=B7=20?= =?UTF-8?q?=E9=9A=90=E8=97=8F=E5=AD=90=E8=A1=A8=E4=B8=AD=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E7=9A=84=E5=88=B0=E5=BA=93=E4=BD=8D=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repleinshRequestMain/repleinshRequestMain.data.ts | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts index e12e661d9..37a24c678 100644 --- a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts +++ b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts @@ -642,8 +642,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive([ sortSearchDefault:1000, isSearch: true, sortTableDefault:1100, - // isTableForm: false, - + isTableForm: false, }, // { @@ -881,9 +880,9 @@ export const RepleinshRequestDetailRules = reactive({ // inventoryStatus: [ // { required: true, message: '请选择库存状态', trigger: 'change' } // ], - toLocationCode: [ - { required: true, message: '请输入到库位代码', trigger: 'blur' } - ], + // toLocationCode: [ + // { required: true, message: '请输入到库位代码', trigger: 'blur' } + // ], itemCode: [ { required: true, message: '请输入物料代码', trigger: 'blur' } ], From 490b675447a792a6f230e9e77d3427a23739a1cc Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Tue, 9 Jul 2024 16:07:25 +0800 Subject: [PATCH 25/38] =?UTF-8?q?=E5=90=88=E6=A0=BC=E8=BD=AC=E9=9A=94?= =?UTF-8?q?=E7=A6=BB=E7=94=B3=E8=AF=B7=E6=B7=BB=E5=8A=A0=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventorymoveRequestMain/index.vue | 47 +++++++++++-------- .../inventorymoveRequestMain.data.ts | 1 + 2 files changed, 28 insertions(+), 20 deletions(-) diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue index bb663d3d6..b92e5212d 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue @@ -42,6 +42,8 @@ nextTick(() => { if (type == 'tableForm') { if(formField == 'fromPackingNumber'){ - row['fromPackingNumber'] = val[0]['packingNumber'] - row['fromContainerNumber'] = val[0]['containerNumber'] - row['itemCode'] = val[0]['itemCode'] - row['fromBatch'] = val[0]['batch'] - row['fromInventoryStatus'] = val[0]['inventoryStatus'] - row['fromLocationCode'] = val[0]['locationCode'] - row['uom'] = val[0]['uom'] - if(routeName.value == 'OktoholdRequestMain'){ - row['toInventoryStatus'] = "HOLD" - }else if ( routeName.value == 'HoldtookRequestMain') { - row['toInventoryStatus'] = "OK" - }else if ( routeName.value == 'HoldtoscrapRequestMain') { - row['toInventoryStatus'] = "SCRAP" - }else if ( routeName.value == 'OktoscrapRequestMain') { - row['toInventoryStatus'] = "SCRAP" - }else if ( routeName.value == 'ScraptoholdRequestMain') { - row['toInventoryStatus'] = "HOLD" - }else{ - row['toInventoryStatus'] = val[0]['inventoryStatus'] - } + + val.forEach(item=>{ + const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) + newRow['fromPackingNumber'] = item['packingNumber'] + newRow['fromContainerNumber'] = item['containerNumber'] + newRow['itemCode'] = item['itemCode'] + newRow['fromBatch'] = item['batch'] + newRow['fromInventoryStatus'] = item['inventoryStatus'] + newRow['fromLocationCode'] = item['locationCode'] + newRow['uom'] = item['uom'] + if(routeName.value == 'OktoholdRequestMain'){ + newRow['toInventoryStatus'] = "HOLD" + }else if ( routeName.value == 'HoldtookRequestMain') { + newRow['toInventoryStatus'] = "OK" + }else if ( routeName.value == 'HoldtoscrapRequestMain') { + newRow['toInventoryStatus'] = "SCRAP" + }else if ( routeName.value == 'OktoscrapRequestMain') { + newRow['toInventoryStatus'] = "SCRAP" + }else if ( routeName.value == 'ScraptoholdRequestMain') { + newRow['toInventoryStatus'] = "HOLD" + }else{ + newRow['toInventoryStatus'] = item['inventoryStatus'] + } + tableData.value.push(newRow) + }) } else { row[formField] = val[0][searchField] } diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts index 8a52a684d..d22558b36 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts @@ -545,6 +545,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( width: 150 }, tableForm:{ + multiple:true, isInpuFocusShow: true, // 开启查询弹窗 searchListPlaceholder: '请选择从包装号', searchField: 'packingNumber', From 17df25887bfd85161ebf2215ee69af98f171c012 Mon Sep 17 00:00:00 2001 From: TengXF <302828528@qq.com> Date: Tue, 9 Jul 2024 16:14:36 +0800 Subject: [PATCH 26/38] =?UTF-8?q?SCP=E4=BE=9B=E5=BA=94=E5=95=86=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=85=B3=E8=81=94=E7=AE=A1=E7=90=86=EF=BC=8C=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E5=85=B3=E8=81=94=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../systemSetting/supplierUser/index.vue | 15 ++++--- .../supplierUser/supplierUser.data.ts | 44 ++++++++++++++----- 2 files changed, 42 insertions(+), 17 deletions(-) diff --git a/src/views/wms/basicDataManage/systemSetting/supplierUser/index.vue b/src/views/wms/basicDataManage/systemSetting/supplierUser/index.vue index cb66c5960..c8d92b883 100644 --- a/src/views/wms/basicDataManage/systemSetting/supplierUser/index.vue +++ b/src/views/wms/basicDataManage/systemSetting/supplierUser/index.vue @@ -55,11 +55,11 @@ - { } } - + // 查询列表页面参数设置 const searchTableParams = ref([ @@ -184,6 +184,9 @@ const searchTableSuccess = (formField, searchField, val, formRef) => { nextTick(() => { const setV = {} setV[formField] = val[0][searchField] + if(formField == 'userName'){ + setV['userId'] = val[0]['id'] + } formRef.setValues(setV) }) } diff --git a/src/views/wms/basicDataManage/systemSetting/supplierUser/supplierUser.data.ts b/src/views/wms/basicDataManage/systemSetting/supplierUser/supplierUser.data.ts index 1e5c4a94e..94a3317c8 100644 --- a/src/views/wms/basicDataManage/systemSetting/supplierUser/supplierUser.data.ts +++ b/src/views/wms/basicDataManage/systemSetting/supplierUser/supplierUser.data.ts @@ -15,7 +15,7 @@ export const User = useCrudSchemas(reactive([ }, { label: '用户名称', - field: 'username', + field: 'userName', sort: 'custom', table: { width: 150 @@ -58,7 +58,8 @@ export const User = useCrudSchemas(reactive([ // 表单校验 export const SupplierUserRules = reactive({ - userId: [required], + // userId: [required], + userName: [required], supplierCode: [required], status: [required], concurrencyStamp: [required], @@ -75,11 +76,37 @@ export const SupplierUser = useCrudSchemas(reactive([ label: '用户ID', field: 'userId', sort: 'custom', + isForm: false, isSearch: true, + // tableForm:{ + // isInpuFocusShow: true, + // searchListPlaceholder: '请选用户信息', + // searchField: 'username', + // searchTitle: '用户信息', + // searchAllSchemas: User.allSchemas, + // searchPage: UserApi.getUserPage + // }, + // form: { + // // labelMessage: '信息提示说明！！！', + // componentProps: { + // dialogWidth:'1025px',//搜索出来弹窗的宽度 + // isSearchList: true, + // searchListPlaceholder: '请选用户信息', + // searchField: 'username', + // searchTitle: '用户信息', + // searchAllSchemas: User.allSchemas, + // searchPage: UserApi.getUserPage + // } + // } + }, + { + label: '用户账号', + field: 'userName', + sort: 'custom', tableForm:{ isInpuFocusShow: true, searchListPlaceholder: '请选用户信息', - searchField: 'id', + searchField: 'username', searchTitle: '用户信息', searchAllSchemas: User.allSchemas, searchPage: UserApi.getUserPage @@ -90,18 +117,13 @@ export const SupplierUser = useCrudSchemas(reactive([ dialogWidth:'1025px',//搜索出来弹窗的宽度 isSearchList: true, searchListPlaceholder: '请选用户信息', - searchField: 'id', + searchField: 'username', searchTitle: '用户信息', searchAllSchemas: User.allSchemas, searchPage: UserApi.getUserPage } - } - }, - { - label: '用户账号', - field: 'userName', - sort: 'custom', - isForm: false, + }, + isSearch: true, }, { label: '用户昵称', From fcf855a0e48ee32efb9535457aaf6c1e8b1bcd51 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Tue, 9 Jul 2024 16:50:34 +0800 Subject: [PATCH 27/38] =?UTF-8?q?=E5=BA=93=E5=86=85=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E7=AE=A1=E7=90=86--=E6=B7=BB=E5=8A=A0=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../containerMainRequest.data.ts | 1 + .../containerMainRequest/index.vue | 15 ++++-- .../initialContainerMainRequest/index.vue | 23 +++++--- .../initialContainerMainRequest.data.ts | 1 + .../inventoryinitRequestMain/index.vue | 14 ++++- .../inventoryinitRequestMain.data.ts | 1 + .../packageoverRequestMain/index.vue | 34 +++++++----- .../packageoverRequestMain.data.ts | 1 + .../transferissueRequestMain/index.vue | 20 ++++--- .../transferissueRequestMain.data.ts | 1 + .../inventorychangeRequestMain/index.vue | 54 ++++++++++--------- .../inventorychangeRequestMain.data.ts | 1 + 12 files changed, 108 insertions(+), 58 deletions(-) diff --git a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts index ed1f59bfd..dabab54a5 100644 --- a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts +++ b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts @@ -357,6 +357,7 @@ export const ContainerDetailRequest = useCrudSchemas(reactive([ field: 'containerNumber', sort: 'custom', tableForm:{ + multiple:true, isInpuFocusShow: true, // 开启查询弹窗 searchListPlaceholder: '请选择器具号', searchField: 'itemCode', diff --git a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue index 250cf0c72..6226545d9 100644 --- a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue +++ b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue @@ -42,6 +42,8 @@ nextTick(() => { if (type == 'tableForm') { if(formField == 'containerNumber') { - row['containerNumber'] = val[0]['itemCode'] - row['uom'] = val[0]['uom'] - row['fromLocationCode'] = val[0]['locationCode'] - row['fromInventoryStatus'] = val[0]['inventoryStatus'] + + val.forEach(item=>{ + const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) + newRow['containerNumber'] = item['itemCode'] + newRow['uom'] = item['uom'] + newRow['fromLocationCode'] = item['locationCode'] + newRow['fromInventoryStatus'] = item['inventoryStatus'] + tableData.value.push(newRow) + }) }else if(formField == 'toLocationCode'){ row['toLocationCode'] = val[0]['code'] }else { diff --git a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue index a8b9799b5..80a5ba071 100644 --- a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue +++ b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue @@ -42,6 +42,8 @@ nextTick(() => { if (type == 'tableForm') { if(formField == 'containerNumber') { - row['containerNumber'] = val[0]['code'] - row['uom'] = val[0]['uom'] - row['toInventoryStatus'] = 'OK' - }else if(formField == 'toLocationCode'){ - row['toLocationCode'] = val[0]['code'] - }else { - row[formField] = val[0][searchField] - } + val.forEach(item=>{ + const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) + newRow['containerNumber'] = item['code'] + newRow['uom'] = item['uom'] + newRow['toInventoryStatus'] = 'OK' + tableData.value.push(newRow) + }) + + }else if(formField == 'toLocationCode'){ + row['toLocationCode'] = val[0]['code'] + }else { + row[formField] = val[0][searchField] + } } const setV = {} setV[formField] = val[0][searchField] diff --git a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts index 42a132c15..97a6dc837 100644 --- a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts +++ b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts @@ -358,6 +358,7 @@ export const ContainerDetailRequest = useCrudSchemas(reactive([ field: 'containerNumber', sort: 'custom', tableForm:{ + multiple:true, isInpuFocusShow: true, // 开启查询弹窗 searchListPlaceholder: '请选择器具号', searchField: 'itemCode', diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue index 342766d7c..391bc45ec 100644 --- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue @@ -42,6 +42,8 @@ nextTick(() => { if (type == 'tableForm') { // 明细查询页赋值 - row[formField] = val[0][searchField] if(formField=='itemCode'){ //物料代码 - row['uom'] = val[0]['uom'] + val.forEach(item=>{ + const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) + newRow[formField] = item[searchField] + newRow['uom'] = item['uom'] + tableData.value.push(newRow) + }) + }else if(formField=='packUnit'){ //包装规格1 + row[formField] = val[0][searchField] row['packUnit'] = val[0]['packUnit'] row['packQty'] = val[0]['packQty'] }else if(formField=='secondPackUnit'){ //包装规格2 + row[formField] = val[0][searchField] row['secondPackUnit'] = val[0]['packUnit'] row['secondPackQty'] = val[0]['packQty'] }else if(formField == 'balancePackUnit'){ // 入库存包装规格 + row[formField] = val[0][searchField] row['balancePackUnit'] = val[0]['packUnit'] } } else { diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts index 8f7b40872..7ea15a22d 100644 --- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts @@ -394,6 +394,7 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive( width: 150 }, tableForm:{ + multiple:true, enterSearch:true, isInpuFocusShow: true, // 开启查询弹窗 searchListPlaceholder: '请选择物料代码', diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue index 788f4465e..dab4cf2b7 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue @@ -42,6 +42,8 @@ if (type == 'tableForm') { // 明细查询页赋值 if (formField == 'itemCode') { - row['itemCode'] = val[0]['itemCode'] - row['uom'] = val[0]['uom'] - row['qty'] = val[0]['qty'] - row['batch'] = val[0]['batch'] - row['fromLocationCode'] = val[0]['locationCode'] - row['toLocationCode'] = val[0]['locationCode'] - row['fromLocationGroupCode'] = val[0]['locationGroupCode'] - row['toLocationGroupCode'] = val[0]['locationGroupCode'] - row['fromAreaCode'] = val[0]['areaCode'] - row['toAreaCode'] = val[0]['areaCode'] - row['inventoryStatus'] = val[0]['inventoryStatus'] - row['fromPackUnit'] = val[0]['packUnit'] - row['fromPackQty'] = val[0]['packQty'] + + val.forEach(item=>{ + const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) + newRow['itemCode'] = item['itemCode'] + newRow['uom'] = item['uom'] + newRow['qty'] = item['qty'] + newRow['batch'] = item['batch'] + newRow['fromLocationCode'] = item['locationCode'] + newRow['toLocationCode'] = item['locationCode'] + newRow['fromLocationGroupCode'] = item['locationGroupCode'] + newRow['toLocationGroupCode'] = item['locationGroupCode'] + newRow['fromAreaCode'] = item['areaCode'] + newRow['toAreaCode'] = item['areaCode'] + newRow['inventoryStatus'] = item['inventoryStatus'] + newRow['fromPackUnit'] = item['packUnit'] + newRow['fromPackQty'] = item['packQty'] + tableData.value.push(newRow) + }) + } else if (formField == 'toPackUnit') { row['toPackUnit'] = val[0]['packUnit'] row['toPackQty'] = val[0]['packQty'] diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts index ad67b4e19..91bbeb867 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts @@ -452,6 +452,7 @@ export const PackageoverRequestDetail = useCrudSchemas(reactive([ } }, tableForm:{ + multiple:true, isInpuFocusShow: true, searchListPlaceholder: '请选择物料代码', // 输入框占位文本 searchField: 'itemCode', // 查询弹窗赋值字段 diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue index ae1397bce..c10f1bcc4 100644 --- a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue @@ -42,6 +42,8 @@ if (type == 'tableForm') { // 明细查询页赋值 if (formField == 'packingNumber') { - row['packingNumber'] = val[0]['packingNumber'] - row['containerNumber'] = val[0]['containerNumber'] - row['batch'] = val[0]['batch'] - row['uom'] = val[0]['uom'] - row['inventoryStatus'] = val[0]['inventoryStatus'] - row['fromLocationCode'] = val[0]['locationCode'] - row['itemCode'] = val[0]['itemCode'] + val.forEach(item=>{ + const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) + newRow['packingNumber'] = item['packingNumber'] + newRow['containerNumber'] = item['containerNumber'] + newRow['batch'] = item['batch'] + newRow['uom'] = item['uom'] + newRow['inventoryStatus'] = item['inventoryStatus'] + newRow['fromLocationCode'] = item['locationCode'] + newRow['itemCode'] = item['itemCode'] + tableData.value.push(newRow) + }) } else { row[formField] = val[0][searchField] } diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts index 4c5170a52..1d3630a91 100644 --- a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts @@ -619,6 +619,7 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive( width: 150 }, tableForm:{ + multiple:true, isInpuFocusShow: true, // 开启查询弹窗 searchListPlaceholder: '请选择包装号', searchField: 'packingNumber', diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue index 143b2f135..aefda2d5c 100644 --- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue +++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue @@ -53,6 +53,8 @@ if(formField=='toOwnerCode'){ //到货主代码 row['toOwnerCode'] = val[0]['code'] - }else{ - row[formField] = val[0][searchField] - row['fromPackingNumber'] = val[0]['packingNumber'] - row['toPackingNumber'] = val[0]['packingNumber'] - row['fromBatch'] = val[0]['batch'] - row['toBatch'] = val[0]['batch'] - row['fromInventoryStatus'] = val[0]['inventoryStatus'] - row['toInventoryStatus'] = val[0]['inventoryStatus'] - row['fromContainerNumber'] = val[0]['containerNumber'] - row['toContainerNumber'] = val[0]['containerNumber'] - row['fromQty'] = val[0]['qty'] - row['toQty'] = val[0]['qty'] - row['fromOwnerCode'] = val[0]['ownerCode'] - row['fromAltBatch'] = val[0]['altBatch'] - row['toAltBatch'] = val[0]['altBatch'] - row['fromArriveDate'] = val[0]['arriveDate'] - row['toArriveDate'] = val[0]['arriveDate'] - row['fromProduceDate'] = val[0]['produceDate'] - row['toProduceDate'] = val[0]['produceDate'] - row['fromExpireDate'] = val[0]['expireDate'] - row['toExpireDate'] = val[0]['expireDate'] - row['itemCode'] = val[0]['itemCode'] - row['locationCode'] = val[0]['locationCode'] - row['uom'] = val[0]['uom'] + }else if(formField == 'fromPackingNumber'){ + val.forEach(item=>{ + const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) + newRow[formField] = item[searchField] + newRow['fromPackingNumber'] = item['packingNumber'] + newRow['toPackingNumber'] = item['packingNumber'] + newRow['fromBatch'] = item['batch'] + newRow['toBatch'] = item['batch'] + newRow['fromInventoryStatus'] = item['inventoryStatus'] + newRow['toInventoryStatus'] = item['inventoryStatus'] + newRow['fromContainerNumber'] = item['containerNumber'] + newRow['toContainerNumber'] = item['containerNumber'] + newRow['fromQty'] = item['qty'] + newRow['toQty'] = item['qty'] + newRow['fromOwnerCode'] = item['ownerCode'] + newRow['fromAltBatch'] = item['altBatch'] + newRow['toAltBatch'] = item['altBatch'] + newRow['fromArriveDate'] = item['arriveDate'] + newRow['toArriveDate'] = item['arriveDate'] + newRow['fromProduceDate'] = item['produceDate'] + newRow['toProduceDate'] = item['produceDate'] + newRow['fromExpireDate'] = item['expireDate'] + newRow['toExpireDate'] = item['expireDate'] + newRow['itemCode'] = item['itemCode'] + newRow['locationCode'] = item['locationCode'] + newRow['uom'] = item['uom'] + tableData.value.push(newRow) + }) } } else { diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts index 74acc42bd..b6e8cc592 100644 --- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts @@ -383,6 +383,7 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive Date: Tue, 9 Jul 2024 17:02:07 +0800 Subject: [PATCH 28/38] =?UTF-8?q?=E5=8F=91=E8=BF=90=E7=BB=93=E7=AE=97?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../relegate/relegateRequest/index.vue | 25 +++++++++++-------- .../relegateRequestMain.data.ts | 2 ++ .../saleShipmentMainRequest/index.vue | 17 ++++++++----- .../saleShipmentMain.data.ts | 1 + 4 files changed, 29 insertions(+), 16 deletions(-) diff --git a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue index 0311d8b2e..777c111db 100644 --- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue +++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue @@ -29,7 +29,7 @@ nextTick(() => { if (type == 'tableForm') { if (formField == 'itemCode') { - row['itemCode'] = val[0]['itemCode'] - row['uom'] = val[0]['uom'] - row['qty'] = val[0]['qty'] - row['fromBatch'] = val[0]['batch'] - row['fromPackingNumber'] = val[0]['packingNumber'] - row['toBatch'] = val[0]['batch'] - row['toPackingNumber'] = val[0]['packingNumber'] - row['fromLocationCode'] = val[0]['locationCode'] - row['inventoryStatus'] = val[0]['inventoryStatus'] + val.forEach(item=>{ + const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) + newRow['itemCode'] = item['itemCode'] + newRow['uom'] = item['uom'] + newRow['qty'] = item['qty'] + newRow['fromBatch'] = item['batch'] + newRow['fromPackingNumber'] = item['packingNumber'] + newRow['toBatch'] = item['batch'] + newRow['toPackingNumber'] = item['packingNumber'] + newRow['fromLocationCode'] = item['locationCode'] + newRow['inventoryStatus'] = item['inventoryStatus'] + tableData.value.push(newRow) + }) + } else if (formField == 'downItemCode') { row['downItemCode'] = val[0]['code'] } else if (formField == 'toLocationCode') { diff --git a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts index c759b61b6..9111450eb 100644 --- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts +++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts @@ -59,6 +59,7 @@ export const RelegateRequestMain = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明！！！', componentProps: { + enterSearch: true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择仓库代码', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 @@ -318,6 +319,7 @@ export const RelegateRequestDetail = useCrudSchemas(reactive([ } }, tableForm:{ + multiple:true, isInpuFocusShow: true, searchListPlaceholder: '请选择物料代码', // 输入框占位文本 searchField: 'itemCode', // 查询弹窗赋值字段 diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue index afac9f2f0..f34280f34 100644 --- a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue +++ b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue @@ -42,7 +42,7 @@ nextTick(() => { if (type == 'tableForm') { if(formField == 'soLine') { - row['soLine'] = val[0]['lineNumber'] - row['soNumber'] = val[0]['number'] - row['itemCode'] = val[0]['itemCode'] - row['projectCode'] = val[0]['projectCode'] - row['uom'] = val[0]['uom'] + val.forEach(item=>{ + const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) + newRow['soLine'] = item['lineNumber'] + newRow['soNumber'] = item['number'] + newRow['itemCode'] = item['itemCode'] + newRow['projectCode'] = item['projectCode'] + newRow['uom'] = item['uom'] + tableData.value.push(newRow) + }) + }else if(formField == 'fromLocationCode'){ row['fromLocationCode'] = val[0]['defaultLocationCode'] } diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts index 08d9752d6..139f6b6f4 100644 --- a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts +++ b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts @@ -339,6 +339,7 @@ export const SaleShipmentDetail = useCrudSchemas(reactive([ width: 150 }, tableForm:{ + multiple: true, isInpuFocusShow: true, // 开启查询弹窗 searchListPlaceholder: '请选择销售订单行', searchField: 'lineNumber', From c54fbed62f6a2d60d43d8e53af725f4596b603cf Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Tue, 9 Jul 2024 17:09:07 +0800 Subject: [PATCH 29/38] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?= =?UTF-8?q?=E7=A5=A8=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinvoiceRecordMain/index.vue | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue index d2ea9d461..86e5bbba9 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue @@ -125,6 +125,9 @@ import * as SupplierinvoiceRecordDetailApi from '@/api/wms/supplierinvoiceRecord import * as defaultButtons from '@/utils/disposition/defaultButtons' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' import * as SupplierinvoiceRequestDetailApi from '@/api/wms/supplierinvoiceRequestDetail' +import * as PackageApi from "@/api/wms/package"; +import {getAccessToken} from "@/utils/auth"; +import {getJmreportBaseUrl} from "@/utils/systemParam"; // 供应商发票记录主 defineOptions({ name: 'SupplierinvoiceRecordMain' }) @@ -151,7 +154,7 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ defaultButtons.defaultExportBtn({hasPermi:'wms:supplierinvoice-record-main:export'}), // 导出 - // defaultButtons.mainLisSelectiontPointBtn(null), // 批量打印 + defaultButtons.mainLisSelectiontPointBtn(null), // 批量打印 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 @@ -180,28 +183,26 @@ const buttonBaseClick = (val, item) => { getList() } } else if (val == 'filtrate') { // 筛选 - } else { // 其他按钮 + }else { // 其他按钮 console.log('其他按钮', item) } } + +const BASE_URL = getJmreportBaseUrl() +const srcPoint = ref(BASE_URL + '/jmreport/view/970564557155733504?token=' + getAccessToken()) const handleSelectionPoint = async ()=>{ let rows:any = [] selectionRows.value.forEach(item=>{ rows = [...rows,...item.selectionRows.map(item1=>item1.id)] }) if(rows.length==0){ + message.warning('至少选择一条数据！') return } console.log('批量打印',rows.join(',')) - // let getLoading = ElLoading.service({ - // lock: true, - // text: 'loading...', - // background: 'rgba(0, 0, 0, 0.7)' - // }) - // getLoading?.close() - - + window.open(srcPoint.value+'&ids='+rows.join(',')) } + // 列表-操作按钮 const butttondata = (row,$index) => { return [ @@ -310,4 +311,4 @@ onMounted(async () => { color:var(--el-color-danger); font-weight:700; } - \ No newline at end of file + From a3b0dd9b1f9799584c51ff99c489a4122e51b94e Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Tue, 9 Jul 2024 18:00:32 +0800 Subject: [PATCH 30/38] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionreturnRequestMain/index.vue | 11 +++++++-- .../productionMainAssemble/index.vue | 10 ++++++-- .../productionMainAssemble.data.ts | 1 + .../productionMainAssembleSparePart/index.vue | 10 ++++++-- .../productionMainAssembleSparePart.data.ts | 1 + .../productionMainPredictSparePart/index.vue | 10 ++++++-- .../productionMainPredictSparePart.data.ts | 1 + .../index.vue | 24 ++++++++++++------- .../productputawayAssembleRequestMain.data.ts | 1 + .../productreceiptRequestMain/index.vue | 15 ++++++++++-- .../productreceiptRequestMain.data.ts | 1 + .../index.vue | 14 +++++++++-- .../productreceiptAssembleRequestMain.data.ts | 1 + .../productreceiptscrapRequestMain/index.vue | 19 ++++++++++++--- .../productreceiptscrapRequestMain.data.ts | 1 + .../productscrapRequestMain/index.vue | 14 ++++++++--- .../productscrapRequestMain.data.ts | 1 + 17 files changed, 108 insertions(+), 27 deletions(-) diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue index 59cb00dc0..af65818e2 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue @@ -42,6 +42,8 @@ }) } } else if(formField == 'workStationCode') { - row['workStationCode'] = val[0]['code'] - row['fromLocationCode'] = val[0]['rawLocationCode'] + // 明细查询页赋值 + val.forEach(item=>{ + const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) + newRow['workStationCode'] = item['code'] + newRow['fromLocationCode'] = item['rawLocationCode'] + tableData.value.push(newRow) + }) } else if(formField == 'packUnit') { row['packUnit'] = val[0]['packUnit'] row['packQty'] = val[0]['packQty'] diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue index d74384f20..0afec4008 100644 --- a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue +++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue @@ -42,6 +42,8 @@ // }).catch(err =>{ // console.log(err); // }) - row[formField] = val[0][searchField] - row['uom'] = val[0]['uom'] + val.forEach(item=>{ + const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) + newRow[formField] = item[searchField] + newRow['uom'] = item['uom'] + tableData.value.push(newRow) + }) } else { const setV = {} if(formField == 'workshop'){ diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts index b6b85d8b5..4bf309088 100644 --- a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts +++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts @@ -635,6 +635,7 @@ export const ProductionDetail = useCrudSchemas(reactive([ } }, tableForm:{ + multiple: true, enterSearch:true, isInpuFocusShow: true, searchListPlaceholder: '请选择物料代码', // 输入框占位文本 diff --git a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue index 1c8dc8bb6..41164cefb 100644 --- a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue +++ b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue @@ -42,6 +42,8 @@ // }).catch(err =>{ // console.log(err); // }) - row[formField] = val[0][searchField] - row['uom'] = val[0]['uom'] + val.forEach(item=>{ + const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) + newRow[formField] = item[searchField] + newRow['uom'] = item['uom'] + tableData.value.push(newRow) + }) } else { const setV = {} if(formField == 'workshop'){ diff --git a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts index 7b01b6b20..47e9efe15 100644 --- a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts +++ b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts @@ -627,6 +627,7 @@ export const ProductionDetail = useCrudSchemas(reactive([ } }, tableForm:{ + multiple:true, enterSearch:true, isInpuFocusShow: true, searchListPlaceholder: '请选择物料代码', // 输入框占位文本 diff --git a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue index c9a6eb60f..6aa22fecd 100644 --- a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue +++ b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue @@ -42,6 +42,8 @@ // }).catch(err =>{ // console.log(err); // }) - row[formField] = val[0][searchField] - row['uom'] = val[0]['uom'] + val.forEach(item=>{ + const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) + newRow[formField] = item[searchField] + newRow['uom'] = item['uom'] + tableData.value.push(newRow) + }) } else { const setV = {} if(formField == 'workshop'){ diff --git a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts index 4ad8db37b..5b2907265 100644 --- a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts +++ b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts @@ -628,6 +628,7 @@ export const ProductionDetail = useCrudSchemas(reactive([ } }, tableForm:{ + multiple:true, enterSearch:true, isInpuFocusShow: true, searchListPlaceholder: '请选择物料代码', // 输入框占位文本 diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue index b7195c45f..378abf063 100644 --- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue +++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue @@ -42,6 +42,8 @@ nextTick(() => { if (type == 'tableForm') { // 明细查询页赋值 - row[formField] = val[0][searchField] - row['poLine'] = val[0]['itemCode'] - row['packingNumber'] = val[0]['packingNumber'] - row['containerNumber'] = val[0]['containerNumber'] - row['batch'] = val[0]['batch'] - row['uom'] = val[0]['uom'] - row['inventoryStatus'] = val[0]['inventoryStatus'] - row['fromLocationCode'] = val[0]['locationCode'] + val.forEach(item=>{ + const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) + newRow[formField] = item[searchField] + newRow['poLine'] = item['itemCode'] + newRow['packingNumber'] = item['packingNumber'] + newRow['containerNumber'] = item['containerNumber'] + newRow['batch'] = item['batch'] + newRow['uom'] = item['uom'] + newRow['inventoryStatus'] = item['inventoryStatus'] + newRow['fromLocationCode'] = item['locationCode'] + tableData.value.push(newRow) + }) } else { const setV = {} setV[formField] = val[0][searchField] diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts index 620475a8a..9dcc911d5 100644 --- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts +++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts @@ -447,6 +447,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive width: 150 }, tableForm:{ + multiple: true, isInpuFocusShow: true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择物料代码', // 输入框占位文本 diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue index 7fb5b61d8..8263f8d62 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue @@ -42,6 +42,8 @@ if (formField == 'secondPackUnit') { row['secondPackUnit'] = val[0]['packUnit'] row['secondPackQty'] = val[0]['packQty'] + row[formField] = val[0][searchField] }else if(formField == 'packUnit'){ row['packUnit'] = val[0]['packUnit'] row['packQty'] = val[0]['packQty'] + row[formField] = val[0][searchField] }else if (formField == 'itemCode') { row['uom'] = val[0]['uom'] row['produceDate'] = dayjs().valueOf() + row[formField] = val[0][searchField] + }else if (formField == 'workStationCode') { + // 明细查询页赋值 + val.forEach(item=>{ + const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) + newRow[formField] = item[searchField] + tableData.value.push(newRow) + }) } - // 明细查询页赋值 - row[formField] = val[0][searchField] + } else { const setV = {} setV[formField] = val[0][searchField] diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts index ad2d93277..560808251 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts @@ -615,6 +615,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive width: 150 }, tableForm:{ + multiple: true, isInpuFocusShow: true, searchListPlaceholder: '请选择工位代码', searchField: 'code', diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue index cd06bef9a..6296dda1e 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue @@ -42,6 +42,8 @@ if (formField == 'secondPackUnit') { row['secondPackUnit'] = val[0]['packUnit'] row['secondPackQty'] = val[0]['packQty'] + row[formField] = val[0][searchField] }else if(formField == 'packUnit'){ row['packUnit'] = val[0]['packUnit'] row['packQty'] = val[0]['packQty'] + row[formField] = val[0][searchField] }else if (formField == 'itemCode') { row['uom'] = val[0]['uom'] row['produceDate'] = dayjs().valueOf() + row[formField] = val[0][searchField] + }else if (formField == 'workStationCode') { + // 明细查询页赋值 + val.forEach(item=>{ + const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) + newRow[formField] = item[searchField] + tableData.value.push(newRow) + }) } - // 明细查询页赋值 - row[formField] = val[0][searchField] } else { const setV = {} setV[formField] = val[0][searchField] diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts index 84fb8ddaa..63fd5b156 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts @@ -616,6 +616,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive width: 150 }, tableForm:{ + multiple: true, isInpuFocusShow: true, searchListPlaceholder: '请选择工位代码', searchField: 'code', diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue index e76239855..d2be36d10 100644 --- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue @@ -42,6 +42,8 @@ { // 查询页面返回 const searchTableSuccess = async (formField, searchField, val, formRef, type, row ) => { + console.log(formField, searchField, val, formRef, type, row) nextTick(async () => { if (type == 'tableForm') { if (formField == 'secondPackUnit') { row['secondPackUnit'] = val[0]['packUnit'] row['secondPackQty'] = val[0]['packQty'] + row[formField] = val[0][searchField] + }else if(formField == 'itemCode'){ - let res = await ItembasicApi.getQueryItemCodeInfo({itemCodes:val.map(item=>item.itemCode).join(',')}) if(res.length>0){ row['uom'] = res[0]['uom'] } + row[formField] = val[0][searchField] + console.log('获取计量单位',res) + }else{ + //添加明细 + val.forEach(item=>{ + const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) + newRow.batch = formatTime(new Date(), 'yyyyMMdd') + newRow[formField] = item[searchField] + tableData.value.push(newRow) + }) } - // 明细查询页赋值 - row[formField] = val[0][searchField] } else { const setV = {} setV[formField] = val[0][searchField] diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts index 7896c89eb..668c03dbc 100644 --- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts @@ -523,6 +523,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive width: 150 }, tableForm:{ + multiple: true, isInpuFocusShow: true, searchListPlaceholder: '请选择生产线代码', searchField: 'code', diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue index 5243a5682..cae64b1f9 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue +++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue @@ -42,6 +42,8 @@ if(formField == 'productionLineCode'){ row['productionLineCode'] = val[0]['code'] }else if(formField == 'workStationCode'){ - row['workStationCode'] = val[0]['code'] - row['fromLocationCode'] = val[0]['rawLocationCode'] + val.forEach(item=>{ + const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) + newRow['workStationCode'] = item['code'] + newRow['fromLocationCode'] = item['rawLocationCode'] + tableData.value.push(newRow) + }) + }else if(formField == 'processCode'){ row['processCode'] = val[0]['code'] }else if(formField == 'itemCode'){ diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts index 5e4add7ff..c7ad921ec 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts +++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts @@ -551,6 +551,7 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive([ width: 150 }, tableForm:{ + multiple: true, isInpuFocusShow: true, searchListPlaceholder: '请选择工位代码', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 From 9b8e56c7ad7c3c428d08836e104c7436ac28418e Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Tue, 9 Jul 2024 18:02:44 +0800 Subject: [PATCH 31/38] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=BA=BF=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionreturnRequestMain.data.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts index baa26aebd..46f95443d 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts @@ -491,6 +491,9 @@ export const ProductionreturnRequestMainRules = reactive({ workshopCode: [ { required: true, message: '请选择车间', trigger: 'change' } ], + productionLineCode: [ + { required: true, message: '请选择生产线代码', trigger: 'change' } + ], }) /** From 8b50d3b5624ad77eb5b9ab571c5647561a79f950 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Tue, 9 Jul 2024 18:08:05 +0800 Subject: [PATCH 32/38] packQty --- .../moveManage/inventorymove/inventorymoveRequestMain/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue index b92e5212d..9eceed8a9 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue @@ -341,6 +341,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => newRow['fromInventoryStatus'] = item['inventoryStatus'] newRow['fromLocationCode'] = item['locationCode'] newRow['uom'] = item['uom'] + newRow['qty'] = item['packQty'] if(routeName.value == 'OktoholdRequestMain'){ newRow['toInventoryStatus'] = "HOLD" }else if ( routeName.value == 'HoldtookRequestMain') { From b292f84830af6483a2c73b954b8eb23652cafbc9 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Tue, 9 Jul 2024 18:10:11 +0800 Subject: [PATCH 33/38] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=AD=90=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wms/basicDataManage/itemManage/itemarea/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue index b4bd4fd9d..46e9ba97b 100644 --- a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue +++ b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue @@ -52,7 +52,7 @@ :tableData="tableData" :apiUpdate="ItemareaApi.updateItemarea" :apiCreate="ItemareaApi.createItemarea" - :isBusiness="true" + :isBusiness="false" @handleAddTable="handleAddTable" @handleDeleteTable="handleDeleteTable" :isShowReduceButtonSelection="true" From b4143cbaeab134dd7676d82352597385e701a685 Mon Sep 17 00:00:00 2001 From: bjang03 <259278618@qq.com> Date: Tue, 9 Jul 2024 18:39:35 +0800 Subject: [PATCH 34/38] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D=20HL-3897=EF=BC=8CH?= =?UTF-8?q?L-3908=EF=BC=8CHL-3966?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/BasicForm/src/BasicForm.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue index 5fa0fbd9a..9b5e713cb 100644 --- a/src/components/BasicForm/src/BasicForm.vue +++ b/src/components/BasicForm/src/BasicForm.vue @@ -135,7 +135,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import ButtonBase from '@/components/XButton/src/ButtonBase.vue' import TableForm from '@/components/TableForm/src/TableForm.vue' import TableFormCountPlan from '@/components/TableFormCountPlan/src/TableFormCountPlan.vue' - +import {DICT_TYPE, getStrDictOptions} from '@/utils/dict' import { tableFormBlurVer,FormBlur,getListByBottonInput } from '@/api/wms/business/business' const props = defineProps({ // 显示窗口宽度设置 From fb7aadc6817e4194f6c2c423348d3964fc15b584 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Tue, 9 Jul 2024 18:43:16 +0800 Subject: [PATCH 35/38] =?UTF-8?q?WMS+SCP=E7=94=B5=E8=84=91=E7=AB=AF?= =?UTF-8?q?=E5=85=A8=E5=B1=80UI=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/RouterSearch/index.vue | 2 +- src/layout/components/CategoryHeader.vue | 9 ++++++++- src/layout/components/Message/src/Message.vue | 2 +- src/layout/components/ToolHeader.vue | 16 ++++++++-------- src/layout/components/UserInfo/src/UserInfo.vue | 4 ++-- src/layout/components/useRenderLayout.tsx | 4 ++-- 6 files changed, 22 insertions(+), 15 deletions(-) diff --git a/src/components/RouterSearch/index.vue b/src/components/RouterSearch/index.vue index 0966638e6..b15f88066 100644 --- a/src/components/RouterSearch/index.vue +++ b/src/components/RouterSearch/index.vue @@ -18,7 +18,7 @@ -->
- + +
) } @@ -127,7 +130,11 @@ $prefix-cls: #{$namespace}-tool-header; left:0; z-index: 999; } - + .tool-header{ + position: absolute; + right: 0px; + top: 0px; + } } .categoryheader{ padding-left: 20px; diff --git a/src/layout/components/Message/src/Message.vue b/src/layout/components/Message/src/Message.vue index 4ca667fbd..67ea37a33 100644 --- a/src/layout/components/Message/src/Message.vue +++ b/src/layout/components/Message/src/Message.vue @@ -62,7 +62,7 @@ onBeforeUnmount(() => { diff --git a/src/layout/components/ToolHeader.vue b/src/layout/components/ToolHeader.vue index 22d7a457c..ca7328fb9 100644 --- a/src/layout/components/ToolHeader.vue +++ b/src/layout/components/ToolHeader.vue @@ -54,28 +54,28 @@ export default defineComponent({ 'dark:bg-[var(--el-bg-color)]' ]} > - {layout.value !== 'top' ? ( + {/* {layout.value !== 'top' ? (
{hamburger.value && layout.value !== 'cutMenu' ? ( ) : undefined} {breadcrumb.value ? : undefined}
- ) : undefined} + ) : undefined} */}
{search.value ? () : undefined} - {screenfull.value ? ( + {/* {screenfull.value ? ( - ) : undefined} - {size.value ? ( + ) : undefined} */} + {/* {size.value ? ( - ) : undefined} - {locale.value ? ( + ) : undefined} */} + {/* {locale.value ? ( - ) : undefined} + ) : undefined} */} {message.value ? ( ) : undefined} diff --git a/src/layout/components/UserInfo/src/UserInfo.vue b/src/layout/components/UserInfo/src/UserInfo.vue index 3c03ea7d2..3521bd443 100644 --- a/src/layout/components/UserInfo/src/UserInfo.vue +++ b/src/layout/components/UserInfo/src/UserInfo.vue @@ -54,7 +54,7 @@ const toDocument = () => {
- + {{ userName }}
@@ -62,7 +62,7 @@ const toDocument = () => { -
{{ t('common.profile') }}
+
{{ t('common.profile') }}
 -
+
\ No newline at end of file diff --git a/src/views/wms/issueManage/issue/issueRequestMain/index.vue b/src/views/wms/issueManage/issue/issueRequestMain/index.vue index 568bb3152..1bb24f9f6 100644 --- a/src/views/wms/issueManage/issue/issueRequestMain/index.vue +++ b/src/views/wms/issueManage/issue/issueRequestMain/index.vue @@ -60,6 +60,7 @@ @searchTableSuccess="searchTableSuccess" @submitForm="submitForm" @onEnter="onEnter" + @onChange="onChange" /> @@ -108,7 +109,16 @@ const tableColumns = ref([...IssueRequestMain.allSchemas.tableColumns,...IssueRe const updataTableColumns = (val) => { tableColumns.value = val } - +const onChange = async (field,value) => { + console.log('onChange',field,value) + if (field == 'workshopCode') { + //车间代码 + const setV = {} + setV['productionLineCode'] = '' + setV['workStationCode'] = '' + formRef.value.formRef.setValues(setV) + } +} const onEnter = async (field,value) => { if (field == 'productionLineCode') { //生产线 @@ -168,6 +178,11 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => setV['fromWarehouseCode'] = val[0]['code'] setV['toWarehouseCode'] = val[0]['code'] } + if (formField == 'workshopCode') { + //车间代码 + setV['productionLineCode'] = '' + setV['workStationCode'] = '' + } if (formField == 'productionLineCode') { //生产线 let res = await WorkstationApi.getWorkstationPage({ From b7c654d15bcdf116a8f1f16417a58ae60267cd51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com> Date: Tue, 9 Jul 2024 19:52:21 +0800 Subject: [PATCH 37/38] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereturnRequestMain/index.vue | 288 +- .../supplierdeliverRequestMain.data.ts | 2933 ++++++++--------- 2 files changed, 1609 insertions(+), 1612 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue index d32bddadf..d09d0bc40 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue @@ -2,7 +2,10 @@ @@ -21,7 +24,8 @@ - {{ row.number }} -