diff --git a/src/api/device/repairOrder.js b/src/api/device/repairOrder.js
index 71f2c80..fdabd15 100644
--- a/src/api/device/repairOrder.js
+++ b/src/api/device/repairOrder.js
@@ -80,9 +80,9 @@ export function queryEquFaultTypeTree(query) {
}
// 维修工单检验
-export function subInspect(data) {
+export function checkRepairWorkOrder(data) {
return request({
- url: '/device/repairOrder/subInspect',
+ url: '/device/repairOrder/checkRepairWorkOrder',
method: 'post',
data: data
});
diff --git a/src/views/device/faultReport/index.vue b/src/views/device/faultReport/index.vue
index 2479eeb..3daf01b 100644
--- a/src/views/device/faultReport/index.vue
+++ b/src/views/device/faultReport/index.vue
@@ -6,7 +6,7 @@
size="small"
:inline="true"
v-show="showSearch"
- label-width="88px"
+ label-width="100px"
>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
-
-
+ @keyup.enter.native="handleQuery"
+ />
-
+
@@ -196,11 +236,19 @@
>
+
-
+
+
+
+
+
@@ -214,7 +262,8 @@
label="设备编码"
align="center"
prop="equipmentCode"
- width="100"
+ :show-overflow-tooltip="true"
+ width="120"
/>
-
+
- 计划性维修
+ 计划性维修
+ 立即维修
不维修
委外维修
- 立即维修
+
@@ -486,12 +534,13 @@
+
是
- 否
+ 否
@@ -569,17 +618,11 @@
是
- 否
+ 否
-
+
-
+
+
@@ -634,8 +672,6 @@
/>
-
-
+
+
+
+
+
+
+
+
@@ -1174,7 +1224,7 @@ import { listFaultDescription } from "@/api/device/faultDescription";
export default {
name: "FaultReport",
components: { ItemSelect, ItemSelectPerson },
- dicts: ["device_order_source", "device_reach_standard"],
+ dicts: ["device_order_source", "device_reach_standard", "device_audit_status", "device_repair_destination", "device_audit_status"],
data() {
return {
CS: {
@@ -1337,6 +1387,16 @@ export default {
orderRepairmanCode: [
{ required: true, message: "报修人工号不能为空", trigger: "blur" },
],
+ //审核中 需要限制的字段 计划停机时间？？？？
+ workPlanTime: [
+ { required: true, message: "计划维修时间", trigger: "blur" },
+ ],
+ // workPlanDownTime: [
+ // { required: true, message: "计划停机时间", trigger: "blur" },
+ // ],
+ workDownMachine: [
+ { required: true, message: "是否停机维修", trigger: "blur" },
+ ],
},
};
},
@@ -1349,6 +1409,14 @@ export default {
indexMethod(index) {
return index + 1;
},
+
+ //监控radio
+ monitorRadio(){
+ if(this.form.workDownMachine == '0'){
+ this.form.workPlanDownTime = null;
+ }
+ },
+
timeBackFilling() {
var getTime = new Date().getTime(); //获取到当前时间戳
var time = new Date(getTime); //创建一个日期对象
@@ -1373,8 +1441,18 @@ export default {
second
);
}
- this.form.workPlanTime = nowDate(time);
+ this.form.workPlanTime = nowDate(time); //当选择为立即维修时候，都是默认值
+ this.form.workPlanDownTime = nowDate(time);
+ this.form.workDownMachine = '1';
},
+
+ //计划维修 时间回填重置
+ timeBackFillingReset() {
+ this.form.workPlanTime = null; //当选择为立即维修时候，都是默认值
+ this.form.workPlanDownTime = null;
+ this.form.workDownMachine = null;
+ },
+
/** 查询维修措施列表 */
getOrderDesc() {
this.loading = true;
@@ -1655,8 +1733,8 @@ export default {
}
if (
- response.data.orderStatus == "审核通过" ||
- response.data.orderStatus == "驳回"
+ response.data.orderStatus == "1" ||
+ response.data.orderStatus == "2"
) {
Message.warning("该报修记录已审核！");
this.form = response.data;
diff --git a/src/views/device/repairOrder/index.vue b/src/views/device/repairOrder/index.vue
index 3182bce..3c21300 100644
--- a/src/views/device/repairOrder/index.vue
+++ b/src/views/device/repairOrder/index.vue
@@ -17,6 +17,20 @@
@keyup.enter.native="handleQuery"
/>
+
+
+
+
+
-
+
结果检验
+ >维修结果审核
@@ -289,13 +303,15 @@
-
- {{ scope.row.resultInspect == '1' ? "通过" :scope.row.resultInspect == '0' ? "不通过" :"待检验" }}
+ width="100">
+
+
-
+
+
+
+
+
+
+
+
@@ -1273,14 +1302,22 @@
-
-
- 待检验
- 未通过
- 通过
+
+
+ 待审核
+ 审核通过
+ 驳回
+ |
+
@@ -1693,7 +1730,7 @@ import {
applyOutsource,
writeRepairOrder,
queryEquFaultTypeTree,
- subInspect,
+ checkRepairWorkOrder,
} from "@/api/device/repairOrder";
import { listFaultReason } from "@/api/device/faultReason";
import { listFaultMeasures } from "@/api/device/faultMeasures";
@@ -1704,11 +1741,10 @@ import ItemSelectPerson from "./selectSinglePerson.vue";
import { Message } from "element-ui";
import ItemSelectSpareParts from "./selectSpareParts.vue";
import moment from "moment";
-
export default {
name: " RepairOrder",
components: { ItemSelect, ItemSelectPerson, ItemSelectSpareParts },
- dicts: ["device_repair_status"],
+ dicts: ["device_repair_status","device_audit_status"],
data() {
return {
//委外表格格式
@@ -1795,6 +1831,8 @@ export default {
inspectDialog: false,
// 检验结果
inspect: null,
+ // 审核意见
+ auditOpinion: null,
// 多个维修单号
orderCodes: [],
// 查询参数
@@ -1827,6 +1865,7 @@ export default {
//计划维修时间组、计划停机时间组
workPlanTimeArray: [],
workPlanDownTimeArray: [],
+ resultInspect: null,
},
auxiliaryQueryParams: {
pageNum: 1,
@@ -2140,6 +2179,7 @@ export default {
updateBy: null,
delFlag: null,
factoryCode: null,
+ auditOpinion: null,
};
this.resetForm("form");
},
@@ -2395,7 +2435,9 @@ export default {
writeRepairOrder(this.form).then((response) => {
this.openWrite = false;
- this.$modal.msgSuccess("填写维修记录成功！");
+ if(response.code == 200){
+ this.$modal.msgSuccess(response.msg);
+ }
this.queryParams.workStatus = null;
this.getList();
});
@@ -2419,14 +2461,15 @@ export default {
},
// 提交检验信息
- subInspect() {
+ checkRepairWorkOrder() {
const data = {
ids: this.ids,
inspect: this.inspect,
orderCodes: this.orderCodes,
+ auditOpinion: this.auditOpinion,
};
- subInspect(data).then((response) => {
+ checkRepairWorkOrder(data).then((response) => {
this.getList();
this.inspectDialog = false;
this.$message({