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
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  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. 22
      src/views/qms/inspectionRecord/inspectionRecordMain.data.ts
  5. 15
      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. 88
      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
}
},
{
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: '创建者',

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

@ -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: '创建者',

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

@ -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: '创建者',

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

@ -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
@ -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: '创建者',

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

@ -29,7 +29,7 @@ export const InspectionRecordMain = useCrudSchemas(
isSearch: false,
table: {
width: 150
},
}
},
{
label: '物料编码',
@ -82,7 +82,6 @@ export const InspectionRecordMain = useCrudSchemas(
}
},
{
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',

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

@ -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: '创建者',

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

@ -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'] }],

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

@ -1,10 +1,11 @@
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<CrudSchema[]>([
export const Balance = useCrudSchemas(
reactive<CrudSchema[]>([
{
label: '物料代码',
field: 'itemCode',
@ -12,7 +13,27 @@ export const Balance = useCrudSchemas(reactive<CrudSchema[]>([
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: '批次',
@ -21,7 +42,7 @@ export const Balance = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isSearch: true,
isSearch: true
},
{
label: '包装号',
@ -30,7 +51,7 @@ export const Balance = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isSearch: true,
isSearch: true
},
{
label: '包装规格',
@ -38,7 +59,7 @@ export const Balance = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
table: {
width: 150
},
}
},
{
label: '包装数量',
@ -46,7 +67,7 @@ export const Balance = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
table: {
width: 150
},
}
},
// {
// label: '器具代码',
@ -65,7 +86,7 @@ export const Balance = useCrudSchemas(reactive<CrudSchema[]>([
width: 150
},
form: {
component: 'InputNumber',
component: 'InputNumber'
}
},
{
@ -77,7 +98,7 @@ export const Balance = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
table: {
width: 150
},
}
},
{
label: '库位代码',
@ -86,7 +107,7 @@ export const Balance = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isSearch: true,
isSearch: true
},
{
label: '库存状态',
@ -97,7 +118,7 @@ export const Balance = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
table: {
width: 150
},
}
},
{
label: '库区类型',
@ -108,7 +129,7 @@ export const Balance = useCrudSchemas(reactive<CrudSchema[]>([
isTable: true,
table: {
width: 150
},
}
},
{
@ -117,7 +138,7 @@ export const Balance = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
table: {
width: 150
},
}
},
{
label: '库位组代码',
@ -125,7 +146,7 @@ export const Balance = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
table: {
width: 150
},
}
},
{
label: '库区代码',
@ -133,7 +154,7 @@ export const Balance = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
table: {
width: 150
},
}
},
// {
// label: 'ERP库位代码',
@ -170,12 +191,12 @@ export const Balance = useCrudSchemas(reactive<CrudSchema[]>([
form: {
component: 'DatePicker',
componentProps: {
style: {width: '100%'},
style: { width: '100%' },
type: 'date',
dateFormat: 'YYYY-MM-DD',
valueFormat: 'x',
valueFormat: 'x'
}
}
},
},
{
label: '生产日期',
@ -192,12 +213,12 @@ export const Balance = useCrudSchemas(reactive<CrudSchema[]>([
form: {
component: 'DatePicker',
componentProps: {
style: {width: '100%'},
style: { width: '100%' },
type: 'date',
dateFormat: 'YYYY-MM-DD',
valueFormat: 'x',
valueFormat: 'x'
}
}
},
},
{
label: '失效日期',
@ -214,12 +235,12 @@ export const Balance = useCrudSchemas(reactive<CrudSchema[]>([
form: {
component: 'DatePicker',
componentProps: {
style: {width: '100%'},
style: { width: '100%' },
type: 'date',
dateFormat: 'YYYY-MM-DD',
valueFormat: 'x',
valueFormat: 'x'
}
}
},
},
{
label: '货主代码',
@ -228,7 +249,7 @@ export const Balance = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false,
isTable: false
},
{
label: '锁定数量',
@ -239,7 +260,7 @@ export const Balance = useCrudSchemas(reactive<CrudSchema[]>([
},
isTable: false,
form: {
component: 'InputNumber',
component: 'InputNumber'
}
},
// {
@ -311,7 +332,7 @@ export const Balance = useCrudSchemas(reactive<CrudSchema[]>([
inactiveValue: 'FALSE',
activeValue: 'TRUE'
}
},
}
},
// {
// label: '冻结原因',
@ -363,7 +384,7 @@ export const Balance = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
table: {
width: 150
},
}
},
{
label: '创建时间',
@ -379,10 +400,10 @@ export const Balance = useCrudSchemas(reactive<CrudSchema[]>([
form: {
component: 'DatePicker',
componentProps: {
style: {width:'100%'},
style: { width: '100%' },
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
},
isForm: false,
@ -394,7 +415,7 @@ export const Balance = useCrudSchemas(reactive<CrudSchema[]>([
type: 'daterange',
defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
}
},
}
},
{
label: '创建者',
@ -421,7 +442,7 @@ export const Balance = useCrudSchemas(reactive<CrudSchema[]>([
componentProps: {
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'x'
}
},
isForm: false,
@ -446,9 +467,10 @@ export const Balance = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 200,
fixed: 'right'
},
}
]))
}
])
)
// 表单校验
export const BalanceRules = reactive({

Write Preview
Loading…
Cancel
Save