diff --git a/src/views/basic/dev-type/index.vue b/src/views/basic/dev-type/index.vue index 51386a3..4e79b03 100644 --- a/src/views/basic/dev-type/index.vue +++ b/src/views/basic/dev-type/index.vue @@ -180,7 +180,7 @@ export default { // 删除按钮 handleDelete(row) { - this.$modal.confirm('是否确认删除设备类型编号为"' + row.id + '"的数据项?').then(async () => { + this.$modal.confirm('是否确认删除设备类型名称为"' + row.typeName + '"的数据项?').then(async () => { var data ={id:row.id} const res = await delDeviceTypeApi(data) if (res.code === 200) { diff --git a/src/views/basic/device-manage/addOrEditForm.vue b/src/views/basic/device-manage/addOrEditForm.vue index 5dfe334..59138ea 100644 --- a/src/views/basic/device-manage/addOrEditForm.vue +++ b/src/views/basic/device-manage/addOrEditForm.vue @@ -125,8 +125,9 @@ export default { setFormData(data) { const {deviceType, deviceCode, userId, remark ,id} = data + this.addOrEditForm = { - deviceType, + deviceType: deviceType ?? '', deviceCode, userId, remark, diff --git a/src/views/basic/model-manage/useOrReturnFormNew.vue b/src/views/basic/model-manage/useOrReturnFormNew.vue index aa8346e..a482ec2 100644 --- a/src/views/basic/model-manage/useOrReturnFormNew.vue +++ b/src/views/basic/model-manage/useOrReturnFormNew.vue @@ -11,7 +11,7 @@