From 21a3a7767227316852bf54b33e5e36bae5c5db94 Mon Sep 17 00:00:00 2001 From: A0010407 Date: Mon, 20 Nov 2023 14:26:35 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=A8=A1=E5=9D=97-=E6=8A=A5?= =?UTF-8?q?=E4=BF=AE-1=EF=BC=88=E6=A3=80=E6=9F=A5=E9=A1=B9=E5=9B=BE?= =?UTF-8?q?=E7=89=87X=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/device/faultReport/index.vue | 300 ++++++++++-------- .../faultReport/selectSingleEquipment.vue | 203 +++++++----- .../device/faultReport/selectSinglePerson.vue | 165 ++++++---- src/views/device/repairOrder/index.vue | 12 + 4 files changed, 421 insertions(+), 259 deletions(-) diff --git a/src/views/device/faultReport/index.vue b/src/views/device/faultReport/index.vue index 4ab5447f..819466e8 100644 --- a/src/views/device/faultReport/index.vue +++ b/src/views/device/faultReport/index.vue @@ -54,9 +54,9 @@ > - + + + - - {{ - form.equipmentCode - }} - {{ - form.orderBreakdownTime - }} - {{ - form.orderSource - }} - {{ - form.orderTime - }} - {{ - form.orderRepairmanName - }} - {{ - form.orderConnection - }} - {{ - form.orderDesc - }} - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + {{ + form.equipmentCode + }} + {{ + form.orderBreakdownTime + }} + {{ + form.orderSource + }} + {{ + form.orderTime + }} + {{ + form.orderRepairmanName + }} + {{ + form.orderConnection + }} + {{ + form.orderDesc + }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -372,7 +387,7 @@ 计划性维修 不维修 委外维修 - 立即维修 @@ -382,21 +397,21 @@ - - - + + + @@ -461,21 +476,21 @@ - - - + + + @@ -641,7 +656,7 @@ - + {{ - form.workDownMachine + form.workDownMachine ? "是" : "否" }} {{ form.workPlanDownTime @@ -679,7 +694,7 @@ form.workPlanTime }} {{ - form.workDownMachine + form.workDownMachine ? "是" : "否" }} {{ form.workPlanDownTime @@ -714,24 +729,34 @@ form.workConnection }} - - {{ - form.outSourceReason - }} - + + {{ + form.outSourceReason + }} + - + + + + @@ -739,9 +764,7 @@ - - - + @@ -930,13 +953,21 @@ - + + + + @@ -944,16 +975,14 @@ - - - +
- 取 消 + 返 回
@@ -977,7 +1006,7 @@ import { getMaintenanceTeamList } from "@/api/device/equTeam"; export default { name: "FaultReport", components: { ItemSelect, ItemSelectPerson }, - dicts: ["device_order_source"], + dicts: ["device_order_source", "device_reach_standard"], data() { return { //选择设备维修班组 @@ -1127,25 +1156,36 @@ export default { this.getList(); }, methods: { - - - + // 生成表头序号 + indexMethod(index) { + return index + 1; + }, timeBackFilling() { -var getTime = new Date().getTime(); //获取到当前时间戳 - var time = new Date(getTime); //创建一个日期对象 - function nowDate(time) { - var year = time.getFullYear(); // 年 - var month = (time.getMonth() + 1).toString().padStart(2, '0'); // 月 - var date = time.getDate().toString().padStart(2, '0'); // 日 - var hour = time.getHours().toString().padStart(2, '0'); // 时 - var minute = time.getMinutes().toString().padStart(2, '0'); // 分 - var second = time.getSeconds().toString().padStart(2, '0'); // 秒 - return ( - year + "-" + month + "-" + date + " " + hour + ":" + minute + ":" + second - ) - } - console.log(time); - console.log(nowDate(time)); + var getTime = new Date().getTime(); //获取到当前时间戳 + var time = new Date(getTime); //创建一个日期对象 + function nowDate(time) { + var year = time.getFullYear(); // 年 + var month = (time.getMonth() + 1).toString().padStart(2, "0"); // 月 + var date = time.getDate().toString().padStart(2, "0"); // 日 + var hour = time.getHours().toString().padStart(2, "0"); // 时 + var minute = time.getMinutes().toString().padStart(2, "0"); // 分 + var second = time.getSeconds().toString().padStart(2, "0"); // 秒 + return ( + year + + "-" + + month + + "-" + + date + + " " + + hour + + ":" + + minute + + ":" + + second + ); + } + console.log(time); + console.log(nowDate(time)); this.form.workPlanTime = nowDate(time); }, //设备选择 @@ -1158,7 +1198,6 @@ var getTime = new Date().getTime(); //获取到当前时间戳 }, //人员选择 onItemSelectedPerson(obj) { - console.log("111111111111", obj); this.form.orderRepairmanCode = obj[0].userName; this.form.orderRepairmanName = obj[0].nickName; }, @@ -1180,6 +1219,10 @@ var getTime = new Date().getTime(); //获取到当前时间戳 this.open = false; this.reset(); }, + // 取消按钮 + cancelView() { + this.openView = false; + }, // 审核返回按钮 cancelCheckForm() { this.viewCheck = false; @@ -1219,6 +1262,8 @@ var getTime = new Date().getTime(); //获取到当前时间戳 }, /** 重置按钮操作 */ resetQuery() { + this.queryParams.orderBreakdownTimeArray = null; + this.queryParams.orderTimeArray = null; this.resetForm("queryForm"); this.handleQuery(); }, @@ -1285,6 +1330,7 @@ var getTime = new Date().getTime(); //获取到当前时间戳 item1.standardList.forEach((item) => { var standard = {}; standard.itemName = item1.itemName; + standard.itemMethod = item1.itemMethod; standard.standardName = item.standardName; standard.detailUpLimit = item.detailUpLimit; standard.detailDownLimit = item.detailDownLimit; diff --git a/src/views/device/faultReport/selectSingleEquipment.vue b/src/views/device/faultReport/selectSingleEquipment.vue index c8ca6974..a8bdb2ae 100644 --- a/src/views/device/faultReport/selectSingleEquipment.vue +++ b/src/views/device/faultReport/selectSingleEquipment.vue @@ -1,8 +1,9 @@ diff --git a/src/views/device/faultReport/selectSinglePerson.vue b/src/views/device/faultReport/selectSinglePerson.vue index dcd38098..99c47372 100644 --- a/src/views/device/faultReport/selectSinglePerson.vue +++ b/src/views/device/faultReport/selectSinglePerson.vue @@ -1,8 +1,9 @@ diff --git a/src/views/device/repairOrder/index.vue b/src/views/device/repairOrder/index.vue index d3877619..e4b506c4 100644 --- a/src/views/device/repairOrder/index.vue +++ b/src/views/device/repairOrder/index.vue @@ -248,6 +248,15 @@ @selection-change="handleSelectionChange" > + + +