diff --git a/src/assets/images/equipment/bg- border1.png b/src/assets/images/equipment/bg- border1.png new file mode 100644 index 0000000..18aa20a Binary files /dev/null and b/src/assets/images/equipment/bg- border1.png differ diff --git a/src/assets/images/equipment/bg-body.png b/src/assets/images/equipment/bg-body.png new file mode 100644 index 0000000..b6f1a5d Binary files /dev/null and b/src/assets/images/equipment/bg-body.png differ diff --git a/src/assets/images/equipment/bg-border1(1).png b/src/assets/images/equipment/bg-border1(1).png new file mode 100644 index 0000000..475ce73 Binary files /dev/null and b/src/assets/images/equipment/bg-border1(1).png differ diff --git a/src/assets/images/equipment/bg-border1.png b/src/assets/images/equipment/bg-border1.png new file mode 100644 index 0000000..475ce73 Binary files /dev/null and b/src/assets/images/equipment/bg-border1.png differ diff --git a/src/assets/images/equipment/bg-border2(1).png b/src/assets/images/equipment/bg-border2(1).png new file mode 100644 index 0000000..72f8410 Binary files /dev/null and b/src/assets/images/equipment/bg-border2(1).png differ diff --git a/src/assets/images/equipment/bg-border2(2).png b/src/assets/images/equipment/bg-border2(2).png new file mode 100644 index 0000000..72f8410 Binary files /dev/null and b/src/assets/images/equipment/bg-border2(2).png differ diff --git a/src/assets/images/equipment/bg-border2(3).png b/src/assets/images/equipment/bg-border2(3).png new file mode 100644 index 0000000..72f8410 Binary files /dev/null and b/src/assets/images/equipment/bg-border2(3).png differ diff --git a/src/assets/images/equipment/bg-border2.png b/src/assets/images/equipment/bg-border2.png new file mode 100644 index 0000000..36bb579 Binary files /dev/null and b/src/assets/images/equipment/bg-border2.png differ diff --git a/src/assets/images/equipment/bg-border3.png b/src/assets/images/equipment/bg-border3.png new file mode 100644 index 0000000..73cc91c Binary files /dev/null and b/src/assets/images/equipment/bg-border3.png differ diff --git a/src/assets/images/equipment/bg-head.png b/src/assets/images/equipment/bg-head.png new file mode 100644 index 0000000..1ada7d8 Binary files /dev/null and b/src/assets/images/equipment/bg-head.png differ diff --git a/src/assets/images/equipment/bg-title.png b/src/assets/images/equipment/bg-title.png new file mode 100644 index 0000000..596c670 Binary files /dev/null and b/src/assets/images/equipment/bg-title.png differ diff --git a/src/assets/images/equipment/logo.png b/src/assets/images/equipment/logo.png new file mode 100644 index 0000000..d7e3468 Binary files /dev/null and b/src/assets/images/equipment/logo.png differ diff --git a/src/assets/images/equipment/number.png b/src/assets/images/equipment/number.png new file mode 100644 index 0000000..48f70a2 Binary files /dev/null and b/src/assets/images/equipment/number.png differ diff --git a/src/assets/images/equipment/矩形备份 30(1).png b/src/assets/images/equipment/矩形备份 30(1).png new file mode 100644 index 0000000..bdf2adc Binary files /dev/null and b/src/assets/images/equipment/矩形备份 30(1).png differ diff --git a/src/assets/images/equipment/矩形备份 30(10).png b/src/assets/images/equipment/矩形备份 30(10).png new file mode 100644 index 0000000..253dcc6 Binary files /dev/null and b/src/assets/images/equipment/矩形备份 30(10).png differ diff --git a/src/assets/images/equipment/矩形备份 30(11).png b/src/assets/images/equipment/矩形备份 30(11).png new file mode 100644 index 0000000..bdf2adc Binary files /dev/null and b/src/assets/images/equipment/矩形备份 30(11).png differ diff --git a/src/assets/images/equipment/矩形备份 30(12).png b/src/assets/images/equipment/矩形备份 30(12).png new file mode 100644 index 0000000..253dcc6 Binary files /dev/null and b/src/assets/images/equipment/矩形备份 30(12).png differ diff --git a/src/assets/images/equipment/矩形备份 30(13).png b/src/assets/images/equipment/矩形备份 30(13).png new file mode 100644 index 0000000..253dcc6 Binary files /dev/null and b/src/assets/images/equipment/矩形备份 30(13).png differ diff --git a/src/assets/images/equipment/矩形备份 30(14).png b/src/assets/images/equipment/矩形备份 30(14).png new file mode 100644 index 0000000..bdf2adc Binary files /dev/null and b/src/assets/images/equipment/矩形备份 30(14).png differ diff --git a/src/assets/images/equipment/矩形备份 30(15).png b/src/assets/images/equipment/矩形备份 30(15).png new file mode 100644 index 0000000..253dcc6 Binary files /dev/null and b/src/assets/images/equipment/矩形备份 30(15).png differ diff --git a/src/assets/images/equipment/矩形备份 30(2).png b/src/assets/images/equipment/矩形备份 30(2).png new file mode 100644 index 0000000..253dcc6 Binary files /dev/null and b/src/assets/images/equipment/矩形备份 30(2).png differ diff --git a/src/assets/images/equipment/矩形备份 30(3).png b/src/assets/images/equipment/矩形备份 30(3).png new file mode 100644 index 0000000..b1329d9 Binary files /dev/null and b/src/assets/images/equipment/矩形备份 30(3).png differ diff --git a/src/assets/images/equipment/矩形备份 30(4).png b/src/assets/images/equipment/矩形备份 30(4).png new file mode 100644 index 0000000..245947c Binary files /dev/null and b/src/assets/images/equipment/矩形备份 30(4).png differ diff --git a/src/assets/images/equipment/矩形备份 30(5).png b/src/assets/images/equipment/矩形备份 30(5).png new file mode 100644 index 0000000..b1329d9 Binary files /dev/null and b/src/assets/images/equipment/矩形备份 30(5).png differ diff --git a/src/assets/images/equipment/矩形备份 30(6).png b/src/assets/images/equipment/矩形备份 30(6).png new file mode 100644 index 0000000..245947c Binary files /dev/null and b/src/assets/images/equipment/矩形备份 30(6).png differ diff --git a/src/assets/images/equipment/矩形备份 30(7).png b/src/assets/images/equipment/矩形备份 30(7).png new file mode 100644 index 0000000..b1329d9 Binary files /dev/null and b/src/assets/images/equipment/矩形备份 30(7).png differ diff --git a/src/assets/images/equipment/矩形备份 30(8).png b/src/assets/images/equipment/矩形备份 30(8).png new file mode 100644 index 0000000..245947c Binary files /dev/null and b/src/assets/images/equipment/矩形备份 30(8).png differ diff --git a/src/assets/images/equipment/矩形备份 30(9).png b/src/assets/images/equipment/矩形备份 30(9).png new file mode 100644 index 0000000..b1329d9 Binary files /dev/null and b/src/assets/images/equipment/矩形备份 30(9).png differ diff --git a/src/assets/images/equipment/矩形备份 30.png b/src/assets/images/equipment/矩形备份 30.png new file mode 100644 index 0000000..253dcc6 Binary files /dev/null and b/src/assets/images/equipment/矩形备份 30.png differ diff --git a/src/assets/images/equipment/编组 58.png b/src/assets/images/equipment/编组 58.png new file mode 100644 index 0000000..67b7319 Binary files /dev/null and b/src/assets/images/equipment/编组 58.png differ diff --git a/src/assets/images/equipment/路径.png b/src/assets/images/equipment/路径.png new file mode 100644 index 0000000..3db97bb Binary files /dev/null and b/src/assets/images/equipment/路径.png differ diff --git a/src/router/index.js b/src/router/index.js index ceb28b8..6398d8a 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -100,10 +100,10 @@ export const constantRoutes = [ component: () => import("@/views/kanban/exception/index"), hidden: true, }, - // 看板路由 - { - path: "/kanban/3decharts", - component: () => import("@/views/kanban/3decharts/index"), + // 看板路由 + { + path: "/kanban/equipment", + component: () => import("@/views/kanban/equipment/index"), hidden: true, }, ] diff --git a/src/views/device/deviceOrder/index.vue b/src/views/device/deviceOrder/index.vue index 0723c8e..f3bf73c 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 }} @@ -849,6 +849,9 @@ export default { const orderCode = row.orderCode || this.ids getDeviceOrder(orderCode).then(response => { this.form = response.data; + 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; @@ -882,7 +885,26 @@ export default { /** 删除按钮操作 */ handleDelete(row) { const orderIds = row.orderId || this.ids; - this.$modal.confirm('是否确认删除计划工单编号为"' + orderIds + '"的数据项？').then(function () { + + var orderCodes = ''; + // 处理信息 + for (let i = 0; i < this.deviceOrderList.length; i++) { + for (let j = 0; j < orderIds.length; j++) { + if (orderIds[j] == this.deviceOrderList[i].orderId) { + orderCodes = orderCodes + this.deviceOrderList[i].orderCode + ','; + } + } + } + + if (orderCodes == '') { + for (let i = 0; i < this.deviceOrderList.length; i++) { + if (orderIds == this.deviceOrderList[i].orderId) { + orderCodes = this.deviceOrderList[i].orderCode; + } + } + } + + this.$modal.confirm('是否确认删除计划工单编号为"' + orderCodes + '"的数据项？').then(function () { return delDeviceOrder(orderIds); }).then(() => { this.getList(); 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/inspectionPlan/index.vue b/src/views/device/inspectionPlan/index.vue index 09302fe..feaa87d 100644 --- a/src/views/device/inspectionPlan/index.vue +++ b/src/views/device/inspectionPlan/index.vue @@ -948,7 +948,11 @@ export default { }, // 删除设备-巡检项 delTheEquItem(e) { - this.form.equipmentItem.splice(e.equipmentCode, 1) + for (let i = 0; i < this.form.equipmentItem.length; i++) { + if (this.form.equipmentItem[i].equipmentCode == e.equipmentCode) { + this.form.equipmentItem.splice(i, 1); + } + } }, // 选择设备确认按钮 confirmSelectEquBtn() { 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/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/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" > + + + 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 > {{ 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; @@ -887,7 +888,26 @@ export default { /** 删除按钮操作 */ handleDelete(row) { const orderIds = row.orderId || this.ids; - this.$modal.confirm('是否确认删除点检工单编号为"' + orderIds + '"的数据项？').then(function() { + + var orderCodes = ''; + // 处理信息 + for (let i = 0; i < this.spotInspectionOrderList.length; i++) { + for (let j = 0; j < orderIds.length; j++) { + if (orderIds[j] == this.spotInspectionOrderList[i].orderId) { + orderCodes = orderCodes + this.spotInspectionOrderList[i].orderCode + ','; + } + } + } + + if (orderCodes == '') { + for (let i = 0; i < this.spotInspectionOrderList.length; i++) { + if (orderIds == this.spotInspectionOrderList[i].orderId) { + orderCodes = this.spotInspectionOrderList[i].orderCode; + } + } + } + + this.$modal.confirm('是否确认删除点检工单编号为"' + orderCodes + '"的数据项？').then(function() { return delSpotInspectionOrder(orderIds); }).then(() => { this.getList(); 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..4a6f5fb 100644 --- a/src/views/device/upkeepOrder/index.vue +++ b/src/views/device/upkeepOrder/index.vue @@ -413,7 +413,7 @@ - + @@ -804,6 +804,9 @@ + {{ 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 }} @@ -1308,12 +1313,32 @@ export default { this.getList(); }, methods: { + // 备件数量 + handleEdit(index, row) { + if (row.amount < Number(row.applyNum)) { + this.$message({ + message: '超过库存数量！', + type: 'warning' + }) + row.applyNum = row.amount; + } + }, // 展示 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; }); @@ -1427,7 +1452,11 @@ export default { }, // 删除设备-巡检项 delTheEquItem(e) { - this.form.equipmentItem.splice(e.equipmentCode, 1) + for (let i = 0; i < this.form.equipmentItem.length; i++) { + if (this.form.equipmentItem[i].equipmentCode == e.equipmentCode) { + this.form.equipmentItem.splice(i, 1); + } + } }, // 选择设备确认按钮 confirmSelectEquBtn() { @@ -1535,6 +1564,10 @@ export default { querySpareList(this.spareQuery).then(response => { this.spareTotal = response.total; this.spareList = response.rows; + // 设置库存：总量-冻结数量 + for (let i = 0; i < this.spareList.length; i++) { + this.spareList[i].amount = Number(this.spareList[i].amount) - Number(this.spareList[i].storageAmount) + } this.spareLoading = false; }) }, @@ -1634,6 +1667,7 @@ export default { /** 修改按钮操作 */ handleUpdate(row) { this.reset(); + this.recordList = []; const orderCode = row.orderCode || this.ids getDeviceOrder(orderCode).then(response => { this.form = response.data; @@ -1673,7 +1707,26 @@ export default { /** 删除按钮操作 */ handleDelete(row) { const orderIds = row.orderId || this.ids; - this.$modal.confirm('是否确认删除保养工单编号为"' + orderIds + '"的数据项？').then(function () { + + var orderCodes = ''; + // 处理信息 + for (let i = 0; i < this.upkeepOrderList.length; i++) { + for (let j = 0; j < orderIds.length; j++) { + if (orderIds[j] == this.upkeepOrderList[i].orderId) { + orderCodes = orderCodes + this.upkeepOrderList[i].orderCode + ','; + } + } + } + + if (orderCodes == '') { + for (let i = 0; i < this.upkeepOrderList.length; i++) { + if (orderIds == this.upkeepOrderList[i].orderId) { + orderCodes = this.upkeepOrderList[i].orderCode; + } + } + } + + this.$modal.confirm('是否确认删除保养工单编号为"' + orderCodes + '"的数据项？').then(function () { return delUpkeepOrder(orderIds); }).then(() => { this.getList(); diff --git a/src/views/device/upkeepPlan/index.vue b/src/views/device/upkeepPlan/index.vue index 40bc2d9..dbdcde1 100644 --- a/src/views/device/upkeepPlan/index.vue +++ b/src/views/device/upkeepPlan/index.vue @@ -477,8 +477,8 @@ - 停机保养 - 开机保养 + 停机保养 + 开机保养 @@ -523,6 +523,7 @@ width="300"> @@ -1314,7 +1315,11 @@ export default { }, // 删除设备-保养项 delTheEquItem(e) { - this.form.equipmentItem.splice(e.equipmentCode, 1) + for (let i = 0; i < this.form.equipmentItem.length; i++) { + if (this.form.equipmentItem[i].equipmentCode == e.equipmentCode) { + this.form.equipmentItem.splice(i, 1); + } + } }, // 选择设备确认按钮 confirmSelectEquBtn() { diff --git a/src/views/kanban/dailyoutput/index.vue b/src/views/kanban/dailyoutput/index.vue index 04ab31b..935365e 100644 --- a/src/views/kanban/dailyoutput/index.vue +++ b/src/views/kanban/dailyoutput/index.vue @@ -1290,7 +1290,7 @@ export default { background-color: transparent; /*将select的宽高等于div的宽高*/ width: 100%; - height: 50px; + /*隐藏select的下拉图标*/ -webkit-appearance: none; -moz-appearance: none; diff --git a/src/views/kanban/equipment/index.vue b/src/views/kanban/equipment/index.vue new file mode 100644 index 0000000..7ac077e --- /dev/null +++ b/src/views/kanban/equipment/index.vue @@ -0,0 +1,1162 @@ + + + +