diff --git a/src/views/base/equipmentPlc/index.vue b/src/views/base/equipmentPlc/index.vue index 4fccc162..0f7c603f 100644 --- a/src/views/base/equipmentPlc/index.vue +++ b/src/views/base/equipmentPlc/index.vue @@ -65,7 +65,7 @@ const switchBtn = { }, methods: {}, render: function (h) { - console.log("render....") + console.log('render....'); return h( 'el-switch', { @@ -187,6 +187,7 @@ export default { label: '编码', prop: 'code', url: '/base/equipment-group/getCode', + rules: [{ required: true, message: '不能为空', trigger: 'blur' }], }, ], [ @@ -194,7 +195,7 @@ export default { input: true, label: '标识', prop: 'name', - // rules: [{ required: true, message: '不能为空', trigger: 'blur' }], + rules: [{ required: true, message: '不能为空', trigger: 'blur' }], // bind: { // disabled: true, // some condition, like detail mode... // } diff --git a/src/views/base/equipmentPlcConnect/index.vue b/src/views/base/equipmentPlcConnect/index.vue index 91d65fa7..e43d31ce 100644 --- a/src/views/base/equipmentPlcConnect/index.vue +++ b/src/views/base/equipmentPlcConnect/index.vue @@ -180,6 +180,7 @@ export default { select: true, label: '关联表名', prop: 'plcId', + labelKey: `plcTableName`, url: '/base/equipment-plc/listAll', rules: [{ required: true, message: '不能为空', trigger: 'blur' }], }, diff --git a/src/views/quality/base/qualityInspectionBoxBtn/index.vue b/src/views/quality/base/qualityInspectionBoxBtn/index.vue index eaaacda8..57ad51e3 100644 --- a/src/views/quality/base/qualityInspectionBoxBtn/index.vue +++ b/src/views/quality/base/qualityInspectionBoxBtn/index.vue @@ -91,9 +91,9 @@ export default { rules: [ { type: 'number', - message: '请输入数字', + message: '请输入整数', trigger: 'blur', - transform: (val) => Number(val), + transform: (val) => Number.isInteger(Number(val)) && Number(val), }, ], }, @@ -120,7 +120,7 @@ export default { textarea: true, label: '检测内容', prop: 'inspectionDetContent', - rules: [{ required: true, message: '不能为空', trigger: 'blur' }], + // rules: [{ required: true, message: '不能为空', trigger: 'blur' }], }, ], ], @@ -173,17 +173,14 @@ export default { filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'), }, { - width: 128, prop: 'productionName', label: '产线', }, { - width: 128, prop: 'sectionName', label: '工段', }, { - width: 128, prop: 'inspectionDetContent', label: '检测内容', }, @@ -217,7 +214,7 @@ export default { searchBarKeys: ['inspectionDetContent'], form: { id: null, - inspectionDetId: null, + buttonId: null, inspectionDetContent: null, productionId: null, sectionId: null, @@ -244,7 +241,7 @@ export default { reset() { this.form = { id: null, - inspectionDetId: null, + buttonId: null, inspectionDetContent: null, productionId: null, sectionId: null, diff --git a/src/views/quality/base/qualityInspectionDet/index.vue b/src/views/quality/base/qualityInspectionDet/index.vue index db48dae1..fdf99d7e 100644 --- a/src/views/quality/base/qualityInspectionDet/index.vue +++ b/src/views/quality/base/qualityInspectionDet/index.vue @@ -275,7 +275,7 @@ export default { handleDelete(row) { const id = row.id; this.$modal - .confirm('是否确认删除质量检测信息基础编号为"' + id + '"的数据项?') + .confirm('是否确认删除检测信息"' + row.content + '?') .then(function () { return deleteQualityInspectionDet(id); })