diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue index f59ab2fd7..038f9da7e 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue @@ -176,7 +176,7 @@ import { ProductreceiptRequestLabelRules, shiftList } from './productreceiptRequestMain.data' -import { SupplierdeliverRequestPackage } from '../../../purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts' +import { SupplierdeliverRequestPackage2 } from '../../../purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts' // } from '../../../supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data' import * as ProductreceiptRequestMainApi from '@/api/wms/productreceiptRequestMain' import * as ProductreceiptRequestDetailApi from '@/api/wms/productreceiptRequestDetail' @@ -940,7 +940,7 @@ const labelPrint = async (row) => { const { getList: getListPrint } = tableMethods getListPrint() tableObject.loading = false - const tableColumns = SupplierdeliverRequestPackage.allSchemas.tableFormColumns + const tableColumns = SupplierdeliverRequestPackage2.allSchemas.tableFormColumns tableColumns.forEach((item) => { item.width = item.table?.width || 150 }) diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue index 13611cbf5..5caf7d9c2 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue @@ -139,7 +139,7 @@ import { ProductreceiptRequestMain,ProductreceiptRequestMainRules,Productreceipt ProductreceiptRequestDetailRules, BackflushDetailRequest, ProductreceiptRequestLabel,ProductreceiptRequestLabelRules,shiftList } from './productreceiptAssembleRequestMain.data' import { - SupplierdeliverRequestPackage + SupplierdeliverRequestPackage2 } from '../../../purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts' import * as ProductreceiptRequestMainApi from '@/api/wms/productreceiptRequestMain' import * as ProductreceiptRequestDetailApi from '@/api/wms/productreceiptRequestDetail' @@ -794,7 +794,7 @@ const labelPrint = async (row) => { const { getList:getListPrint } = tableMethods getListPrint() tableObject.loading = false - const tableColumns = SupplierdeliverRequestPackage.allSchemas.tableFormColumns + const tableColumns = SupplierdeliverRequestPackage2.allSchemas.tableFormColumns tableColumns.forEach((item) => { item.width = item.table?.width || 150 }) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts index 6bff0c144..bfc4ff495 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts @@ -1870,3 +1870,61 @@ export const SupplierdeliverRequestPackage = useCrudSchemas(reactive([ + { + label: '物料代码', + field: 'itemCode', + sort: 'custom', + isSearch: true, + table: { + }, + tableForm: { + disabled: true + } + }, + { + label: '批次', + field: 'batch', + sort: 'custom', + isSearch: true, + tableForm: { + type: 'FormDate', + format: 'YYYYMMDD', + valueFormat: 'YYYYMMDD', + } + }, + { + label: '包装规格', + field: 'packUnit', + sort: 'custom', + tableForm: { + disabled: true + } + }, + { + label: '标包数量', + field: 'packQty', + sort: 'custom', + tableForm: { + disabled: true + } + }, + { + label: '计量单位', + field: 'uom', + sort: 'custom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + form: { + component: 'Select' + }, + table: { + }, + tableForm: { + type: 'Select', + disabled: true + } + }, + +]))