sfms3.0
/
sfms3.0-ui
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

增加检验任务 申请 记录 包装号查询的条件

linshi20240813
叶佳兴 8 months ago
parent
0e56334d29
commit
aa4e7955bc
8 changed files with 524 additions and 439 deletions
Unified View
  1. 13
      src/views/qms/inspectionJob/inspectionJobMain.data.ts
  2. 13
      src/views/qms/inspectionJobProduction/inspectionJobMain.data.ts
  3. 13
      src/views/qms/inspectionJobPurchase/inspectionJobMain.data.ts
  4. 24
      src/views/qms/inspectionRecord/inspectionRecordMain.data.ts
  5. 17
      src/views/qms/inspectionRecordFirst/inspectionRecordFirstMain.data.ts
  6. 15
      src/views/qms/inspectionRequest/inspectionRequestMain.data.ts
  7. 2
      src/views/qms/inspectionScheme/addForm.vue
  8. 866
      src/views/wms/inventoryManage/balance/balance.data.ts

13
src/views/qms/inspectionJob/inspectionJobMain.data.ts
View File

@ -595,6 +595,17 @@ export const InspectionJobMain = useCrudSchemas(
width: 110 width: 110
} }
}, },
{
label: '包装号',
field: 'packageCode',
sort: 'custom',
isSearch: true,
isTable: false,
isForm: false,
tableForm: {
disabled: false
}
},
{ {
label: '创建时间', label: '创建时间',
field: 'createTime', field: 'createTime',
@ -623,7 +634,7 @@ export const InspectionJobMain = useCrudSchemas(
type: 'daterange', type: 'daterange',
defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
} }
}, }
}, },
{ {
label: '创建者', label: '创建者',

13
src/views/qms/inspectionJobProduction/inspectionJobMain.data.ts
View File

@ -594,6 +594,17 @@ export const InspectionJobMain = useCrudSchemas(
width: 110 width: 110
} }
}, },
{
label: '包装号',
field: 'packageCode',
sort: 'custom',
isSearch: true,
isTable: false,
isForm: false,
tableForm: {
disabled: false
}
},
{ {
label: '创建时间', label: '创建时间',
field: 'createTime', field: 'createTime',
@ -623,7 +634,7 @@ export const InspectionJobMain = useCrudSchemas(
type: 'daterange', type: 'daterange',
defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
} }
}, }
}, },
{ {
label: '创建者', label: '创建者',

13
src/views/qms/inspectionJobPurchase/inspectionJobMain.data.ts
View File

@ -594,6 +594,17 @@ export const InspectionJobMain = useCrudSchemas(
width: 110 width: 110
} }
}, },
{
label: '包装号',
field: 'packageCode',
sort: 'custom',
isSearch: true,
isTable: false,
isForm: false,
tableForm: {
disabled: false
}
},
{ {
label: '创建时间', label: '创建时间',
field: 'createTime', field: 'createTime',
@ -623,7 +634,7 @@ export const InspectionJobMain = useCrudSchemas(
type: 'daterange', type: 'daterange',
defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
} }
}, }
}, },
{ {
label: '创建者', label: '创建者',

24
src/views/qms/inspectionRecord/inspectionRecordMain.data.ts
View File

@ -58,7 +58,7 @@ export const InspectionRecordMain = useCrudSchemas(
field: 'asnNumber', field: 'asnNumber',
sort: 'custom', sort: 'custom',
isSearch: true, isSearch: true,
isForm:false, isForm: false,
form: { form: {
componentProps: { componentProps: {
disabled: true disabled: true
@ -245,7 +245,6 @@ export const InspectionRecordMain = useCrudSchemas(
componentProps: { componentProps: {
disabled: true disabled: true
} }
}, },
table: { table: {
width: 150 width: 150
@ -277,7 +276,6 @@ export const InspectionRecordMain = useCrudSchemas(
componentProps: { componentProps: {
disabled: true disabled: true
} }
}, },
table: { table: {
width: 150 width: 150
@ -294,7 +292,6 @@ export const InspectionRecordMain = useCrudSchemas(
componentProps: { componentProps: {
disabled: true disabled: true
} }
}, },
table: { table: {
width: 150 width: 150
@ -421,7 +418,7 @@ export const InspectionRecordMain = useCrudSchemas(
componentProps: { componentProps: {
type: 'datetime', type: 'datetime',
valueFormat: 'x', valueFormat: 'x',
disabled: true disabled: true
} }
}, },
detail: { detail: {
@ -499,7 +496,7 @@ export const InspectionRecordMain = useCrudSchemas(
table: { table: {
width: 150 width: 150
}, },
isForm:false isForm: false
}, },
{ {
label: '执行结果', label: '执行结果',
@ -516,6 +513,17 @@ export const InspectionRecordMain = useCrudSchemas(
} }
} }
}, },
{
label: '包装号',
field: 'packageCode',
sort: 'custom',
isSearch: true,
isTable: false,
isForm: false,
tableForm: {
disabled: false
}
},
{ {
label: '创建时间', label: '创建时间',
field: 'createTime', field: 'createTime',
@ -543,8 +551,8 @@ export const InspectionRecordMain = useCrudSchemas(
valueFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'YYYY-MM-DD HH:mm:ss',
type: 'daterange', type: 'daterange',
defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
}, }
}, }
}, },
{ {
label: '创建者', label: '创建者',

17
src/views/qms/inspectionRecordFirst/inspectionRecordFirstMain.data.ts
View File

@ -29,7 +29,7 @@ export const InspectionRecordMain = useCrudSchemas(
isSearch: false, isSearch: false,
table: { table: {
width: 150 width: 150
}, }
}, },
{ {
label: '物料编码', label: '物料编码',
@ -81,8 +81,7 @@ export const InspectionRecordMain = useCrudSchemas(
width: 200 width: 200
} }
}, },
{ {
label: '检验人', label: '检验人',
field: 'creator', field: 'creator',
@ -123,7 +122,6 @@ export const InspectionRecordMain = useCrudSchemas(
type: 'daterange', type: 'daterange',
dateFormat: 'YYYY-MM-DD', dateFormat: 'YYYY-MM-DD',
valueFormat: 'YYYY-MM-DD' valueFormat: 'YYYY-MM-DD'
} }
}, },
form: { form: {
@ -136,6 +134,17 @@ export const InspectionRecordMain = useCrudSchemas(
} }
} }
}, },
{
label: '包装号',
field: 'packageCode',
sort: 'custom',
isSearch: true,
isTable: false,
isForm: false,
tableForm: {
disabled: false
}
},
{ {
label: '操作', label: '操作',
field: 'action', field: 'action',

15
src/views/qms/inspectionRequest/inspectionRequestMain.data.ts
View File

@ -484,6 +484,19 @@ export const InspectionMain = useCrudSchemas(
width: 110 width: 110
} }
}, },
{
label: '包装号',
field: 'packageCode',
sort: 'custom',
isSearch: true,
isTable: false,
isForm: false,
tableForm: {
disabled: false
}
},
{ {
label: '创建时间', label: '创建时间',
field: 'createTime', field: 'createTime',
@ -512,7 +525,7 @@ export const InspectionMain = useCrudSchemas(
type: 'daterange', type: 'daterange',
defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
} }
}, }
}, },
{ {
label: '创建者', label: '创建者',

2
src/views/qms/inspectionScheme/addForm.vue
View File

@ -820,7 +820,7 @@ const rules = ref({
programmeTemplateCode: [ programmeTemplateCode: [
{ required: true, message: '请选择检验模板', trigger: ['blur', 'change'] } { 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'] }], // splitRule: [{ required: true, message: '请选择拆分规则', trigger: ['blur', 'change'] }],
aql: [{ required: true, message: '请选择aql', trigger: ['blur', 'change'] }], aql: [{ required: true, message: '请选择aql', trigger: ['blur', 'change'] }],
inspectionLevel: [{ required: true, message: '请选择检验水平', trigger: ['blur', 'change'] }], inspectionLevel: [{ required: true, message: '请选择检验水平', trigger: ['blur', 'change'] }],

866
src/views/wms/inventoryManage/balance/balance.data.ts
View File

@ -1,454 +1,476 @@
import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' import { dateFormatter, dateFormatter2 } from '@/utils/formatTime'
/** /**
* @returns {Array} 库存余额 * @returns {Array} 库存余额
*/ */
export const Balance = useCrudSchemas(reactive<CrudSchema[]>([ export const Balance = useCrudSchemas(
{ reactive<CrudSchema[]>([
label: '物料代码', {
field: 'itemCode', label: '物料代码',
sort: 'custom', field: 'itemCode',
table: { sort: 'custom',
width: 150 table: {
}, width: 150
isSearch: true, },
}, isSearch: true
{ },
label: '批次', {
field: 'batch', label: '物料名称',
sort: 'custom', field: 'itemName',
table: { sort: 'custom',
width: 150 table: {
}, width: 150
isSearch: true, },
}, isSearch: true
{ },
label: '包装号', {
field: 'packingNumber', label: '物料类型',
sort: 'custom', field: 'itemType',
table: { sort: 'custom',
width: 150 dictType: DICT_TYPE.ITEM_TYPE,
}, dictClass: 'string',
isSearch: true, isSearch: true,
}, table: {
{ width: 100
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',
} }
}, },
}, {
{ label: '批次',
label: '生产日期', field: 'batch',
field: 'produceDate', sort: 'custom',
isTable: true, table: {
formatter: dateFormatter2, width: 150
detail: { },
dateFormat: 'YYYY-MM-DD' isSearch: true
}, },
sort: 'custom', {
table: { label: '包装号',
width: 150 field: 'packingNumber',
}, sort: 'custom',
form: { table: {
component: 'DatePicker', width: 150
componentProps: { },
style: {width: '100%'}, isSearch: true
type: 'date', },
dateFormat: 'YYYY-MM-DD', {
valueFormat: 'x', label: '包装规格',
field: 'packUnit',
sort: 'custom',
table: {
width: 150
} }
}, },
}, {
{ label: '包装数量',
label: '失效日期', field: 'packQty',
field: 'expireDate', sort: 'custom',
isTable: true, table: {
formatter: dateFormatter2, width: 150
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: '器具代码',
label: '货主代码', // field: 'containerNumber',
field: 'ownerCode', // sort: 'custom',
sort: 'custom', // table: {
table: { // width: 150
width: 150 // },
}, // isTable:false
isTable: false, // },
}, {
{ label: '库存数量',
label: '锁定数量', field: 'qty',
field: 'lockedQty', sort: 'custom',
sort: 'custom', table: {
table: { width: 150
width: 150 },
form: {
component: 'InputNumber'
}
}, },
isTable: false, {
form: { label: '计量单位',
component: 'InputNumber', field: 'uom',
} dictType: DICT_TYPE.UOM,
}, dictClass: 'string',
// { isTable: true,
// label: '可用数量', sort: 'custom',
// field: 'usableQty', table: {
// sort: 'custom', width: 150
// 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', label: '库位代码',
value: 'TRUE', field: 'locationCode',
componentProps: { sort: 'custom',
inactiveValue: 'FALSE', table: {
activeValue: 'TRUE' width: 150
},
isSearch: true
},
{
label: '库存状态',
field: 'inventoryStatus',
dictType: DICT_TYPE.INVENTORY_STATUS,
dictClass: 'string',
isTable: true,
sort: 'custom',
table: {
width: 150
} }
}, },
}, {
// { label: '库区类型',
// label: '冻结原因', field: 'areaType',
// field: 'frozenReason', sort: 'custom',
// dictType: DICT_TYPE.FROZEN_REASON, dictType: DICT_TYPE.AREA_TYPE,
// dictClass: 'string', dictClass: 'string',
// isTable: true, isTable: true,
// sort: 'custom', table: {
// table: { width: 150
// 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: '创建时间', label: '仓库代码',
field: 'createTime', field: 'warehouseCode',
formatter: dateFormatter, sort: 'custom',
detail: { table: {
dateFormat: 'YYYY-MM-DD HH:mm:ss' width: 150
}
}, },
sort: 'custom', {
table: { label: '库位组代码',
width: 180 field: 'locationGroupCode',
sort: 'custom',
table: {
width: 150
}
}, },
form: { {
component: 'DatePicker', label: '库区代码',
componentProps: { field: 'areaCode',
style: {width:'100%'}, sort: 'custom',
type: 'datetime', table: {
dateFormat: 'YYYY-MM-DD HH:mm:ss', width: 150
valueFormat: 'x',
} }
}, },
isForm: false, // {
isSearch: true, // label: 'ERP库位代码',
search: { // field: 'erpLocationCode',
component: 'DatePicker', // dictType: DICT_TYPE.ERP_LOCATION,
componentProps: { // dictClass: 'string',
valueFormat: 'YYYY-MM-DD HH:mm:ss', // isTable: false,
type: 'daterange', // sort: 'custom',
defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] // 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: '生产日期',
label: '创建者', field: 'produceDate',
field: 'creator', isTable: true,
sort: 'custom', formatter: dateFormatter2,
table: { detail: {
width: 150 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: 'expireDate',
label: '最后更新时间', isTable: true,
field: 'updateTime', formatter: dateFormatter2,
formatter: dateFormatter, detail: {
detail: { dateFormat: 'YYYY-MM-DD'
dateFormat: 'YYYY-MM-DD HH:mm:ss' },
sort: 'custom',
table: {
width: 150
},
form: {
component: 'DatePicker',
componentProps: {
style: { width: '100%' },
type: 'date',
dateFormat: 'YYYY-MM-DD',
valueFormat: 'x'
}
}
}, },
sort: 'custom', {
table: { label: '货主代码',
width: 180 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', // label: '可用数量',
componentProps: { // field: 'usableQty',
type: 'datetime', // sort: 'custom',
dateFormat: 'YYYY-MM-DD HH:mm:ss', // table: {
valueFormat: 'x', // 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: 'frozenReason',
{ // dictType: DICT_TYPE.FROZEN_REASON,
label: '最后更新者', // dictClass: 'string',
field: 'updater', // isTable: true,
sort: 'custom', // sort: 'custom',
table: { // table: {
width: 150 // 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 label: '创建时间',
}, field: 'createTime',
// TODO: 临时添加 方便操作 formatter: dateFormatter,
{ detail: {
label: '操作', dateFormat: 'YYYY-MM-DD HH:mm:ss'
field: 'action', },
isDetail: false, sort: 'custom',
isForm: false, table: {
table: { width: 180
width: 200, },
fixed: 'right' 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({ export const BalanceRules = reactive({

Write Preview
Loading…
Cancel
Save