Browse Source

BUG修改

master_hella_20240701
parent
commit
4a9a11cc61
  1. 12
      src/views/qms/aql/aql.data.ts
  2. 78
      src/views/qms/basicDataManage/inspectionScheme/inspectionScheme.data.ts
  3. 9
      src/views/qms/inspectionMethod/inspectionMethod.data.ts
  4. 29
      src/views/qms/samplingProcess/samplingProcess.data.ts
  5. 9
      src/views/qms/samplingScheme/samplingScheme.data.ts

12
src/views/qms/aql/aql.data.ts

@ -540,9 +540,15 @@ export const Aql = useCrudSchemas(reactive<CrudSchema[]>([
detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
table: {
width: 115
}
form: {
component: 'DatePicker',
componentProps: {
style: {width: '100%'},
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
}
},
},
{
label: '操作',

78
src/views/qms/basicDataManage/inspectionScheme/inspectionScheme.data.ts

@ -5,10 +5,10 @@ import { dateFormatter } from '@/utils/formatTime'
export const InspectionTemplateRules = reactive({
description: [
{ required: true , message: '请填写描述', trigger: 'blur' }
{ required: true, message: '请填写描述', trigger: 'blur' }
],
version: [
{ required: true , message: '请填写版本', trigger: 'blur' }
{ required: true, message: '请填写版本', trigger: 'blur' }
],
inspectionCode: [
{ required: true, message: '请选择检验方案模板编码', trigger: 'blur' }
@ -77,11 +77,11 @@ export const InspectionSchemeMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 220,
fixed: 'left'
},
isSearch:true,
form:{
componentProps:{
disabled:true,
placeholder:'系统自动获取'
isSearch: true,
form: {
componentProps: {
disabled: true,
placeholder: '系统自动获取'
}
}
},
@ -92,7 +92,7 @@ export const InspectionSchemeMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isSearch:true,
isSearch: true,
},
{
label: '物料编码',
@ -101,19 +101,19 @@ export const InspectionSchemeMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isSearch:true,
isSearch: true,
}, {
label: '描述',
field: 'description',
sort: 'custom',
},{
}, {
label: '版本',
field: 'version',
sort: 'custom',
table: {
width: 150
}
},{
}, {
label: '检验类型编码',
field: 'inspectionType',
dictType: DICT_TYPE.INSPECTION_TYPE,
@ -122,14 +122,14 @@ export const InspectionSchemeMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
}
},{
}, {
label: '检验模板编码',
field: 'programmeTemplateCode',
sort: 'custom',
table: {
width: 150
}
},{
}, {
label: '拆分规则',
field: 'splitRule',
sort: 'custom',
@ -137,8 +137,8 @@ export const InspectionSchemeMain = useCrudSchemas(reactive<CrudSchema[]>([
dictClass: 'string', // 默认都是字符串类型其他暂不考虑
table: {
width: 150
},
},{
},
}, {
label: 'aql',
field: 'aql',
sort: 'custom',
@ -147,32 +147,54 @@ export const InspectionSchemeMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
}
},{
}, {
label: '检验水平',
field: 'inspectionLevel',
sort: 'custom',
dictType: DICT_TYPE.INSPECTION_LEVEL,
dictClass: 'string',
dictClass: 'string',
table: {
width: 150
},
isSearch:true,
},{
},
isSearch: true,
},
{
label: '生效时间',
field: 'effectiveDate',
sort: 'custom',
formatter: dateFormatter,
table: {
width: 180
}
},{
isForm: false,
detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
form: {
component: 'DatePicker',
componentProps: {
style: { width: '100%' },
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
}
},
},
{
label: '失效时间',
field: 'expirationDate',
sort: 'custom',
formatter: dateFormatter,
table: {
width: 180
}
isForm: false,
detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
form: {
component: 'DatePicker',
componentProps: {
style: { width: '100%' },
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
}
},
},
// {
// label: '是否可用',
@ -197,7 +219,7 @@ export const InspectionSchemeMain = useCrudSchemas(reactive<CrudSchema[]>([
label: '操作',
field: 'action',
isDetail: false,
isForm: false ,
isForm: false,
table: {
width: 150,
fixed: 'right'

9
src/views/qms/inspectionMethod/inspectionMethod.data.ts

@ -61,6 +61,15 @@ export const InspectionMethod = useCrudSchemas(reactive<CrudSchema[]>([
detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
form: {
component: 'DatePicker',
componentProps: {
style: {width: '100%'},
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
}
},
},
{
label: '操作',

29
src/views/qms/samplingProcess/samplingProcess.data.ts

@ -76,16 +76,25 @@ export const SamplingProcess = useCrudSchemas(reactive<CrudSchema[]>([
}
},
},
{
label: '创建时间',
field: 'createTime',
sort: 'custom',
formatter: dateFormatter,
isForm: false,
detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
},
{
label: '创建时间',
field: 'createTime',
sort: 'custom',
formatter: dateFormatter,
isForm: false,
detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
form: {
component: 'DatePicker',
componentProps: {
style: {width: '100%'},
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
}
},
},
{
label: '操作',
field: 'action',

9
src/views/qms/samplingScheme/samplingScheme.data.ts

@ -32,6 +32,15 @@ export const SamplingScheme = useCrudSchemas(reactive<CrudSchema[]>([
detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
form: {
component: 'DatePicker',
componentProps: {
style: {width: '100%'},
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
}
},
},
{
label: '操作',

Loading…
Cancel
Save