diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts index 3a58640c4..84123c145 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts @@ -1616,3 +1616,65 @@ export const CustomerReturnRequestDetailLabel = 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 + } + }, + +])) + diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue index 665592790..0257fed81 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue @@ -113,8 +113,8 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import { DeliverRecordMain,DeliverRecordDetail } from '../../deliver/deliverRecordMain/deliverRecordMain.data' import * as DeliverRecordDetailApi from '@/api/wms/deliverRecordDetail' import { - SupplierdeliverRequestPackage -} from '../../../purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data' + DeliverReturnRequestPackage +} from './customerreturnRequestMain.data' import * as PackageApi from '@/api/wms/package' import { getAccessToken } from '@/utils/auth' import { getJmreportBaseUrl } from '@/utils/systemParam' @@ -548,7 +548,7 @@ const labelPrint = async (row) => { const { getList:getListPrint } = tableMethods getListPrint() tableObject.loading = false - const tableColumns = SupplierdeliverRequestPackage.allSchemas.tableFormColumns + const tableColumns = DeliverReturnRequestPackage.allSchemas.tableFormColumns tableColumns.forEach((item) => { item.width = item.table?.width || 150 })