diff --git a/src/views/quality/base/qualityInspectionBoxBtn/index.vue b/src/views/quality/base/qualityInspectionBoxBtn/index.vue index 0e4390b4..1fd5f281 100644 --- a/src/views/quality/base/qualityInspectionBoxBtn/index.vue +++ b/src/views/quality/base/qualityInspectionBoxBtn/index.vue @@ -82,6 +82,9 @@ export default { url: '/base/workshop-section/listAll', prop: 'sectionId', rules: [{ required: true, message: '不能为空', trigger: 'blur' }], + bind: { + filterable: true, + }, }, ], [ @@ -94,7 +97,8 @@ export default { type: 'number', message: '请输入整数', trigger: 'blur', - transform: (val) => Number.isInteger(Number(val)) && Number(val), + transform: (val) => + Number.isInteger(Number(val)) && Number(val), }, ], }, @@ -108,9 +112,9 @@ export default { rules: [ { type: 'number', - message: '请输入100以内的数字', + message: '请输入100以内的整数', trigger: 'blur', - transform: (val) => Number(val) <= 100 && Number(val), + transform: (val) => Number(val) <= 100 && Number.isInteger(+val) && Number(val), }, ], bind: { type: 'number', min: 0, max: 100 }, @@ -294,7 +298,7 @@ export default { handleDelete(row) { const id = row.id; this.$modal - .confirm('是否确认删除安灯按钮16键对应编号为"' + id + '"的数据项?') + .confirm('是否确认删除"' + row.sectionName + '"?') .then(function () { return deleteQualityInspectionBoxBtn(id); }) diff --git a/src/views/quality/base/qualityInspectionDet/index.vue b/src/views/quality/base/qualityInspectionDet/index.vue index 4f3cf8b3..a5518679 100644 --- a/src/views/quality/base/qualityInspectionDet/index.vue +++ b/src/views/quality/base/qualityInspectionDet/index.vue @@ -276,7 +276,7 @@ export default { handleDelete(row) { const id = row.id; this.$modal - .confirm('是否确认删除检测信息"' + row.content + '?') + .confirm('是否确认删除检测信息"' + row.content + '"?') .then(function () { return deleteQualityInspectionDet(id); }) diff --git a/src/views/quality/monitoring/qualityInspectionRecord/index.vue b/src/views/quality/monitoring/qualityInspectionRecord/index.vue index ac7342af..73ac7c12 100644 --- a/src/views/quality/monitoring/qualityInspectionRecord/index.vue +++ b/src/views/quality/monitoring/qualityInspectionRecord/index.vue @@ -69,7 +69,7 @@ export default { [ { select: true, - label: '检测内容ID', + label: '检测内容', url: '/base/quality-inspection-det/listAll', prop: 'inspectionDetId', labelKey: 'content', @@ -98,6 +98,9 @@ export default { label: '产线', url: '/base/production-line/listAll', prop: 'productionLineId', + bind: { + filterable: true, + }, rules: [{ required: true, message: '不能为空', trigger: 'blur' }], }, { @@ -106,6 +109,9 @@ export default { url: '/base/workshop-section/listAll', // 这个 url 其实可加可不加,因为下面会更新 options options: [], // 这个options也可加可不加, 因为下面会更新 options prop: 'sectionId', + bind: { + filterable: true, + }, rules: [{ required: true, message: '不能为空', trigger: 'blur' }], }, ], @@ -119,6 +125,7 @@ export default { datetime: true, label: '检测时间', prop: 'checkTime', + rules: [{ required: true, message: '不能为空', trigger: 'blur' }], bind: { format: 'yyyy-MM-dd HH:mm:ss', 'value-format': 'timestamp', @@ -127,15 +134,15 @@ export default { }, }, ], - [ - { - textarea: true, - label: '检测内容', - prop: 'inspectionDetContent', - value: '', - rules: [{ required: true, message: '不能为空', trigger: 'blur' }], - }, - ], + // [ + // { + // textarea: true, + // label: '检测内容', + // prop: 'inspectionDetContent', + // value: '', + // rules: [{ required: true, message: '不能为空', trigger: 'blur' }], + // }, + // ], [{ textarea: true, label: '描述', prop: 'explainText' }], [{ input: true, label: '备注', prop: 'remark' }], ], @@ -390,7 +397,7 @@ export default { handleDelete(row) { const id = row.id; this.$modal - .confirm('是否确认删除质量检查信息记录表编号为"' + id + '"的数据项?') + .confirm('是否确认删除"' + row.inspectionDetContent + '"?') .then(function () { return deleteQualityInspectionRecord(id); })