From 5be417f74f7e4790b624f27dbfffa2f7e3ebeb8d Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Mon, 25 Nov 2024 15:04:35 +0800 Subject: [PATCH 1/2] =?UTF-8?q?YT-1237=E5=8F=B7=E5=8F=A3=E5=93=81=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E6=A0=87=E7=AD=BE=E5=BA=94=E4=B8=8E=E8=A1=A5=E7=BB=99?= =?UTF-8?q?=E5=93=81=E5=88=9B=E5=BB=BA=E6=A0=87=E7=AD=BE=E4=BF=9D=E6=8C=81?= =?UTF-8?q?=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productreceiptAssembleRequestMain.data.ts | 308 +++++++++--------- 1 file changed, 146 insertions(+), 162 deletions(-) diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts index e632c9a82..1d5cf2ffb 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts @@ -1701,56 +1701,36 @@ export const BackflushDetailRequest = useCrudSchemas(reactive([ /** - * @returns {Array} 制品收货申请创建标签 + * @returns {Array} 号口品收货申请创建标签 */ export const ProductreceiptRequestLabel = useCrudSchemas(reactive([ { - label: '生产线代码', - field: 'productionLineCodePackage', + label: '物料代码', + field: 'itemCode', sort: 'custom', table: { width: 150 }, - tableForm:{ + tableForm: { disabled: true - // isInpuFocusShow: true, - // searchListPlaceholder: '请选择生产线代码', // 输入框占位文本 - // searchField: 'productionLineCode', // 查询弹窗赋值字段 - // searchTitle: '生产线物料关系信息', // 查询弹窗标题 - // searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类 - // searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法 - // searchCondition:[{ - // key: 'itemCode', - // value: 'itemCode', - // isMainValue: true - // }] + }, + form: { + componentProps: { + disabled: true + } } }, { - label: '供应商代码', - field: 'supplierItemCode', + label: '批次', + field: 'batch', sort: 'custom', table: { width: 150 }, - tableForm:{ - isInpuFocusShow: true, - searchListPlaceholder: '请选择供应商代码', // 输入框占位文本 - searchField: 'supplierCode', // 查询弹窗赋值字段 - searchTitle: '供应商信息', // 查询弹窗标题 - searchAllSchemas: Supplieritem.allSchemas, // 查询弹窗所需类 - searchPage: SupplieritemApi.getSupplieritemPage, // 查询弹窗所需分页方法 - searchCondition:[{ - key: 'itemCode', - value: 'itemCode', - message: '请填写物料代码！', - isMainValue: true - }] - } }, { - label: '物料代码', - field: 'itemCode', + label: '数量', + field: 'qty', sort: 'custom', table: { width: 150 @@ -1765,38 +1745,132 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive( } }, { - label: '物料名称', - field: 'itemName', + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: true, sort: 'custom', table: { width: 150 }, - isTableForm: false, - isForm: false, + tableForm: { + disabled: true + }, + form: { + componentProps: { + disabled: true + } + } }, { - label: '物料描述1', - field: 'itemDesc1', + label: '包装规格', + field: 'packUnit', + sort: 'custom', + table: { + width: 150, + componentProps: { + disabled: true, + isSearchList: true, + searchListPlaceholder: '请选择包装', + searchField: 'packUnit', + searchTitle: '物品包装信息', + searchAllSchemas: Itempackaging.allSchemas, + searchPage: ItemPackageApi.getItemPackagingPageByItemCode, + searchCondition: [ + { + key: 'itemCode', + value: 'itemCode', + message: '请选择订单行', + isMainValue: true + }, + { + key: 'available', + value: 'TRUE', + isMainValue: false + } + ] + + } + }, + tableForm: { + disabled: true, + isInpuFocusShow: true, + searchListPlaceholder: '请选择包装', + searchField: 'packUnit', + searchTitle: '物品包装信息', + searchAllSchemas: Itempackaging.allSchemas, + searchPage: ItemPackageApi.getItemPackagingPageByItemCode, + searchCondition: [ + { + key: 'itemCode', + value: 'itemCode', + message: '请选择订单行', + isMainValue: true + }, + { + key: 'available', + value: 'TRUE', + isMainValue: false + }] + }, + }, + { + label: '包装数量', + field: 'packQty', sort: 'custom', table: { width: 150 }, - isTableForm: false, - isForm: false, + form: { + componentProps: { + disabled: true + } + }, + tableForm: { + disabled: true, + } }, { - label: '物料描述2', - field: 'itemDesc2', + label: '标签生产线代码', + field: 'productionLineCodePackage', sort: 'custom', table: { width: 150 }, + isTable: false, + tableForm: { + disabled: true, + }, + }, + { + label: '供应商代码', + field: 'supplierItemCode', + sort: 'custom', isTableForm: false, isForm: false, + table: { + width: 150 + }, + tableForm: { + isInpuFocusShow: true, + searchListPlaceholder: '请选择供应商代码', // 输入框占位文本 + searchField: 'supplierCode', // 查询弹窗赋值字段 + searchTitle: '供应商信息', // 查询弹窗标题 + searchAllSchemas: Supplieritem.allSchemas, // 查询弹窗所需类 + searchPage: SupplieritemApi.getSupplieritemPage, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'itemCode', + value: 'itemCode', + message: '请填写物料代码！', + isMainValue: true + }] + } }, + { - label: '项目代码', - field: 'projectCode', + label: '物料名称', + field: 'itemName', sort: 'custom', table: { width: 150 @@ -1805,56 +1879,36 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive( isForm: false, }, { - label: '批次', - field: 'batch', + label: '物料描述1', + field: 'itemDesc1', sort: 'custom', table: { width: 150 }, - tableForm: { - disabled: true, - }, - form: { - componentProps: { - disabled: true - } - } + isTableForm: false, + isForm: false, }, { - label: '数量', - field: 'qty', + label: '物料描述2', + field: 'itemDesc2', sort: 'custom', table: { width: 150 }, - tableForm: { - disabled: true - }, - form: { - componentProps: { - disabled: true - } - } + isTableForm: false, + isForm: false, }, { - label: '计量单位', - field: 'uom', - dictType: DICT_TYPE.UOM, - dictClass: 'string', - isTable: true, + label: '项目代码', + field: 'projectCode', sort: 'custom', table: { width: 150 }, - tableForm: { - disabled: true - }, - form: { - componentProps: { - disabled: true - } - } + isTableForm: false, + isForm: false, }, + { label: '库存状态', field: 'inventoryStatus', @@ -1862,6 +1916,8 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive( dictClass: 'string', isTable: true, sort: 'custom', + isTableForm: false, + isForm: false, table: { width: 150 }, @@ -1879,22 +1935,8 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive( label: '来源生产线代码', field: 'productionLineCode', sort: 'custom', - table: { - width: 150 - }, - tableForm: { - disabled: true - }, - form: { - componentProps: { - disabled: true - } - } - }, - { - label: '来源生产线代码', - field: 'productionLineCode', - sort: 'custom', + isTableForm: false, + isForm: false, table: { width: 150 }, @@ -1911,6 +1953,8 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive( label: '来源工位代码', field: 'workStationCode', sort: 'custom', + isTableForm: false, + isForm: false, table: { width: 150 }, @@ -1927,6 +1971,8 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive( label: '来源库位代码', field: 'fromLocationCode', sort: 'custom', + isTableForm: false, + isForm: false, table: { width: 150 }, @@ -1953,78 +1999,13 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive( } } }, - { - label: '包装规格1', - field: 'packUnit', - sort: 'custom', - table: { - width: 150, - componentProps: { - disabled: true, - isSearchList: true, - searchListPlaceholder: '请选择包装', - searchField: 'packUnit', - searchTitle: '物品包装信息', - searchAllSchemas: Itempackaging.allSchemas, - searchPage: ItemPackageApi.getItempackagingPageByProductreceipt, - searchCondition: [ - { - key: 'itemCode', - value: 'itemCode', - message: '请选择订单行', - isMainValue: true - }, - { - key: 'available', - value: 'TRUE', - isMainValue: false - } - ] - } - }, - tableForm: { - disabled: true, - isInpuFocusShow: true, - searchListPlaceholder: '请选择包装', - searchField: 'packUnit', - searchTitle: '物品包装信息', - searchAllSchemas: Itempackaging.allSchemas, - searchPage: ItemPackageApi.getItempackagingPageByProductreceipt, - searchCondition: [ - { - key: 'itemCode', - value: 'itemCode', - message: '请选择订单行', - isMainValue: true - }, - { - key: 'available', - value: 'TRUE', - isMainValue: false - }] - } - }, - { - label: '包装数量1', - field: 'packQty', - sort: 'custom', - table: { - width: 150 - }, - form: { - componentProps: { - disabled: true - } - }, - tableForm: { - disabled: true, - } - }, { label: '包装规格2', field: 'secondPackUnit', sort: 'custom', + isTableForm: false, + isForm: false, table: { width: 150, componentProps: { @@ -2052,6 +2033,7 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive( } }, tableForm: { + enterSearch: true, disabled: true, isInpuFocusShow: true, searchListPlaceholder: '请选择包装', @@ -2077,12 +2059,14 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive( label: '包装数量2', field: 'secondPackQty', sort: 'custom', + isTableForm: false, + isForm: false, table: { width: 150 }, form: { componentProps: { - disabled:true + disabled: true } }, tableForm: { From ea561b2804eb56877cb084f7fe7ca2a5ee242575 Mon Sep 17 00:00:00 2001 From: songguoqiang <765017469@qq.com> Date: Mon, 25 Nov 2024 15:06:35 +0800 Subject: [PATCH 2/2] =?UTF-8?q?YT-1246:=E8=A1=A5=E7=BB=99=E5=93=81?= =?UTF-8?q?=E6=94=B6=E8=B4=A7=EF=BC=8C=E5=8F=B7=E5=8F=A3=E5=93=81=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=EF=BC=8C=E7=B1=BB=E5=9E=8B=E5=BA=94=E5=B8=A6=E7=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productreceiptRequestMain.data.ts | 4 ++++ .../productreceiptAssembleRequestMain.data.ts | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts index 50a2cfd91..457dd5cd4 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts @@ -174,6 +174,10 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false + }, { + key: 'type', + value: 'predict',//补给品类型 + isMainValue: false }, { key: 'workshopCode', value: 'workshopCode', diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts index e632c9a82..1aa573789 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts @@ -182,6 +182,10 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false + },{ + key: 'type', + value: 'assemble',//号口品类型 + isMainValue: false },{ key: 'workshopCode', value: 'workshopCode',