diff --git a/src/views/inventory/DeviceInspectMyTake.vue b/src/views/inventory/DeviceInspectMyTake.vue
index 259eebf2..d0307447 100644
--- a/src/views/inventory/DeviceInspectMyTake.vue
+++ b/src/views/inventory/DeviceInspectMyTake.vue
@@ -16,6 +16,17 @@
clearable>
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+ {{ repairTypeMap[scope.row.type] }}
+
+
{{ statusMap[scope.row.status] }}
@@ -247,6 +261,11 @@ export default {
0: "草稿",
1: "未分配",
},
+ repairTypeMap: {
+ 1: "巡检",
+ 2: "养护",
+ 3: "报修",
+ },
statusdetailMap: {
1: "未开始",
2: "已检查",
diff --git a/src/views/inventory/DeviceInspectTakeAdd.vue b/src/views/inventory/DeviceInspectTakeAdd.vue
index 098497c6..07eff59c 100644
--- a/src/views/inventory/DeviceInspectTakeAdd.vue
+++ b/src/views/inventory/DeviceInspectTakeAdd.vue
@@ -82,7 +82,8 @@
@@ -93,6 +94,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -346,6 +373,7 @@ export default {
updateTime: null,
taskOrderIdFk: null
},
+ ischeck:false,
deviceList: [],
delectList: [],
deviceTotal: 0,
@@ -361,6 +389,8 @@ export default {
deviceName: [{required: true, message:"请输入设备名称!",trigger: 'blur'}],
code: [{required: true, message:"请输入物资编码!",trigger: 'blur'}],
type: [{required: true, message:"请选择类型!",trigger: 'blur'}],
+ repairType: [{required: true, message:"请选择维修类型!",trigger: 'blur'}],
+ level: [{required: true, message:"请选择紧急程度!",trigger: 'blur'}],
},
statusMap: {
1: "未开始",
@@ -387,6 +417,15 @@ export default {
this.getInvList();
});
},
+ repairType(val){
+ if(val == 3){
+ //报修
+ this.ischeck = true;
+
+ }else
+ this.ischeck = false;
+
+ },
getInvList() {
let params = {deptCode: this.inspectTake.deptCode};
getInvListByUser(params)
@@ -646,6 +685,9 @@ export default {
this.getUserBus();
if (!isBlank(this.inspectTake.id)) {
this.selectDeviceInspecTakeDetail({taskOrderIdFk: this.inspectTake.orderId});
+ if(this.inspectTake.type == 3){
+ this.ischeck =true
+ }
}
}
,
diff --git a/src/views/inventory/DeviceInspectTakeAuditModify.vue b/src/views/inventory/DeviceInspectTakeAuditModify.vue
index 8c70a186..4a48f64d 100644
--- a/src/views/inventory/DeviceInspectTakeAuditModify.vue
+++ b/src/views/inventory/DeviceInspectTakeAuditModify.vue
@@ -71,7 +71,9 @@
-
+
@@ -96,6 +98,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -245,6 +272,7 @@ export default {
updateTime: null,
taskOrderIdFk: null
},
+ ischeck:false,
deviceList: [],
delectList: [],
deviceTotal: 0,
@@ -312,6 +340,15 @@ export default {
},
//!-------------------------------------------------------------- 新加方法 --------------------------------------------------------- //
+ repairType(val){
+ if(val == 3){
+ //报修
+ this.ischeck = true;
+ }else
+ this.ischeck = false;
+ },
+
+
selectDeviceInspecTakeDetail(obj) {
selectDeviceInspecTakeDetail(obj).then((res) => {
this.loading = false;
@@ -459,6 +496,9 @@ export default {
this.getUserBus();
if (!isBlank(this.inspectTake.id)) {
this.selectDeviceInspecTakeDetail({taskOrderIdFk: this.inspectTake.orderId});
+ if(this.inspectTake.type == 3){
+ this.ischeck =true
+ }
}
}
,
diff --git a/src/views/inventory/DeviceProjectSet.vue b/src/views/inventory/DeviceProjectSet.vue
index 1e1cf12f..4b56e007 100644
--- a/src/views/inventory/DeviceProjectSet.vue
+++ b/src/views/inventory/DeviceProjectSet.vue
@@ -113,6 +113,7 @@
:visible.sync="formVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
+ :before-close="closeDialog"
width="40%"
v-if="formVisible"
>
@@ -300,6 +301,7 @@ export default {
closeDialog() {
this.formVisible = false;
this.getList();
+ this.deviceRepairOrder = []
},
},
diff --git a/src/views/inventory/DeviceProjectSetDialog.vue b/src/views/inventory/DeviceProjectSetDialog.vue
index fde46947..67b1d7eb 100644
--- a/src/views/inventory/DeviceProjectSetDialog.vue
+++ b/src/views/inventory/DeviceProjectSetDialog.vue
@@ -32,6 +32,7 @@
>
+
diff --git a/src/views/inventory/DeviceRepairOrderAudit.vue b/src/views/inventory/DeviceRepairOrderAudit.vue
index 81b2e2c5..49d4cb4b 100644
--- a/src/views/inventory/DeviceRepairOrderAudit.vue
+++ b/src/views/inventory/DeviceRepairOrderAudit.vue
@@ -370,6 +370,7 @@ export default {
if (res.code === 20000) {
this.$message.success("删除成功！");
this.getList();
+ this.delectList = [];
} else {
this.$message.error(res.message);
}
@@ -427,6 +428,7 @@ export default {
},
closeDialog() {
this.formVisible = false;
+ this.delectList = [];
this.getList();
},
showImgViewer(row){
diff --git a/src/views/inventory/DeviceRepairOrderCompleted.vue b/src/views/inventory/DeviceRepairOrderCompleted.vue
index d672164b..a8bab52e 100644
--- a/src/views/inventory/DeviceRepairOrderCompleted.vue
+++ b/src/views/inventory/DeviceRepairOrderCompleted.vue
@@ -401,6 +401,7 @@ export default {
if (res.code === 20000) {
this.$message.success("删除成功！");
this.getList();
+ this.delectList = [];
} else {
this.$message.error(res.message);
}
diff --git a/src/views/inventory/DeviceRepairOrderNew.vue b/src/views/inventory/DeviceRepairOrderNew.vue
index 09062c72..f5e8d036 100644
--- a/src/views/inventory/DeviceRepairOrderNew.vue
+++ b/src/views/inventory/DeviceRepairOrderNew.vue
@@ -386,6 +386,7 @@ export default {
if (res.code === 20000) {
this.$message.success("删除成功！");
this.getList();
+ this.detailList = [];
} else {
this.$message.error(res.message);
}
@@ -396,6 +397,7 @@ export default {
},
closeDialog() {
this.formVisible = false;
+ this.detailList = [];
this.getList();
},
showImgViewer(row) {