lb #30

Merged
g7hoo merged 23 commits from lb into test 2023-09-22 09:57:16 +08:00
3 changed files with 27 additions and 16 deletions
Showing only changes of commit 7407b97f5a - Show all commits

View File

@ -82,6 +82,9 @@ export default {
url: '/base/workshop-section/listAll', url: '/base/workshop-section/listAll',
prop: 'sectionId', prop: 'sectionId',
rules: [{ required: true, message: '不能为空', trigger: 'blur' }], rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
bind: {
filterable: true,
},
}, },
], ],
[ [
@ -94,7 +97,8 @@ export default {
type: 'number', type: 'number',
message: '请输入整数', message: '请输入整数',
trigger: 'blur', 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: [ rules: [
{ {
type: 'number', type: 'number',
message: '请输入100以内的', message: '请输入100以内的数',
trigger: 'blur', 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 }, bind: { type: 'number', min: 0, max: 100 },
@ -294,7 +298,7 @@ export default {
handleDelete(row) { handleDelete(row) {
const id = row.id; const id = row.id;
this.$modal this.$modal
.confirm('是否确认删除安灯按钮16键对应编号为"' + id + '"的数据项?') .confirm('是否确认删除"' + row.sectionName + '"?')
.then(function () { .then(function () {
return deleteQualityInspectionBoxBtn(id); return deleteQualityInspectionBoxBtn(id);
}) })

View File

@ -276,7 +276,7 @@ export default {
handleDelete(row) { handleDelete(row) {
const id = row.id; const id = row.id;
this.$modal this.$modal
.confirm('是否确认删除检测信息"' + row.content + '?') .confirm('是否确认删除检测信息"' + row.content + '"?')
.then(function () { .then(function () {
return deleteQualityInspectionDet(id); return deleteQualityInspectionDet(id);
}) })

View File

@ -69,7 +69,7 @@ export default {
[ [
{ {
select: true, select: true,
label: '检测内容ID', label: '检测内容',
url: '/base/quality-inspection-det/listAll', url: '/base/quality-inspection-det/listAll',
prop: 'inspectionDetId', prop: 'inspectionDetId',
labelKey: 'content', labelKey: 'content',
@ -98,6 +98,9 @@ export default {
label: '产线', label: '产线',
url: '/base/production-line/listAll', url: '/base/production-line/listAll',
prop: 'productionLineId', prop: 'productionLineId',
bind: {
filterable: true,
},
rules: [{ required: true, message: '不能为空', trigger: 'blur' }], rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
}, },
{ {
@ -106,6 +109,9 @@ export default {
url: '/base/workshop-section/listAll', // url options url: '/base/workshop-section/listAll', // url options
options: [], // options, options options: [], // options, options
prop: 'sectionId', prop: 'sectionId',
bind: {
filterable: true,
},
rules: [{ required: true, message: '不能为空', trigger: 'blur' }], rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
}, },
], ],
@ -119,6 +125,7 @@ export default {
datetime: true, datetime: true,
label: '检测时间', label: '检测时间',
prop: 'checkTime', prop: 'checkTime',
rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
bind: { bind: {
format: 'yyyy-MM-dd HH:mm:ss', format: 'yyyy-MM-dd HH:mm:ss',
'value-format': 'timestamp', 'value-format': 'timestamp',
@ -127,15 +134,15 @@ export default {
}, },
}, },
], ],
[ // [
{ // {
textarea: true, // textarea: true,
label: '检测内容', // label: '',
prop: 'inspectionDetContent', // prop: 'inspectionDetContent',
value: '', // value: '',
rules: [{ required: true, message: '不能为空', trigger: 'blur' }], // rules: [{ required: true, message: '', trigger: 'blur' }],
}, // },
], // ],
[{ textarea: true, label: '描述', prop: 'explainText' }], [{ textarea: true, label: '描述', prop: 'explainText' }],
[{ input: true, label: '备注', prop: 'remark' }], [{ input: true, label: '备注', prop: 'remark' }],
], ],
@ -390,7 +397,7 @@ export default {
handleDelete(row) { handleDelete(row) {
const id = row.id; const id = row.id;
this.$modal this.$modal
.confirm('是否确认删除质量检查信息记录表编号为"' + id + '"的数据项?') .confirm('是否确认删除"' + row.inspectionDetContent + '"?')
.then(function () { .then(function () {
return deleteQualityInspectionRecord(id); return deleteQualityInspectionRecord(id);
}) })