diff --git a/src/views/inventory/DeviceProjectSelect.vue b/src/views/inventory/DeviceProjectSelect.vue
index 1707505d..89a1570a 100644
--- a/src/views/inventory/DeviceProjectSelect.vue
+++ b/src/views/inventory/DeviceProjectSelect.vue
@@ -139,7 +139,8 @@ export default {
projectSetType: {
1: "巡检",
- 2: "养护"
+ 2: "养护",
+ 3: "报修",
},
formName: null,
deviceRepairOrder: {},
diff --git a/src/views/inventory/DeviceRepairOrderModify.vue b/src/views/inventory/DeviceRepairOrderModify.vue
index a3c2c4d8..b283eb2b 100644
--- a/src/views/inventory/DeviceRepairOrderModify.vue
+++ b/src/views/inventory/DeviceRepairOrderModify.vue
@@ -209,11 +209,9 @@
-
-
@@ -292,7 +290,6 @@ export default {
formRules: {
deptCode: [{required: true, message: '请选择部门', trigger: 'blur'}],
invCode: [{required: true, message: '请选择仓库', trigger: 'blur'}],
- deviceName: [{required: true, message: '请输入设备名称', trigger: 'blur'}],
code: [{required: true, message: '请输入物资编码', trigger: 'blur'}],
repairType: [{required: true, message: '请选择维修类型', trigger: 'blur'}],
urgencyType: [{required: true, message: '请选择紧急程度', trigger: 'blur'}],
@@ -423,22 +420,19 @@ export default {
this.filterQuery.page = 1;
this.getDeviceList();
},
- handleCurrentChange(val) {
- this.check = !this.check
- if (val.length >= 2) {
- // 删除索引为0的
- // console.log(val.splice(0,val.length-1),'被删除的')
- let arrays = val.splice(0, val.length - 1)
- arrays.forEach(row => {
- this.$refs.ref.toggleRowSelection(row); //除了当前点击的,其他的全部取消选中
- })
+ handleCurrentChange(row) {
+ this.selectRow = row;
+ },
+ // 刷新表单
+ resetForm() {
+ if (this.$refs["dataForm"]) {
+ // 清空验证信息表单
+ this.$refs["dataForm"].clearValidate();
}
- // console.log(val,'最后得到的')
-
- this.selectRow = val[0];
},
combine() {
- if (this.check == false) {
+ this.resetForm();
+ if (this.selectRow == null) {
this.$message.error("请勾选设备!")
return;
}