From 70739f0f4b91822aac790a3f773613353e9f56ca Mon Sep 17 00:00:00 2001 From: wws <18630710203@163.com> Date: Fri, 17 Nov 2023 11:01:25 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E5=A1=AB=E5=86=99=E8=AE=B0=E5=BD=95BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/device/deviceOrder/index.vue | 4 +- .../device/spotInspectionOrder/index.vue | 9 +- src/views/device/upkeepPlan/index.vue | 99 +++++++++++++++---- 3 files changed, 89 insertions(+), 23 deletions(-) diff --git a/src/views/device/deviceOrder/index.vue b/src/views/device/deviceOrder/index.vue index a70a261..c487ca9 100644 --- a/src/views/device/deviceOrder/index.vue +++ b/src/views/device/deviceOrder/index.vue @@ -363,11 +363,11 @@ - {{ this.form.equ.equipmentName }} + {{ this.form.equipmentName }} -
+
diff --git a/src/views/device/spotInspectionOrder/index.vue b/src/views/device/spotInspectionOrder/index.vue index 3a34ebb..0018fbb 100644 --- a/src/views/device/spotInspectionOrder/index.vue +++ b/src/views/device/spotInspectionOrder/index.vue @@ -367,11 +367,11 @@ - {{ this.form.equ.equipmentName }} + {{ this.form.equipmentName }} -
+
@@ -395,7 +395,7 @@ 达标 - + @@ -523,6 +523,7 @@ export default { orderStart: null, orderEnd: null, equipmentCode: null, + equipmentName: null, orderStatus: null, orderCost: null, planPerson: null, @@ -537,7 +538,6 @@ export default { createTime: null, updateBy: null, updateTime: null, - equ: {equipmentName: null}, }, // 表单参数 form: { @@ -602,6 +602,7 @@ export default { orderStart: null, orderEnd: null, equipmentCode: null, + equipmentName: null, orderStatus: null, orderCost: null, planPerson: null, diff --git a/src/views/device/upkeepPlan/index.vue b/src/views/device/upkeepPlan/index.vue index 38fc6aa..801e50d 100644 --- a/src/views/device/upkeepPlan/index.vue +++ b/src/views/device/upkeepPlan/index.vue @@ -18,12 +18,14 @@ /> - + + + + + + + + - + - + - + - + + + + + + + + + 搜索 重置 @@ -268,8 +306,8 @@ - - + + @@ -446,7 +484,7 @@ 内部 - 外部 + 委外 @@ -484,6 +522,11 @@ label="保养项" width="300"> + + + - + @@ -975,6 +1021,8 @@ export default { updateTime: null, createTimeArray: [], updateTimeArray: [], + loopEndArray: [], + loopStartArray: [], }, // 表单参数 form: { @@ -996,8 +1044,20 @@ export default { }, created() { this.getList(); + this.setWorkCenter(); }, methods: { + // 备件数量 + handleEdit(index, row) { + console.log('row:',index, row); + if (row.amount < Number(row.applyNum)) { + this.$message({ + message: '超过库存数量！', + type: 'warning' + }) + row.applyNum = row.amount; + } + }, // 备件选择完成按钮 spareChangeCom() { console.log("点击了完成按钮") @@ -1036,7 +1096,7 @@ export default { }, // 选择备件-添加备件 addSpareList(e) { - console.log("选择备件") + console.log("选择备件123") console.log(e) for (let i = 0; i < this.chooseSpareList.length; i++){ if (this.chooseSpareList[i].materialCode == e.materialCode) { @@ -1189,7 +1249,7 @@ export default { }, // 选择备件按钮操作 selectSpareBtn(e) { - console.log("点击了选择备件按钮！") + console.log("点击了选择备件按钮！321") console.log(e) this.setSpareList(); if (e.spareList == null) { @@ -1406,6 +1466,8 @@ export default { workOutsourcingUnit: null, workConnection: null, workReason: null, + loopEndArray: [], + loopStartArray: [], }; this.resetForm("form"); }, @@ -1431,6 +1493,9 @@ export default { // 重置日期范围 this.queryParams.createTimeArray = []; this.queryParams.updateTimeArray = []; + this.queryParams.loopEndArray = []; + this.queryParams.loopStartArray = []; + this.queryParams.upkeep = null; this.handleQuery(); }, // 多选框选中数据 From d06d2f76b25a975b872e99361ca6db18f5980bc4 Mon Sep 17 00:00:00 2001 From: wws <18630710203@163.com> Date: Fri, 17 Nov 2023 11:53:17 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E5=A1=AB=E5=86=99=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/device/deviceOrder/index.vue | 126 ++++++++--------- .../device/spotInspectionOrder/index.vue | 128 ++++++++---------- src/views/device/upkeepOrder/index.vue | 125 ++++++++--------- 3 files changed, 172 insertions(+), 207 deletions(-) diff --git a/src/views/device/deviceOrder/index.vue b/src/views/device/deviceOrder/index.vue index c487ca9..18e9be6 100644 --- a/src/views/device/deviceOrder/index.vue +++ b/src/views/device/deviceOrder/index.vue @@ -359,73 +359,54 @@ - - - - - {{ this.form.equipmentName }} - - - -
- - - - - {{ detail.itemName }} - - - -
-
- - - - - {{ standard.standardName }} - - - - - 未达标 - 达标 - - - -
-
- - - - - {{ standard.standardName }} - - - - - {{ standard.detailUpLimit }} - - - - - {{ standard.detailDownLimit }} - - - - - {{ standard.detailUnit }} - - - - - - - - -
-
- -
+ + + + + + + + + + + + + + + + + + @@ -475,9 +456,11 @@ import { export default { name: "DeviceOrder", - dicts: ['device_order_status', 'device_loop_type'], + dicts: ['device_order_status', 'device_loop_type','device_reach_standard'], data() { return { + // 记录 + recordList: [], // 遮罩层 loading: true, // 选中数组 @@ -614,11 +597,18 @@ export default { /** 修改按钮操作 */ handleUpdate(row) { this.reset(); + this.recordList = []; const orderCode = row.orderCode || this.ids getDeviceOrder(orderCode).then(response => { this.form = response.data; console.log("这里是回显信息") console.log(response.data) + for (let i = 0; i < this.form.detailList.length; i++) { + for (let j = 0; j < this.form.detailList[i].standardList.length; j++) { + this.form.detailList[i].standardList[j].itemName = this.form.detailList[i].itemName; + this.recordList.push(this.form.detailList[i].standardList[j]); + } + } this.open = true; this.title = "填写记录"; }); diff --git a/src/views/device/spotInspectionOrder/index.vue b/src/views/device/spotInspectionOrder/index.vue index 0018fbb..b18de08 100644 --- a/src/views/device/spotInspectionOrder/index.vue +++ b/src/views/device/spotInspectionOrder/index.vue @@ -363,76 +363,54 @@ - - - - - {{ this.form.equipmentName }} - - - -
- - - - - {{ detail.itemName }} - - - -
-
- - - - - {{ standard.standardName }} - - - - - 未达标 - 达标 - - - - - - -
-
- - - - - {{ standard.standardName }} - - - - - {{ standard.detailUpLimit }} - - - - - {{ standard.detailDownLimit }} - - - - - {{ standard.detailUnit }} - - - - - - - - -
-
- -
+ + + + + + + + + + + + + + + + + + @@ -478,11 +456,13 @@ import {getWorkCenter} from "@/api/device/plan"; export default { name: "SpotInspectionOrder", - dicts: ['device_order_status', 'device_loop_type'], + dicts: ['device_order_status', 'device_loop_type','device_reach_standard'], data() { return { dialogImageUrl: '', dialogVisible: false, + // 记录 + recordList: [], disabled: false, // 上传图片弹出层 imgDialog: false, @@ -654,6 +634,12 @@ export default { if (response.data.timeArray[0] == null) { response.data.timeArray = []; } + for (let i = 0; i < this.form.detailList.length; i++) { + for (let j = 0; j < this.form.detailList[i].standardList.length; j++) { + this.form.detailList[i].standardList[j].itemName = this.form.detailList[i].itemName; + this.recordList.push(this.form.detailList[i].standardList[j]); + } + } this.open = true; this.title = "填写记录"; }); diff --git a/src/views/device/upkeepOrder/index.vue b/src/views/device/upkeepOrder/index.vue index 4131878..fd925a5 100644 --- a/src/views/device/upkeepOrder/index.vue +++ b/src/views/device/upkeepOrder/index.vue @@ -745,73 +745,54 @@ - - - - - {{ this.form.equipmentName }} - - - -
- - - - - {{ detail.itemName }} - - - -
-
- - - - - {{ standard.standardName }} - - - - - 未达标 - 达标 - - - -
-
- - - - - {{ standard.standardName }} - - - - - {{ standard.detailUpLimit }} - - - - - {{ standard.detailDownLimit }} - - - - - {{ standard.detailUnit }} - - - - - - - - -
-
- -
+ + + + + + + + + + + + + + + + + + Date: Fri, 17 Nov 2023 15:03:53 +0800 Subject: [PATCH 03/12] =?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" + > - - + + - - - + + + + \ No newline at end of file From 369c48346ce20c7efddd277432a0633dbe1b8ff0 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Mon, 20 Nov 2023 09:50:40 +0800 Subject: [PATCH 09/12] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../quality/qcTableIncome/selectSupplier.vue | 142 ++++++++++++++++++ 1 file changed, 142 insertions(+) create mode 100644 src/views/quality/qcTableIncome/selectSupplier.vue diff --git a/src/views/quality/qcTableIncome/selectSupplier.vue b/src/views/quality/qcTableIncome/selectSupplier.vue new file mode 100644 index 0000000..c6b4d89 --- /dev/null +++ b/src/views/quality/qcTableIncome/selectSupplier.vue @@ -0,0 +1,142 @@ + + From d7980c0a7517437e33e04eb294ad1d7974172c11 Mon Sep 17 00:00:00 2001 From: wws <18630710203@163.com> Date: Mon, 20 Nov 2023 11:02:23 +0800 Subject: [PATCH 10/12] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E3=80=81=E4=BF=9D=E5=85=BB=E7=94=A8=E6=97=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/device/deviceOrder/index.vue | 8 ++--- src/views/device/inspectionWork/index.vue | 8 ++--- src/views/device/maintenanceWork/index.vue | 31 +++++++++++++------ .../device/spotInspectionOrder/index.vue | 9 +++--- src/views/device/spotInspectionWork/index.vue | 8 ++--- src/views/device/upkeepOrder/index.vue | 23 +++++++++++--- src/views/device/upkeepPlan/index.vue | 4 +-- 7 files changed, 59 insertions(+), 32 deletions(-) diff --git a/src/views/device/deviceOrder/index.vue b/src/views/device/deviceOrder/index.vue index 0723c8e..d40f1b2 100644 --- a/src/views/device/deviceOrder/index.vue +++ b/src/views/device/deviceOrder/index.vue @@ -538,10 +538,10 @@ {{ workVO.order.orderCode }} {{ workVO.order.planWorkshop }} - {{ workVO.order.planLoopStart }} - {{ workVO.order.planLoopEnd }} - {{ workVO.order.orderStart }} - {{ workVO.order.orderEnd }} + {{ workVO.order.planLoopStart }} + {{ workVO.order.planLoopEnd }} + {{ workVO.order.orderStart }} + {{ workVO.order.orderEnd }} {{ workVO.order.planPerson }} {{ workVO.order.repairCode }} diff --git a/src/views/device/inspectionWork/index.vue b/src/views/device/inspectionWork/index.vue index 4bdd019..4fc82c6 100644 --- a/src/views/device/inspectionWork/index.vue +++ b/src/views/device/inspectionWork/index.vue @@ -428,10 +428,10 @@ {{ workVO.order.orderCode }} {{ workVO.order.planWorkshop }} - {{ workVO.order.planLoopStart }} - {{ workVO.order.planLoopEnd }} - {{ workVO.order.orderStart }} - {{ workVO.order.orderEnd }} + {{ workVO.order.planLoopStart }} + {{ workVO.order.planLoopEnd }} + {{ workVO.order.orderStart }} + {{ workVO.order.orderEnd }} {{ workVO.order.planPerson }} {{ workVO.order.repairCode }} diff --git a/src/views/device/maintenanceWork/index.vue b/src/views/device/maintenanceWork/index.vue index 5a614d7..99831cb 100644 --- a/src/views/device/maintenanceWork/index.vue +++ b/src/views/device/maintenanceWork/index.vue @@ -342,7 +342,7 @@ - + - + - + @@ -446,6 +446,7 @@ @pagination="getList" /> + {{ workVO.order.orderCode }} {{ workVO.order.planWorkshop }} - {{ workVO.order.planLoopStart }} - {{ workVO.order.planLoopEnd }} - {{ workVO.order.orderStart }} - {{ workVO.order.orderEnd }} + {{ workVO.order.planLoopStart }} + {{ workVO.order.planLoopEnd }} + {{ workVO.order.orderStart }} + {{ workVO.order.orderEnd }} + {{ workVO.order.upkeep }} + {{ workVO.order.shutDown }} {{ workVO.order.planPerson }} {{ workVO.order.repairCode }} @@ -565,7 +568,7 @@ import {getWorkCenter} from "@/api/device/plan"; export default { name: "InspectionWork", - dicts: ['device_order_status', 'device_loop_type'], + dicts: ['device_order_status', 'device_loop_type','device_upkeep_type','device_inspect_status'], data() { return { // 日期范围选择快捷 @@ -696,12 +699,22 @@ export default { this.workCenterList = response.data; }) }, - // 测试 + // 展示 showWork(row) { this.reset(); const orderId = row.orderId || this.ids getInspectionWork(orderId).then(response => { this.workVO = response.data; + if (this.workVO.order.upkeep == 0) { + this.workVO.order.upkeep = '内部'; + }else { + this.workVO.order.upkeep = '委外'; + } + if (this.workVO.order.shutDown == 0) { + this.workVO.order.shutDown = '开机保养'; + }else { + this.workVO.order.shutDown = '停机保养'; + } this.workDetail = true; }); diff --git a/src/views/device/spotInspectionOrder/index.vue b/src/views/device/spotInspectionOrder/index.vue index 906b20d..9188460 100644 --- a/src/views/device/spotInspectionOrder/index.vue +++ b/src/views/device/spotInspectionOrder/index.vue @@ -529,10 +529,10 @@ {{ workVO.order.orderCode }} {{ workVO.order.planWorkshop }} - {{ workVO.order.planLoopStart }} - {{ workVO.order.planLoopEnd }} - {{ workVO.order.orderStart }} - {{ workVO.order.orderEnd }} + {{ workVO.order.planLoopStart }} + {{ workVO.order.planLoopEnd }} + {{ workVO.order.orderStart }} + {{ workVO.order.orderEnd }} {{ workVO.order.planPerson }} {{ workVO.order.repairCode }} @@ -846,6 +846,7 @@ export default { /** 修改按钮操作 */ handleUpdate(row) { this.reset(); + this.recordList = []; const orderCode = row.orderCode || this.ids getDeviceOrder(orderCode).then(response => { this.form = response.data; diff --git a/src/views/device/spotInspectionWork/index.vue b/src/views/device/spotInspectionWork/index.vue index 2d12861..31bb3e0 100644 --- a/src/views/device/spotInspectionWork/index.vue +++ b/src/views/device/spotInspectionWork/index.vue @@ -417,10 +417,10 @@ {{ workVO.order.orderCode }} {{ workVO.order.planWorkshop }} - {{ workVO.order.planLoopStart }} - {{ workVO.order.planLoopEnd }} - {{ workVO.order.orderStart }} - {{ workVO.order.orderEnd }} + {{ workVO.order.planLoopStart }} + {{ workVO.order.planLoopEnd }} + {{ workVO.order.orderStart }} + {{ workVO.order.orderEnd }} {{ workVO.order.planPerson }} {{ workVO.order.repairCode }} diff --git a/src/views/device/upkeepOrder/index.vue b/src/views/device/upkeepOrder/index.vue index 82cf593..ec3d02d 100644 --- a/src/views/device/upkeepOrder/index.vue +++ b/src/views/device/upkeepOrder/index.vue @@ -413,7 +413,7 @@ - + @@ -1006,10 +1006,12 @@ {{ workVO.order.orderCode }} {{ workVO.order.planWorkshop }} - {{ workVO.order.planLoopStart }} - {{ workVO.order.planLoopEnd }} - {{ workVO.order.orderStart }} - {{ workVO.order.orderEnd }} + {{ workVO.order.planLoopStart }} + {{ workVO.order.planLoopEnd }} + {{ workVO.order.orderStart }} + {{ workVO.order.orderEnd }} + {{ workVO.order.upkeep }} + {{ workVO.order.shutDown }} {{ workVO.order.planPerson }} {{ workVO.order.repairCode }} @@ -1314,6 +1316,16 @@ export default { const orderId = row.orderId || this.ids getInspectionWork(orderId).then(response => { this.workVO = response.data; + if (this.workVO.order.upkeep == 0) { + this.workVO.order.upkeep = '内部'; + }else { + this.workVO.order.upkeep = '委外'; + } + if (this.workVO.order.shutDown == 0) { + this.workVO.order.shutDown = '开机保养'; + }else { + this.workVO.order.shutDown = '停机保养'; + } this.workDetail = true; }); @@ -1634,6 +1646,7 @@ export default { /** 修改按钮操作 */ handleUpdate(row) { this.reset(); + this.recordList = []; const orderCode = row.orderCode || this.ids getDeviceOrder(orderCode).then(response => { this.form = response.data; diff --git a/src/views/device/upkeepPlan/index.vue b/src/views/device/upkeepPlan/index.vue index 40bc2d9..d27b146 100644 --- a/src/views/device/upkeepPlan/index.vue +++ b/src/views/device/upkeepPlan/index.vue @@ -477,8 +477,8 @@ - 停机保养 - 开机保养 + 停机保养 + 开机保养 From 21a3a7767227316852bf54b33e5e36bae5c5db94 Mon Sep 17 00:00:00 2001 From: A0010407 Date: Mon, 20 Nov 2023 14:26:35 +0800 Subject: [PATCH 11/12] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=A8=A1=E5=9D=97-?= =?UTF-8?q?=E6=8A=A5=E4=BF=AE-1=EF=BC=88=E6=A3=80=E6=9F=A5=E9=A1=B9?= =?UTF-8?q?=E5=9B=BE=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 | 167 ++++++---- src/views/device/repairOrder/index.vue | 12 + 4 files changed, 422 insertions(+), 260 deletions(-) diff --git a/src/views/device/faultReport/index.vue b/src/views/device/faultReport/index.vue index 4ab5447..819466e 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 c8ca697..a8bdb2a 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 dcd3809..99c4737 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 d387761..e4b506c 100644 --- a/src/views/device/repairOrder/index.vue +++ b/src/views/device/repairOrder/index.vue @@ -248,6 +248,15 @@ @selection-change="handleSelectionChange" > + + + From 97d066a3f7753d67211153a514d3fac44ab54415 Mon Sep 17 00:00:00 2001 From: A0010407 Date: Mon, 20 Nov 2023 16:21:59 +0800 Subject: [PATCH 12/12] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E5=A7=94=E5=A4=96-1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/device/outsourceWorkOrder/index.vue | 866 +++++++++++------- src/views/device/repairOrderReport/index.vue | 1 + 2 files changed, 523 insertions(+), 344 deletions(-) diff --git a/src/views/device/outsourceWorkOrder/index.vue b/src/views/device/outsourceWorkOrder/index.vue index 80d89de..bc151a6 100644 --- a/src/views/device/outsourceWorkOrder/index.vue +++ b/src/views/device/outsourceWorkOrder/index.vue @@ -1,166 +1,285 @@ diff --git a/src/views/device/repairOrderReport/index.vue b/src/views/device/repairOrderReport/index.vue index a71499c..de8469d 100644 --- a/src/views/device/repairOrderReport/index.vue +++ b/src/views/device/repairOrderReport/index.vue @@ -192,6 +192,7 @@ align="center" :index="indexMethod" label="序号" + fixed >