From a99f27e23381a953292b0c55c1c62775c80935cd Mon Sep 17 00:00:00 2001 From: A0010407 Date: Fri, 17 Nov 2023 15:03:53 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/device/faultReport/index.vue | 831 +++++++----------- src/views/device/repairOrder/index.vue | 687 +++++++-------- .../device/repairOrder/selectSinglePerson.vue | 49 +- src/views/device/repairOrderReport/index.vue | 15 +- 4 files changed, 635 insertions(+), 947 deletions(-) diff --git a/src/views/device/faultReport/index.vue b/src/views/device/faultReport/index.vue index 43b8f25..4ab5447 100644 --- a/src/views/device/faultReport/index.vue +++ b/src/views/device/faultReport/index.vue @@ -308,164 +308,62 @@ > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + {{ + form.equipmentCode + }} + {{ + form.orderBreakdownTime + }} + {{ + form.orderSource + }} + {{ + form.orderTime + }} + {{ + form.orderRepairmanName + }} + {{ + form.orderConnection + }} + {{ + form.orderDesc + }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -474,7 +372,7 @@ 计划性维修 不维修 委外维修 - 立即维修 @@ -484,10 +382,21 @@ - + + + @@ -552,10 +461,21 @@ - + + + @@ -564,7 +484,7 @@ clearable v-model="form.workPlanTime" type="datetime" - placeholder="" + disabled > @@ -670,330 +590,162 @@ append-to-body > - - - - - - - - - - - - - - - - - - - - - - + + + + {{ + form.equipmentCode + }} + {{ + form.equipmentName + }} + {{ + form.equipmentTypeName + }} + {{ + form.equipmentSpec + }} + {{ + form.department + }} + {{ + form.equipmentLocation + }} + {{ + form.orderBreakdownTime + }} + {{ + form.orderSource + }} + {{ + form.orderTime + }} + {{ + form.orderRepairmanName + }} + {{ + form.orderConnection + }} + {{ + form.orderDesc + }} + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + {{ + form.repairDestination + }} + {{ + form.workTeam + }} + {{ + form.workPlanTime + }} + {{ + form.workDownMachine + }} + {{ + form.workPlanDownTime + }} + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 报修信息审核 - - - - - 计划性维修 - 不维修 - 委外维修 - 立即维修 - - - - - - - - - - - - - - - - - - - - - - 是 - 否 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 是 - 否 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + {{ + form.repairDestination + }} + {{ + form.workTeam + }} + {{ + form.workPlanTime + }} + {{ + form.workDownMachine + }} + {{ + form.workPlanDownTime + }} + + + + {{ + form.repairDestination + }} + + + + {{ + form.repairDestination + }} + {{ + form.workOutsourcingUnit + }} + {{ + form.outSourcePerson + }} + {{ + form.workConnection + }} + + + {{ + form.outSourceReason + }} + + + + + + + + + + + + + + + + + + + + + + + + + +
返 回 @@ -1167,40 +919,36 @@ }} - - + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + @@ -1224,6 +972,7 @@ import { import ItemSelect from "./selectSingleEquipment.vue"; import ItemSelectPerson from "./selectSinglePerson.vue"; import { Message } from "element-ui"; +import { getMaintenanceTeamList } from "@/api/device/equTeam"; export default { name: "FaultReport", @@ -1231,6 +980,8 @@ export default { dicts: ["device_order_source"], data() { return { + //选择设备维修班组 + teamOption: [], //图片存储 fileList: [], //设备选择 @@ -1252,7 +1003,7 @@ export default { //检查项表格数据 checkList: [], //url表 - urlLists:[], + urlLists: [], // 弹出层标题 title: "", // 是否显示弹出层 @@ -1363,9 +1114,6 @@ export default { orderTime: [ { required: true, message: "报修时间不能为空", trigger: "blur" }, ], - orderRepairmanCode: [ - { required: true, message: "报修人编号不能为空", trigger: "blur" }, - ], orderDesc: [ { required: true, message: "故障描述不能为空", trigger: "blur" }, ], @@ -1379,9 +1127,26 @@ export default { this.getList(); }, methods: { + + + timeBackFilling() { - this.form.workPlanTime = new Date(); - log("时间时间", new Date()); +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); }, //设备选择 handleSelectEquipment() { @@ -1393,7 +1158,7 @@ export default { }, //人员选择 onItemSelectedPerson(obj) { - console.log("接收参数", obj); + console.log("111111111111", obj); this.form.orderRepairmanCode = obj[0].userName; this.form.orderRepairmanName = obj[0].nickName; }, @@ -1507,10 +1272,10 @@ export default { this.form.fileList = newFiles; var urlLists = []; this.form.fileList.forEach((item) => { - urlLists.push(item.url); + urlLists.push(item.url); }); - this.urlLists = urlLists ; - console.log("2222222222",this.urlLists) + this.urlLists = urlLists; + console.log("2222222222", this.urlLists); } this.checkList = response.data.checkList; //检查项遍历 @@ -1540,6 +1305,10 @@ export default { handleCheck(row) { this.reset(); const orderId = row.orderId || this.ids; + getMaintenanceTeamList(this.queryParams).then((response) => { + console.log(response.rows); + this.teamOption = response.rows; + }); getFaultReport(orderId).then((response) => { if (response.data.files != null) { var newFiles = []; diff --git a/src/views/device/repairOrder/index.vue b/src/views/device/repairOrder/index.vue index 002bb41..d387761 100644 --- a/src/views/device/repairOrder/index.vue +++ b/src/views/device/repairOrder/index.vue @@ -88,12 +88,12 @@ style="width: 200px" @keyup.enter.native="handleQuery" > - + @@ -132,22 +132,24 @@ start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd HH:mm:ss" - :picker-options="pickerOptions"> + :picker-options="pickerOptions" + > - - + + - - - + + +