diff --git a/src/views/device/faultReport/index.vue b/src/views/device/faultReport/index.vue
index ab7dafe..92b35f6 100644
--- a/src/views/device/faultReport/index.vue
+++ b/src/views/device/faultReport/index.vue
@@ -965,16 +965,25 @@
/>
-
-
-
-
-
+
+
+
+
+
+
+
@@ -1122,6 +1131,7 @@ import ItemSelect from "./selectSingleEquipment.vue";
import ItemSelectPerson from "./selectSinglePerson.vue";
import { Message } from "element-ui";
import { getMaintenanceTeamList } from "@/api/device/equTeam";
+import { listFaultDescription } from "@/api/device/faultDescription";
export default {
name: "FaultReport",
@@ -1144,6 +1154,12 @@ export default {
"text-align": "center",
width: "120px",
},
+ auxiliaryQueryParams: {
+ pageNum: 1,
+ pageSize: 1000,
+ },
+ //故障描述
+ orderDescOption : [],
teamOption: [],
//图片存储
fileList: [],
@@ -1282,6 +1298,7 @@ export default {
},
created() {
this.getList();
+ this.getOrderDesc();
},
methods: {
// 生成表头序号
@@ -1316,6 +1333,13 @@ export default {
console.log(nowDate(time));
this.form.workPlanTime = nowDate(time);
},
+ /** 查询维修措施列表 */
+ getOrderDesc() {
+ this.loading = true;
+ listFaultDescription(this.auxiliaryQueryParams).then((response) => {
+ this.orderDescOption = response.rows;
+ });
+ },
//设备选择
handleSelectEquipment() {
this.$refs.itemSelect.showFlag = true;
diff --git a/src/views/device/repairOrder/index.vue b/src/views/device/repairOrder/index.vue
index 6e42cae..5dfaeab 100644
--- a/src/views/device/repairOrder/index.vue
+++ b/src/views/device/repairOrder/index.vue
@@ -989,7 +989,7 @@
元
@@ -1039,9 +1039,9 @@
clearable
v-model="form.workStartTime"
type="datetime"
- style="width: 195px"
+ style="width: 250px"
value-format="yyyy-MM-dd HH:mm:ss"
- @change="listening"
+ @change="listeningTime"
placeholder="请输入开始时间"
>
@@ -1052,7 +1052,7 @@
clearable
v-model="form.workEndTime"
type="datetime"
- style="width: 195px"
+ style="width: 250px"
@change="listeningTime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请输入结束时间"
@@ -1061,7 +1061,7 @@
-
+
@@ -1080,35 +1080,51 @@
-->
-
-
-
+
+
+ placeholder="请选择故障原因"
+ @change="$forceUpdate()"
+ clearable
+ filterable
+ style="width: 250px"
+ @keyup.enter.native="handleQuery"
+ >
+
+
-
-
-
+
-
+ placeholder="请选择处理措施"
+ @change="$forceUpdate()"
+ clearable
+ filterable
+ style="width: 250px"
+ @keyup.enter.native="handleQuery"
+ >
+
+
@@ -1379,7 +1395,7 @@
type="datetime"
style="width: 195px"
value-format="yyyy-MM-dd HH:mm:ss"
- @change="listening"
+ @change="listeningTime"
disabled
>
@@ -1430,29 +1446,44 @@
-->
-
-
-
+
+
+ @change="$forceUpdate()"
+ disabled
+ clearable
+ filterable
+ style="width: 250px"
+ @keyup.enter.native="handleQuery"
+ >
+
+
-
-
-
+
-
+ @change="$forceUpdate()"
+ clearable
+ filterable
+ disabled
+ style="width: 250px"
+ @keyup.enter.native="handleQuery"
+ >
+
+
@@ -1487,6 +1518,8 @@ import {
writeRepairOrder,
queryEquFaultTypeTree,
} from "@/api/device/repairOrder";
+import { listFaultReason } from "@/api/device/faultReason";
+import { listFaultMeasures } from "@/api/device/faultMeasures";
import { getMaintenanceTeamList } from "@/api/device/equTeam";
import ItemSelect from "./selectSingleEquipment.vue";
import ItemSelectPerson from "./selectSinglePerson.vue";
@@ -1533,6 +1566,10 @@ export default {
"text-align": "center",
width: "250px",
},
+ //维修处理措施模糊选择
+ repairMeasuresOption : [],
+ //原因分析模糊选择
+ workReasonOption: [],
//检查项表格数据
detailList: [],
//维修前照片
@@ -1602,6 +1639,10 @@ export default {
workPlanTimeArray: [],
workPlanDownTimeArray: [],
},
+ auxiliaryQueryParams: {
+ pageNum: 1,
+ pageSize: 1000,
+ },
//选择是否委外
workOutsourceOption: [
{
@@ -1680,6 +1721,8 @@ export default {
this.getList();
this.getTeamList();
this.getEquFaultTypeTree();
+ this.getWorkReason();
+ this.getRepairMeasures();
},
methods: {
// 生成表头序号
@@ -1743,11 +1786,24 @@ export default {
this.loading = false;
});
},
- /** 查询维修工单列表 */
+ /** 查询维修原因列表 */
+ getWorkReason() {
+ this.loading = true;
+ listFaultReason(this.auxiliaryQueryParams).then((response) => {
+ this.workReasonOption = response.rows;
+ });
+ },
+ /** 查询维修措施列表 */
+ getRepairMeasures() {
+ this.loading = true;
+ listFaultMeasures(this.auxiliaryQueryParams).then((response) => {
+ this.repairMeasuresOption = response.rows;
+ });
+ },
+ /** 查询维修班组列表 */
getTeamList() {
this.loading = true;
getMaintenanceTeamList(this.queryParams).then((response) => {
- console.log(response.rows);
this.teamOption = response.rows;
});
},