diff --git a/src/views/qms/inspectionJob/inspectionJobMain.data.ts b/src/views/qms/inspectionJob/inspectionJobMain.data.ts index 70cefaaa1..0a89714df 100644 --- a/src/views/qms/inspectionJob/inspectionJobMain.data.ts +++ b/src/views/qms/inspectionJob/inspectionJobMain.data.ts @@ -595,6 +595,17 @@ export const InspectionJobMain = useCrudSchemas( width: 110 } }, + { + label: '包装号', + field: 'packageCode', + sort: 'custom', + isSearch: true, + isTable: false, + isForm: false, + tableForm: { + disabled: false + } + }, { label: '创建时间', field: 'createTime', @@ -623,7 +634,7 @@ export const InspectionJobMain = useCrudSchemas( type: 'daterange', defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } - }, + } }, { label: '创建者', diff --git a/src/views/qms/inspectionJobProduction/inspectionJobMain.data.ts b/src/views/qms/inspectionJobProduction/inspectionJobMain.data.ts index 4d365fbe6..802586cd9 100644 --- a/src/views/qms/inspectionJobProduction/inspectionJobMain.data.ts +++ b/src/views/qms/inspectionJobProduction/inspectionJobMain.data.ts @@ -594,6 +594,17 @@ export const InspectionJobMain = useCrudSchemas( width: 110 } }, + { + label: '包装号', + field: 'packageCode', + sort: 'custom', + isSearch: true, + isTable: false, + isForm: false, + tableForm: { + disabled: false + } + }, { label: '创建时间', field: 'createTime', @@ -623,7 +634,7 @@ export const InspectionJobMain = useCrudSchemas( type: 'daterange', defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } - }, + } }, { label: '创建者', diff --git a/src/views/qms/inspectionJobPurchase/inspectionJobMain.data.ts b/src/views/qms/inspectionJobPurchase/inspectionJobMain.data.ts index e3788cf45..fa86592bf 100644 --- a/src/views/qms/inspectionJobPurchase/inspectionJobMain.data.ts +++ b/src/views/qms/inspectionJobPurchase/inspectionJobMain.data.ts @@ -594,6 +594,17 @@ export const InspectionJobMain = useCrudSchemas( width: 110 } }, + { + label: '包装号', + field: 'packageCode', + sort: 'custom', + isSearch: true, + isTable: false, + isForm: false, + tableForm: { + disabled: false + } + }, { label: '创建时间', field: 'createTime', @@ -623,7 +634,7 @@ export const InspectionJobMain = useCrudSchemas( type: 'daterange', defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } - }, + } }, { label: '创建者', diff --git a/src/views/qms/inspectionRecord/inspectionRecordMain.data.ts b/src/views/qms/inspectionRecord/inspectionRecordMain.data.ts index 21dc7cf85..7a6389c69 100644 --- a/src/views/qms/inspectionRecord/inspectionRecordMain.data.ts +++ b/src/views/qms/inspectionRecord/inspectionRecordMain.data.ts @@ -58,7 +58,7 @@ export const InspectionRecordMain = useCrudSchemas( field: 'asnNumber', sort: 'custom', isSearch: true, - isForm:false, + isForm: false, form: { componentProps: { disabled: true @@ -245,7 +245,6 @@ export const InspectionRecordMain = useCrudSchemas( componentProps: { disabled: true } - }, table: { width: 150 @@ -277,7 +276,6 @@ export const InspectionRecordMain = useCrudSchemas( componentProps: { disabled: true } - }, table: { width: 150 @@ -294,7 +292,6 @@ export const InspectionRecordMain = useCrudSchemas( componentProps: { disabled: true } - }, table: { width: 150 @@ -421,7 +418,7 @@ export const InspectionRecordMain = useCrudSchemas( componentProps: { type: 'datetime', valueFormat: 'x', - disabled: true + disabled: true } }, detail: { @@ -499,7 +496,7 @@ export const InspectionRecordMain = useCrudSchemas( table: { width: 150 }, - isForm:false + isForm: false }, { label: '执行结果', @@ -516,6 +513,17 @@ export const InspectionRecordMain = useCrudSchemas( } } }, + { + label: '包装号', + field: 'packageCode', + sort: 'custom', + isSearch: true, + isTable: false, + isForm: false, + tableForm: { + disabled: false + } + }, { label: '创建时间', field: 'createTime', @@ -543,8 +551,8 @@ export const InspectionRecordMain = useCrudSchemas( valueFormat: 'YYYY-MM-DD HH:mm:ss', type: 'daterange', defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] - }, - }, + } + } }, { label: '创建者', diff --git a/src/views/qms/inspectionRecordFirst/inspectionRecordFirstMain.data.ts b/src/views/qms/inspectionRecordFirst/inspectionRecordFirstMain.data.ts index 160d50658..b6dea510f 100644 --- a/src/views/qms/inspectionRecordFirst/inspectionRecordFirstMain.data.ts +++ b/src/views/qms/inspectionRecordFirst/inspectionRecordFirstMain.data.ts @@ -29,7 +29,7 @@ export const InspectionRecordMain = useCrudSchemas( isSearch: false, table: { width: 150 - }, + } }, { label: '物料编码', @@ -81,8 +81,7 @@ export const InspectionRecordMain = useCrudSchemas( width: 200 } }, - - + { label: '检验人', field: 'creator', @@ -123,7 +122,6 @@ export const InspectionRecordMain = useCrudSchemas( type: 'daterange', dateFormat: 'YYYY-MM-DD', valueFormat: 'YYYY-MM-DD' - } }, form: { @@ -136,6 +134,17 @@ export const InspectionRecordMain = useCrudSchemas( } } }, + { + label: '包装号', + field: 'packageCode', + sort: 'custom', + isSearch: true, + isTable: false, + isForm: false, + tableForm: { + disabled: false + } + }, { label: '操作', field: 'action', diff --git a/src/views/qms/inspectionRequest/inspectionRequestMain.data.ts b/src/views/qms/inspectionRequest/inspectionRequestMain.data.ts index 89c4b6f7b..bdb62d65b 100644 --- a/src/views/qms/inspectionRequest/inspectionRequestMain.data.ts +++ b/src/views/qms/inspectionRequest/inspectionRequestMain.data.ts @@ -484,6 +484,19 @@ export const InspectionMain = useCrudSchemas( width: 110 } }, + + { + label: '包装号', + field: 'packageCode', + sort: 'custom', + isSearch: true, + isTable: false, + isForm: false, + tableForm: { + disabled: false + } + }, + { label: '创建时间', field: 'createTime', @@ -512,7 +525,7 @@ export const InspectionMain = useCrudSchemas( type: 'daterange', defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } - }, + } }, { label: '创建者', diff --git a/src/views/qms/inspectionScheme/addForm.vue b/src/views/qms/inspectionScheme/addForm.vue index 950e2c522..4fc555f2d 100644 --- a/src/views/qms/inspectionScheme/addForm.vue +++ b/src/views/qms/inspectionScheme/addForm.vue @@ -820,7 +820,7 @@ const rules = ref({ programmeTemplateCode: [ { required: true, message: '请选择检验模板', trigger: ['blur', 'change'] } ], - description: [{ required: true, message: '请选择描述', trigger: 'blur' }], + description: [{ required: false, message: '请选择描述', trigger: 'blur' }], // splitRule: [{ required: true, message: '请选择拆分规则', trigger: ['blur', 'change'] }], aql: [{ required: true, message: '请选择aql', trigger: ['blur', 'change'] }], inspectionLevel: [{ required: true, message: '请选择检验水平', trigger: ['blur', 'change'] }], diff --git a/src/views/wms/inventoryManage/balance/balance.data.ts b/src/views/wms/inventoryManage/balance/balance.data.ts index 38fbed5bd..31e8df4fe 100644 --- a/src/views/wms/inventoryManage/balance/balance.data.ts +++ b/src/views/wms/inventoryManage/balance/balance.data.ts @@ -1,454 +1,476 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' +import { dateFormatter, dateFormatter2 } from '@/utils/formatTime' /** * @returns {Array} 库存余额 */ -export const Balance = useCrudSchemas(reactive([ - { - label: '物料代码', - field: 'itemCode', - sort: 'custom', - table: { - width: 150 - }, - isSearch: true, - }, - { - label: '批次', - field: 'batch', - sort: 'custom', - table: { - width: 150 - }, - isSearch: true, - }, - { - label: '包装号', - field: 'packingNumber', - sort: 'custom', - table: { - width: 150 - }, - isSearch: true, - }, - { - label: '包装规格', - field: 'packUnit', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '包装数量', - field: 'packQty', - sort: 'custom', - table: { - width: 150 - }, - }, - // { - // label: '器具代码', - // field: 'containerNumber', - // sort: 'custom', - // table: { - // width: 150 - // }, - // isTable:false - // }, - { - label: '库存数量', - field: 'qty', - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'InputNumber', - } - }, - { - label: '计量单位', - field: 'uom', - dictType: DICT_TYPE.UOM, - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '库位代码', - field: 'locationCode', - sort: 'custom', - table: { - width: 150 - }, - isSearch: true, - }, - { - label: '库存状态', - field: 'inventoryStatus', - dictType: DICT_TYPE.INVENTORY_STATUS, - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '库区类型', - field: 'areaType', - sort: 'custom', - dictType: DICT_TYPE.AREA_TYPE, - dictClass: 'string', - isTable: true, - table: { - width: 150 - }, - }, - - { - label: '仓库代码', - field: 'warehouseCode', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '库位组代码', - field: 'locationGroupCode', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '库区代码', - field: 'areaCode', - sort: 'custom', - table: { - width: 150 - }, - }, - // { - // label: 'ERP库位代码', - // field: 'erpLocationCode', - // dictType: DICT_TYPE.ERP_LOCATION, - // dictClass: 'string', - // isTable: false, - // sort: 'custom', - // table: { - // width: 150 - // }, - // }, - // { - // label: '替代批次', - // field: 'altBatch', - // sort: 'custom', - // table: { - // width: 150 - // }, - // isTable: false, - // }, - { - label: '到货日期', - field: 'arriveDate', - isTable: true, - formatter: dateFormatter2, - detail: { - dateFormat: 'YYYY-MM-DD' - }, - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'DatePicker', - componentProps: { - style: {width: '100%'}, - type: 'date', - dateFormat: 'YYYY-MM-DD', - valueFormat: 'x', +export const Balance = useCrudSchemas( + reactive([ + { + label: '物料代码', + field: 'itemCode', + sort: 'custom', + table: { + width: 150 + }, + isSearch: true + }, + { + label: '物料名称', + field: 'itemName', + sort: 'custom', + table: { + width: 150 + }, + isSearch: true + }, + { + label: '物料类型', + field: 'itemType', + sort: 'custom', + dictType: DICT_TYPE.ITEM_TYPE, + dictClass: 'string', + isSearch: true, + table: { + width: 100 } }, - }, - { - label: '生产日期', - field: 'produceDate', - isTable: true, - formatter: dateFormatter2, - detail: { - dateFormat: 'YYYY-MM-DD' - }, - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'DatePicker', - componentProps: { - style: {width: '100%'}, - type: 'date', - dateFormat: 'YYYY-MM-DD', - valueFormat: 'x', + { + label: '批次', + field: 'batch', + sort: 'custom', + table: { + width: 150 + }, + isSearch: true + }, + { + label: '包装号', + field: 'packingNumber', + sort: 'custom', + table: { + width: 150 + }, + isSearch: true + }, + { + label: '包装规格', + field: 'packUnit', + sort: 'custom', + table: { + width: 150 } }, - }, - { - label: '失效日期', - field: 'expireDate', - isTable: true, - formatter: dateFormatter2, - detail: { - dateFormat: 'YYYY-MM-DD' - }, - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'DatePicker', - componentProps: { - style: {width: '100%'}, - type: 'date', - dateFormat: 'YYYY-MM-DD', - valueFormat: 'x', + { + label: '包装数量', + field: 'packQty', + sort: 'custom', + table: { + width: 150 } }, - }, - { - label: '货主代码', - field: 'ownerCode', - sort: 'custom', - table: { - width: 150 - }, - isTable: false, - }, - { - label: '锁定数量', - field: 'lockedQty', - sort: 'custom', - table: { - width: 150 + // { + // label: '器具代码', + // field: 'containerNumber', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isTable:false + // }, + { + label: '库存数量', + field: 'qty', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'InputNumber' + } }, - isTable: false, - form: { - component: 'InputNumber', - } - }, - // { - // label: '可用数量', - // field: 'usableQty', - // sort: 'custom', - // table: { - // width: 150 - // }, - // form: { - // component: 'InputNumber', - // } - // }, - // { - // label: '单价', - // field: 'singlePrice', - // sort: 'custom', - // table: { - // width: 150 - // }, - // form: { - // component: 'InputNumber', - // } - // }, - // { - // label: '金额', - // field: 'amount', - // sort: 'custom', - // table: { - // width: 150 - // }, - // form: { - // component: 'InputNumber', - // } - // }, - // { - // label: '入库时间', - // field: 'putInTime', - // isTable: true, - // formatter: dateFormatter, - // detail: { - // dateFormat: 'YYYY-MM-DD HH:mm:ss' - // }, - // sort: 'custom', - // table: { - // width: 150 - // }, - // form: { - // component: 'DatePicker', - // componentProps: { - // type: 'datetime', - // } - // } - // }, - { - label: '是否冻结', - field: 'frozen', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 + { + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + } }, - form: { - component: 'Switch', - value: 'TRUE', - componentProps: { - inactiveValue: 'FALSE', - activeValue: 'TRUE' + { + label: '库位代码', + field: 'locationCode', + sort: 'custom', + table: { + width: 150 + }, + isSearch: true + }, + { + label: '库存状态', + field: 'inventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 } }, - }, - // { - // label: '冻结原因', - // field: 'frozenReason', - // dictType: DICT_TYPE.FROZEN_REASON, - // dictClass: 'string', - // isTable: true, - // sort: 'custom', - // table: { - // width: 150 - // }, - // }, - // { - // label: '重量', - // field: 'weight', - // sort: 'custom', - // table: { - // width: 150 - // }, - // form: { - // component: 'InputNumber', - // } - // }, - // { - // label: '面积', - // field: 'area', - // sort: 'custom', - // table: { - // width: 150 - // }, - // form: { - // component: 'InputNumber', - // } - // }, - // { - // label: '体积', - // field: 'volume', - // sort: 'custom', - // table: { - // width: 150 - // }, - // form: { - // component: 'InputNumber', - // } - // }, - { - label: '最后事务号', - field: 'lastTransNumber', - sort: 'custom', - table: { - width: 150 + { + label: '库区类型', + field: 'areaType', + sort: 'custom', + dictType: DICT_TYPE.AREA_TYPE, + dictClass: 'string', + isTable: true, + table: { + width: 150 + } }, - }, - { - label: '创建时间', - field: 'createTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + + { + label: '仓库代码', + field: 'warehouseCode', + sort: 'custom', + table: { + width: 150 + } }, - sort: 'custom', - table: { - width: 180 + { + label: '库位组代码', + field: 'locationGroupCode', + sort: 'custom', + table: { + width: 150 + } }, - form: { - component: 'DatePicker', - componentProps: { - style: {width:'100%'}, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', + { + label: '库区代码', + field: 'areaCode', + sort: 'custom', + table: { + width: 150 } }, - isForm: false, - isSearch: true, - 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: 'ERP库位代码', + // field: 'erpLocationCode', + // dictType: DICT_TYPE.ERP_LOCATION, + // dictClass: 'string', + // isTable: false, + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, + // { + // label: '替代批次', + // field: 'altBatch', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isTable: false, + // }, + { + label: '到货日期', + field: 'arriveDate', + isTable: true, + formatter: dateFormatter2, + detail: { + dateFormat: 'YYYY-MM-DD' + }, + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'DatePicker', + componentProps: { + style: { width: '100%' }, + type: 'date', + dateFormat: 'YYYY-MM-DD', + valueFormat: 'x' + } } }, - }, - { - label: '创建者', - field: 'creator', - sort: 'custom', - table: { - width: 150 + { + label: '生产日期', + field: 'produceDate', + isTable: true, + formatter: dateFormatter2, + detail: { + dateFormat: 'YYYY-MM-DD' + }, + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'DatePicker', + componentProps: { + style: { width: '100%' }, + type: 'date', + dateFormat: 'YYYY-MM-DD', + valueFormat: 'x' + } + } }, - isForm: false - }, - { - label: '最后更新时间', - field: 'updateTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + { + label: '失效日期', + field: 'expireDate', + isTable: true, + formatter: dateFormatter2, + detail: { + dateFormat: 'YYYY-MM-DD' + }, + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'DatePicker', + componentProps: { + style: { width: '100%' }, + type: 'date', + dateFormat: 'YYYY-MM-DD', + valueFormat: 'x' + } + } }, - sort: 'custom', - table: { - width: 180 + { + label: '货主代码', + field: 'ownerCode', + sort: 'custom', + table: { + width: 150 + }, + isTable: false + }, + { + label: '锁定数量', + field: 'lockedQty', + sort: 'custom', + table: { + width: 150 + }, + isTable: false, + form: { + component: 'InputNumber' + } }, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', + // { + // label: '可用数量', + // field: 'usableQty', + // sort: 'custom', + // table: { + // width: 150 + // }, + // form: { + // component: 'InputNumber', + // } + // }, + // { + // label: '单价', + // field: 'singlePrice', + // sort: 'custom', + // table: { + // width: 150 + // }, + // form: { + // component: 'InputNumber', + // } + // }, + // { + // label: '金额', + // field: 'amount', + // sort: 'custom', + // table: { + // width: 150 + // }, + // form: { + // component: 'InputNumber', + // } + // }, + // { + // label: '入库时间', + // field: 'putInTime', + // isTable: true, + // formatter: dateFormatter, + // detail: { + // dateFormat: 'YYYY-MM-DD HH:mm:ss' + // }, + // sort: 'custom', + // table: { + // width: 150 + // }, + // form: { + // component: 'DatePicker', + // componentProps: { + // type: 'datetime', + // } + // } + // }, + { + label: '是否冻结', + field: 'frozen', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } } }, - isForm: false, - isTable: false - }, - { - label: '最后更新者', - field: 'updater', - sort: 'custom', - table: { - width: 150 + // { + // label: '冻结原因', + // field: 'frozenReason', + // dictType: DICT_TYPE.FROZEN_REASON, + // dictClass: 'string', + // isTable: true, + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, + // { + // label: '重量', + // field: 'weight', + // sort: 'custom', + // table: { + // width: 150 + // }, + // form: { + // component: 'InputNumber', + // } + // }, + // { + // label: '面积', + // field: 'area', + // sort: 'custom', + // table: { + // width: 150 + // }, + // form: { + // component: 'InputNumber', + // } + // }, + // { + // label: '体积', + // field: 'volume', + // sort: 'custom', + // table: { + // width: 150 + // }, + // form: { + // component: 'InputNumber', + // } + // }, + { + label: '最后事务号', + field: 'lastTransNumber', + sort: 'custom', + table: { + width: 150 + } }, - isForm: false, - isTable: false - }, - // TODO: 临时添加 方便操作 - { - label: '操作', - field: 'action', - isDetail: false, - isForm: false, - table: { - width: 200, - fixed: 'right' + { + label: '创建时间', + field: 'createTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + style: { width: '100%' }, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } + }, + isForm: false, + isSearch: true, + 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: 'creator', + sort: 'custom', + table: { + width: 150 + }, + isForm: false + }, + { + label: '最后更新时间', + field: 'updateTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } + }, + isForm: false, + isTable: false + }, + { + label: '最后更新者', + field: 'updater', + sort: 'custom', + table: { + width: 150 + }, + isForm: false, + isTable: false + }, + // TODO: 临时添加 方便操作 + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false, + table: { + width: 200, + fixed: 'right' + } + } + ]) +) // 表单校验 export const BalanceRules = reactive({