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

BUG修改

hella_online_20240829
添砖-JAVA\Administrator 4 months ago
parent
a528949fc3
commit
33b51ea887
4 changed files with 168 additions and 83 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  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
View File

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

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

@ -280,7 +280,7 @@ export const InspectionJobMain = useCrudSchemas(
isDetail: false, isDetail: false,
isSearch: true, isSearch: true,
isTableForm: false, isTableForm: false,
isForm: false, isForm: false
}, },
// { // {
// label: '检验批来源', // 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: '完成人', label: '完成人',
field: 'completeUserName', field: 'completeUserName',
@ -493,7 +522,7 @@ export const InspectionJobMain = useCrudSchemas(
}, },
isForm: false, isForm: false,
isTable: true, isTable: true,
isDetail:true isDetail: true
}, },
{ {
label: '完成时间', label: '完成时间',

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

@ -364,6 +364,34 @@ export const InspectionRecordMain = useCrudSchemas(
width: 175 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: '检验水平', label: '检验水平',
field: 'inspectionLevel', field: 'inspectionLevel',

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

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

Write Preview
Loading…
Cancel
Save