Browse Source

BUG修改

hella_online_20240829
parent
commit
33b51ea887
  1. 16
      src/views/qms/inspectionJob/addForm.vue
  2. 33
      src/views/qms/inspectionJob/inspectionJobMain.data.ts
  3. 28
      src/views/qms/inspectionRecord/inspectionRecordMain.data.ts
  4. 174
      src/views/qms/inspectionRequest/inspectionRequestMain.data.ts

16
src/views/qms/inspectionJob/addForm.vue

@ -1012,10 +1012,10 @@ const submitForm = async () => {
message.error('检验工序和检验特性有字段未填写完全')
return
}
if (isOutweigh?.length > 0) {
message.error('检验特性中有开始时间大于结束时间')
return
}
// if (isOutweigh?.length > 0) {
// message.error('')
// return
// }
if (isParseFloat) {
message.error('合格数量和不合格数量之和不可以是小数')
return
@ -1141,10 +1141,10 @@ const staging = async () => {
message.error('检验工序和检验特性有字段未填写完全')
return
}
if (isOutweigh?.length > 0) {
message.error('检验特性中有开始时间大于结束时间')
return
}
// if (isOutweigh?.length > 0) {
// message.error('')
// return
// }
if (isParseFloat) {
message.error('合格数量和不合格数量之和不可以是小数')
return

33
src/views/qms/inspectionJob/inspectionJobMain.data.ts

@ -280,7 +280,7 @@ export const InspectionJobMain = useCrudSchemas(
isDetail: false,
isSearch: true,
isTableForm: false,
isForm: false,
isForm: false
},
// {
// label: '检验批来源',
@ -485,6 +485,35 @@ export const InspectionJobMain = useCrudSchemas(
}
},
{
label: '收货时间',
field: 'deliveryTime',
sort: 'custom',
formatter: dateFormatter,
isSearch: false,
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')]
}
},
form: {
component: 'DatePicker',
componentProps: {
type: 'datetime',
valueFormat: 'x'
}
},
detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
table: {
width: 175
}
},
{
label: '完成人',
field: 'completeUserName',
@ -493,7 +522,7 @@ export const InspectionJobMain = useCrudSchemas(
},
isForm: false,
isTable: true,
isDetail:true
isDetail: true
},
{
label: '完成时间',

28
src/views/qms/inspectionRecord/inspectionRecordMain.data.ts

@ -364,6 +364,34 @@ export const InspectionRecordMain = useCrudSchemas(
width: 175
}
},
{
label: '收货时间',
field: 'deliveryTime',
sort: 'custom',
formatter: dateFormatter,
isSearch: false,
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')]
}
},
form: {
component: 'DatePicker',
componentProps: {
type: 'datetime',
valueFormat: 'x'
}
},
detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
table: {
width: 175
}
},
{
label: '检验水平',
field: 'inspectionLevel',

174
src/views/qms/inspectionRequest/inspectionRequestMain.data.ts

@ -169,6 +169,34 @@ export const InspectionMain = useCrudSchemas(
width: 175
}
},
{
label: '收货时间',
field: 'deliveryTime',
sort: 'custom',
formatter: dateFormatter,
isSearch: false,
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')]
}
},
form: {
component: 'DatePicker',
componentProps: {
type: 'datetime',
valueFormat: 'x'
}
},
detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
table: {
width: 175
}
},
{
label: '完成时间',
field: 'finishTime',
@ -388,79 +416,79 @@ export const InspectionMain = useCrudSchemas(
}
},
{
      label: '创建时间',
      field: 'createTime',
      isForm: false,
      table: {
        width: 180
      },
      formatter: dateFormatter,
      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: 'creator',
      table: {
        width: 130
      },
      isForm: false,
      isTable: true
    },
    {
      label: '最后更新时间',
      field: 'updateTime',
      sort: 'custom',
      isDetail: true,
      isForm: false,
      isTable: false,
      formatter: dateFormatter,
      detail: {
        dateFormat: 'YYYY-MM-DD HH:mm:ss'
      },
      table: {
        width: 180
      },
      form: {
        component: 'DatePicker',
        componentProps: {
          style: { width: '100%' },
          type: 'datetime',
          dateFormat: 'YYYY-MM-DD HH:mm:ss',
          valueFormat: 'x'
        }
      }
    },
    {
      label: '最后更新者',
      field: 'updater',
      isDetail: true,
      isForm: false,
      isTable: false,
      table: {
        width: 150
      }
    },
    {
      label: '操作',
      field: 'action',
      isForm: false,
      isDetail: false,
      table: {
        width: 300,
        fixed: 'right'
      }
    }
label: '创建时间',
field: 'createTime',
isForm: false,
table: {
width: 180
},
formatter: dateFormatter,
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: 'creator',
table: {
width: 130
},
isForm: false,
isTable: true
},
{
label: '最后更新时间',
field: 'updateTime',
sort: 'custom',
isDetail: true,
isForm: false,
isTable: false,
formatter: dateFormatter,
detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
table: {
width: 180
},
form: {
component: 'DatePicker',
componentProps: {
style: { width: '100%' },
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x'
}
}
},
{
label: '最后更新者',
field: 'updater',
isDetail: true,
isForm: false,
isTable: false,
table: {
width: 150
}
},
{
label: '操作',
field: 'action',
isForm: false,
isDetail: false,
table: {
width: 300,
fixed: 'right'
}
}
])
)

Loading…
Cancel
Save